Skip to content

A platform for community discussion. Free, open, simple.

DEV: Type-check with TypeScript 7 (#43406)

David Taylor570ffdda808b
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c3be6d9226e..48241c955f1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -29,6 +29,7 @@
"dbaeumer.vscode-eslint",
"lifeart.vscode-glimmer-syntax",
"typed-ember.glint2-vscode",
+ "TypeScriptTeam.native-preview",
"stylelint.vscode-stylelint"
]
}
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index f234acf636a..1c2a40ea7d7 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -87,6 +87,10 @@ jobs:
if: ${{ !cancelled() }}
run: pnpm lint:types
+ - name: TypeScript language server
+ if: ${{ !cancelled() }}
+ run: pnpm --dir=frontend/discourse-types test
+
- name: Prettier
if: ${{ !cancelled() }}
run: |
diff --git a/.github/workflows/publish-types.yml b/.github/workflows/publish-types.yml
index 7d952f17468..e80f60950d5 100644
--- a/.github/workflows/publish-types.yml
+++ b/.github/workflows/publish-types.yml
@@ -58,44 +58,3 @@ jobs:
- name: Publish the package
working-directory: frontend/discourse-types
run: pnpm publish --no-git-checks --tag latest
-
- - name: Wait for the published version to be resolvable
- run: |
- for i in $(seq 1 30); do
- pnpm view "@discourse/types@${package_version}" version && exit 0
- echo "Not yet resolvable, waiting..."
- sleep 10
- done
-
- echo "Timed out waiting for @discourse/types@${package_version} to become resolvable" >&2
- exit 1
-
- - name: Bump @discourse/types in workspace package.json files
- run: |
- git checkout -- frontend/discourse-types/package.json
-
- pnpm update --filter './plugins/**' --filter './themes/**' \
- "discourse@npm:@discourse/types@${package_version}"
-
- - name: Open a PR with the bump
- env:
- GH_TOKEN: ${{ secrets.GH_PUSH_TOKEN }}
- run: |
- git config --global user.email "[email protected]"
- git config --global user.name "discoursebot"
-
- branch="types-bump/${package_version}"
- git checkout -b "$branch"
- git add -A
-
- if git diff --cached --quiet; then
- echo "Nothing to bump, skipping PR"
- exit 0
- fi
-
- git commit -m "DEV: Bump @discourse/types to ${package_version}"
- git push -f origin "$branch"
-
- title="DEV: Bump @discourse/types to ${package_version}"
- gh pr create --base main --head "$branch" --title "$title" --body "" ||
- gh pr edit "$branch" --title "$title"
diff --git a/.prettierignore b/.prettierignore
index ca079d4c43b..c8dcf217fc1 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -27,3 +27,4 @@ tmp/
!**/tsconfig.json
**/*.md
**/*.d.ts
+**/*.d.*.ts
diff --git a/.skills/discourse-writing-typescript/SKILL.md b/.skills/discourse-writing-typescript/SKILL.md
index 9695f93e119..60af4593cdc 100644
--- a/.skills/discourse-writing-typescript/SKILL.md
+++ b/.skills/discourse-writing-typescript/SKILL.md
@@ -370,7 +370,7 @@ file after `bin/lint --fix`** to confirm the placement still reads well.
## Verification (all three, in order)
1. `bin/lint --fix <files>`: clean.
-2. `pnpm lint:types` from the **repo root** (composite `ember-tsc -b`): **0 errors**. It
+2. `pnpm lint:types` from the **repo root** (composite `tsc -b --runExternalCode`): **0 errors**. It
also surfaces consumer fallout when you tighten a previously loose type (e.g. an untyped
helper's return).
3. `bin/qunit` for the touched files' tests: behavior plus the runtime module-resolution
diff --git a/.skills/discourse-writing-typescript/references/js-to-ts-conversion.md b/.skills/discourse-writing-typescript/references/js-to-ts-conversion.md
index 09fc323c4a1..314b1075aa5 100644
--- a/.skills/discourse-writing-typescript/references/js-to-ts-conversion.md
+++ b/.skills/discourse-writing-typescript/references/js-to-ts-conversion.md
@@ -155,7 +155,7 @@ primitive with dozens of consumers gets its own.
## The runtime pitfall (the one that bites)
-**`ember-tsc` does NOT catch runtime module-resolution errors in non-`@ts-check` `.js`/`.gjs`
+**`tsc` does NOT catch runtime module-resolution errors in non-`@ts-check` `.js`/`.gjs`
consumers.** When you rename `x.gjs` to `x.gts`, any consumer that imported it with the
**explicit old extension**
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index f7031a46243..cb0823605da 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -6,6 +6,7 @@
"dbaeumer.vscode-eslint",
"lifeart.vscode-glimmer-syntax",
"typed-ember.glint2-vscode",
+ "TypeScriptTeam.native-preview",
"stylelint.vscode-stylelint",
]
}
diff --git a/docs/developer-guides/docs/03-code-internals/27-types.md b/docs/developer-guides/docs/03-code-internals/27-types.md
index c4bbdd893ba..a71bf754fa0 100644
--- a/docs/developer-guides/docs/03-code-internals/27-types.md
+++ b/docs/developer-guides/docs/03-code-internals/27-types.md
@@ -26,7 +26,7 @@ Types whose meaning a runtime test can't capture (a generic's resolved type, an
- **CLI**: Run `pnpm lint:types`
-- **VSCode**: Install the [Glint v2](https://marketplace.visualstudio.com/items?itemName=typed-ember.glint2-vscode) extension. This is part of our [recommended config](https://github.com/discourse/discourse/blob/main/.vscode/extensions.json), so you may already have it. If anything isn't working, you may need to trigger "Restart extension host" from VSCode's command palette, or restart the IDE.
+- **VSCode**: Install the [TypeScript 7](https://marketplace.visualstudio.com/items?itemName=TypeScriptTeam.native-preview) and [Glint v2](https://marketplace.visualstudio.com/items?itemName=typed-ember.glint2-vscode) extensions. Glint 1.4.0 and newer hands `.gts`/`.gjs` files to TypeScript's own language server. Both are part of our [recommended config](https://github.com/discourse/discourse/blob/main/.vscode/extensions.json), so you may already have it. If anything isn't working, you may need to trigger "Restart extension host" from VSCode's command palette, or restart the IDE.
- **JetBrains** (RubyMine, WebStorm, Intellij, etc.): Install the [EmberExperimental](https://plugins.jetbrains.com/plugin/15499-emberexperimental-js) plugin.
@@ -38,22 +38,13 @@ Ensure that you've run `pnpm install` recently
Official themes/plugins, and the official skeletons, are all wired up for types. To enable it for your own plugin/theme, pull in the latest changes from the relevant skeleton (`package.json`, `tsconfig.json`)
-## Live type updates for bundled plugins and themes
+## Bundled plugins and themes
-If you're adding or changing core types and need to use those changes immediately in a bundled plugin or theme, use live type updates.
+Plugins and themes in this repository depend on `@discourse/types` through the pnpm workspace and reference the core project from their `tsconfig.json`. `pnpm lint:types` builds core first, so a core type change is checked against every bundled plugin in the same run, with no release or version bump in between.
-To do so, temporarily change the plugin or theme's `package.json` to:
+In the editor, the TypeScript 7 language server resolves core imports straight to core source. Editors still on TypeScript 6 read the declarations that the last `pnpm lint:types` emitted, so run it, or keep `pnpm types:watch` running, after changing core types.
-```json
-{
- "private": true,
- "dependencies": {
- "discourse": "workspace:@discourse/types@*"
- }
-}
-```
-
-Then run `pnpm install` and start the type watcher with `pnpm types:watch`.
+External plugins and themes consume the published `@discourse/types` package. It is published from `main` by the `publish-types` workflow.
## Relative imports
diff --git a/docs/developer-guides/package.json b/docs/developer-guides/package.json
index 1e1bfcaa60c..ebe97e88b7a 100644
--- a/docs/developer-guides/package.json
+++ b/docs/developer-guides/package.json
@@ -6,7 +6,7 @@
"lint:fix": "prettier --write '**/*.{md,json,mjs,yml}'"
},
"devDependencies": {
- "@discourse/lint-configs": "^3.8.0",
+ "@discourse/lint-configs": "^3.8.2",
"prettier": "3.8.1"
}
}
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 7b1ddcc25ea..1f03d76ec7e 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -18,6 +18,7 @@ export default [
"spec/",
"frontend/discourse/dist/",
"**/*.d.ts",
+ "**/*.d.*.ts",
"frontend/discourse-types/external-types",
"frontend/discourse-types/dts-generator.{js,ts}",
"tmp/",
diff --git a/frontend/discourse-types/dts-generator.ts b/frontend/discourse-types/dts-generator.ts
index 6ffb23b6fea..11ea5481e6a 100644
--- a/frontend/discourse-types/dts-generator.ts
+++ b/frontend/discourse-types/dts-generator.ts
@@ -2,10 +2,18 @@
* Based on https://github.com/SitePen/dts-generator
* The original package: © 2015-2019 SitePen, Inc. New BSD License.
*/
-import { createWriteStream } from "node:fs";
+import { writeFileSync } from "node:fs";
import { EOL } from "node:os";
import * as path from "node:path";
-import * as ts from "typescript";
+import {
+ type ExportDeclaration,
+ type ImportDeclaration,
+ type Node,
+ type SourceFile,
+ type StringLiteral,
+ SyntaxKind,
+} from "typescript/unstable/ast";
+import { API } from "typescript/unstable/sync";
export interface ResolveModuleIdParams {
/** The identifier of the module being declared in the generated d.ts */
@@ -18,9 +26,6 @@ export interface ResolveModuleImportParams {
/** The identifier of the enclosing module currently being declared in the generated d.ts */
currentModuleId: string;
-
- /** True if the imported module id is declared as a module in the input files. */
- isDeclaredExternalModule: boolean;
}
export interface Options {
@@ -41,64 +46,23 @@ const filenameToMid: (filename: string) => string = (function () {
}
})();
-/**
- * A helper function that takes TypeScript diagnostic errors and returns an error
- * object.
- * @param diagnostics The array of TypeScript Diagnostic objects
- */
-function getError(diagnostics: ts.Diagnostic[]) {
- let message = "Declaration generation failed";
-
- diagnostics.forEach(function (diagnostic) {
- // not all errors have an associated file: in particular, problems with a
- // the tsconfig.json don't; the messageText is enough to diagnose in those
- // cases.
- if (diagnostic.file && diagnostic.start !== undefined) {
- const position = diagnostic.file.getLineAndCharacterOfPosition(
- diagnostic.start
- );
-
- message +=
- `\n${diagnostic.file.fileName}(${position.line + 1},${position.character + 1}): ` +
- `error TS${diagnostic.code}: ${diagnostic.messageText}`;
- } else {
- message += `\nerror TS${diagnostic.code}: ${diagnostic.messageText}`;
- }
- });
-
- const error = new Error(message);
- error.name = "EmitterError";
- return error;
-}
-
-function getFilenames(baseDir: string, files: string[]): string[] {
- return files.map(function (filename) {
- const resolvedFilename = path.resolve(filename);
- if (resolvedFilename.startsWith(baseDir)) {
- return resolvedFilename;
- }
-
- return path.resolve(baseDir, filename);
- });
-}
-
function processTree(
- sourceFile: ts.SourceFile,
- replacer: (node: ts.Node) => string | null
+ sourceFile: SourceFile,
+ replacer: (node: Node) => string | null
): string {
let code = "";
let cursorPosition = 0;
- function skip(node: ts.Node) {
+ function skip(node: Node) {
cursorPosition = node.end;
}
- function readThrough(node: ts.Node) {
+ function readThrough(node: Node) {
code += sourceFile.text.slice(cursorPosition, node.pos);
cursorPosition = node.pos;
}
- function visit(node: ts.Node) {
+ function visit(node: Node) {
readThrough(node);
const replacement = replacer(node);
@@ -109,7 +73,7 @@ function processTree(
code += replacement;
skip(node);
} else {
- ts.forEachChild(node, visit);
+ node.forEachChild(visit);
}
}
@@ -119,117 +83,50 @@ function processTree(
return code;
}
-function isNodeKindImportDeclaration(
- value: ts.Node
-): value is ts.ImportDeclaration {
- return value && value.kind === ts.SyntaxKind.ImportDeclaration;
-}
-
-function isNodeKindStringLiteral(value: ts.Node): value is ts.StringLiteral {
- return value && value.kind === ts.SyntaxKind.StringLiteral;
+function isNodeKindImportDeclaration(value: Node): value is ImportDeclaration {
+ return value && value.kind === SyntaxKind.ImportDeclaration;
}
-function isNodeKindExportDeclaration(
- value: ts.Node
-): value is ts.ExportDeclaration {
- return value && value.kind === ts.SyntaxKind.ExportDeclaration;
+function isNodeKindStringLiteral(value: Node): value is StringLiteral {
+ return value && value.kind === SyntaxKind.StringLiteral;
}
-function isNodeKindModuleDeclaration(
- value: ts.Node
-): value is ts.ModuleDeclaration {
- return value && value.kind === ts.SyntaxKind.ModuleDeclaration;
+function isNodeKindExportDeclaration(value: Node): value is ExportDeclaration {
+ return value && value.kind === SyntaxKind.ExportDeclaration;
}
-export default function generate(options: Options): Promise<void> {
- const result = ts.parseConfigFileTextToJson("tsconfig.json", "{}");
- const configParseResult = ts.parseJsonConfigFileContent(
- result.config,
- ts.sys,
- options.project.slice(0, -1)
- );
-
- const compilerOptions: ts.CompilerOptions = configParseResult.options;
- const files: string[] = configParseResult.fileNames;
+export default function generate(options: Options): void {
const nonEmptyLineStart = new RegExp(EOL + "(?!" + EOL + "|$)", "g");
const indent = "\t";
-
- // use input values if tsconfig leaves any of these undefined.
- // this is for backwards compatibility
- compilerOptions.declaration = true;
- compilerOptions.target = ts.ScriptTarget.Latest; // is this necessary?
-
const baseDir = path.resolve(options.project);
- const filenames = getFilenames(baseDir, files);
-
- const output = createWriteStream(options.out, {
- mode: parseInt("644", 8),
- });
- const host = ts.createCompilerHost(compilerOptions);
- const program = ts.createProgram(filenames, compilerOptions, host);
-
- function writeFile(filename: string, data: string) {
- // Compiler is emitting the non-declaration file, which we do not care about
- if (!filename.endsWith(".d.ts")) {
- return;
- }
+ const output: string[] = [];
- writeDeclaration(
- ts.createSourceFile(filename, data, compilerOptions.target!, true),
- true
+ const api = new API({ cwd: baseDir });
+ try {
+ const { fileNames } = api.parseJsonConfigFileContent(
+ {},
+ { configDirectory: baseDir }
);
- }
-
- let declaredExternalModules: string[] = [];
-
- return new Promise<void>(function (resolve, reject) {
- output.on("close", () => resolve(undefined));
- output.on("error", reject);
-
- program.getSourceFiles().forEach(function (sourceFile) {
- processTree(sourceFile, function (node) {
- if (isNodeKindModuleDeclaration(node)) {
- const name = node.name;
- if (isNodeKindStringLiteral(name)) {
- declaredExternalModules.push(name.text);
- }
- }
- return null;
- });
- });
-
- program.getSourceFiles().some(function (sourceFile) {
- // Source file is a default library, or other dependency from another project, that should not be included in
- // our bundled output
- if (!path.normalize(sourceFile.fileName).startsWith(baseDir + path.sep)) {
- return;
- }
-
- // Source file is already a declaration file so should does not need to be pre-processed by the emitter
- if (sourceFile.fileName.endsWith(".d.ts")) {
- writeDeclaration(sourceFile, false);
- return;
+ const program = api.createProgram(fileNames, {});
+
+ for (const fileName of program.getSourceFileNames()) {
+ // Default libraries and other packages' files stay out of the bundle
+ if (
+ !path.normalize(fileName).startsWith(baseDir + path.sep) ||
+ !fileName.endsWith(".d.ts")
+ ) {
+ continue;
}
- const emitOutput = program.emit(sourceFile, writeFile);
- if (emitOutput.emitSkipped || emitOutput.diagnostics.length > 0) {
- reject(
- getError(
- emitOutput.diagnostics
- .concat(program.getSemanticDiagnostics(sourceFile))
- .concat(program.getSyntacticDiagnostics(sourceFile))
- .concat(program.getDeclarationDiagnostics(sourceFile))
- )
- );
-
- return true;
- }
- });
+ writeDeclaration(program.getSourceFile(fileName)!);
+ }
+ } finally {
+ api.close();
+ }
- output.end();
- });
+ writeFileSync(options.out, output.join(""), { mode: 0o644 });
- function writeDeclaration(declarationFile: ts.SourceFile, isOutput: boolean) {
+ function writeDeclaration(declarationFile: SourceFile) {
// resolving is important for dealing with relative outDirs
const filename = path.resolve(declarationFile.fileName);
@@ -241,12 +138,9 @@ export default function generate(options: Options): Promise<void> {
);
function resolveModuleImport(moduleId: string): string {
- const isDeclaredExternalModule: boolean =
- declaredExternalModules.includes(moduleId);
let resolved: string = options.resolveModuleImport({
importedModuleId: moduleId,
currentModuleId: currentModuleId,
- isDeclaredExternalModule: isDeclaredExternalModule,
});
if (!resolved) {
@@ -263,9 +157,7 @@ export default function generate(options: Options): Promise<void> {
return resolved;
}
- /* For some reason, SourceFile.externalModuleIndicator is missing from 1.6+, so having
- * to use a sledgehammer on the nut */
- if ((<any>declarationFile).externalModuleIndicator) {
+ if (declarationFile.externalModuleIndicator) {
const resolvedModuleId: string = options.resolveModuleId({
currentModuleId: currentModuleId,
});
@@ -275,12 +167,10 @@ export default function generate(options: Options): Promise<void> {
return;
}
- output.write(
- "declare module '" + resolvedModuleId + "' {" + EOL + indent
- );
+ output.push("declare module '" + resolvedModuleId + "' {" + EOL + indent);
const content = processTree(declarationFile, function (node) {
- if (node.kind == ts.SyntaxKind.DeclareKeyword) {
+ if (node.kind == SyntaxKind.DeclareKeyword) {
return "";
} else if (
isNodeKindStringLiteral(node) &&
@@ -298,10 +188,10 @@ export default function generate(options: Options): Promise<void> {
return null;
});
- output.write(content.replace(nonEmptyLineStart, "$&" + indent));
- output.write(EOL + "}" + EOL);
+ output.push(content.replace(nonEmptyLineStart, "$&" + indent));
+ output.push(EOL + "}" + EOL);
} else {
- output.write(declarationFile.text);
+ output.push(declarationFile.text);
}
}
}
diff --git a/frontend/discourse-types/generate-external-types.js b/frontend/discourse-types/generate-external-types.js
index 4a7bfadad2e..1f53dcdbf28 100644
--- a/frontend/discourse-types/generate-external-types.js
+++ b/frontend/discourse-types/generate-external-types.js
@@ -31,6 +31,17 @@ const packageNames = [
"pretender",
];
+// A module whose default export is a namespace hides that namespace's types
+// from consumers' declaration emit, which then expands them structurally
+// without bound. Exporting the namespace by name gives the types a path.
+function exportDefaultNamespaces(dts) {
+ return dts.replace(/^(\t) namespace (\w+) \{$/gm, (line, indent, name) =>
+ new RegExp(`^\\texport default ${name};$`, "m").test(dts)
+ ? `${indent}export namespace ${name} {`
+ : line
+ );
+}
+
(async function () {
try {
rmSync("./external-types", { recursive: true });
@@ -100,6 +111,11 @@ const packageNames = [
cpSync(path, `${targetPackagePath}/${relativePath}`);
}
+
+ writeFileSync(
+ `${targetPackagePath}/types/index.d.ts`,
+ 'export * from "./stable/index";\n'
+ );
} else {
function transformPath(relativePath) {
// Declarations emitted by newer TypeScript keep explicit extensions on
@@ -131,9 +147,10 @@ const packageNames = [
}
}
+ const out = `${targetPackagePath}/index.d.ts`;
await generateDtsBundle({
project: resolve(packagePath) + "/",
- out: `${targetPackagePath}/index.d.ts`,
+ out,
resolveModuleId({ currentModuleId }) {
return transformPath(currentModuleId);
},
@@ -147,6 +164,7 @@ const packageNames = [
}
},
});
+ writeFileSync(out, exportDefaultNamespaces(readFileSync(out, "utf-8")));
}
}
})().then(() => {
diff --git a/frontend/discourse-types/language-server.test.mjs b/frontend/discourse-types/language-server.test.mjs
new file mode 100644
index 00000000000..2b160432c9e
--- /dev/null
+++ b/frontend/discourse-types/language-server.test.mjs
@@ -0,0 +1,182 @@
+import assert from "node:assert/strict";
+import { spawn } from "node:child_process";
+import { once } from "node:events";
+import { dirname, join, resolve } from "node:path";
+import { test } from "node:test";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const ROOT = resolve(import.meta.dirname, "../..");
+const TSC = join(
+ dirname(fileURLToPath(import.meta.resolve("typescript/package.json"))),
+ "bin/tsc"
+);
+const PROBE_URI = fileUri(
+ "plugins/chat/assets/javascripts/discourse/language-server-probe.ts"
+);
+
+// Each binding must resolve to its core source file through the project reference.
+const IMPORTS = [
+ {
+ specifier: "discourse/lib/later",
+ binding: "* as later",
+ name: "later",
+ source: "frontend/discourse/app/lib/later.ts",
+ },
+ {
+ specifier: "discourse/lib/ajax",
+ binding: "{ ajax }",
+ name: "ajax",
+ source: "frontend/discourse/app/lib/ajax.js",
+ },
+ {
+ specifier: "discourse/ui-kit/d-button",
+ binding: "DButton",
+ name: "DButton",
+ source: "frontend/discourse/app/ui-kit/d-button.gts",
+ },
+ {
+ specifier: "discourse/components/pinned-button",
+ binding: "PinnedButton",
+ name: "PinnedButton",
+ source: "frontend/discourse/app/components/pinned-button.gjs",
+ },
+];
+
+const PROBE_LINES = [
+ ...IMPORTS.map(
+ ({ specifier, binding }) => `import ${binding} from "${specifier}";`
+ ),
+ `export const probe = [${IMPORTS.map(({ name }) => name).join(", ")}];`,
+];
+
+function fileUri(path) {
+ return pathToFileURL(join(ROOT, path)).href;
+}
+
+class LanguageServer {
+ #nextId = 0;
+ #pending = new Map();
+ #buffer = Buffer.alloc(0);
+ #stderr = "";
+ #process;
+
+ constructor() {
+ this.#process = spawn(process.execPath, [TSC, "--lsp", "--stdio"], {
+ cwd: ROOT,
+ });
+ this.#process.stdout.on("data", (chunk) => this.#receive(chunk));
+ this.#process.stderr.on("data", (chunk) => (this.#stderr += chunk));
+ this.#process.stdin.on("error", (error) => this.#fail(error.message));
+ this.#process.on("exit", (code) => this.#fail(`exited with ${code}`));
+ }
+
+ request(method, params) {
+ const id = ++this.#nextId;
+ const response = new Promise((resolvePromise, reject) =>
+ this.#pending.set(id, { resolve: resolvePromise, reject })
+ );
+ this.#write({ id, method, params });
+ return response;
+ }
+
+ notify(method, params) {
+ this.#write({ method, params });
+ }
+
+ async close() {
+ if (this.#process.exitCode === null) {
+ this.#process.kill();
+ await once(this.#process, "exit");
+ }
+ }
+
+ #write(message) {
+ const body = JSON.stringify({ jsonrpc: "2.0", ...message });
+ this.#process.stdin.write(
+ `Content-Length: ${Buffer.byteLength(body)}\r\n\r\n${body}`
+ );
+ }
+
+ #receive(chunk) {
+ this.#buffer = Buffer.concat([this.#buffer, chunk]);
+
+ for (;;) {
+ const headerEnd = this.#buffer.indexOf("\r\n\r\n");
+ if (headerEnd === -1) {
+ return;
+ }
+ const header = this.#buffer.subarray(0, headerEnd).toString();
+ const length = Number(/Content-Length: (\d+)/i.exec(header)[1]);
+ const bodyStart = headerEnd + 4;
+ if (this.#buffer.length < bodyStart + length) {
+ return;
+ }
+ const body = this.#buffer.subarray(bodyStart, bodyStart + length);
+ this.#buffer = this.#buffer.subarray(bodyStart + length);
+ this.#handle(JSON.parse(body.toString()));
+ }
+ }
+
+ #handle(message) {
+ if (message.method) {
+ // The server waits for an answer to its own requests.
+ if (message.id !== undefined) {
+ this.#write({ id: message.id, result: null });
+ }
+ return;
+ }
+
+ const pending = this.#pending.get(message.id);
+ this.#pending.delete(message.id);
+ if (message.error) {
+ pending?.reject(new Error(message.error.message));
+ } else {
+ pending?.resolve(message.result);
+ }
+ }
+
+ #fail(reason) {
+ const error = new Error(`Language server ${reason}\n${this.#stderr}`);
+ for (const { reject } of this.#pending.values()) {
+ reject(error);
+ }
+ this.#pending.clear();
+ }
+}
+
+test("the language server resolves core imports from a plugin to core source", async (t) => {
+ const server = new LanguageServer();
+ t.after(() => server.close());
+
+ await server.request("initialize", {
+ processId: process.pid,
+ rootUri: pathToFileURL(ROOT).href,
+ capabilities: {},
+ initializationOptions: { runExternalCode: true },
+ });
+ server.notify("initialized", {});
+ server.notify("textDocument/didOpen", {
+ textDocument: {
+ uri: PROBE_URI,
+ languageId: "typescript",
+ version: 1,
+ text: PROBE_LINES.join("\n") + "\n",
+ },
+ });
+
+ for (const [line, { name, source }] of IMPORTS.entries()) {
+ const result = await server.request("textDocument/definition", {
+ textDocument: { uri: PROBE_URI },
+ position: { line, character: PROBE_LINES[line].indexOf(name) },
+ });
+ const uris = [result ?? []]
+ .flat()
+ .map((location) => location.targetUri ?? location.uri);
+ assert.deepEqual(uris, [fileUri(source)], name);
+ }
+
+ const diagnostics = await server.request("textDocument/diagnostic", {
+ textDocument: { uri: PROBE_URI },
+ });
+ assert.deepEqual(diagnostics.items, []);
+});
diff --git a/frontend/discourse-types/package.json b/frontend/discourse-types/package.json
index 6d3ec678eda..90b36c4dac0 100644
--- a/frontend/discourse-types/package.json
+++ b/frontend/discourse-types/package.json
@@ -17,30 +17,55 @@
"scripts": {
"compile-dts-generator": "tsc --ignoreConfig --types node dts-generator.ts --target esnext --moduleResolution nodenext --module nodenext",
"generate-external-types": "node generate-external-types.js",
- "generate-external": "pnpm compile-dts-generator && pnpm generate-external-types"
+ "generate-external": "pnpm compile-dts-generator && pnpm generate-external-types",
+ "test": "node --test --test-timeout=60000 language-server.test.mjs"
},
"exports": {
"./tsconfig-plugin": "./tsconfig-plugin.json",
"./tests/*": {
- "types": "./declarations/tests/*.d.ts"
+ "types": [
+ "./declarations/tests/*.d.ts",
+ "./declarations/tests/*.d.gjs.ts",
+ "./declarations/tests/*.d.gts.ts"
+ ]
},
"./admin/*": {
- "types": "./declarations/admin/*.d.ts"
+ "types": [
+ "./declarations/admin/*.d.ts",
+ "./declarations/admin/*.d.gjs.ts",
+ "./declarations/admin/*.d.gts.ts"
+ ]
},
"./dialog-holder/*": {
- "types": "./declarations/dialog-holder/*.d.ts"
+ "types": [
+ "./declarations/dialog-holder/*.d.ts",
+ "./declarations/dialog-holder/*.d.gjs.ts",
+ "./declarations/dialog-holder/*.d.gts.ts"
+ ]
},
"./float-kit/*": {
- "types": "./declarations/float-kit/*.d.ts"
+ "types": [
+ "./declarations/float-kit/*.d.ts",
+ "./declarations/float-kit/*.d.gjs.ts",
+ "./declarations/float-kit/*.d.gts.ts"
+ ]
},
"./select-kit/*": {
- "types": "./declarations/select-kit/*.d.ts"
+ "types": [
+ "./declarations/select-kit/*.d.ts",
+ "./declarations/select-kit/*.d.gjs.ts",
+ "./declarations/select-kit/*.d.gts.ts"
+ ]
},
"./truth-helpers": {
"types": "./declarations/truth-helpers/index.d.ts"
},
"./truth-helpers/*": {
- "types": "./declarations/truth-helpers/*.d.ts"
+ "types": [
+ "./declarations/truth-helpers/*.d.ts",
+ "./declarations/truth-helpers/*.d.gjs.ts",
+ "./declarations/truth-helpers/*.d.gts.ts"
+ ]
},
"./blocks": {
"types": "./declarations/app/blocks/index.d.ts"
@@ -52,12 +77,17 @@
"types": "./declarations/app/lib/blocks/index.d.ts"
},
"./*": {
- "types": "./declarations/app/*.d.ts"
+ "types": [
+ "./declarations/app/*.d.ts",
+ "./declarations/app/*.d.gjs.ts",
+ "./declarations/app/*.d.gts.ts"
+ ]
}
},
"devDependencies": {
"@types/node": "^26.4.0",
- "compare-versions": "^6.1.1"
+ "compare-versions": "^6.1.1",
+ "typescript": "7.1.0-dev.20260930.4"
},
"engines": {
"node": ">= 20",
diff --git a/frontend/discourse-types/tsconfig-plugin.json b/frontend/discourse-types/tsconfig-plugin.json
index b6acc98ef27..9d91b7550fa 100644
--- a/frontend/discourse-types/tsconfig-plugin.json
+++ b/frontend/discourse-types/tsconfig-plugin.json
@@ -14,7 +14,10 @@
"declaration": true,
"outDir": "declarations",
"composite": true,
- "typeRoots": ["./external-types"],
+ "tsBuildInfoFile": "${configDir}/tsconfig.tsbuildinfo",
+ "typeRoots": [
+ "./external-types"
+ ],
"types": [
"discourse-i18n",
"ember-modifier",
@@ -34,5 +37,14 @@
"rsvp",
"sinon"
]
- }
+ },
+ "contentMappers": [
+ {
+ "package": "ember-content-mapper",
+ "extensions": [
+ ".gts",
+ ".gjs"
+ ]
+ }
+ ]
}
diff --git a/frontend/discourse/app/blocks/block-outlet.gts b/frontend/discourse/app/blocks/block-outlet.gts
index c546935f3b7..f0f47aba5a5 100644
--- a/frontend/discourse/app/blocks/block-outlet.gts
+++ b/frontend/discourse/app/blocks/block-outlet.gts
@@ -396,6 +396,9 @@ interface OutletInfoSignature {
outletArgs: Record<string, unknown>;
error: Error | null;
};
+ Blocks: {
+ default: [];
+ };
}
/**
diff --git a/frontend/discourse/app/lib/ajax.js b/frontend/discourse/app/lib/ajax.js
index a13ef58bc12..724557b926f 100644
--- a/frontend/discourse/app/lib/ajax.js
+++ b/frontend/discourse/app/lib/ajax.js
@@ -82,22 +82,22 @@ export function updateCsrfToken() {
in subfolders.
**/
-export function ajax() {
+export function ajax(...params) {
let url, args;
let ajaxObj;
- if (arguments.length === 1) {
- if (typeof arguments[0] === "string") {
- url = arguments[0];
+ if (params.length === 1) {
+ if (typeof params[0] === "string") {
+ url = params[0];
args = {};
} else {
- args = arguments[0];
+ args = params[0];
url = args.url;
delete args.url;
}
- } else if (arguments.length === 2) {
- url = arguments[0];
- args = arguments[1];
+ } else if (params.length === 2) {
+ url = params[0];
+ args = params[1];
}
url = getURL(url);
diff --git a/frontend/discourse/app/lib/blocks/-internals/glimmer-manager.d.ts b/frontend/discourse/app/lib/blocks/-internals/glimmer-manager.d.ts
deleted file mode 100644
index 0ed996ce7ba..00000000000
--- a/frontend/discourse/app/lib/blocks/-internals/glimmer-manager.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Ambient shim for `@glimmer/manager`. The package ships its own types, but it
-// is a transitive dependency with no resolvable entry point from the app, so
-// `ember-tsc` cannot find the module (TS2307). Declare the two internal-manager
-// helpers the block decorator relies on, typed just precisely enough to wrap the
-// returned manager in a Proxy — the manager object itself is opaque here.
-declare module "@glimmer/manager" {
- export function getInternalComponentManager(definition: object): object;
-
- export function setInternalComponentManager<T extends object>(
- manager: object,
- obj: T
- ): T;
-}
diff --git a/frontend/discourse/app/lib/debounce.js b/frontend/discourse/app/lib/debounce.js
index b987bbea467..7d09764ede8 100644
--- a/frontend/discourse/app/lib/debounce.js
+++ b/frontend/discourse/app/lib/debounce.js
@@ -7,12 +7,12 @@ import { isTesting } from "discourse/lib/environment";
Original function will be called with the context and arguments from the last call made.
**/
-export default function () {
+export default function (...params) {
if (isTesting()) {
- const lastArgument = arguments[arguments.length - 1];
+ const lastArgument = params[params.length - 1];
const hasImmediateArgument = typeof lastArgument === "boolean";
- let args = [].slice.call(arguments, 0, hasImmediateArgument ? -2 : -1);
+ let args = [].slice.call(params, 0, hasImmediateArgument ? -2 : -1);
// Replace the time argument with 10ms
args.push(10);
@@ -23,6 +23,6 @@ export default function () {
return debounce.apply(undefined, args);
} else {
- return debounce(...arguments);
+ return debounce(...params);
}
}
diff --git a/frontend/discourse/app/ui-kit/d-otp/index.gjs b/frontend/discourse/app/ui-kit/d-otp/index.gjs
index ea06f898dae..60b465e4e8f 100644
--- a/frontend/discourse/app/ui-kit/d-otp/index.gjs
+++ b/frontend/discourse/app/ui-kit/d-otp/index.gjs
@@ -23,9 +23,9 @@ const DEFAULT_SLOTS = 6;
* @property {string} [Args.inputMode] - The inputmode attribute for the hidden input (defaults to "numeric")
* @property {string} [Args.autocomplete] - The autocomplete attribute for the hidden input (defaults to "one-time-code")
* @property {boolean} [Args.autoFocus] - Focus the input automatically unless disabled or on iOS
- * @property {function(string): string} [Args.normalizeInput] - Callback used to normalize typed or pasted input
- * @property {function(string): void} [Args.onChange] - Callback fired when the input value changes
- * @property {function(string): void} [Args.onFill] - Callback fired when all slots become filled
+ * @property {(value: string) => string} [Args.normalizeInput] - Callback used to normalize typed or pasted input
+ * @property {(value: string) => void} [Args.onChange] - Callback fired when the input value changes
+ * @property {(value: string) => void} [Args.onFill] - Callback fired when all slots become filled
* @property {number} [Args.groupSize] - Adds a visual separator after every groupSize slots
*
*/
diff --git a/frontend/discourse/app/ui-kit/modifiers/d-close-on-click-outside.js b/frontend/discourse/app/ui-kit/modifiers/d-close-on-click-outside.js
index 21f312def7d..5b12f7a1bdf 100644
--- a/frontend/discourse/app/ui-kit/modifiers/d-close-on-click-outside.js
+++ b/frontend/discourse/app/ui-kit/modifiers/d-close-on-click-outside.js
@@ -2,6 +2,18 @@ import { registerDestructor } from "@ember/destroyable";
import Modifier from "ember-modifier";
import { bind } from "discourse/lib/decorators";
+/**
+ * @typedef DCloseOnClickOutsideOptions
+ * @property {string} [targetSelector]
+ * @property {string} [secondaryTargetSelector]
+ * @property {Element | null} [target]
+ */
+
+/**
+ * @typedef {{ Args: { Positional: [closeFn: (event: PointerEvent) => void, options?: DCloseOnClickOutsideOptions] } }} DCloseOnClickOutsideSignature
+ */
+
+/** @extends {Modifier<DCloseOnClickOutsideSignature>} */
export default class DCloseOnClickOutside extends Modifier {
constructor(owner, args) {
super(owner, args);
diff --git a/frontend/discourse/app/ui-kit/modifiers/d-scroll-into-view.js b/frontend/discourse/app/ui-kit/modifiers/d-scroll-into-view.js
index c7f98ced313..ec8f56b6844 100644
--- a/frontend/discourse/app/ui-kit/modifiers/d-scroll-into-view.js
+++ b/frontend/discourse/app/ui-kit/modifiers/d-scroll-into-view.js
@@ -4,9 +4,7 @@ import Modifier from "ember-modifier";
* @typedef ScrollIntoViewSignature
*
* @property {object} Args
- * @property {Array} Args.Positional
- * @property {boolean} Args.Positional.0 - Whether to scroll this element into view
- * @property {ScrollIntoViewOptions} [Args.Positional.1] - ScrollIntoView options (behavior, block, inline)
+ * @property {[shouldScroll: boolean, options?: ScrollIntoViewOptions]} Args.Positional
*/
/**
diff --git a/frontend/discourse/package.json b/frontend/discourse/package.json
index cd0c331a277..0b3eb7c8891 100644
--- a/frontend/discourse/package.json
+++ b/frontend/discourse/package.json
@@ -50,7 +50,7 @@
"@fullcalendar/moment-timezone": "^6.1.20",
"@fullcalendar/timegrid": "^6.1.20",
"@glimmer/syntax": "0.95.0",
- "@glint/ember-tsc": "^1.11.4",
+ "@glint/ember-tsc": "^1.11.6",
"@glint/template": "^1.9.0",
"@highlightjs/cdn-assets": "11.12.0",
"@json-editor/json-editor": "2.17.2",
@@ -176,7 +176,7 @@
"source-map-js": "^1.2.1",
"testem": "^3.20.2",
"tracked-built-ins": "^4.1.2",
- "typescript": "^6.0.3",
+ "typescript": "7.1.0-dev.20260930.4",
"util": "^0.12.5",
"xss": "^1.0.15"
},
diff --git a/frontend/discourse/tsconfig.json b/frontend/discourse/tsconfig.json
index 3c01798547f..0ad7edcf983 100644
--- a/frontend/discourse/tsconfig.json
+++ b/frontend/discourse/tsconfig.json
@@ -18,14 +18,36 @@
"outDir": "../discourse-types/declarations",
"types": ["ember-source/types"],
"paths": {
- "discourse/tests/*": ["./tests/*"],
- "discourse/admin/*": ["./admin/*"],
- "discourse/select-kit/*": ["./select-kit/*"],
- "discourse/float-kit/*": ["./float-kit/*"],
- "discourse/truth-helpers/*": ["./truth-helpers/*"],
+ "discourse/tests/*": ["./tests/*", "./tests/*.gjs", "./tests/*.gts"],
+ "discourse/admin/*": ["./admin/*", "./admin/*.gjs", "./admin/*.gts"],
+ "discourse/select-kit/*": [
+ "./select-kit/*",
+ "./select-kit/*.gjs",
+ "./select-kit/*.gts"
+ ],
+ "discourse/float-kit/*": [
+ "./float-kit/*",
+ "./float-kit/*.gjs",
+ "./float-kit/*.gts"
+ ],
+ "discourse/truth-helpers/*": [
+ "./truth-helpers/*",
+ "./truth-helpers/*.gjs",
+ "./truth-helpers/*.gts"
+ ],
"discourse/truth-helpers": ["./truth-helpers/index"],
- "discourse/dialog-holder/*": ["./dialog-holder/*"],
- "discourse/*": ["./app/*"]
+ "discourse/dialog-holder/*": [
+ "./dialog-holder/*",
+ "./dialog-holder/*.gjs",
+ "./dialog-holder/*.gts"
+ ],
+ "discourse/*": ["./app/*", "./app/*.gjs", "./app/*.gts"]
}
- }
+ },
+ "contentMappers": [
+ {
+ "package": "ember-content-mapper",
+ "extensions": [".gts", ".gjs"]
+ }
+ ]
}
diff --git a/lefthook.yml b/lefthook.yml
index 66fd7d3a6d4..3706df942ce 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -209,5 +209,5 @@ lints:
i18n-lint:
glob: *i18n_glob
run: bundle exec ruby script/i18n_lint.rb {all_files}
- glint:
+ tsc:
run: pnpm lint:types
diff --git a/package.json b/package.json
index 68aa4845d10..9e575bf33af 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,14 @@
"author": "Discourse",
"license": "GPL-2.0-only",
"devDependencies": {
- "@discourse/lint-configs": "^3.8.0",
+ "@discourse/lint-configs": "^3.8.2",
"@discourse/moment-timezone-names-translations": "^1.0.0",
"@fortawesome/fontawesome-free": "7.3.1",
- "@glint/ember-tsc": "^1.11.4",
- "@glint/tsserver-plugin": "^2.7.7",
+ "@glint/ember-tsc": "^1.11.6",
+ "@glint/tsserver-plugin": "^2.7.9",
"@rdil/parallel-prettier": "^3.0.0",
"concurrently": "^10.0.5",
+ "ember-content-mapper": "^0.3.1",
"eslint": "10.6.0",
"execa": "^10.0.1",
"jsdoc": "^4.0.5",
@@ -22,9 +23,10 @@
"postcss-value-parser": "^4.2.0",
"prettier": "3.8.1",
"stylelint": "17.5.0",
- "typescript": "^6.0.3"
+ "typescript": "7.1.0-dev.20260930.4"
},
"scripts": {
+ "prepare": "pnpm types:generate",
"dev": "bin/dev",
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
@@ -34,9 +36,9 @@
"lint:js:fix": "eslint --fix ./frontend $(script/list_bundled_plugins) ./themes --no-error-on-unmatched-pattern",
"lint:prettier": "pnpm pprettier --list-different 'app/assets/stylesheets/**/*.scss' 'frontend/**/*.{js,gjs,ts,gts,mts,cts,cjs,mjs,css}' $(script/list_bundled_plugins '/assets/stylesheets/**/*.scss') $(script/list_bundled_plugins '/{assets,admin/assets,test}/javascripts/**/*.{js,gjs,ts,gts,mts,cts,cjs,mjs}') 'themes/**/*.{js,gjs,ts,gts,cjs,mjs,scss}'",
"lint:prettier:fix": "pnpm prettier -w --no-error-on-unmatched-pattern 'app/assets/stylesheets/**/*.scss' 'frontend/**/*.{js,gjs,ts,gts,mts,cts,cjs,mjs,css}' $(script/list_bundled_plugins '/assets/stylesheets/**/*.scss') $(script/list_bundled_plugins '/{assets,admin/assets,test}/javascripts/**/*.{js,gjs,ts,gts,mts,cts,cjs,mjs}') 'themes/**/*.{js,gjs,ts,gts,cjs,mjs,scss}'",
- "lint:types": "NODE_OPTIONS=--max-old-space-size=8192 ember-tsc -b",
- "types:generate": "pnpm --dir=frontend/discourse-i18n ember-tsc && pnpm --dir=frontend/discourse-types generate-external",
- "types:watch": "pnpm types:generate && NODE_OPTIONS=--max-old-space-size=8192 pnpm ember-tsc -b --watch --preserveWatchOutput",
+ "lint:types": "tsc -b --runExternalCode",
+ "types:generate": "pnpm --dir=frontend/discourse-i18n tsc && pnpm --dir=frontend/discourse-types generate-external",
+ "types:watch": "pnpm types:generate && tsc -b --runExternalCode --watch --preserveWatchOutput",
"lttf:ignore": "lint-to-the-future ignore",
"lttf:output": "lint-to-the-future output -o ./lint-progress/",
"lint-progress": "pnpm lttf:output && npx html-pages ./lint-progress --no-cache",
diff --git a/plugins/automation/package.json b/plugins/automation/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/automation/package.json
+++ b/plugins/automation/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/automation/tsconfig.json b/plugins/automation/tsconfig.json
index 03b85f4dbae..409260f6b39 100644
--- a/plugins/automation/tsconfig.json
+++ b/plugins/automation/tsconfig.json
@@ -24,5 +24,10 @@
"./admin/assets/javascripts/admin/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/boards/package.json b/plugins/boards/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/boards/package.json
+++ b/plugins/boards/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/boards/tsconfig.json b/plugins/boards/tsconfig.json
index 7a398dd6838..85b0769b9f6 100644
--- a/plugins/boards/tsconfig.json
+++ b/plugins/boards/tsconfig.json
@@ -19,5 +19,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/chat/package.json b/plugins/chat/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/chat/package.json
+++ b/plugins/chat/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/chat/tsconfig.json b/plugins/chat/tsconfig.json
index 5c0fc56bf6b..e71249aedb9 100644
--- a/plugins/chat/tsconfig.json
+++ b/plugins/chat/tsconfig.json
@@ -24,5 +24,10 @@
"./admin/assets/javascripts/admin/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/checklist/package.json b/plugins/checklist/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/checklist/package.json
+++ b/plugins/checklist/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/checklist/tsconfig.json b/plugins/checklist/tsconfig.json
index 7709ef714f7..84643845c81 100644
--- a/plugins/checklist/tsconfig.json
+++ b/plugins/checklist/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-adplugin/package.json b/plugins/discourse-adplugin/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-adplugin/package.json
+++ b/plugins/discourse-adplugin/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-adplugin/tsconfig.json b/plugins/discourse-adplugin/tsconfig.json
index 9a033fddf56..dae7643530f 100644
--- a/plugins/discourse-adplugin/tsconfig.json
+++ b/plugins/discourse-adplugin/tsconfig.json
@@ -24,5 +24,10 @@
"./admin/assets/javascripts/admin/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-affiliate/package.json b/plugins/discourse-affiliate/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-affiliate/package.json
+++ b/plugins/discourse-affiliate/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-affiliate/tsconfig.json b/plugins/discourse-affiliate/tsconfig.json
index c074be49a54..e62dc8791c9 100644
--- a/plugins/discourse-affiliate/tsconfig.json
+++ b/plugins/discourse-affiliate/tsconfig.json
@@ -13,5 +13,10 @@
"./assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/controllers/admin/dashboard-sentiment.js b/plugins/discourse-ai/admin/assets/javascripts/discourse/controllers/admin/dashboard-sentiment.js
index 3ae60132efd..9362d4f944c 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/controllers/admin/dashboard-sentiment.js
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/controllers/admin/dashboard-sentiment.js
@@ -2,6 +2,7 @@ import { computed } from "@ember/object";
import AdminDashboardTabController from "discourse/admin/controllers/admin-dashboard-tab";
export default class AdminDashboardSentiment extends AdminDashboardTabController {
+ /** @returns {AdminDashboardTabController["filters"]} */
@computed("startDate", "endDate")
get filters() {
return { startDate: this.startDate, endDate: this.endDate };
diff --git a/plugins/discourse-ai/package.json b/plugins/discourse-ai/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-ai/package.json
+++ b/plugins/discourse-ai/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-ai/tsconfig.json b/plugins/discourse-ai/tsconfig.json
index b5caf9fc997..7158a3290dd 100644
--- a/plugins/discourse-ai/tsconfig.json
+++ b/plugins/discourse-ai/tsconfig.json
@@ -24,5 +24,10 @@
"./admin/assets/javascripts/admin/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-apple-auth/package.json b/plugins/discourse-apple-auth/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-apple-auth/package.json
+++ b/plugins/discourse-apple-auth/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-apple-auth/tsconfig.json b/plugins/discourse-apple-auth/tsconfig.json
index 6418c4ee2b6..593b534ecc2 100644
--- a/plugins/discourse-apple-auth/tsconfig.json
+++ b/plugins/discourse-apple-auth/tsconfig.json
@@ -13,5 +13,10 @@
"./assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-assign/package.json b/plugins/discourse-assign/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-assign/package.json
+++ b/plugins/discourse-assign/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-assign/tsconfig.json b/plugins/discourse-assign/tsconfig.json
index 71591a0d18e..dce765da039 100644
--- a/plugins/discourse-assign/tsconfig.json
+++ b/plugins/discourse-assign/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-cakeday/package.json b/plugins/discourse-cakeday/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-cakeday/package.json
+++ b/plugins/discourse-cakeday/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-cakeday/tsconfig.json b/plugins/discourse-cakeday/tsconfig.json
index d04b6ac8057..05d1e2c3aa4 100644
--- a/plugins/discourse-cakeday/tsconfig.json
+++ b/plugins/discourse-cakeday/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-captcha/package.json b/plugins/discourse-captcha/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-captcha/package.json
+++ b/plugins/discourse-captcha/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-captcha/tsconfig.json b/plugins/discourse-captcha/tsconfig.json
index ec50553926a..52e3a72a517 100644
--- a/plugins/discourse-captcha/tsconfig.json
+++ b/plugins/discourse-captcha/tsconfig.json
@@ -19,5 +19,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-chat-integration/package.json b/plugins/discourse-chat-integration/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-chat-integration/package.json
+++ b/plugins/discourse-chat-integration/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-chat-integration/tsconfig.json b/plugins/discourse-chat-integration/tsconfig.json
index cd303b8a770..6bef2fdbb30 100644
--- a/plugins/discourse-chat-integration/tsconfig.json
+++ b/plugins/discourse-chat-integration/tsconfig.json
@@ -19,5 +19,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-data-explorer/package.json b/plugins/discourse-data-explorer/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-data-explorer/package.json
+++ b/plugins/discourse-data-explorer/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-data-explorer/tsconfig.json b/plugins/discourse-data-explorer/tsconfig.json
index 395523e9d3b..5f686fefd61 100644
--- a/plugins/discourse-data-explorer/tsconfig.json
+++ b/plugins/discourse-data-explorer/tsconfig.json
@@ -24,5 +24,10 @@
"./admin/assets/javascripts/admin/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-details/package.json b/plugins/discourse-details/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-details/package.json
+++ b/plugins/discourse-details/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-details/tsconfig.json b/plugins/discourse-details/tsconfig.json
index 227da631e22..25ccaa63f12 100644
--- a/plugins/discourse-details/tsconfig.json
+++ b/plugins/discourse-details/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-events/package.json b/plugins/discourse-events/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-events/package.json
+++ b/plugins/discourse-events/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-events/tsconfig.json b/plugins/discourse-events/tsconfig.json
index f0ec90cc7d6..fde37c701e1 100644
--- a/plugins/discourse-events/tsconfig.json
+++ b/plugins/discourse-events/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-gamification/package.json b/plugins/discourse-gamification/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-gamification/package.json
+++ b/plugins/discourse-gamification/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-gamification/tsconfig.json b/plugins/discourse-gamification/tsconfig.json
index 0aa79cca5cd..2205ac44d87 100644
--- a/plugins/discourse-gamification/tsconfig.json
+++ b/plugins/discourse-gamification/tsconfig.json
@@ -24,5 +24,10 @@
"./admin/assets/javascripts/admin/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-github/package.json b/plugins/discourse-github/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-github/package.json
+++ b/plugins/discourse-github/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-github/tsconfig.json b/plugins/discourse-github/tsconfig.json
index 4560e5d5cd0..fcc06991460 100644
--- a/plugins/discourse-github/tsconfig.json
+++ b/plugins/discourse-github/tsconfig.json
@@ -13,5 +13,10 @@
"./assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-graphviz/package.json b/plugins/discourse-graphviz/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-graphviz/package.json
+++ b/plugins/discourse-graphviz/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-graphviz/tsconfig.json b/plugins/discourse-graphviz/tsconfig.json
index 370cff4fb70..fd9430f47c5 100644
--- a/plugins/discourse-graphviz/tsconfig.json
+++ b/plugins/discourse-graphviz/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-lazy-videos/package.json b/plugins/discourse-lazy-videos/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-lazy-videos/package.json
+++ b/plugins/discourse-lazy-videos/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-lazy-videos/tsconfig.json b/plugins/discourse-lazy-videos/tsconfig.json
index 16867408f36..44b9363b03b 100644
--- a/plugins/discourse-lazy-videos/tsconfig.json
+++ b/plugins/discourse-lazy-videos/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-local-dates/package.json b/plugins/discourse-local-dates/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-local-dates/package.json
+++ b/plugins/discourse-local-dates/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-local-dates/tsconfig.json b/plugins/discourse-local-dates/tsconfig.json
index c3a414369de..b888a42e002 100644
--- a/plugins/discourse-local-dates/tsconfig.json
+++ b/plugins/discourse-local-dates/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-login-with-amazon/package.json b/plugins/discourse-login-with-amazon/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-login-with-amazon/package.json
+++ b/plugins/discourse-login-with-amazon/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-lti/package.json b/plugins/discourse-lti/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-lti/package.json
+++ b/plugins/discourse-lti/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-lti/tsconfig.json b/plugins/discourse-lti/tsconfig.json
index f4a7807e626..0c91c6ba497 100644
--- a/plugins/discourse-lti/tsconfig.json
+++ b/plugins/discourse-lti/tsconfig.json
@@ -13,5 +13,10 @@
"./assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-math/package.json b/plugins/discourse-math/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-math/package.json
+++ b/plugins/discourse-math/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-math/tsconfig.json b/plugins/discourse-math/tsconfig.json
index f1b0bf75488..9d5b1a4526a 100644
--- a/plugins/discourse-math/tsconfig.json
+++ b/plugins/discourse-math/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-microsoft-auth/package.json b/plugins/discourse-microsoft-auth/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-microsoft-auth/package.json
+++ b/plugins/discourse-microsoft-auth/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-microsoft-auth/tsconfig.json b/plugins/discourse-microsoft-auth/tsconfig.json
index 59613730b8e..315a4db30e0 100644
--- a/plugins/discourse-microsoft-auth/tsconfig.json
+++ b/plugins/discourse-microsoft-auth/tsconfig.json
@@ -13,5 +13,10 @@
"./assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-narrative-bot/package.json b/plugins/discourse-narrative-bot/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-narrative-bot/package.json
+++ b/plugins/discourse-narrative-bot/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-narrative-bot/tsconfig.json b/plugins/discourse-narrative-bot/tsconfig.json
index 75b10a7ca98..b7d969a2aee 100644
--- a/plugins/discourse-narrative-bot/tsconfig.json
+++ b/plugins/discourse-narrative-bot/tsconfig.json
@@ -13,5 +13,10 @@
"./assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-oauth2-basic/package.json b/plugins/discourse-oauth2-basic/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-oauth2-basic/package.json
+++ b/plugins/discourse-oauth2-basic/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-oauth2-basic/tsconfig.json b/plugins/discourse-oauth2-basic/tsconfig.json
index a4593fed5b0..85cd25f150b 100644
--- a/plugins/discourse-oauth2-basic/tsconfig.json
+++ b/plugins/discourse-oauth2-basic/tsconfig.json
@@ -13,5 +13,10 @@
"./assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-openid-connect/package.json b/plugins/discourse-openid-connect/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-openid-connect/package.json
+++ b/plugins/discourse-openid-connect/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-openid-connect/tsconfig.json b/plugins/discourse-openid-connect/tsconfig.json
index 40772bf1c3c..0ea6c6d14f3 100644
--- a/plugins/discourse-openid-connect/tsconfig.json
+++ b/plugins/discourse-openid-connect/tsconfig.json
@@ -13,5 +13,10 @@
"./assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-patreon/package.json b/plugins/discourse-patreon/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-patreon/package.json
+++ b/plugins/discourse-patreon/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-patreon/tsconfig.json b/plugins/discourse-patreon/tsconfig.json
index 2f777154846..278a97d18db 100644
--- a/plugins/discourse-patreon/tsconfig.json
+++ b/plugins/discourse-patreon/tsconfig.json
@@ -16,5 +16,10 @@
"./admin/assets/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-policy/package.json b/plugins/discourse-policy/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-policy/package.json
+++ b/plugins/discourse-policy/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-policy/tsconfig.json b/plugins/discourse-policy/tsconfig.json
index d845db767a9..691ab02c854 100644
--- a/plugins/discourse-policy/tsconfig.json
+++ b/plugins/discourse-policy/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-post-voting/package.json b/plugins/discourse-post-voting/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-post-voting/package.json
+++ b/plugins/discourse-post-voting/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-post-voting/tsconfig.json b/plugins/discourse-post-voting/tsconfig.json
index a382ac7e5c0..3cb498e334e 100644
--- a/plugins/discourse-post-voting/tsconfig.json
+++ b/plugins/discourse-post-voting/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-presence/package.json b/plugins/discourse-presence/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-presence/package.json
+++ b/plugins/discourse-presence/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-presence/tsconfig.json b/plugins/discourse-presence/tsconfig.json
index 55157223baa..d76836c929d 100644
--- a/plugins/discourse-presence/tsconfig.json
+++ b/plugins/discourse-presence/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-reactions/package.json b/plugins/discourse-reactions/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-reactions/package.json
+++ b/plugins/discourse-reactions/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-reactions/tsconfig.json b/plugins/discourse-reactions/tsconfig.json
index ac773313f4a..f7708950ef2 100644
--- a/plugins/discourse-reactions/tsconfig.json
+++ b/plugins/discourse-reactions/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-rewind/package.json b/plugins/discourse-rewind/package.json
index 6495465c8e4..5baab56b131 100644
--- a/plugins/discourse-rewind/package.json
+++ b/plugins/discourse-rewind/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-rewind/tsconfig.json b/plugins/discourse-rewind/tsconfig.json
index fd0ab12a43e..845a93b6690 100644
--- a/plugins/discourse-rewind/tsconfig.json
+++ b/plugins/discourse-rewind/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-rss-polling/package.json b/plugins/discourse-rss-polling/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-rss-polling/package.json
+++ b/plugins/discourse-rss-polling/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-rss-polling/tsconfig.json b/plugins/discourse-rss-polling/tsconfig.json
index 08960fdcf8c..846d4365950 100644
--- a/plugins/discourse-rss-polling/tsconfig.json
+++ b/plugins/discourse-rss-polling/tsconfig.json
@@ -21,5 +21,10 @@
"./admin/assets/javascripts/admin/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-solved/package.json b/plugins/discourse-solved/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-solved/package.json
+++ b/plugins/discourse-solved/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-solved/tsconfig.json b/plugins/discourse-solved/tsconfig.json
index 55af232d6e0..01726d28d00 100644
--- a/plugins/discourse-solved/tsconfig.json
+++ b/plugins/discourse-solved/tsconfig.json
@@ -24,5 +24,10 @@
"./admin/assets/javascripts/admin/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-subscriptions/package.json b/plugins/discourse-subscriptions/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-subscriptions/package.json
+++ b/plugins/discourse-subscriptions/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-subscriptions/tsconfig.json b/plugins/discourse-subscriptions/tsconfig.json
index d980e61758b..a9295a2b68a 100644
--- a/plugins/discourse-subscriptions/tsconfig.json
+++ b/plugins/discourse-subscriptions/tsconfig.json
@@ -19,5 +19,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-templates/package.json b/plugins/discourse-templates/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-templates/package.json
+++ b/plugins/discourse-templates/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-templates/tsconfig.json b/plugins/discourse-templates/tsconfig.json
index 159b7d33607..ae3456d8637 100644
--- a/plugins/discourse-templates/tsconfig.json
+++ b/plugins/discourse-templates/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-topic-voting/package.json b/plugins/discourse-topic-voting/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-topic-voting/package.json
+++ b/plugins/discourse-topic-voting/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-topic-voting/tsconfig.json b/plugins/discourse-topic-voting/tsconfig.json
index c58cc869436..0d25a279222 100644
--- a/plugins/discourse-topic-voting/tsconfig.json
+++ b/plugins/discourse-topic-voting/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-user-notes/package.json b/plugins/discourse-user-notes/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-user-notes/package.json
+++ b/plugins/discourse-user-notes/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-user-notes/tsconfig.json b/plugins/discourse-user-notes/tsconfig.json
index ea0eb40371a..67123892296 100644
--- a/plugins/discourse-user-notes/tsconfig.json
+++ b/plugins/discourse-user-notes/tsconfig.json
@@ -19,5 +19,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/discourse-zendesk-plugin/package.json b/plugins/discourse-zendesk-plugin/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/discourse-zendesk-plugin/package.json
+++ b/plugins/discourse-zendesk-plugin/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/discourse-zendesk-plugin/tsconfig.json b/plugins/discourse-zendesk-plugin/tsconfig.json
index 34691828cb0..53c32ca0bae 100644
--- a/plugins/discourse-zendesk-plugin/tsconfig.json
+++ b/plugins/discourse-zendesk-plugin/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/footnote/package.json b/plugins/footnote/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/footnote/package.json
+++ b/plugins/footnote/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/footnote/tsconfig.json b/plugins/footnote/tsconfig.json
index 59d617d25cc..a26c3d55591 100644
--- a/plugins/footnote/tsconfig.json
+++ b/plugins/footnote/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/poll/package.json b/plugins/poll/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/poll/package.json
+++ b/plugins/poll/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/poll/tsconfig.json b/plugins/poll/tsconfig.json
index 41879c15b13..edd719bbeba 100644
--- a/plugins/poll/tsconfig.json
+++ b/plugins/poll/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/spoiler-alert/package.json b/plugins/spoiler-alert/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/spoiler-alert/package.json
+++ b/plugins/spoiler-alert/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/spoiler-alert/tsconfig.json b/plugins/spoiler-alert/tsconfig.json
index cf38937e7f1..87e93130a01 100644
--- a/plugins/spoiler-alert/tsconfig.json
+++ b/plugins/spoiler-alert/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/styleguide/package.json b/plugins/styleguide/package.json
index 0d0d1962348..5baab56b131 100644
--- a/plugins/styleguide/package.json
+++ b/plugins/styleguide/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/plugins/styleguide/tsconfig.json b/plugins/styleguide/tsconfig.json
index 1b1cc4b5857..5167e15926f 100644
--- a/plugins/styleguide/tsconfig.json
+++ b/plugins/styleguide/tsconfig.json
@@ -16,5 +16,10 @@
"./test/javascripts/*.gts"
]
}
- }
+ },
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}
diff --git a/plugins/voice/package.json b/plugins/voice/package.json
index aa8526eeabf..840324617b7 100644
--- a/plugins/voice/package.json
+++ b/plugins/voice/package.json
@@ -4,6 +4,6 @@
"voice:bots": "node scripts/voice-fake-participants.mjs"
},
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 39c753f8f3d..d8e670370f1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,7 +6,7 @@ settings:
overrides:
tmp: ^0.2.7
- typescript: ^6.0.3
+ '@glint/tsserver-plugin>typescript': ^6.0.3
babel-plugin-ember-template-compilation@~2.3.0: 2.4.1
@@ -35,8 +35,8 @@ importers:
.:
devDependencies:
'@discourse/lint-configs':
- specifier: ^3.8.0
+ specifier: ^3.8.2
'@discourse/moment-timezone-names-translations':
specifier: ^1.0.0
version: 1.0.0
@@ -44,17 +44,20 @@ importers:
specifier: 7.3.1
version: 7.3.1
'@glint/ember-tsc':
- specifier: ^1.11.4
- version: 1.11.4([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])
+ specifier: ^1.11.6
+ version: 1.11.6([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])
'@glint/tsserver-plugin':
- specifier: ^2.7.7
- version: 2.7.7([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))
+ specifier: ^2.7.9
+ version: 2.7.9([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))
'@rdil/parallel-prettier':
specifier: ^3.0.0
version: 3.0.0([email protected])
concurrently:
specifier: ^10.0.5
version: 10.0.5
+ ember-content-mapper:
+ specifier: ^0.3.1
+ version: 0.3.1([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])
eslint:
specifier: 10.6.0
version: 10.6.0([email protected])
@@ -87,16 +90,16 @@ importers:
version: 3.8.1
stylelint:
specifier: 17.5.0
- version: 17.5.0([email protected])
+ version: 17.5.0([email protected])
typescript:
- specifier: ^6.0.3
- version: 6.0.3
+ specifier: 7.1.0-dev.20260930.4
+ version: 7.1.0-dev.20260930.4
docs/developer-guides:
devDependencies:
'@discourse/lint-configs':
- specifier: ^3.8.0
+ specifier: ^3.8.2
prettier:
specifier: 3.8.1
version: 3.8.1
@@ -272,8 +275,8 @@ importers:
specifier: 0.95.0
version: 0.95.0
'@glint/ember-tsc':
- specifier: ^1.11.4
- version: 1.11.4([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])
+ specifier: ^1.11.6
+ version: 1.11.6([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])
'@glint/template':
specifier: ^1.9.0
version: 1.9.0
@@ -645,8 +648,8 @@ importers:
specifier: ^4.1.2
version: 4.1.2(@babel/[email protected])
typescript:
- specifier: ^6.0.3
- version: 6.0.3
+ specifier: 7.1.0-dev.20260930.4
+ version: 7.1.0-dev.20260930.4
util:
specifier: ^0.12.5
version: 0.12.5
@@ -695,6 +698,9 @@ importers:
compare-versions:
specifier: ^6.1.1
version: 6.1.1
+ typescript:
+ specifier: 7.1.0-dev.20260930.4
+ version: 7.1.0-dev.20260930.4
frontend/playwright-runner:
dependencies:
@@ -748,272 +754,272 @@ importers:
plugins/automation:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/boards:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/chat:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/checklist:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-adplugin:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-affiliate:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-ai:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-apple-auth:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-assign:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-cakeday:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-captcha:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-chat-integration:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-data-explorer:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-details:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-events:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-gamification:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-github:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-graphviz:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-lazy-videos:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-local-dates:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-login-with-amazon:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-lti:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-math:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-microsoft-auth:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-narrative-bot:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-oauth2-basic:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-openid-connect:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-patreon:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-policy:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-post-voting:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-presence:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-reactions:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-rss-polling:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-solved:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-subscriptions:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-templates:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-topic-voting:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-user-notes:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/discourse-zendesk-plugin:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/footnote:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/poll:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/spoiler-alert:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/styleguide:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
plugins/voice:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
themes/horizon:
dependencies:
discourse:
- specifier: npm:@discourse/[email protected]
- version: '@discourse/[email protected]'
+ specifier: workspace:@discourse/types@*
+ version: link:../../frontend/discourse-types
packages:
@@ -1847,8 +1853,8 @@ packages:
'@discourse/[email protected]':
resolution: {integrity: sha512-Veu75DEDC7uKsCCsD94UIjFwvHE73+AATBQbBWb83QyJV34wmyxl2Ji+fiiM234mlNn4cpo3DUl0QFrXgRTcfA==}
- '@discourse/[email protected]':
- resolution: {integrity: sha512-GeaLkfxmIrwbnX02KZYajdNfPRt1TN0Dfau4shhtp2tjSPfBTOaeUcifN3hKYc0JhdUmQId246QdmHTd602liw==}
+ '@discourse/[email protected]':
+ resolution: {integrity: sha512-qjhx6T+wK5XTzDbbQaL9Nt0IXo90TfaqHvSdiUZMrlDqTLh56+w65EJuXNRdFKQvpXy1wkzLrQp89zLDQ8BtSQ==}
peerDependencies:
eslint: 10.6.0
prettier: 3.8.1
@@ -1863,10 +1869,6 @@ packages:
'@discourse/[email protected]':
resolution: {integrity: sha512-iSPfgyCWTXsLcYoUN7/TxTbCSMlSqCI2v9/dCmg5dQdr/qi0TtRKjMzmSy7+8+Ns2v076IQDtdyfvBT8CQPd3g==}
- '@discourse/[email protected]':
- resolution: {integrity: sha512-yxR72bEx7BWZZgyehZfu6GTbDFlyJFI9PHH9KBYmiftC9PSWjUAckraWBHN55DjKZuEVQW0HCDi/2PtXxTVlnA==}
- engines: {node: '>= 20', npm: please-use-pnpm, pnpm: ^10, yarn: please-use-pnpm}
-
'@discourse/[email protected]':
resolution: {integrity: sha512-2dXuEED+ISG26RbWij3NvdQmgHCD8ssnPoHMd0LnLKJc/dtd2lqg1dhrrA/WYDxfFoJaoGepoxFOsqe0d2/wqw==}
@@ -2091,12 +2093,12 @@ packages:
'@glimmer/[email protected]':
resolution: {integrity: sha512-A+Cp5m6vZMAEu0Kg/YwU2dJZXyYxVJs2zI57d3CP6NctmX7FsT8WjViiRUmt5abVmMmRH5b8BUovqY6GSMAdrw==}
- '@glint/[email protected]':
- resolution: {integrity: sha512-7lFRjaA+hv+G1usoP1IYdpcmxtNvm7uhhKjIpyuXaZG/J7kS3WaOUTvDXwL5y1dXQWqLgt/5Q54Q3Pgw1m/h8w==}
+ '@glint/[email protected]':
+ resolution: {integrity: sha512-+UEkP71/fCijNBd2teUm3fjlnY9A22ZY20VNSYVnMf+i+TO4Zp91Ws4zJpjjAFc2TMppjscMluQLrbKrUHn/BQ==}
hasBin: true
peerDependencies:
ember-source: '>=3.28.0'
- typescript: ^6.0.3
+ typescript: '>=5.6.0'
peerDependenciesMeta:
ember-source:
optional: true
@@ -2104,8 +2106,8 @@ packages:
resolution: {integrity: sha512-AoLE/VeDcCI3vroIwP3uTjc33+44JYJbARbswRxe8/Jz7P+dWlhO+ycmigsT2WdVI051+HF9jZLsSwUXv0JxwQ==}
- '@glint/[email protected]':
- resolution: {integrity: sha512-jLRv2/n83wz+YUfpRab6+Wl6Fqy2NQimiKF0piGCROFTscu0rROdzPT+H3W3KElMiX/cY/vqxINe6gLR/5ilqA==}
+ '@glint/[email protected]':
+ resolution: {integrity: sha512-W8J8ild0o1WV6Fy4SaZzhKOVYr3u0D5hKoTIonNOh3ixKMASzlz+xwNZ6YH30jY7N7GCt6pB4jYD7nUrxjiZxQ==}
'@handlebars/[email protected]':
resolution: {integrity: sha512-n/SZW+12rwikx/f8YcSv9JCi5p9vn1Bnts9ZtVvfErG4h0gbjHI1H1ZMhVUnaOC7yzFc6PtsCKIK8XeTnL90Gw==}
@@ -2855,26 +2857,26 @@ packages:
peerDependencies:
'@typescript-eslint/parser': ^8.62.1
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-sPhE4iHuJDSvoAiec+Ro8JyXw8f0ql13HFR82P99nCm9GwTEKG0KYLvDe6REk8BCXuit6vJAv/Yxg5ABaNS2rA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.0.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-yQ3RgY5RkSBpsNS1Bx/JQEcA24FOSdfGktoyprAr5u18390UQdtVcfnEv4nIrIshNnavlVyZBKxQwT1fIAE6cg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==}
@@ -2888,26 +2890,26 @@ packages:
resolution: {integrity: sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.0.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-xadytJqX9vJVQ2fdQjkcIVigwaOJNWkpjdLt6cEQ+xPnrI1fkp+/jZE/I97k9KUjqtpd25i0HeyZf3T6dutv2g==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-sUAbkulqBAsncKnbRP3+7CtQFRKicexnj7ZwNC6ddCR7EmrXvjvdCYMJbUIqMd6lwoEriZjwLo08aS5tSjVMHg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-aXM5xlqXiTxPibXB93cLAURfT3rlizf7uMXISCXy66Isr/9hISJx3yDsKl0L7lKa51b8JpFuNKby0/O0pEm9jg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==}
@@ -2921,27 +2923,27 @@ packages:
resolution: {integrity: sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.0.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-xMcW9oP9u7fAMXYs9A65CVmtLQe2r//oXINHfi8HV+oiqhih17sbLdhXr4540YWlgpDKQdY854OL5ZrdCiQsAA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.0.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-sHtbPfuKNZCG+ih8SyjjucqRntSVmp8XgL5u6o9mAhiSn8ds5o/M/XdM0abweme2Tln3szOstOrZ9OXitvPh0g==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==}
@@ -2951,6 +2953,48 @@ packages:
resolution: {integrity: sha512-4g3BLxfdTMy8iZG0MaBkadnlRrCJ74cQiFbyEVMrkwIoqdyaXXQM22cotDvrl4x28wgIZ9rEJRoM+mmhSJpJ1g==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-/k0in+czN7835T9HwQ7r73/PmhkLn+5yhreiO9zPGpErXkv7P97ksHK9ImSFSAs2/gXboazzPpsOl+mk0zA1iQ==}
+ engines: {node: '>=16.20.0'}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-ITDKKWveMkFtQYPwpWqerAKmYAwh1kGIzzn2NEomufg/LBrbdo0F4LSotLmO2wq0vDQlTFZBMjikNOgQpxU09w==}
+ engines: {node: '>=16.20.0'}
+ cpu: [x64]
+ os: [darwin]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-3zBDMDf+XNflm7d7JlL+eCeSq8eb0TtYE5GTs7c8NkA6RxlabvUTYsfH7MEPvEpawODuU89knqE5AsOlpNQxEg==}
+ engines: {node: '>=16.20.0'}
+ cpu: [arm64]
+ os: [linux]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-0qLPMj5LqB/0dQLIdysmpF/CBoj4JWKaXrCtls7eIy3wRj+zxLJH9xw6EjIznxH3cTw0K/auVzGd11rRa09xaQ==}
+ engines: {node: '>=16.20.0'}
+ cpu: [arm]
+ os: [linux]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-nit0a2o1oZLc15Vxx01WmEwxh58mNru+fbdrl2w2ntsrs277G4E5bTVlmjusQTMQrYaoGPQ87dHP4iiGCwGR0w==}
+ engines: {node: '>=16.20.0'}
+ cpu: [x64]
+ os: [linux]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-+82D46C7JiTuMEY9R8sbSphs68rJcMZs9QvN0yx+PwQkuFx64OfrC5mQ2XYHKBgmx2y9MYaVsb9/3eZsCOuf6A==}
+ engines: {node: '>=16.20.0'}
+ cpu: [arm64]
+ os: [win32]
+
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-bwUDNgcarVhWX6HF5uOFtPStCfOE9tLtDMYO8auDoLMp1GYXWxlet7Lh+SN2x506wtA8170nY1+3IHZwWPwd/w==}
+ engines: {node: '>=16.20.0'}
+ cpu: [x64]
+ os: [win32]
+
resolution: {integrity: sha512-UBz+shrtDbnOf11AboDrkc9Fq2Cdf8HbFftE+gqfxig6fkv5rHpHhBCLkl8wCGAq+X/CxdqvvNhm/OM23Uzw2w==}
peerDependencies:
@@ -3012,7 +3056,7 @@ packages:
resolution: {integrity: sha512-cKX4vK9dtZvDRaAzeoUdaAJEew6IdxHNCRrdp5Kvcl6zZOqb6jTOfk3kXkIkG3T7oTFXguEMt5+9ptyqYR84Pg==}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '*'
resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==}
@@ -4014,7 +4058,7 @@ packages:
resolution: {integrity: sha512-gtTZxTDau1wL7Y7zifc2dd8jHSK/k6BTx/2Xp/BpdlAdnlYWFVt7qhJqgwi7637yRwRQ3qL4ZidbB4I8tA5VOg==}
engines: {node: '>=14'}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.9.5'
peerDependenciesMeta:
typescript:
optional: true
@@ -4263,6 +4307,10 @@ packages:
engines: {node: '>= 20.19.0'}
hasBin: true
+ resolution: {integrity: sha512-m46P1JIJiuMmYZc9PNWZA+KWBc7lkfTpTbtixOknxHoR9Nj5WDmLgWG011edUzqzzzFT22fvMvdukHnEYlTNgA==}
+ engines: {node: ^22.21.1 || >=24.10.0}
+
resolution: {integrity: sha512-8N1WWt1KuMntWvB+i9ShwXFMU0tliJO7XinLJB+fihSl/ip+72UWAW3UCRttpiirKuIXJPpwqt6VCmlKbL8C4A==}
peerDependencies:
@@ -7540,6 +7588,10 @@ packages:
resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
engines: {node: '>=12.0.0'}
+ resolution: {integrity: sha512-9YodfrxS9g9IbFr/KOjE5bAeJ0p61n3bW6mqvy0jtoeKd1kTW1Cxm0oulm6KX2lyM9Gl6WIe8nEbY7LWv5ZJww==}
+ engines: {node: ^20.0.0 || >=22.0.0}
+
resolution: {integrity: sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==}
engines: {node: '>=14.0.0'}
@@ -7603,7 +7655,7 @@ packages:
resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
engines: {node: '>=18.12'}
peerDependencies:
- typescript: ^6.0.3
+ typescript: '>=4.8.4'
resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
@@ -7666,16 +7718,26 @@ packages:
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
- typescript: ^6.0.3
+ typescript: '>=4.8.4 <6.1.0'
resolution: {integrity: sha512-GQ90TcKpIH4XxYTI2F98yEQYZgjNMOGPpOgdjIBhaLaWji5HPWlRnZ4AeA1hfBxtY7bCGDJsqDDHk/KaHOl5bA==}
+ resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+ engines: {node: '>=14.17'}
+ hasBin: true
+
resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
engines: {node: '>=14.17'}
hasBin: true
+ resolution: {integrity: sha512-SHLXGxB3FtSbkBdHOIPJibBMRJinqsXaYHzcheJO5cKYP6x2Sdmq3c9iU8lnGwEBU7D9KEBsWZiTz7nA1DO4Kw==}
+ engines: {node: '>=16.20.0'}
+ hasBin: true
+
resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
@@ -9200,19 +9262,20 @@ snapshots:
dependencies:
wasm-feature-detect: 1.8.0
dependencies:
'@babel/core': 8.0.1
'@babel/eslint-parser': 8.0.1(@babel/[email protected])([email protected]([email protected]))
'@babel/plugin-proposal-decorators': 8.0.2(@babel/[email protected])
'@eslint/js': 10.0.1([email protected]([email protected]))
+ '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
eslint: 10.6.0([email protected])
eslint-plugin-qunit: 8.2.6([email protected]([email protected]))
eslint-plugin-simple-import-sort: 13.0.0([email protected]([email protected]))
globals: 17.7.0
prettier: 3.8.1
prettier-plugin-ember-template-tag: 2.1.7([email protected])
@@ -9220,10 +9283,36 @@ snapshots:
stylelint-config-standard: 40.0.0([email protected]([email protected]))
stylelint-config-standard-scss: 17.0.0([email protected])([email protected]([email protected]))
stylelint-scss: 7.2.0([email protected]([email protected]))
- typescript: 6.0.3
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - postcss
+ - supports-color
+
+ dependencies:
+ '@babel/core': 8.0.1
+ '@babel/eslint-parser': 8.0.1(@babel/[email protected])([email protected]([email protected]))
+ '@babel/plugin-proposal-decorators': 8.0.2(@babel/[email protected])
+ '@eslint/js': 10.0.1([email protected]([email protected]))
+ '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
+ eslint: 10.6.0([email protected])
+ eslint-plugin-qunit: 8.2.6([email protected]([email protected]))
+ eslint-plugin-simple-import-sort: 13.0.0([email protected]([email protected]))
+ globals: 17.7.0
+ prettier: 3.8.1
+ prettier-plugin-ember-template-tag: 2.1.7([email protected])
+ stylelint: 17.5.0([email protected])
+ stylelint-config-standard: 40.0.0([email protected]([email protected]))
+ stylelint-config-standard-scss: 17.0.0([email protected])([email protected]([email protected]))
+ stylelint-scss: 7.2.0([email protected]([email protected]))
+ typescript: 5.9.3
transitivePeerDependencies:
- - '@typescript-eslint/parser'
- postcss
- supports-color
@@ -9233,8 +9322,6 @@ snapshots:
'@discourse/[email protected]': {}
- '@discourse/[email protected]': {}
-
'@discourse/[email protected]':
dependencies:
wasm-feature-detect: 1.8.0
@@ -9675,7 +9762,7 @@ snapshots:
dependencies:
'@glimmer/interfaces': 0.94.6
- '@glint/[email protected]([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])':
+ '@glint/[email protected]([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])':
dependencies:
'@glimmer/syntax': 0.95.0
'@glint/template': 1.9.0
@@ -9700,11 +9787,36 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@glint/[email protected]([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])':
+ dependencies:
+ '@glimmer/syntax': 0.95.0
+ '@glint/template': 1.9.0
+ '@volar/kit': 2.4.28([email protected])
+ '@volar/language-core': 2.4.28
+ '@volar/language-server': 2.4.28
+ '@volar/language-service': 2.4.28
+ '@volar/source-map': 2.4.28
+ '@volar/test-utils': 2.4.28
+ '@volar/typescript': 2.4.28
+ content-tag: 4.2.0
+ ember-estree: 0.8.0
+ silent-error: 1.1.1
+ typescript: 7.1.0-dev.20260930.4
+ volar-service-html: 0.0.71(@volar/[email protected])
+ volar-service-typescript: 0.0.71(@volar/[email protected])
+ vscode-languageserver-protocol: 3.18.3
+ vscode-languageserver-textdocument: 1.0.14
+ vscode-uri: 3.2.0
+ optionalDependencies:
+ ember-source: 7.3.0(patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected])
+ transitivePeerDependencies:
+ - supports-color
+
'@glint/[email protected]': {}
- '@glint/[email protected]([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))':
+ '@glint/[email protected]([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))':
dependencies:
- '@glint/ember-tsc': 1.11.4([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])
+ '@glint/ember-tsc': 1.11.6([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])
'@volar/language-core': 2.4.28
'@volar/typescript': 2.4.28
jiti: 2.7.0
@@ -10382,49 +10494,49 @@ snapshots:
dependencies:
'@types/node': 26.4.0
dependencies:
'@eslint-community/regexpp': 4.12.2
- '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
'@typescript-eslint/scope-manager': 8.62.1
- '@typescript-eslint/type-utils': 8.62.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/utils': 8.62.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/type-utils': 8.62.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/utils': 8.62.1([email protected]([email protected]))([email protected])
'@typescript-eslint/visitor-keys': 8.62.1
eslint: 10.6.0([email protected])
ignore: 7.0.5
natural-compare: 1.4.0
- ts-api-utils: 2.5.0([email protected])
- typescript: 6.0.3
+ ts-api-utils: 2.5.0([email protected])
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
dependencies:
'@typescript-eslint/scope-manager': 8.62.1
'@typescript-eslint/types': 8.62.1
- '@typescript-eslint/typescript-estree': 8.62.1([email protected])
+ '@typescript-eslint/typescript-estree': 8.62.1([email protected])
'@typescript-eslint/visitor-keys': 8.62.1
debug: 4.4.3
eslint: 10.6.0([email protected])
- typescript: 6.0.3
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]([email protected])':
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- '@typescript-eslint/tsconfig-utils': 8.63.0([email protected])
+ '@typescript-eslint/tsconfig-utils': 8.63.0([email protected])
'@typescript-eslint/types': 8.62.1
debug: 4.4.3
- typescript: 6.0.3
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]([email protected])':
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- '@typescript-eslint/tsconfig-utils': 8.63.0([email protected])
+ '@typescript-eslint/tsconfig-utils': 8.63.0([email protected])
'@typescript-eslint/types': 8.62.1
debug: 4.4.3
- typescript: 6.0.3
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
@@ -10438,27 +10550,27 @@ snapshots:
'@typescript-eslint/types': 8.62.1
'@typescript-eslint/visitor-keys': 8.62.1
- '@typescript-eslint/[email protected]([email protected])':
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- typescript: 6.0.3
+ typescript: 5.9.3
- '@typescript-eslint/[email protected]([email protected])':
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- typescript: 6.0.3
+ typescript: 5.9.3
- '@typescript-eslint/[email protected]([email protected])':
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- typescript: 6.0.3
+ typescript: 5.9.3
dependencies:
'@typescript-eslint/types': 8.62.1
- '@typescript-eslint/typescript-estree': 8.62.1([email protected])
- '@typescript-eslint/utils': 8.62.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/typescript-estree': 8.62.1([email protected])
+ '@typescript-eslint/utils': 8.62.1([email protected]([email protected]))([email protected])
debug: 4.4.3
eslint: 10.6.0([email protected])
- ts-api-utils: 2.5.0([email protected])
- typescript: 6.0.3
+ ts-api-utils: 2.5.0([email protected])
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
@@ -10466,55 +10578,55 @@ snapshots:
'@typescript-eslint/[email protected]': {}
- '@typescript-eslint/[email protected]([email protected])':
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- '@typescript-eslint/project-service': 8.56.1([email protected])
- '@typescript-eslint/tsconfig-utils': 8.56.1([email protected])
+ '@typescript-eslint/project-service': 8.56.1([email protected])
+ '@typescript-eslint/tsconfig-utils': 8.56.1([email protected])
'@typescript-eslint/types': 8.56.1
'@typescript-eslint/visitor-keys': 8.56.1
debug: 4.4.3
minimatch: 10.2.6
semver: 7.8.5
tinyglobby: 0.2.17
- ts-api-utils: 2.5.0([email protected])
- typescript: 6.0.3
+ ts-api-utils: 2.5.0([email protected])
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]([email protected])':
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- '@typescript-eslint/project-service': 8.62.1([email protected])
- '@typescript-eslint/tsconfig-utils': 8.62.1([email protected])
+ '@typescript-eslint/project-service': 8.62.1([email protected])
+ '@typescript-eslint/tsconfig-utils': 8.62.1([email protected])
'@typescript-eslint/types': 8.62.1
'@typescript-eslint/visitor-keys': 8.62.1
debug: 4.4.3
minimatch: 10.2.6
semver: 7.8.5
tinyglobby: 0.2.17
- ts-api-utils: 2.5.0([email protected])
- typescript: 6.0.3
+ ts-api-utils: 2.5.0([email protected])
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
dependencies:
'@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@typescript-eslint/scope-manager': 8.56.1
'@typescript-eslint/types': 8.56.1
- '@typescript-eslint/typescript-estree': 8.56.1([email protected])
+ '@typescript-eslint/typescript-estree': 8.56.1([email protected])
eslint: 10.6.0([email protected])
- typescript: 6.0.3
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
dependencies:
'@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@typescript-eslint/scope-manager': 8.62.1
'@typescript-eslint/types': 8.62.1
- '@typescript-eslint/typescript-estree': 8.62.1([email protected])
+ '@typescript-eslint/typescript-estree': 8.62.1([email protected])
eslint: 10.6.0([email protected])
- typescript: 6.0.3
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
@@ -10528,6 +10640,27 @@ snapshots:
'@typescript-eslint/types': 8.62.1
eslint-visitor-keys: 5.0.1
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
+ '@typescript/[email protected]':
+ optional: true
+
dependencies:
'@uppy/companion-client': 5.1.1(@uppy/[email protected])
@@ -10620,6 +10753,15 @@ snapshots:
vscode-languageserver-textdocument: 1.0.14
vscode-uri: 3.2.0
+ dependencies:
+ '@volar/language-service': 2.4.28
+ '@volar/typescript': 2.4.28
+ typesafe-path: 0.2.2
+ typescript: 7.1.0-dev.20260930.4
+ vscode-languageserver-textdocument: 1.0.14
+ vscode-uri: 3.2.0
+
dependencies:
'@volar/source-map': 2.4.28
@@ -11724,6 +11866,15 @@ snapshots:
optionalDependencies:
typescript: 6.0.3
+ dependencies:
+ env-paths: 2.2.1
+ import-fresh: 3.3.1
+ js-yaml: 4.3.2
+ parse-json: 5.2.0
+ optionalDependencies:
+ typescript: 7.1.0-dev.20260930.4
+
@@ -12183,6 +12334,16 @@ snapshots:
- walrus
- whiskers
+ [email protected]([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected]):
+ dependencies:
+ '@glint/ember-tsc': 1.11.6([email protected](patch_hash=aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201)(@glimmer/[email protected]))([email protected])
+ tinypool: 2.1.2
+ vscode-jsonrpc: 9.0.2
+ transitivePeerDependencies:
+ - ember-source
+ - supports-color
+ - typescript
+
dependencies:
'@embroider/addon-shim': 1.10.3
@@ -12193,10 +12354,10 @@ snapshots:
- '@babel/core'
- supports-color
dependencies:
'@glimmer/syntax': 0.95.0
- '@typescript-eslint/tsconfig-utils': 8.63.0([email protected])
+ '@typescript-eslint/tsconfig-utils': 8.63.0([email protected])
content-tag: 4.2.0
ember-estree: 0.6.11
eslint-scope: 9.1.2
@@ -12205,7 +12366,7 @@ snapshots:
svg-tags: 1.0.0
optionalDependencies:
'@babel/eslint-parser': 8.0.1(@babel/[email protected])([email protected]([email protected]))
- '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
transitivePeerDependencies:
- typescript
@@ -12535,14 +12696,14 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@ember-data/rfc395-data': 0.0.4
aria-query: 5.3.2
axobject-query: 4.1.0
css-tree: 3.2.1
editorconfig: 3.0.2
ember-rfc176-data: 0.3.18
eslint: 10.6.0([email protected])
eslint-utils: 3.0.0([email protected]([email protected]))
@@ -12556,7 +12717,7 @@ snapshots:
snake-case: 3.0.4
svg-tags: 1.0.0
optionalDependencies:
- '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
transitivePeerDependencies:
- '@babel/eslint-parser'
- typescript
@@ -12571,11 +12732,11 @@ snapshots:
dependencies:
eslint: 10.6.0([email protected])
dependencies:
'@microsoft/tsdoc': 0.16.0
'@microsoft/tsdoc-config': 0.18.1
- '@typescript-eslint/utils': 8.56.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/utils': 8.56.1([email protected]([email protected]))([email protected])
transitivePeerDependencies:
- eslint
- supports-color
@@ -15792,10 +15953,23 @@ snapshots:
optionalDependencies:
postcss: 8.5.28
+ dependencies:
+ postcss-scss: 4.0.9([email protected])
+ stylelint: 17.5.0([email protected])
+ stylelint-config-recommended: 18.0.0([email protected]([email protected]))
+ stylelint-scss: 7.2.0([email protected]([email protected]))
+ optionalDependencies:
+ postcss: 8.5.28
+
dependencies:
stylelint: 17.5.0([email protected])
+ dependencies:
+ stylelint: 17.5.0([email protected])
+
dependencies:
stylelint: 17.5.0([email protected])
@@ -15804,11 +15978,24 @@ snapshots:
optionalDependencies:
postcss: 8.5.28
+ dependencies:
+ stylelint: 17.5.0([email protected])
+ stylelint-config-recommended-scss: 17.0.1([email protected])([email protected]([email protected]))
+ stylelint-config-standard: 40.0.0([email protected]([email protected]))
+ optionalDependencies:
+ postcss: 8.5.28
+
dependencies:
stylelint: 17.5.0([email protected])
stylelint-config-recommended: 18.0.0([email protected]([email protected]))
+ dependencies:
+ stylelint: 17.5.0([email protected])
+ stylelint-config-recommended: 18.0.0([email protected]([email protected]))
+
dependencies:
'@csstools/css-calc': 3.2.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
@@ -15824,6 +16011,21 @@ snapshots:
postcss-value-parser: 4.2.0
stylelint: 17.5.0([email protected])
+ dependencies:
+ '@csstools/css-calc': 3.2.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
+ '@csstools/css-parser-algorithms': 4.0.0(@csstools/[email protected])
+ '@csstools/css-syntax-patches-for-csstree': 1.1.5([email protected])
+ '@csstools/css-tokenizer': 4.0.0
+ css-tree: 3.2.1
+ is-plain-object: 5.0.0
+ known-css-properties: 0.37.0
+ postcss-media-query-parser: 0.2.3
+ postcss-resolve-nested-selector: 0.1.6
+ postcss-selector-parser: 7.1.6
+ postcss-value-parser: 4.2.0
+ stylelint: 17.5.0([email protected])
+
dependencies:
'@csstools/css-calc': 3.2.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
@@ -15867,6 +16069,49 @@ snapshots:
- supports-color
- typescript
+ dependencies:
+ '@csstools/css-calc': 3.2.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
+ '@csstools/css-parser-algorithms': 4.0.0(@csstools/[email protected])
+ '@csstools/css-syntax-patches-for-csstree': 1.1.5([email protected])
+ '@csstools/css-tokenizer': 4.0.0
+ '@csstools/media-query-list-parser': 5.0.0(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])
+ '@csstools/selector-resolve-nested': 4.0.1([email protected])
+ '@csstools/selector-specificity': 6.0.0([email protected])
+ colord: 2.9.3
+ cosmiconfig: 9.0.2([email protected])
+ css-functions-list: 3.3.3
+ css-tree: 3.2.1
+ debug: 4.4.3
+ fast-glob: 3.3.3
+ fastest-levenshtein: 1.0.16
+ file-entry-cache: 11.1.3
+ global-modules: 2.0.0
+ globby: 16.2.0
+ globjoin: 0.1.4
+ html-tags: 5.1.0
+ ignore: 7.0.5
+ import-meta-resolve: 4.2.0
+ imurmurhash: 0.1.4
+ is-plain-object: 5.0.0
+ mathml-tag-names: 4.0.0
+ meow: 14.1.0
+ micromatch: 4.0.8
+ normalize-path: 3.0.0
+ picocolors: 1.1.1
+ postcss: 8.5.28
+ postcss-safe-parser: 7.0.1([email protected])
+ postcss-selector-parser: 7.1.6
+ postcss-value-parser: 4.2.0
+ string-width: 8.2.1
+ supports-hyperlinks: 4.4.0
+ svg-tags: 1.0.0
+ table: 6.9.0
+ write-file-atomic: 7.0.1
+ transitivePeerDependencies:
+ - supports-color
+ - typescript
+
@@ -16078,6 +16323,8 @@ snapshots:
fdir: 6.5.0([email protected])
picomatch: 4.0.7
+
@@ -16149,9 +16396,9 @@ snapshots:
dependencies:
- typescript: 6.0.3
+ typescript: 5.9.3
@@ -16224,21 +16471,33 @@ snapshots:
dependencies:
semver: 7.8.5
dependencies:
- '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/typescript-estree': 8.62.1([email protected])
- '@typescript-eslint/utils': 8.62.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/parser': 8.62.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/typescript-estree': 8.62.1([email protected])
+ '@typescript-eslint/utils': 8.62.1([email protected]([email protected]))([email protected])
eslint: 10.6.0([email protected])
- typescript: 6.0.3
+ typescript: 5.9.3
transitivePeerDependencies:
- supports-color
+
+ optionalDependencies:
+ '@typescript/typescript-darwin-arm64': 7.1.0-dev.20260930.4
+ '@typescript/typescript-darwin-x64': 7.1.0-dev.20260930.4
+ '@typescript/typescript-linux-arm': 7.1.0-dev.20260930.4
+ '@typescript/typescript-linux-arm64': 7.1.0-dev.20260930.4
+ '@typescript/typescript-linux-x64': 7.1.0-dev.20260930.4
+ '@typescript/typescript-win32-arm64': 7.1.0-dev.20260930.4
+ '@typescript/typescript-win32-x64': 7.1.0-dev.20260930.4
+
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 40f662b7451..996da8a9581 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -90,7 +90,7 @@ peerDependencyRules:
- "@types/react"
overrides:
"tmp": "^0.2.7"
- typescript: "^6.0.3"
+ "@glint/tsserver-plugin>typescript": "^6.0.3"
"babel-plugin-ember-template-compilation@~2.3.0": "2.4.1"
"[email protected]": "^8.0.2"
allowedDeprecatedVersions:
diff --git a/themes/horizon/package.json b/themes/horizon/package.json
index 0d0d1962348..5baab56b131 100644
--- a/themes/horizon/package.json
+++ b/themes/horizon/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"dependencies": {
- "discourse": "npm:@discourse/[email protected]"
+ "discourse": "workspace:@discourse/types@*"
}
}
diff --git a/themes/horizon/tsconfig.json b/themes/horizon/tsconfig.json
index d63718c186f..60a0b29d3ff 100644
--- a/themes/horizon/tsconfig.json
+++ b/themes/horizon/tsconfig.json
@@ -1,4 +1,9 @@
{
"extends": "discourse/tsconfig-plugin",
- "include": ["javascripts/**/*", "test/**/*"]
+ "include": ["javascripts/**/*", "test/**/*"],
+ "references": [
+ {
+ "path": "../../frontend/discourse"
+ }
+ ]
}