From 0abf283fb00d6027ff166def8741f6e4d696d509 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:35:04 -0400 Subject: [PATCH 1/3] Upgrade from Glint v2 alpha to stable 'v2' --- package.json | 10 +- pnpm-lock.yaml | 279 ++++++++++++----------- tsconfig.json | 5 +- unpublished-development-types/index.d.ts | 14 -- 4 files changed, 153 insertions(+), 155 deletions(-) delete mode 100644 unpublished-development-types/index.d.ts diff --git a/package.json b/package.json index 9241d7c..855a13f 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", - "lint:types": "glint", + "lint:types": "ember-tsc", "prepack": "rollup --config", "start": "vite dev", "test": "vite build --mode=development --out-dir dist-tests && testem --file testem.cjs ci --port 0" @@ -70,11 +70,9 @@ "@embroider/macros": "^1.18.0", "@embroider/vite": "^1.1.5", "@glimmer/component": "^2.0.0", - "@glint/core": "^2.0.0-alpha.2", - "@glint/environment-ember-loose": "^2.0.0-alpha.2", - "@glint/environment-ember-template-imports": "^2.0.0-alpha.2", - "@glint/template": "^1.6.0-alpha.1", - "@glint/tsserver-plugin": "^2.0.0-alpha.2", + "@glint/ember-tsc": "1.0.0", + "@glint/template": "^1.6.1", + "@glint/tsserver-plugin": "2.0.3", "@nullvoxpopuli/eslint-configs": "^5.3.0", "@rollup/plugin-babel": "^6.0.4", "@types/qunit": "^2.19.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 946aff1..8b517e8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,40 +32,34 @@ importers: version: 1.1.3 '@ember/test-helpers': specifier: ^5.2.1 - version: 5.2.2(@babel/core@7.28.0)(@glint/template@1.6.0-alpha.2) + version: 5.2.2(@babel/core@7.28.0)(@glint/template@1.6.1) '@embroider/addon-dev': specifier: ^8.1.0 - version: 8.1.0(@glint/template@1.6.0-alpha.2)(rollup@4.46.0) + version: 8.1.0(@glint/template@1.6.1)(rollup@4.46.0) '@embroider/compat': specifier: ^4.1.0 - version: 4.1.1(@embroider/core@4.1.3(@glint/template@1.6.0-alpha.2))(@glimmer/component@2.0.0)(@glint/template@1.6.0-alpha.2)(rsvp@4.8.5)(webpack@5.100.2) + version: 4.1.1(@embroider/core@4.1.3(@glint/template@1.6.1))(@glimmer/component@2.0.0)(@glint/template@1.6.1)(rsvp@4.8.5)(webpack@5.100.2) '@embroider/core': specifier: ^4.1.0 - version: 4.1.3(@glint/template@1.6.0-alpha.2) + version: 4.1.3(@glint/template@1.6.1) '@embroider/macros': specifier: ^1.18.0 - version: 1.18.1(@glint/template@1.6.0-alpha.2) + version: 1.18.1(@glint/template@1.6.1) '@embroider/vite': specifier: ^1.1.5 - version: 1.1.6(@embroider/core@4.1.3(@glint/template@1.6.0-alpha.2))(@glint/template@1.6.0-alpha.2)(rollup@4.46.0)(vite@6.3.5(@types/node@24.1.0)(jiti@2.4.2)(terser@5.43.1)) + version: 1.1.6(@embroider/core@4.1.3(@glint/template@1.6.1))(@glint/template@1.6.1)(rollup@4.46.0)(vite@6.3.5(@types/node@24.1.0)(jiti@2.4.2)(terser@5.43.1)) '@glimmer/component': specifier: ^2.0.0 version: 2.0.0 - '@glint/core': - specifier: ^2.0.0-alpha.2 - version: 2.0.0-alpha.3(typescript@5.8.3) - '@glint/environment-ember-loose': - specifier: ^2.0.0-alpha.2 - version: 2.0.0-alpha.3(@glimmer/component@2.0.0)(@glint/core@2.0.0-alpha.3(typescript@5.8.3))(@glint/template@1.6.0-alpha.2) - '@glint/environment-ember-template-imports': - specifier: ^2.0.0-alpha.2 - version: 2.0.0-alpha.3(@glint/core@2.0.0-alpha.3(typescript@5.8.3))(@glint/environment-ember-loose@2.0.0-alpha.3(@glimmer/component@2.0.0)(@glint/core@2.0.0-alpha.3(typescript@5.8.3))(@glint/template@1.6.0-alpha.2))(@glint/template@1.6.0-alpha.2) + '@glint/ember-tsc': + specifier: 1.0.0 + version: 1.0.0(typescript@5.8.3) '@glint/template': - specifier: ^1.6.0-alpha.1 - version: 1.6.0-alpha.2 + specifier: ^1.6.1 + version: 1.6.1 '@glint/tsserver-plugin': - specifier: ^2.0.0-alpha.2 - version: 2.0.0-alpha.3 + specifier: 2.0.3 + version: 2.0.3 '@nullvoxpopuli/eslint-configs': specifier: ^5.3.0 version: 5.3.0(@babel/core@7.28.0)(@babel/eslint-parser@7.28.0(@babel/core@7.28.0)(eslint@9.32.0(jiti@2.4.2)))(eslint@9.32.0(jiti@2.4.2))(prettier@3.6.2)(typescript@5.8.3) @@ -83,7 +77,7 @@ importers: version: 9.2.0 ember-qunit: specifier: ^9.0.2 - version: 9.0.3(@ember/test-helpers@5.2.2(@babel/core@7.28.0)(@glint/template@1.6.0-alpha.2))(@glint/template@1.6.0-alpha.2)(qunit@2.24.1) + version: 9.0.3(@ember/test-helpers@5.2.2(@babel/core@7.28.0)(@glint/template@1.6.1))(@glint/template@1.6.1)(qunit@2.24.1) ember-resolver: specifier: ^13.1.0 version: 13.1.1 @@ -1104,6 +1098,9 @@ packages: '@glimmer/syntax@0.94.9': resolution: {integrity: sha512-OBw8DqMzKO4LX4kJBhwfTUqtpbd7O9amQXNTfb1aS7pufio5Vu5Qi6mRTfdFj6RyJ//aSI/l0kxWt6beYW0Apg==} + '@glimmer/syntax@0.95.0': + resolution: {integrity: sha512-W/PHdODnpONsXjbbdY9nedgIHpglMfOzncf/moLVrKIcCfeQhw2vG07Rs/YW8KeJCgJRCLkQsi+Ix7XvrurGAg==} + '@glimmer/util@0.92.3': resolution: {integrity: sha512-K1oH93gGU36slycxJ9CcFpUTsdOc4XQ6RuZFu5oRsxFYtEF5PSu7ik11h58fyeoaWOr1ebfkyAMawbeI2AJ5GA==} @@ -1136,42 +1133,34 @@ packages: '@glimmer/wire-format@0.94.8': resolution: {integrity: sha512-A+Cp5m6vZMAEu0Kg/YwU2dJZXyYxVJs2zI57d3CP6NctmX7FsT8WjViiRUmt5abVmMmRH5b8BUovqY6GSMAdrw==} - '@glint/core@2.0.0-alpha.3': - resolution: {integrity: sha512-PCiajENyPfNkFfSDhqIcQ0DXzJZrPc1g7v5o8FyLDtvSwmM+/wlmpI4yJDXgo2TGJKFowjSOY1MKFRMiEd36GA==} + '@glint/ember-tsc@1.0.0': + resolution: {integrity: sha512-/wLAdKjICkfquLkIlDU/aI0Go9bvxpMwHVR0oMTXPs51gkODCN83nnFe3HHD5ofddAiWnXa5Gvi+Mw1n2OoUaQ==} hasBin: true peerDependencies: typescript: '>=5.6.0' - '@glint/environment-ember-loose@2.0.0-alpha.3': - resolution: {integrity: sha512-hLogEykHVUwC+aElg8W1XMp9edcxiKO+ZZufrWcgHUBFTtsoJCP8jWYb0H+1XgLTEnnSV+2OyO6yMPsegGUWkg==} + '@glint/ember-tsc@1.0.3': + resolution: {integrity: sha512-EDWJJl0Bz7GCfGh6CzfAAy2a6AATjkH1qh0Dz7ERgJj1WUfe+liWZCoBHs1bDbexNrEPoUdkOZCzqFObaP9NBA==} + hasBin: true peerDependencies: - '@glimmer/component': '>=1.1.2' - '@glint/core': '*' - '@glint/template': '*' - ember-cli-htmlbars: ^6.0.1 - ember-modifier: ^3.2.7 || ^4.0.0 - peerDependenciesMeta: - ember-cli-htmlbars: - optional: true - ember-modifier: - optional: true + typescript: '>=5.6.0' - '@glint/environment-ember-template-imports@2.0.0-alpha.3': - resolution: {integrity: sha512-OLcmZ1MtHyyt5LZqUUdBxBviUV8apoXzb46yBNn68JREzzkkmVQIKr4YZuNtwrmGrmUMGGr7G5og56rWur0IXw==} - peerDependencies: - '@glint/core': '*' - '@glint/environment-ember-loose': '*' - '@glint/template': '*' + '@glint/template@1.6.0': + resolution: {integrity: sha512-7UB9lZlGVIipS5TpQEqUCChDMT32NIrqCvUD4I3PwkU05dyDzpYvLNSOWaIN4cE2epySg+/AO7GTKatcTMyCjg==} - '@glint/template@1.6.0-alpha.2': - resolution: {integrity: sha512-T1jnkJ4g9kj4CQFdax6/AE8rdd8S5+1/88l63w1xPjfSByhKt3ES6Noko3fPx9WhV7gZxalgg6sjBoZlhPZabg==} + '@glint/template@1.6.1': + resolution: {integrity: sha512-/VuVbS+p2ON/qYVlTljIBnNMR3eUiu202uXdYJHTQ7bfFWmLija+ZfdgQCjdm83uZUMXQqtWvjOwwFXe5cvPtg==} - '@glint/tsserver-plugin@2.0.0-alpha.3': - resolution: {integrity: sha512-VPg0rVOu7Ql+ji28/mYO10J7xDpd4bEOEAF+Bu8i8cNIlLaKQoNqlrhMjChxPyS87Neiys69Kdh6lGzJ904xeg==} + '@glint/tsserver-plugin@2.0.3': + resolution: {integrity: sha512-wieKViqtlsH5Djzj3uv+m9FE0rrSN0Mtq7Zfo42RY18pgPm8mwnVD97TZ/6iLLZ4d3oszSXd25fJKPo/aAqAEQ==} '@handlebars/parser@2.0.0': resolution: {integrity: sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==} + '@handlebars/parser@2.2.1': + resolution: {integrity: sha512-D76vKOZFEGA9v6g0rZTYTQDUXNopCblW1Zeas3EEVrbdeh8gWrCEO9/goocKmcgtqAwv1Md76p58UQp7HeFTEw==} + engines: {node: ^18 || ^20 || ^22 || >=24} + '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} @@ -1758,28 +1747,28 @@ packages: cpu: [x64] os: [win32] - '@volar/kit@2.4.12': - resolution: {integrity: sha512-f9JE8oy9C2rBcCWxUYKUF23hOXz4mwgVXFjk7nHhxzplaoVjEOsKpBm8NI2nBH7Cwu8DRxDwBsbIxMl/8wlLxw==} + '@volar/kit@2.4.23': + resolution: {integrity: sha512-YuUIzo9zwC2IkN7FStIcVl1YS9w5vkSFEZfPvnu0IbIMaR9WHhc9ZxvlT+91vrcSoRY469H2jwbrGqpG7m1KaQ==} peerDependencies: typescript: '*' - '@volar/language-core@2.4.12': - resolution: {integrity: sha512-RLrFdXEaQBWfSnYGVxvR2WrO6Bub0unkdHYIdC31HzIEqATIuuhRRzYu76iGPZ6OtA4Au1SnW0ZwIqPP217YhA==} + '@volar/language-core@2.4.23': + resolution: {integrity: sha512-hEEd5ET/oSmBC6pi1j6NaNYRWoAiDhINbT8rmwtINugR39loROSlufGdYMF9TaKGfz+ViGs1Idi3mAhnuPcoGQ==} - '@volar/language-server@2.4.12': - resolution: {integrity: sha512-KC0YqTXCZMaImMWyAKC+dLB2BXjfz80kqesJkV6oXxJsGEQPfmdqug299idwtrT6FVSmZ7q5UrPfvgKwA0S3JA==} + '@volar/language-server@2.4.23': + resolution: {integrity: sha512-k0iO+tybMGMMyrNdWOxgFkP0XJTdbH0w+WZlM54RzJU3WZSjHEupwL30klpM7ep4FO6qyQa03h+VcGHD4Q8gEg==} - '@volar/language-service@2.4.12': - resolution: {integrity: sha512-nifOPGYYPnCmxja6/ML/Gl2EgFkUdw4gLbYqbh8FjqX3gSpXSZl/0ebqORjKo1KW56YWHWRZd1jFutEtCiRYhA==} + '@volar/language-service@2.4.23': + resolution: {integrity: sha512-h5mU9DZ/6u3LCB9xomJtorNG6awBNnk9VuCioGsp6UtFiM8amvS5FcsaC3dabdL9zO0z+Gq9vIEMb/5u9K6jGQ==} - '@volar/source-map@2.4.12': - resolution: {integrity: sha512-bUFIKvn2U0AWojOaqf63ER0N/iHIBYZPpNGogfLPQ68F5Eet6FnLlyho7BS0y2HJ1jFhSif7AcuTx1TqsCzRzw==} + '@volar/source-map@2.4.23': + resolution: {integrity: sha512-Z1Uc8IB57Lm6k7q6KIDu/p+JWtf3xsXJqAX/5r18hYOTpJyBn0KXUR8oTJ4WFYOcDzWC9n3IflGgHowx6U6z9Q==} - '@volar/test-utils@2.4.12': - resolution: {integrity: sha512-8nIP0qGt1jANEuWY8Pm5658UsxbWl3p4N5XUNA/SZmuHvb9C3vygjLIWFHf0+Apbvy6yNwbKsRxawoYCoh+kkQ==} + '@volar/test-utils@2.4.23': + resolution: {integrity: sha512-ZF3Ejtv6mfwXHuR6aZGsh1ksvAdSZUfWKGacXa9S+Mnc3MpSPgxzHN3PwdXGt26HfRDWGuykJc8y6lVs20dDKw==} - '@volar/typescript@2.4.12': - resolution: {integrity: sha512-HJB73OTJDgPc80K30wxi3if4fSsZZAOScbj2fcicMuOPoOkcf9NNAINb33o+DzhBdF9xTKC1gnPmIRDous5S0g==} + '@volar/typescript@2.4.23': + resolution: {integrity: sha512-lAB5zJghWxVPqfcStmAP1ZqQacMpe90UrP5RJ3arDyrhy4aCUQqmxPPLB2PWDKugvylmO41ljK7vZ+t6INMTag==} '@vscode/l10n@0.0.18': resolution: {integrity: sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==} @@ -7015,11 +7004,11 @@ snapshots: '@ember/library-tsconfig@1.1.3': {} - '@ember/test-helpers@5.2.2(@babel/core@7.28.0)(@glint/template@1.6.0-alpha.2)': + '@ember/test-helpers@5.2.2(@babel/core@7.28.0)(@glint/template@1.6.1)': dependencies: - '@ember/test-waiters': 4.1.1(@glint/template@1.6.0-alpha.2) + '@ember/test-waiters': 4.1.1(@glint/template@1.6.1) '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(@glint/template@1.6.0-alpha.2) + '@embroider/macros': 1.18.1(@glint/template@1.6.1) '@simple-dom/interface': 1.4.0 decorator-transforms: 2.3.0(@babel/core@7.28.0) dom-element-descriptors: 0.5.1 @@ -7028,17 +7017,17 @@ snapshots: - '@glint/template' - supports-color - '@ember/test-waiters@4.1.1(@glint/template@1.6.0-alpha.2)': + '@ember/test-waiters@4.1.1(@glint/template@1.6.1)': dependencies: '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(@glint/template@1.6.0-alpha.2) + '@embroider/macros': 1.18.1(@glint/template@1.6.1) transitivePeerDependencies: - '@glint/template' - supports-color - '@embroider/addon-dev@8.1.0(@glint/template@1.6.0-alpha.2)(rollup@4.46.0)': + '@embroider/addon-dev@8.1.0(@glint/template@1.6.1)(rollup@4.46.0)': dependencies: - '@embroider/core': 4.1.3(@glint/template@1.6.0-alpha.2) + '@embroider/core': 4.1.3(@glint/template@1.6.1) '@rollup/pluginutils': 5.2.0(rollup@4.46.0) content-tag: 3.1.3 execa: 5.1.1 @@ -7065,7 +7054,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/compat@4.1.1(@embroider/core@4.1.3(@glint/template@1.6.0-alpha.2))(@glimmer/component@2.0.0)(@glint/template@1.6.0-alpha.2)(rsvp@4.8.5)(webpack@5.100.2)': + '@embroider/compat@4.1.1(@embroider/core@4.1.3(@glint/template@1.6.1))(@glimmer/component@2.0.0)(@glint/template@1.6.1)(rsvp@4.8.5)(webpack@5.100.2)': dependencies: '@babel/code-frame': 7.27.1 '@babel/core': 7.28.0 @@ -7076,8 +7065,8 @@ snapshots: '@babel/preset-env': 7.28.0(@babel/core@7.28.0) '@babel/runtime': 7.28.2 '@babel/traverse': 7.28.0 - '@embroider/core': 4.1.3(@glint/template@1.6.0-alpha.2) - '@embroider/macros': 1.18.1(@glint/template@1.6.0-alpha.2) + '@embroider/core': 4.1.3(@glint/template@1.6.1) + '@embroider/macros': 1.18.1(@glint/template@1.6.1) '@types/babel__code-frame': 7.0.6 assert-never: 1.4.0 babel-import-util: 3.0.1 @@ -7097,7 +7086,7 @@ snapshots: broccoli-source: 3.0.1 chalk: 4.1.2 debug: 4.4.1 - ember-source: 6.1.0-beta.1(@glimmer/component@2.0.0)(@glint/template@1.6.0-alpha.2)(rsvp@4.8.5)(webpack@5.100.2) + ember-source: 6.1.0-beta.1(@glimmer/component@2.0.0)(@glint/template@1.6.1)(rsvp@4.8.5)(webpack@5.100.2) fast-sourcemap-concat: 2.1.1 fs-extra: 9.1.0 fs-tree-diff: 2.0.1 @@ -7122,12 +7111,12 @@ snapshots: - utf-8-validate - webpack - '@embroider/core@4.1.3(@glint/template@1.6.0-alpha.2)': + '@embroider/core@4.1.3(@glint/template@1.6.1)': dependencies: '@babel/core': 7.28.0 '@babel/parser': 7.28.0 '@babel/traverse': 7.28.0 - '@embroider/macros': 1.18.1(@glint/template@1.6.0-alpha.2) + '@embroider/macros': 1.18.1(@glint/template@1.6.1) '@embroider/reverse-exports': 0.1.2 '@embroider/shared-internals': 3.0.0 assert-never: 1.4.0 @@ -7158,7 +7147,7 @@ snapshots: - supports-color - utf-8-validate - '@embroider/macros@1.18.1(@glint/template@1.6.0-alpha.2)': + '@embroider/macros@1.18.1(@glint/template@1.6.1)': dependencies: '@embroider/shared-internals': 3.0.0 assert-never: 1.4.0 @@ -7169,7 +7158,7 @@ snapshots: resolve: 1.22.10 semver: 7.7.2 optionalDependencies: - '@glint/template': 1.6.0-alpha.2 + '@glint/template': 1.6.1 transitivePeerDependencies: - supports-color @@ -7213,11 +7202,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/vite@1.1.6(@embroider/core@4.1.3(@glint/template@1.6.0-alpha.2))(@glint/template@1.6.0-alpha.2)(rollup@4.46.0)(vite@6.3.5(@types/node@24.1.0)(jiti@2.4.2)(terser@5.43.1))': + '@embroider/vite@1.1.6(@embroider/core@4.1.3(@glint/template@1.6.1))(@glint/template@1.6.1)(rollup@4.46.0)(vite@6.3.5(@types/node@24.1.0)(jiti@2.4.2)(terser@5.43.1))': dependencies: '@babel/core': 7.28.0 - '@embroider/core': 4.1.3(@glint/template@1.6.0-alpha.2) - '@embroider/macros': 1.18.1(@glint/template@1.6.0-alpha.2) + '@embroider/core': 4.1.3(@glint/template@1.6.1) + '@embroider/macros': 1.18.1(@glint/template@1.6.1) '@embroider/reverse-exports': 0.1.2 '@rollup/pluginutils': 5.2.0(rollup@4.46.0) assert-never: 1.4.0 @@ -7588,6 +7577,14 @@ snapshots: '@handlebars/parser': 2.0.0 simple-html-tokenizer: 0.5.11 + '@glimmer/syntax@0.95.0': + dependencies: + '@glimmer/interfaces': 0.94.6 + '@glimmer/util': 0.94.8 + '@glimmer/wire-format': 0.94.8 + '@handlebars/parser': 2.2.1 + simple-html-tokenizer: 0.5.11 + '@glimmer/util@0.92.3': dependencies: '@glimmer/env': 0.1.7 @@ -7639,24 +7636,26 @@ snapshots: dependencies: '@glimmer/interfaces': 0.94.6 - '@glint/core@2.0.0-alpha.3(typescript@5.8.3)': - dependencies: - '@glimmer/syntax': 0.94.9 - '@volar/kit': 2.4.12(typescript@5.8.3) - '@volar/language-core': 2.4.12 - '@volar/language-server': 2.4.12 - '@volar/language-service': 2.4.12 - '@volar/source-map': 2.4.12 - '@volar/test-utils': 2.4.12 - '@volar/typescript': 2.4.12 + '@glint/ember-tsc@1.0.0(typescript@5.8.3)': + dependencies: + '@glimmer/syntax': 0.95.0 + '@glint/template': 1.6.0 + '@volar/kit': 2.4.23(typescript@5.8.3) + '@volar/language-core': 2.4.23 + '@volar/language-server': 2.4.23 + '@volar/language-service': 2.4.23 + '@volar/source-map': 2.4.23 + '@volar/test-utils': 2.4.23 + '@volar/typescript': 2.4.23 computeds: 0.0.1 + content-tag: 3.1.3 escape-string-regexp: 4.0.0 semver: 7.7.2 silent-error: 1.1.1 typescript: 5.8.3 uuid: 8.3.2 - volar-service-html: 0.0.64(@volar/language-service@2.4.12) - volar-service-typescript: 0.0.65(@volar/language-service@2.4.12) + volar-service-html: 0.0.64(@volar/language-service@2.4.23) + volar-service-typescript: 0.0.65(@volar/language-service@2.4.23) vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 @@ -7664,26 +7663,42 @@ snapshots: transitivePeerDependencies: - supports-color - '@glint/environment-ember-loose@2.0.0-alpha.3(@glimmer/component@2.0.0)(@glint/core@2.0.0-alpha.3(typescript@5.8.3))(@glint/template@1.6.0-alpha.2)': + '@glint/ember-tsc@1.0.3(typescript@5.8.3)': dependencies: - '@glimmer/component': 2.0.0 - '@glint/core': 2.0.0-alpha.3(typescript@5.8.3) - '@glint/template': 1.6.0-alpha.2 - - '@glint/environment-ember-template-imports@2.0.0-alpha.3(@glint/core@2.0.0-alpha.3(typescript@5.8.3))(@glint/environment-ember-loose@2.0.0-alpha.3(@glimmer/component@2.0.0)(@glint/core@2.0.0-alpha.3(typescript@5.8.3))(@glint/template@1.6.0-alpha.2))(@glint/template@1.6.0-alpha.2)': - dependencies: - '@glint/core': 2.0.0-alpha.3(typescript@5.8.3) - '@glint/environment-ember-loose': 2.0.0-alpha.3(@glimmer/component@2.0.0)(@glint/core@2.0.0-alpha.3(typescript@5.8.3))(@glint/template@1.6.0-alpha.2) - '@glint/template': 1.6.0-alpha.2 + '@glimmer/syntax': 0.95.0 + '@glint/template': 1.6.1 + '@volar/kit': 2.4.23(typescript@5.8.3) + '@volar/language-core': 2.4.23 + '@volar/language-server': 2.4.23 + '@volar/language-service': 2.4.23 + '@volar/source-map': 2.4.23 + '@volar/test-utils': 2.4.23 + '@volar/typescript': 2.4.23 + computeds: 0.0.1 content-tag: 3.1.3 + escape-string-regexp: 4.0.0 + semver: 7.7.2 + silent-error: 1.1.1 + typescript: 5.8.3 + uuid: 8.3.2 + volar-service-html: 0.0.64(@volar/language-service@2.4.23) + volar-service-typescript: 0.0.65(@volar/language-service@2.4.23) + vscode-languageserver-protocol: 3.17.5 + vscode-languageserver-textdocument: 1.0.12 + vscode-uri: 3.1.0 + yargs: 17.7.2 + transitivePeerDependencies: + - supports-color - '@glint/template@1.6.0-alpha.2': {} + '@glint/template@1.6.0': {} - '@glint/tsserver-plugin@2.0.0-alpha.3': + '@glint/template@1.6.1': {} + + '@glint/tsserver-plugin@2.0.3': dependencies: - '@glint/core': 2.0.0-alpha.3(typescript@5.8.3) - '@volar/language-core': 2.4.12 - '@volar/typescript': 2.4.12 + '@glint/ember-tsc': 1.0.3(typescript@5.8.3) + '@volar/language-core': 2.4.23 + '@volar/typescript': 2.4.23 jiti: 2.4.2 typescript: 5.8.3 transitivePeerDependencies: @@ -7691,6 +7706,8 @@ snapshots: '@handlebars/parser@2.0.0': {} + '@handlebars/parser@2.2.1': {} + '@humanfs/core@0.19.1': {} '@humanfs/node@0.16.6': @@ -8278,24 +8295,24 @@ snapshots: '@unrs/resolver-binding-win32-x64-msvc@1.11.1': optional: true - '@volar/kit@2.4.12(typescript@5.8.3)': + '@volar/kit@2.4.23(typescript@5.8.3)': dependencies: - '@volar/language-service': 2.4.12 - '@volar/typescript': 2.4.12 + '@volar/language-service': 2.4.23 + '@volar/typescript': 2.4.23 typesafe-path: 0.2.2 typescript: 5.8.3 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 - '@volar/language-core@2.4.12': + '@volar/language-core@2.4.23': dependencies: - '@volar/source-map': 2.4.12 + '@volar/source-map': 2.4.23 - '@volar/language-server@2.4.12': + '@volar/language-server@2.4.23': dependencies: - '@volar/language-core': 2.4.12 - '@volar/language-service': 2.4.12 - '@volar/typescript': 2.4.12 + '@volar/language-core': 2.4.23 + '@volar/language-service': 2.4.23 + '@volar/typescript': 2.4.23 path-browserify: 1.0.1 request-light: 0.7.0 vscode-languageserver: 9.0.1 @@ -8303,25 +8320,25 @@ snapshots: vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 - '@volar/language-service@2.4.12': + '@volar/language-service@2.4.23': dependencies: - '@volar/language-core': 2.4.12 + '@volar/language-core': 2.4.23 vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 - '@volar/source-map@2.4.12': {} + '@volar/source-map@2.4.23': {} - '@volar/test-utils@2.4.12': + '@volar/test-utils@2.4.23': dependencies: - '@volar/language-core': 2.4.12 - '@volar/language-server': 2.4.12 + '@volar/language-core': 2.4.23 + '@volar/language-server': 2.4.23 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 - '@volar/typescript@2.4.12': + '@volar/typescript@2.4.23': dependencies: - '@volar/language-core': 2.4.12 + '@volar/language-core': 2.4.23 path-browserify: 1.0.1 vscode-uri: 3.1.0 @@ -9491,7 +9508,7 @@ snapshots: electron-to-chromium@1.5.191: {} - ember-auto-import@2.10.0(@glint/template@1.6.0-alpha.2)(webpack@5.100.2): + ember-auto-import@2.10.0(@glint/template@1.6.1)(webpack@5.100.2): dependencies: '@babel/core': 7.28.0 '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.28.0) @@ -9499,7 +9516,7 @@ snapshots: '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.28.0) '@babel/plugin-transform-class-static-block': 7.27.1(@babel/core@7.28.0) '@babel/preset-env': 7.28.0(@babel/core@7.28.0) - '@embroider/macros': 1.18.1(@glint/template@1.6.0-alpha.2) + '@embroider/macros': 1.18.1(@glint/template@1.6.1) '@embroider/shared-internals': 2.9.1 babel-loader: 8.4.1(@babel/core@7.28.0)(webpack@5.100.2) babel-plugin-ember-modules-api-polyfill: 3.5.0 @@ -9673,11 +9690,11 @@ snapshots: - supports-color - typescript - ember-qunit@9.0.3(@ember/test-helpers@5.2.2(@babel/core@7.28.0)(@glint/template@1.6.0-alpha.2))(@glint/template@1.6.0-alpha.2)(qunit@2.24.1): + ember-qunit@9.0.3(@ember/test-helpers@5.2.2(@babel/core@7.28.0)(@glint/template@1.6.1))(@glint/template@1.6.1)(qunit@2.24.1): dependencies: - '@ember/test-helpers': 5.2.2(@babel/core@7.28.0)(@glint/template@1.6.0-alpha.2) + '@ember/test-helpers': 5.2.2(@babel/core@7.28.0)(@glint/template@1.6.1) '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(@glint/template@1.6.0-alpha.2) + '@embroider/macros': 1.18.1(@glint/template@1.6.1) qunit: 2.24.1 qunit-theme-ember: 1.0.0 transitivePeerDependencies: @@ -9700,7 +9717,7 @@ snapshots: transitivePeerDependencies: - supports-color - ember-source@6.1.0-beta.1(@glimmer/component@2.0.0)(@glint/template@1.6.0-alpha.2)(rsvp@4.8.5)(webpack@5.100.2): + ember-source@6.1.0-beta.1(@glimmer/component@2.0.0)(@glint/template@1.6.1)(rsvp@4.8.5)(webpack@5.100.2): dependencies: '@babel/core': 7.28.0 '@ember/edition-utils': 1.2.0 @@ -9729,7 +9746,7 @@ snapshots: broccoli-funnel: 3.0.8 broccoli-merge-trees: 4.2.0 chalk: 4.1.2 - ember-auto-import: 2.10.0(@glint/template@1.6.0-alpha.2)(webpack@5.100.2) + ember-auto-import: 2.10.0(@glint/template@1.6.1)(webpack@5.100.2) ember-cli-babel: 8.2.0(@babel/core@7.28.0) ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 @@ -13345,15 +13362,15 @@ snapshots: jiti: 2.4.2 terser: 5.43.1 - volar-service-html@0.0.64(@volar/language-service@2.4.12): + volar-service-html@0.0.64(@volar/language-service@2.4.23): dependencies: vscode-html-languageservice: 5.5.1 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 optionalDependencies: - '@volar/language-service': 2.4.12 + '@volar/language-service': 2.4.23 - volar-service-typescript@0.0.65(@volar/language-service@2.4.12): + volar-service-typescript@0.0.65(@volar/language-service@2.4.23): dependencies: path-browserify: 1.0.1 semver: 7.7.2 @@ -13362,7 +13379,7 @@ snapshots: vscode-nls: 5.2.0 vscode-uri: 3.1.0 optionalDependencies: - '@volar/language-service': 2.4.12 + '@volar/language-service': 2.4.23 vscode-html-languageservice@5.5.1: dependencies: diff --git a/tsconfig.json b/tsconfig.json index 04f8ab7..a3038e4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,10 +5,7 @@ */ { "extends": "@ember/app-tsconfig", - "glint": { - "environment": ["ember-loose", "ember-template-imports"] - }, - "include": ["src/**/*", "tests/**/*", "unpublished-development-types/**/*"], + "include": ["src/**/*", "tests/**/*"], "compilerOptions": { "rootDir": ".", "types": ["ember-source/types", "vite/client", "@embroider/core/virtual"] diff --git a/unpublished-development-types/index.d.ts b/unpublished-development-types/index.d.ts deleted file mode 100644 index 45276a7..0000000 --- a/unpublished-development-types/index.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -// Add any types here that you need for local development only. -// These will *not* be published as part of your addon, so be careful that your published code does not rely on them! - -import '@glint/environment-ember-loose'; -import '@glint/environment-ember-template-imports'; - -// Uncomment if you need to support consuming projects in loose mode -// -// declare module '@glint/environment-ember-loose/registry' { -// export default interface Registry { -// // Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates) -// // See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons -// } -// } From ca8793ee19e3f1e313ef9876e22197ace3ab4e25 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:38:49 -0400 Subject: [PATCH 2/3] Update tsconfigs --- tsconfig.json | 2 +- tsconfig.publish.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index a3038e4..d99bcd4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,6 @@ "include": ["src/**/*", "tests/**/*"], "compilerOptions": { "rootDir": ".", - "types": ["ember-source/types", "vite/client", "@embroider/core/virtual"] + "types": ["ember-source/types", "vite/client", "@embroider/core/virtual", "@glint/ember-tsc/types"] } } diff --git a/tsconfig.publish.json b/tsconfig.publish.json index e100b77..13f82c8 100644 --- a/tsconfig.publish.json +++ b/tsconfig.publish.json @@ -25,6 +25,6 @@ */ "rootDir": "./src", - "types": ["ember-source/types"] + "types": ["ember-source/types", "@glint/ember-tsc/types"] } } From c21a770586618b7ba7c70719bf976e3705aa9891 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:41:04 -0400 Subject: [PATCH 3/3] lint:fix --- tsconfig.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index d99bcd4..d6fd2dd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,11 @@ "include": ["src/**/*", "tests/**/*"], "compilerOptions": { "rootDir": ".", - "types": ["ember-source/types", "vite/client", "@embroider/core/virtual", "@glint/ember-tsc/types"] + "types": [ + "ember-source/types", + "vite/client", + "@embroider/core/virtual", + "@glint/ember-tsc/types" + ] } }