diff --git a/docs-app/examples/daisyui/app.ts b/docs-app/examples/daisyui/app.ts new file mode 100644 index 000000000..96b4c8be0 --- /dev/null +++ b/docs-app/examples/daisyui/app.ts @@ -0,0 +1,24 @@ +import EmberRouter from '@ember/routing/router'; + +import PageTitleService from 'ember-page-title/services/page-title'; +import { properLinks } from 'ember-primitives/proper-links'; +import Application from 'ember-strict-application-resolver'; + +@properLinks +class Router extends EmberRouter { + location = 'history'; + rootURL = '/examples/daisyui/'; +} +Router.map(function () { + this.route('avatar'); +}); + +class App extends Application { + modules = { + './router': Router, + './services/page-title': PageTitleService, + ...import.meta.glob('./templates/**/*.gts', { eager: true }), + }; +} + +App.create(); diff --git a/docs-app/examples/daisyui/index.html b/docs-app/examples/daisyui/index.html new file mode 100644 index 000000000..ea9997b73 --- /dev/null +++ b/docs-app/examples/daisyui/index.html @@ -0,0 +1,16 @@ + + + + + DaisyUI + ember-primitives + + + + + + + + + + + diff --git a/docs-app/examples/daisyui/templates/application.gts b/docs-app/examples/daisyui/templates/application.gts new file mode 100644 index 000000000..fc13ff0df --- /dev/null +++ b/docs-app/examples/daisyui/templates/application.gts @@ -0,0 +1,11 @@ +import pageTitle from 'ember-page-title/helpers/page-title'; + + diff --git a/docs-app/examples/daisyui/templates/avatar.gts b/docs-app/examples/daisyui/templates/avatar.gts new file mode 100644 index 000000000..c3275ec25 --- /dev/null +++ b/docs-app/examples/daisyui/templates/avatar.gts @@ -0,0 +1,34 @@ +import { Avatar } from 'ember-primitives/components/avatar'; + + diff --git a/docs-app/index.html b/docs-app/index.html index 7c0968de0..e8427f6ab 100644 --- a/docs-app/index.html +++ b/docs-app/index.html @@ -1,5 +1,5 @@ - + ember-primitives diff --git a/docs-app/package.json b/docs-app/package.json index 5dbcbc6ff..df0cba67c 100644 --- a/docs-app/package.json +++ b/docs-app/package.json @@ -20,7 +20,7 @@ "lint:hbs:fix": "pnpm -w exec lint hbs:fix", "lint:prettier:fix": "pnpm -w exec lint prettier:fix", "lint:prettier": "pnpm -w exec lint prettier", - "lint:types": "glint", + "lint:types": "ember-tsc", "start": "pnpm vite", "test": "vite build --mode test && ember test --path dist", "test:ember": "vite build --mode test && ember test --path dist" @@ -38,6 +38,7 @@ "ember-primitives": "workspace:^", "ember-repl": "^6.0.0", "ember-route-template": "^1.0.3", + "ember-strict-application-resolver": "^0.1.0", "form-data-utils": "^0.6.0", "hash": "^0.2.1", "highlight.js": "^11.8.0", @@ -68,10 +69,9 @@ "@embroider/vite": "^1.1.5", "@fontsource/lexend": "^5.2.7", "@glimmer/component": "^2.0.0", - "@glint/core": "1.5.2", - "@glint/environment-ember-loose": "1.5.2", - "@glint/environment-ember-template-imports": "1.5.2", - "@glint/template": "1.5.2", + "@glint/ember-tsc": "1.0.3", + "@glint/template": "1.6.1", + "@glint/tsserver-plugin": "2.0.3", "@nullvoxpopuli/eslint-configs": "^5.3.3", "@rollup/plugin-babel": "^6.0.4", "@tailwindcss/typography": "^0.5.15", @@ -98,7 +98,7 @@ "ember-qunit": "^9.0.3", "ember-resolver": "^13.1.1", "ember-resources": "^7.0.4", - "ember-source": "6.5.0", + "ember-source": "6.7.0", "ember-template-lint": "^7.7.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.26.0", diff --git a/docs-app/tsconfig.json b/docs-app/tsconfig.json index a99237fe4..bf8627253 100644 --- a/docs-app/tsconfig.json +++ b/docs-app/tsconfig.json @@ -1,15 +1,11 @@ { "extends": "@ember/app-tsconfig", - "include": ["app", "tests", "types"], - "glint": { - "environment": ["ember-loose", "ember-template-imports"] - }, "compilerOptions": { "paths": { "docs-app/tests/*": ["./tests/*"], "docs-app/*": ["./app/*"], "*": ["./types/*"] }, - "types": ["ember-source/types", "kolay/virtual", "@embroider/core/virtual"] + "types": ["ember-source/types", "kolay/virtual", "@embroider/core/virtual", "vite/client", "@glint/ember-tsc/types"] } } diff --git a/docs-app/vite.config.mjs b/docs-app/vite.config.mjs index 28207861c..279f9c426 100644 --- a/docs-app/vite.config.mjs +++ b/docs-app/vite.config.mjs @@ -8,6 +8,16 @@ export default defineConfig((/* { mode } */) => { return { build: { target: ["esnext"], + rollupOptions: { + input: { + main: "index.html", + tests: "tests/index.html", + "examples/daisyui": import.meta.resolve( + "./examples/daisyui/index.html", + import.meta.dirname, + ), + }, + }, }, css: { postcss: "./config/postcss.config.mjs", @@ -16,7 +26,7 @@ export default defineConfig((/* { mode } */) => { extensions, }, plugins: [ - classicEmberSupport(), + // classicEmberSupport(), ember(), kolay({ src: "public/docs", diff --git a/ember-primitives/package.json b/ember-primitives/package.json index 26e4bf50b..85a1617d3 100644 --- a/ember-primitives/package.json +++ b/ember-primitives/package.json @@ -28,7 +28,7 @@ "lint:published-types": "attw *.tgz || exit 0", "lint:prettier:fix": "pnpm -w exec lint prettier:fix", "lint:prettier": "pnpm -w exec lint prettier", - "lint:types": "glint", + "lint:types": "ember-tsc", "pack": "pnpm pack", "start": "rollup --config --watch", "test": "echo 'A v2 addon does not have tests, run tests in test-app'", @@ -63,10 +63,9 @@ "@embroider/addon-dev": "^7.0.1", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", - "@glint/core": "1.5.2", - "@glint/environment-ember-loose": "1.5.2", - "@glint/environment-ember-template-imports": "1.5.2", - "@glint/template": "^1.5.2", + "@glint/ember-tsc": "1.0.3", + "@glint/template": "1.6.1", + "@glint/tsserver-plugin": "2.0.3", "@nullvoxpopuli/eslint-configs": "^5.3.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^3.0.5", @@ -74,7 +73,7 @@ "concurrently": "^9.1.0", "ember-modifier": "^4.2.2", "ember-resources": "^7.0.4", - "ember-source": "6.5.0", + "ember-source": "6.7.0", "ember-template-lint": "^7.7.0", "eslint": "^9.26.0", "fix-bad-declaration-output": "^1.1.4", diff --git a/ember-primitives/tsconfig.json b/ember-primitives/tsconfig.json index b575c3d7d..89bb0ab6c 100644 --- a/ember-primitives/tsconfig.json +++ b/ember-primitives/tsconfig.json @@ -1,9 +1,6 @@ { "extends": "@tsconfig/ember/tsconfig.json", "include": ["src/**/*"], - "glint": { - "environment": ["ember-template-imports"] - }, "compilerOptions": { "skipLibCheck": true, "declarationDir": "declarations", @@ -43,6 +40,6 @@ can do the proper transformations on those files. */ "allowImportingTsExtensions": true, - "types": ["ember-source/types"] + "types": ["ember-source/types", "@glint/ember-tsc/types"] } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7dae87b56..96bf353e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,7 +33,7 @@ importers: version: 9.2.0 ember-primitives: specifier: workspace:^ - version: file:ember-primitives(476e92d9efd9761c8ee687aec07344bc) + version: link:ember-primitives prettier: specifier: ^3.2.5 version: 3.6.2 @@ -91,7 +91,7 @@ importers: version: 3.9.2 '@universal-ember/docs-support': specifier: ^0.6.7 - version: 0.6.7(4deea9ad690acacdca44ee8dd2590397) + version: 0.6.7(b0512eb69af463fd2172ede4391b0e05) assert: specifier: ^2.0.0 version: 2.1.0 @@ -109,7 +109,7 @@ importers: version: 1.1.1(2e468118d92053bd23af6e749b69cb3d) ember-mobile-menu: specifier: ^5.1.0 - version: 5.3.0(75f91512d1c22e02dbf0b088938c2cd8) + version: 5.3.0(a81b7c3a3e988c889e645adc8637172a) ember-modifier: specifier: ^4.2.2 version: 4.2.2(@babel/core@7.28.3) @@ -118,10 +118,13 @@ importers: version: link:../ember-primitives ember-repl: specifier: ^6.0.0 - version: 6.0.0(d97e38db66a4cde03ab989926c12faab) + version: 6.0.0(bcc72a692c3fcc14b8d277fbb7bea5f1) ember-route-template: specifier: ^1.0.3 version: 1.0.3 + ember-strict-application-resolver: + specifier: ^0.1.0 + version: 0.1.0(@babel/core@7.28.3) form-data-utils: specifier: ^0.6.0 version: 0.6.0 @@ -136,7 +139,7 @@ importers: version: 2.2.2(highlight.js@11.11.1) kolay: specifier: ^3.8.0 - version: 3.9.1(43269d8c5833f7fe825e7dd55295ad3a) + version: 3.9.1(dea7a95eed90345e2269e7fed0f09ad5) lorem-ipsum: specifier: ^2.0.8 version: 2.0.8 @@ -145,7 +148,7 @@ importers: version: 1.0.1 reactiveweb: specifier: ^1.8.0 - version: 1.8.0(7f7ef56b9fddf0319c9eb9405fc14dbc) + version: 1.8.0(d46a779a1ca6b0c0f22a9f4a5f7b9d82) shiki: specifier: ^3.4.2 version: 3.9.2 @@ -173,40 +176,37 @@ importers: version: 4.0.1 '@ember/test-helpers': specifier: ^5.2.2 - version: 5.2.2(731de5cfbb3f32d50726bf63427bba20) + version: 5.2.2(f9dfbf4fac3dbc0e0370b14ce6056988) '@ember/test-waiters': specifier: ^4.1.0 - version: 4.1.1(731de5cfbb3f32d50726bf63427bba20) + version: 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/compat': specifier: ^4.1.0 - version: 4.1.2(13b11a263de2cd1612b46cb3cf762c70) + version: 4.1.2(50817f4f01f7dfc977cb9d512fe86d1f) '@embroider/config-meta-loader': specifier: 1.0.1-unstable.f9c81e9 version: 1.0.1-unstable.f9c81e9 '@embroider/core': specifier: ^4.1.0 - version: 4.1.3(@glint/template@1.5.2) + version: 4.1.3(@glint/template@1.6.1) '@embroider/vite': specifier: ^1.1.5 - version: 1.1.6(fb50af483f9af9826c2eb745313a11cb) + version: 1.1.6(2cd65f555c6368c49d09b8c73afc0ffd) '@fontsource/lexend': specifier: ^5.2.7 version: 5.2.9 '@glimmer/component': specifier: ^2.0.0 version: 2.0.0 - '@glint/core': - specifier: 1.5.2 - version: 1.5.2(typescript@5.9.2) - '@glint/environment-ember-loose': - specifier: 1.5.2 - version: 1.5.2(bb2a2ec32409667a7f85f52cb32a6474) - '@glint/environment-ember-template-imports': - specifier: 1.5.2 - version: 1.5.2(35813836f891eeca95241da440fecc6b) + '@glint/ember-tsc': + specifier: 1.0.3 + version: 1.0.3(typescript@5.9.2) '@glint/template': - specifier: 1.5.2 - version: 1.5.2 + specifier: 1.6.1 + version: 1.6.1 + '@glint/tsserver-plugin': + specifier: 2.0.3 + version: 2.0.3 '@nullvoxpopuli/eslint-configs': specifier: ^5.3.3 version: 5.3.3(d15dbee1824a061087fb273678f50d84) @@ -245,10 +245,10 @@ importers: version: 9.2.0 ember-a11y-testing: specifier: ^7.0.1 - version: 7.1.2(efcc5749432e061a1dcc113a3ab1defd) + version: 7.1.2(6a47f971d750d1512ced46c17ebb5cd6) ember-auto-import: specifier: ^2.10.0 - version: 2.10.0(@glint/template@1.5.2)(webpack@5.101.2) + version: 2.10.0(@glint/template@1.6.1)(webpack@5.101.2) ember-cli: specifier: ~5.12.0 version: 5.12.0(handlebars@4.7.8)(underscore@1.13.7) @@ -278,13 +278,13 @@ importers: version: 9.0.2 ember-qunit: specifier: ^9.0.3 - version: 9.0.3(14c1a5c233d9a15ad8455873a61dc84c) + version: 9.0.3(68b07d0bf2007558cb96500995160331) ember-resolver: specifier: ^13.1.1 version: 13.1.1(@babel/core@7.28.3) ember-resources: specifier: ^7.0.4 - version: 7.0.6(7e45a25ffdb3df2da8e6d27f36d1e0ce) + version: 7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6) ember-source: specifier: 6.7.0 version: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5) @@ -365,7 +365,7 @@ importers: version: 1.10.0 '@embroider/macros': specifier: ^1.18.0 - version: 1.18.1(731de5cfbb3f32d50726bf63427bba20) + version: 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@floating-ui/dom': specifier: ^1.7.0 version: 1.7.4 @@ -380,7 +380,7 @@ importers: version: 0.6.0 reactiveweb: specifier: ^1.8.0 - version: 1.8.0(7f7ef56b9fddf0319c9eb9405fc14dbc) + version: 1.8.0(d46a779a1ca6b0c0f22a9f4a5f7b9d82) should-handle-link: specifier: ^1.2.2 version: 1.3.0 @@ -423,31 +423,28 @@ importers: version: 7.27.1(@babel/core@7.28.3) '@ember/test-helpers': specifier: ^5.2.2 - version: 5.2.2(731de5cfbb3f32d50726bf63427bba20) + version: 5.2.2(f9dfbf4fac3dbc0e0370b14ce6056988) '@ember/test-waiters': specifier: ^4.1.0 - version: 4.1.1(731de5cfbb3f32d50726bf63427bba20) + version: 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/addon-dev': specifier: ^7.0.1 - version: 7.1.5(@glint/template@1.5.2)(rollup@4.44.2) + version: 7.1.5(@glint/template@1.6.1)(rollup@4.44.2) '@glimmer/component': specifier: ^2.0.0 version: 2.0.0 '@glimmer/tracking': specifier: ^1.1.2 version: 1.1.2 - '@glint/core': - specifier: 1.5.2 - version: 1.5.2(typescript@5.9.2) - '@glint/environment-ember-loose': - specifier: 1.5.2 - version: 1.5.2(bb2a2ec32409667a7f85f52cb32a6474) - '@glint/environment-ember-template-imports': - specifier: 1.5.2 - version: 1.5.2(35813836f891eeca95241da440fecc6b) + '@glint/ember-tsc': + specifier: 1.0.3 + version: 1.0.3(typescript@5.9.2) '@glint/template': - specifier: ^1.5.2 - version: 1.5.2 + specifier: 1.6.1 + version: 1.6.1 + '@glint/tsserver-plugin': + specifier: 2.0.3 + version: 2.0.3 '@nullvoxpopuli/eslint-configs': specifier: ^5.3.3 version: 5.3.3(d15dbee1824a061087fb273678f50d84) @@ -468,7 +465,7 @@ importers: version: 4.2.2(@babel/core@7.28.3) ember-resources: specifier: ^7.0.4 - version: 7.0.6(7e45a25ffdb3df2da8e6d27f36d1e0ce) + version: 7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6) ember-source: specifier: 6.7.0 version: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5) @@ -504,10 +501,10 @@ importers: dependencies: ember-primitives: specifier: workspace:^ - version: file:ember-primitives(476e92d9efd9761c8ee687aec07344bc) + version: link:../ember-primitives ember-resources: specifier: ^7.0.4 - version: 7.0.6(f96b9c5b02315288858d60085fdcc77f) + version: 7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6) ember-route-template: specifier: ^1.0.3 version: 1.0.3 @@ -532,46 +529,40 @@ importers: version: 4.0.1 '@ember/test-helpers': specifier: ^5.2.2 - version: 5.2.2(a556003fddcfdc6b00136115370fd4a2) + version: 5.2.2(f9dfbf4fac3dbc0e0370b14ce6056988) '@ember/test-waiters': specifier: ^4.1.0 - version: 4.1.1(a556003fddcfdc6b00136115370fd4a2) + version: 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/compat': specifier: ^4.1.0 - version: 4.1.2(e9d7265b3e12075af899cd5b0df24a57) + version: 4.1.2(50817f4f01f7dfc977cb9d512fe86d1f) '@embroider/config-meta-loader': specifier: ^1.0.0 version: 1.0.0 '@embroider/core': specifier: ^4.1.0 - version: 4.1.3(@glint/template@1.6.0-alpha.3) + version: 4.1.3(@glint/template@1.6.1) '@embroider/macros': specifier: ^1.18.0 - version: 1.18.1(a556003fddcfdc6b00136115370fd4a2) + version: 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/vite': specifier: ^1.1.5 - version: 1.1.6(64e8a595279181399c4a322df7c62def) + version: 1.1.6(2cd65f555c6368c49d09b8c73afc0ffd) '@floating-ui/dom': specifier: ^1.7.0 version: 1.7.4 '@glimmer/component': specifier: ^2.0.0 version: 2.0.0 - '@glint/core': - specifier: alpha - version: 2.0.0-alpha.10(typescript@5.9.2) - '@glint/environment-ember-loose': - specifier: alpha - version: 2.0.0-alpha.3(c97dc91619b4d0a0fea7fc035312a11f) - '@glint/environment-ember-template-imports': - specifier: alpha - version: 2.0.0-alpha.3(d9ea7aef7d8fc0938299106a7b0ad9f5) + '@glint/ember-tsc': + specifier: 1.0.3 + version: 1.0.3(typescript@5.9.2) '@glint/template': - specifier: alpha - version: 1.6.0-alpha.3 + specifier: 1.6.1 + version: 1.6.1 '@glint/tsserver-plugin': - specifier: alpha - version: 2.0.0-alpha.10 + specifier: 2.0.3 + version: 2.0.3 '@nullvoxpopuli/eslint-configs': specifier: ^5.3.3 version: 5.3.3(d15dbee1824a061087fb273678f50d84) @@ -595,7 +586,7 @@ importers: version: 9.2.0 ember-auto-import: specifier: 2.10.0 - version: 2.10.0(12c3a7ab3b4499c9314d5a6b89125a70) + version: 2.10.0(@glint/template@1.6.1)(webpack@5.101.2) ember-cli: specifier: ~5.12.0 version: 5.12.0(handlebars@4.7.8)(underscore@1.13.7) @@ -634,7 +625,7 @@ importers: version: 9.0.2 ember-qunit: specifier: ^9.0.3 - version: 9.0.3(5df52696f02fd33b4ce9aa07a8c5e644) + version: 9.0.3(68b07d0bf2007558cb96500995160331) ember-resolver: specifier: ^13.1.1 version: 13.1.1(@babel/core@7.28.3) @@ -1850,94 +1841,17 @@ packages: '@glimmer/wire-format@0.94.8': resolution: {integrity: sha512-A+Cp5m6vZMAEu0Kg/YwU2dJZXyYxVJs2zI57d3CP6NctmX7FsT8WjViiRUmt5abVmMmRH5b8BUovqY6GSMAdrw==} - '@glint/core@1.5.2': - resolution: {integrity: sha512-kbEt8jBEkH65yDB20tBq/rnZl+iigmAenKQcgu1cqex6/eT6LrQ5E9QxyKtqe9S18qZv0c/LNa0qE7jwbAEKMA==} - hasBin: true - peerDependencies: - typescript: '>=4.8.0' - - '@glint/core@2.0.0-alpha.10': - resolution: {integrity: sha512-gvpdtnWOCFDDFPoz+t/oIPEaBae3KnaZRTLwKRhOxLB9+RmaN5oW8QrLUUotAM2YAKy+8H5sKMtF3r1eok79aA==} + '@glint/ember-tsc@1.0.3': + resolution: {integrity: sha512-EDWJJl0Bz7GCfGh6CzfAAy2a6AATjkH1qh0Dz7ERgJj1WUfe+liWZCoBHs1bDbexNrEPoUdkOZCzqFObaP9NBA==} hasBin: true peerDependencies: typescript: '>=5.6.0' - '@glint/environment-ember-loose@1.5.2': - resolution: {integrity: sha512-AuYRwZbQZW13WMW9tmyYqSGHLBXbdXn+HqdRDAG1qHItnjON4uv6sJVQUrnadlMT3G2AVRjL6jtfnwHs3t2Kuw==} - peerDependencies: - '@glimmer/component': ^2.0.0 - '@glint/template': ^1.5.2 - '@types/ember__array': ^4.0.2 - '@types/ember__component': ^4.0.10 - '@types/ember__controller': ^4.0.2 - '@types/ember__object': ^4.0.4 - '@types/ember__routing': ^4.0.11 - ember-cli-htmlbars: ^6.0.1 - ember-modifier: ^3.2.7 || ^4.0.0 - peerDependenciesMeta: - '@types/ember__array': - optional: true - '@types/ember__component': - optional: true - '@types/ember__controller': - optional: true - '@types/ember__object': - optional: true - '@types/ember__routing': - optional: true - ember-cli-htmlbars: - optional: true - ember-modifier: - optional: true + '@glint/template@1.6.1': + resolution: {integrity: sha512-/VuVbS+p2ON/qYVlTljIBnNMR3eUiu202uXdYJHTQ7bfFWmLija+ZfdgQCjdm83uZUMXQqtWvjOwwFXe5cvPtg==} - '@glint/environment-ember-loose@2.0.0-alpha.3': - resolution: {integrity: sha512-hLogEykHVUwC+aElg8W1XMp9edcxiKO+ZZufrWcgHUBFTtsoJCP8jWYb0H+1XgLTEnnSV+2OyO6yMPsegGUWkg==} - peerDependencies: - '@glimmer/component': ^2.0.0 - '@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 - - '@glint/environment-ember-template-imports@1.5.2': - resolution: {integrity: sha512-f/asPRUr2YWtwYWlvl67JC6PIlihIiFnEtvESvMnblsDyJPpzJmVFGGlVujCOkajLwbkX9DDEw7fydn64He8Qw==} - peerDependencies: - '@glint/environment-ember-loose': ^1.5.2 - '@glint/template': ^1.5.2 - '@types/ember__component': ^4.0.10 - '@types/ember__helper': ^4.0.1 - '@types/ember__modifier': ^4.0.3 - '@types/ember__routing': ^4.0.12 - peerDependenciesMeta: - '@types/ember__component': - optional: true - '@types/ember__helper': - optional: true - '@types/ember__modifier': - optional: true - '@types/ember__routing': - optional: true - - '@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.5.2': - resolution: {integrity: sha512-fA9FoHCmWsWkoOKWshsOQlS0WCAM7NwwoaeSTHuz5yHvBZmmtkgx3t2SPOTJs85/hWTNVzYC/Gthw7xDUR3BlQ==} - - '@glint/template@1.6.0-alpha.3': - resolution: {integrity: sha512-S7k7EWjNr6KMZ1+XJcVKLdy7/M9AaFh+zfmXwfJlRaVhjM6lBhn5KGUnf33sJ63EHzyorWKsCsiqxyXSx0GAYQ==} - - '@glint/tsserver-plugin@2.0.0-alpha.10': - resolution: {integrity: sha512-8VHrG8AaG57cahgHFhADncuZ1elQZ6Q+RLZ1q4uacZSFGyytZstOm963mA4bn7qnzfLhyEbO7Fr8LlCzYepKkg==} + '@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==} @@ -4615,6 +4529,9 @@ packages: peerDependencies: '@glimmer/component': ^2.0.0 + ember-strict-application-resolver@0.1.0: + resolution: {integrity: sha512-dmVJPLDoltiB5PN4xhUmg9JrUMPJxdeIlwqUtRBvIHpOLrbi069m7AvXGEh0b+Pq7g1HkLwt/lMm6ouHVry7hQ==} + ember-template-lint@7.9.2: resolution: {integrity: sha512-j2vt1laRRn1yipSrVm6+E2UbVrERTDoX/ye66Kc+FtI+W+SJSAuEPvMA+t2sofkqvP0u+TEg8Bc66YbShblAgg==} engines: {node: ^18.18.0 || >= 20.9.0} @@ -9257,33 +9174,19 @@ packages: vscode-json-languageservice@4.2.1: resolution: {integrity: sha512-xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==} - vscode-jsonrpc@8.1.0: - resolution: {integrity: sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==} - engines: {node: '>=14.0.0'} - vscode-jsonrpc@8.2.0: resolution: {integrity: sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==} engines: {node: '>=14.0.0'} - vscode-languageserver-protocol@3.17.3: - resolution: {integrity: sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==} - vscode-languageserver-protocol@3.17.5: resolution: {integrity: sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==} vscode-languageserver-textdocument@1.0.12: resolution: {integrity: sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==} - vscode-languageserver-types@3.17.3: - resolution: {integrity: sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==} - vscode-languageserver-types@3.17.5: resolution: {integrity: sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==} - vscode-languageserver@8.1.0: - resolution: {integrity: sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw==} - hasBin: true - vscode-languageserver@9.0.1: resolution: {integrity: sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==} hasBin: true @@ -10494,25 +10397,25 @@ snapshots: transitivePeerDependencies: - supports-color - '@ember/render-modifiers@2.1.0(a6f58e0a28265489416199ad19fe6530)': + '@ember/render-modifiers@2.1.0(08b2578a7a71205bcdddd1708846504b)': dependencies: - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) ember-cli-babel: 8.2.0(@babel/core@7.28.3) ember-modifier-manager-polyfill: 1.2.0(@babel/core@7.28.3) ember-source: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5) optionalDependencies: - '@glint/template': 1.5.2 + '@glint/template': 1.6.1 transitivePeerDependencies: - '@babel/core' - supports-color '@ember/string@4.0.1': {} - '@ember/test-helpers@5.2.2(731de5cfbb3f32d50726bf63427bba20)': + '@ember/test-helpers@5.2.2(f9dfbf4fac3dbc0e0370b14ce6056988)': dependencies: - '@ember/test-waiters': 4.1.1(731de5cfbb3f32d50726bf63427bba20) + '@ember/test-waiters': 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@simple-dom/interface': 1.4.0 decorator-transforms: 2.3.0(@babel/core@7.28.3) dom-element-descriptors: 0.5.1 @@ -10521,40 +10424,18 @@ snapshots: - '@glint/template' - supports-color - '@ember/test-helpers@5.2.2(a556003fddcfdc6b00136115370fd4a2)': + '@ember/test-waiters@4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988)': dependencies: - '@ember/test-waiters': 4.1.1(a556003fddcfdc6b00136115370fd4a2) '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) - '@simple-dom/interface': 1.4.0 - decorator-transforms: 2.3.0(@babel/core@7.28.3) - dom-element-descriptors: 0.5.1 + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) transitivePeerDependencies: - '@babel/core' - '@glint/template' - supports-color - '@ember/test-waiters@4.1.1(731de5cfbb3f32d50726bf63427bba20)': + '@embroider/addon-dev@7.1.5(@glint/template@1.6.1)(rollup@4.44.2)': dependencies: - '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - supports-color - - '@ember/test-waiters@4.1.1(a556003fddcfdc6b00136115370fd4a2)': - dependencies: - '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - supports-color - - '@embroider/addon-dev@7.1.5(@glint/template@1.5.2)(rollup@4.44.2)': - dependencies: - '@embroider/core': 3.5.7(@glint/template@1.5.2) + '@embroider/core': 3.5.7(@glint/template@1.6.1) '@rollup/pluginutils': 4.2.1 content-tag: 3.1.3 execa: 5.1.1 @@ -10590,63 +10471,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/compat@4.1.2(13b11a263de2cd1612b46cb3cf762c70)': - dependencies: - '@babel/code-frame': 7.27.1 - '@babel/core': 7.28.3 - '@babel/plugin-syntax-decorators': 7.27.1(@babel/core@7.28.3) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.28.3) - '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.3) - '@babel/plugin-transform-runtime': 7.28.3(@babel/core@7.28.3) - '@babel/preset-env': 7.28.3(@babel/core@7.28.3) - '@babel/runtime': 7.28.3 - '@babel/traverse': 7.28.3 - '@embroider/core': 4.1.3(@glint/template@1.5.2) - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) - '@types/babel__code-frame': 7.0.6 - assert-never: 1.4.0 - babel-import-util: 3.0.1 - babel-plugin-debug-macros: 2.0.0(@babel/core@7.28.3) - babel-plugin-ember-template-compilation: 2.4.1 - babel-plugin-ember-template-compilation-2: babel-plugin-ember-template-compilation@2.4.1 - babel-plugin-syntax-dynamic-import: 6.18.0 - babylon: 6.18.0 - bind-decorator: 1.0.11 - broccoli: 3.5.2 - broccoli-concat: 4.2.5 - broccoli-file-creator: 2.1.1 - broccoli-funnel: 3.0.8 - broccoli-merge-trees: 4.2.0 - broccoli-persistent-filter: 3.1.3 - broccoli-plugin: 4.0.7 - broccoli-source: 3.0.1 - chalk: 4.1.2 - debug: 4.4.1 - ember-source: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5) - fast-sourcemap-concat: 2.1.1 - fs-extra: 9.1.0 - fs-tree-diff: 2.0.1 - jsdom: 25.0.1 - lodash: 4.17.21 - pkg-up: 3.1.0 - resolve: 1.22.10 - resolve-package-path: 4.0.3 - resolve.exports: 2.0.3 - semver: 7.7.2 - symlink-or-copy: 1.3.1 - tree-sync: 2.1.0 - typescript-memoize: 1.1.1 - walk-sync: 3.0.0 - transitivePeerDependencies: - - '@glimmer/component' - - '@glint/template' - - bufferutil - - canvas - - rsvp - - supports-color - - utf-8-validate - - '@embroider/compat@4.1.2(e9d7265b3e12075af899cd5b0df24a57)': + '@embroider/compat@4.1.2(50817f4f01f7dfc977cb9d512fe86d1f)': dependencies: '@babel/code-frame': 7.27.1 '@babel/core': 7.28.3 @@ -10657,8 +10482,8 @@ snapshots: '@babel/preset-env': 7.28.3(@babel/core@7.28.3) '@babel/runtime': 7.28.3 '@babel/traverse': 7.28.3 - '@embroider/core': 4.1.3(@glint/template@1.6.0-alpha.3) - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) + '@embroider/core': 4.1.3(@glint/template@1.6.1) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@types/babel__code-frame': 7.0.6 assert-never: 1.4.0 babel-import-util: 3.0.1 @@ -10706,12 +10531,12 @@ snapshots: '@embroider/config-meta-loader@1.0.1-unstable.f9c81e9': {} - '@embroider/core@3.5.7(@glint/template@1.5.2)': + '@embroider/core@3.5.7(@glint/template@1.6.1)': dependencies: '@babel/core': 7.28.3 '@babel/parser': 7.28.3 '@babel/traverse': 7.28.3 - '@embroider/macros': 1.16.13(731de5cfbb3f32d50726bf63427bba20) + '@embroider/macros': 1.16.13(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/shared-internals': 2.9.1 assert-never: 1.4.0 babel-plugin-ember-template-compilation: 2.4.1 @@ -10740,48 +10565,12 @@ snapshots: - supports-color - utf-8-validate - '@embroider/core@4.1.3(@glint/template@1.5.2)': - dependencies: - '@babel/core': 7.28.3 - '@babel/parser': 7.28.3 - '@babel/traverse': 7.28.3 - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) - '@embroider/reverse-exports': 0.1.2 - '@embroider/shared-internals': 3.0.0 - assert-never: 1.4.0 - babel-plugin-ember-template-compilation: 2.4.1 - broccoli-node-api: 1.7.0 - broccoli-persistent-filter: 3.1.3 - broccoli-plugin: 4.0.7 - broccoli-source: 3.0.1 - debug: 4.4.1 - escape-string-regexp: 4.0.0 - fast-sourcemap-concat: 2.1.1 - fs-extra: 9.1.0 - fs-tree-diff: 2.0.1 - handlebars: 4.7.8 - js-string-escape: 1.0.1 - jsdom: 25.0.1 - lodash: 4.17.21 - resolve: 1.22.10 - resolve-package-path: 4.0.3 - resolve.exports: 2.0.3 - semver: 7.7.2 - typescript-memoize: 1.1.1 - walk-sync: 3.0.0 - transitivePeerDependencies: - - '@glint/template' - - bufferutil - - canvas - - supports-color - - utf-8-validate - - '@embroider/core@4.1.3(@glint/template@1.6.0-alpha.3)': + '@embroider/core@4.1.3(@glint/template@1.6.1)': dependencies: '@babel/core': 7.28.3 '@babel/parser': 7.28.3 '@babel/traverse': 7.28.3 - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/reverse-exports': 0.1.2 '@embroider/shared-internals': 3.0.0 assert-never: 1.4.0 @@ -10812,7 +10601,7 @@ snapshots: - supports-color - utf-8-validate - '@embroider/macros@1.16.13(731de5cfbb3f32d50726bf63427bba20)': + '@embroider/macros@1.16.13(f9dfbf4fac3dbc0e0370b14ce6056988)': dependencies: '@embroider/shared-internals': 2.9.0 assert-never: 1.4.0 @@ -10823,12 +10612,12 @@ snapshots: resolve: 1.22.10 semver: 7.7.2 optionalDependencies: - '@glint/template': 1.5.2 + '@glint/template': 1.6.1 transitivePeerDependencies: - '@babel/core' - supports-color - '@embroider/macros@1.16.9(731de5cfbb3f32d50726bf63427bba20)': + '@embroider/macros@1.16.9(f9dfbf4fac3dbc0e0370b14ce6056988)': dependencies: '@embroider/shared-internals': 2.8.1 assert-never: 1.4.0 @@ -10839,28 +10628,12 @@ snapshots: resolve: 1.22.10 semver: 7.7.2 optionalDependencies: - '@glint/template': 1.5.2 - transitivePeerDependencies: - - '@babel/core' - - supports-color - - '@embroider/macros@1.18.1(731de5cfbb3f32d50726bf63427bba20)': - dependencies: - '@embroider/shared-internals': 3.0.0 - assert-never: 1.4.0 - babel-import-util: 3.0.1 - ember-cli-babel: 8.2.0(@babel/core@7.28.3) - find-up: 5.0.0 - lodash: 4.17.21 - resolve: 1.22.10 - semver: 7.7.2 - optionalDependencies: - '@glint/template': 1.5.2 + '@glint/template': 1.6.1 transitivePeerDependencies: - '@babel/core' - supports-color - '@embroider/macros@1.18.1(a556003fddcfdc6b00136115370fd4a2)': + '@embroider/macros@1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988)': dependencies: '@embroider/shared-internals': 3.0.0 assert-never: 1.4.0 @@ -10871,7 +10644,7 @@ snapshots: resolve: 1.22.10 semver: 7.7.2 optionalDependencies: - '@glint/template': 1.6.0-alpha.3 + '@glint/template': 1.6.1 transitivePeerDependencies: - '@babel/core' - supports-color @@ -10950,38 +10723,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/vite@1.1.6(64e8a595279181399c4a322df7c62def)': + '@embroider/vite@1.1.6(2cd65f555c6368c49d09b8c73afc0ffd)': dependencies: '@babel/core': 7.28.3 - '@embroider/core': 4.1.3(@glint/template@1.6.0-alpha.3) - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) - '@embroider/reverse-exports': 0.1.2 - '@rollup/pluginutils': 5.2.0(rollup@4.44.2) - assert-never: 1.4.0 - browserslist: 4.25.2 - browserslist-to-esbuild: 2.1.1(browserslist@4.25.2) - content-tag: 3.1.3 - debug: 4.4.1 - fast-glob: 3.3.3 - fs-extra: 10.1.0 - jsdom: 25.0.1 - send: 0.18.0 - source-map-url: 0.4.1 - terser: 5.43.1 - vite: 6.3.5(d042f1bfad50a086b055e5ecba35bd99) - transitivePeerDependencies: - - '@glint/template' - - bufferutil - - canvas - - rollup - - supports-color - - utf-8-validate - - '@embroider/vite@1.1.6(fb50af483f9af9826c2eb745313a11cb)': - dependencies: - '@babel/core': 7.28.3 - '@embroider/core': 4.1.3(@glint/template@1.5.2) - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) + '@embroider/core': 4.1.3(@glint/template@1.6.1) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/reverse-exports': 0.1.2 '@rollup/pluginutils': 5.2.0(rollup@4.44.2) assert-never: 1.4.0 @@ -11335,25 +11081,10 @@ snapshots: dependencies: '@glimmer/interfaces': 0.94.6 - '@glint/core@1.5.2(typescript@5.9.2)': - dependencies: - '@glimmer/syntax': 0.84.3 - escape-string-regexp: 4.0.0 - semver: 7.7.2 - silent-error: 1.1.1 - typescript: 5.9.2 - uuid: 8.3.2 - vscode-languageserver: 8.1.0 - vscode-languageserver-textdocument: 1.0.12 - vscode-uri: 3.1.0 - yargs: 17.7.2 - transitivePeerDependencies: - - supports-color - - '@glint/core@2.0.0-alpha.10(typescript@5.9.2)': + '@glint/ember-tsc@1.0.3(typescript@5.9.2)': dependencies: '@glimmer/syntax': 0.95.0 - '@glint/template': 1.6.0-alpha.3 + '@glint/template': 1.6.1 '@volar/kit': 2.4.23(typescript@5.9.2) '@volar/language-core': 2.4.23 '@volar/language-server': 2.4.23 @@ -11377,43 +11108,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@glint/environment-ember-loose@1.5.2(bb2a2ec32409667a7f85f52cb32a6474)': - dependencies: - '@glimmer/component': 2.0.0 - '@glint/template': 1.5.2 - optionalDependencies: - ember-cli-htmlbars: 6.3.0 - ember-modifier: 4.2.2(@babel/core@7.28.3) - - '@glint/environment-ember-loose@2.0.0-alpha.3(c97dc91619b4d0a0fea7fc035312a11f)': - dependencies: - '@glimmer/component': 2.0.0 - '@glint/core': 2.0.0-alpha.10(typescript@5.9.2) - '@glint/template': 1.6.0-alpha.3 - optionalDependencies: - ember-cli-htmlbars: 6.3.0 - ember-modifier: 4.2.2(@babel/core@7.28.3) + '@glint/template@1.6.1': {} - '@glint/environment-ember-template-imports@1.5.2(35813836f891eeca95241da440fecc6b)': + '@glint/tsserver-plugin@2.0.3': dependencies: - '@glint/environment-ember-loose': 1.5.2(bb2a2ec32409667a7f85f52cb32a6474) - '@glint/template': 1.5.2 - content-tag: 2.0.3 - - '@glint/environment-ember-template-imports@2.0.0-alpha.3(d9ea7aef7d8fc0938299106a7b0ad9f5)': - dependencies: - '@glint/core': 2.0.0-alpha.10(typescript@5.9.2) - '@glint/environment-ember-loose': 2.0.0-alpha.3(c97dc91619b4d0a0fea7fc035312a11f) - '@glint/template': 1.6.0-alpha.3 - content-tag: 3.1.3 - - '@glint/template@1.5.2': {} - - '@glint/template@1.6.0-alpha.3': {} - - '@glint/tsserver-plugin@2.0.0-alpha.10': - dependencies: - '@glint/core': 2.0.0-alpha.10(typescript@5.9.2) + '@glint/ember-tsc': 1.0.3(typescript@5.9.2) '@volar/language-core': 2.4.23 '@volar/typescript': 2.4.23 jiti: 2.4.2 @@ -12346,19 +12045,19 @@ snapshots: '@ungap/structured-clone@1.3.0': {} - '@universal-ember/docs-support@0.6.7(4deea9ad690acacdca44ee8dd2590397)': + '@universal-ember/docs-support@0.6.7(b0512eb69af463fd2172ede4391b0e05)': dependencies: '@embroider/addon-shim': 1.10.0 '@fontsource/lexend': 5.2.9 '@tailwindcss/typography': 0.5.16(tailwindcss@3.4.17) change-case: 5.4.4 decorator-transforms: 2.3.0(@babel/core@7.28.3) - ember-mobile-menu: 5.3.0(75f91512d1c22e02dbf0b088938c2cd8) + ember-mobile-menu: 5.3.0(a81b7c3a3e988c889e645adc8637172a) ember-modifier: 4.2.2(@babel/core@7.28.3) - ember-primitives: file:ember-primitives(2b647363f6cf74f7c2155e7905e05e08) - ember-resources: 7.0.6(7e45a25ffdb3df2da8e6d27f36d1e0ce) + ember-primitives: file:ember-primitives(8df3675981dac123b3b71482d1691d85) + ember-resources: 7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6) inter-ui: 4.1.1 - kolay: 3.9.1(43269d8c5833f7fe825e7dd55295ad3a) + kolay: 3.9.1(dea7a95eed90345e2269e7fed0f09ad5) package-up: 5.0.0 read-package-up: 11.0.0 should-handle-link: 1.3.0 @@ -14164,15 +13863,15 @@ snapshots: electron-to-chromium@1.5.202: {} - ember-a11y-testing@7.1.2(efcc5749432e061a1dcc113a3ab1defd): + ember-a11y-testing@7.1.2(6a47f971d750d1512ced46c17ebb5cd6): dependencies: - '@ember/test-helpers': 5.2.2(731de5cfbb3f32d50726bf63427bba20) - '@ember/test-waiters': 4.1.1(731de5cfbb3f32d50726bf63427bba20) + '@ember/test-helpers': 5.2.2(f9dfbf4fac3dbc0e0370b14ce6056988) + '@ember/test-waiters': 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@glimmer/env': 0.1.7 '@scalvert/ember-setup-middleware-reporter': 0.1.1 axe-core: 4.10.3 broccoli-persistent-filter: 3.1.3 - ember-auto-import: 2.10.0(@glint/template@1.5.2)(webpack@5.101.2) + ember-auto-import: 2.10.0(@glint/template@1.6.1)(webpack@5.101.2) ember-cli-babel: 8.2.0(@babel/core@7.28.3) ember-cli-htmlbars: 6.3.0 ember-cli-typescript: 4.2.1 @@ -14353,9 +14052,9 @@ snapshots: - walrus - whiskers - ember-async-data@2.0.1(731de5cfbb3f32d50726bf63427bba20): + ember-async-data@2.0.1(f9dfbf4fac3dbc0e0370b14ce6056988): dependencies: - '@ember/test-waiters': 4.1.1(731de5cfbb3f32d50726bf63427bba20) + '@ember/test-waiters': 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/addon-shim': 1.10.0 decorator-transforms: 2.3.0(@babel/core@7.28.3) transitivePeerDependencies: @@ -14363,17 +14062,7 @@ snapshots: - '@glint/template' - supports-color - ember-async-data@2.0.1(a556003fddcfdc6b00136115370fd4a2): - dependencies: - '@ember/test-waiters': 4.1.1(a556003fddcfdc6b00136115370fd4a2) - '@embroider/addon-shim': 1.10.0 - decorator-transforms: 2.3.0(@babel/core@7.28.3) - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - supports-color - - ember-auto-import@2.10.0(12c3a7ab3b4499c9314d5a6b89125a70): + ember-auto-import@2.10.0(@glint/template@1.6.1)(webpack@5.101.2): dependencies: '@babel/core': 7.28.3 '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.28.3) @@ -14381,50 +14070,7 @@ snapshots: '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.28.3) '@babel/plugin-transform-class-static-block': 7.28.3(@babel/core@7.28.3) '@babel/preset-env': 7.28.3(@babel/core@7.28.3) - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) - '@embroider/shared-internals': 2.9.1 - babel-loader: 8.4.1(@babel/core@7.28.3)(webpack@5.101.2) - babel-plugin-ember-modules-api-polyfill: 3.5.0 - babel-plugin-ember-template-compilation: 2.4.1 - babel-plugin-htmlbars-inline-precompile: 5.3.1 - babel-plugin-syntax-dynamic-import: 6.18.0 - broccoli-debug: 0.6.5 - broccoli-funnel: 3.0.8 - broccoli-merge-trees: 4.2.0 - broccoli-plugin: 4.0.7 - broccoli-source: 3.0.1 - css-loader: 5.2.7(webpack@5.101.2) - debug: 4.4.1 - fs-extra: 10.1.0 - fs-tree-diff: 2.0.1 - handlebars: 4.7.8 - is-subdir: 1.2.0 - js-string-escape: 1.0.1 - lodash: 4.17.21 - mini-css-extract-plugin: 2.9.4(webpack@5.101.2) - minimatch: 3.1.2 - parse5: 6.0.1 - pkg-entry-points: 1.1.1 - resolve: 1.22.10 - resolve-package-path: 4.0.3 - semver: 7.7.2 - style-loader: 2.0.0(webpack@5.101.2) - typescript-memoize: 1.1.1 - walk-sync: 3.0.0 - transitivePeerDependencies: - - '@glint/template' - - supports-color - - webpack - - ember-auto-import@2.10.0(@glint/template@1.5.2)(webpack@5.101.2): - dependencies: - '@babel/core': 7.28.3 - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.28.3) - '@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.3) - '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.28.3) - '@babel/plugin-transform-class-static-block': 7.28.3(@babel/core@7.28.3) - '@babel/preset-env': 7.28.3(@babel/core@7.28.3) - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/shared-internals': 2.9.1 babel-loader: 8.4.1(@babel/core@7.28.3)(webpack@5.101.2) babel-plugin-ember-modules-api-polyfill: 3.5.0 @@ -14469,9 +14115,9 @@ snapshots: - '@babel/core' - supports-color - ember-cached-decorator-polyfill@1.0.2(a6f58e0a28265489416199ad19fe6530): + ember-cached-decorator-polyfill@1.0.2(08b2578a7a71205bcdddd1708846504b): dependencies: - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@glimmer/tracking': 1.1.2 babel-import-util: 1.4.1 ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.28.3) @@ -15096,7 +14742,7 @@ snapshots: - '@babel/core' - supports-color - ember-concurrency@4.0.6(731de5cfbb3f32d50726bf63427bba20): + ember-concurrency@4.0.6(f9dfbf4fac3dbc0e0370b14ce6056988): dependencies: '@babel/helper-module-imports': 7.27.1 '@babel/helper-plugin-utils': 7.27.1 @@ -15104,7 +14750,7 @@ snapshots: '@embroider/addon-shim': 1.10.0 decorator-transforms: 1.2.1(@babel/core@7.28.3) optionalDependencies: - '@glint/template': 1.5.2 + '@glint/template': 1.6.1 transitivePeerDependencies: - '@babel/core' - supports-color @@ -15159,14 +14805,14 @@ snapshots: transitivePeerDependencies: - supports-color - ember-gesture-modifiers@6.1.0(140fb3d8afd3b99bdd0e12054e41b0ad): + ember-gesture-modifiers@6.1.0(6496327679d7af20a13a15a479d4098f): dependencies: '@embroider/addon-shim': 1.10.0 decorator-transforms: 2.3.0(@babel/core@7.28.3) ember-modifier: 4.2.2(@babel/core@7.28.3) ember-source: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5) optionalDependencies: - '@ember/test-helpers': 5.2.2(731de5cfbb3f32d50726bf63427bba20) + '@ember/test-helpers': 5.2.2(f9dfbf4fac3dbc0e0370b14ce6056988) transitivePeerDependencies: - '@babel/core' - supports-color @@ -15175,18 +14821,18 @@ snapshots: dependencies: ember-source: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5) - ember-mobile-menu@5.3.0(75f91512d1c22e02dbf0b088938c2cd8): + ember-mobile-menu@5.3.0(a81b7c3a3e988c889e645adc8637172a): dependencies: - '@ember/render-modifiers': 2.1.0(a6f58e0a28265489416199ad19fe6530) - '@ember/test-waiters': 4.1.1(731de5cfbb3f32d50726bf63427bba20) + '@ember/render-modifiers': 2.1.0(08b2578a7a71205bcdddd1708846504b) + '@ember/test-waiters': 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/addon-shim': 1.10.0 '@glimmer/component': 2.0.0 '@glimmer/tracking': 1.1.2 decorator-transforms: 2.3.0(@babel/core@7.28.3) - ember-cached-decorator-polyfill: 1.0.2(a6f58e0a28265489416199ad19fe6530) - ember-concurrency: 4.0.6(731de5cfbb3f32d50726bf63427bba20) - ember-gesture-modifiers: 6.1.0(140fb3d8afd3b99bdd0e12054e41b0ad) - ember-on-resize-modifier: 2.0.2(5d7a2557e2d63d6d1c31165052d09561) + ember-cached-decorator-polyfill: 1.0.2(08b2578a7a71205bcdddd1708846504b) + ember-concurrency: 4.0.6(f9dfbf4fac3dbc0e0370b14ce6056988) + ember-gesture-modifiers: 6.1.0(6496327679d7af20a13a15a479d4098f) + ember-on-resize-modifier: 2.0.2(86ed58883672b1dbfa56b870e6ff6c6d) ember-set-body-class: 1.0.2(@babel/core@7.28.3) ember-source: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5) tracked-built-ins: 4.0.0(@babel/core@7.28.3) @@ -15217,9 +14863,9 @@ snapshots: - '@babel/core' - supports-color - ember-on-resize-modifier@2.0.2(5d7a2557e2d63d6d1c31165052d09561): + ember-on-resize-modifier@2.0.2(86ed58883672b1dbfa56b870e6ff6c6d): dependencies: - ember-auto-import: 2.10.0(@glint/template@1.5.2)(webpack@5.101.2) + ember-auto-import: 2.10.0(@glint/template@1.6.1)(webpack@5.101.2) ember-cli-babel: 8.2.0(@babel/core@7.28.3) ember-cli-htmlbars: 5.7.2 ember-modifier: 4.2.2(@babel/core@7.28.3) @@ -15237,75 +14883,37 @@ snapshots: transitivePeerDependencies: - supports-color - ember-primitives@file:ember-primitives(2b647363f6cf74f7c2155e7905e05e08): + ember-primitives@file:ember-primitives(8df3675981dac123b3b71482d1691d85): dependencies: '@babel/runtime': 7.28.4 - '@ember/test-waiters': 4.1.1(731de5cfbb3f32d50726bf63427bba20) + '@ember/test-waiters': 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@floating-ui/dom': 1.7.4 '@glimmer/component': 2.0.0 decorator-transforms: 2.3.0(@babel/core@7.28.3) ember-element-helper: 0.8.8 ember-modifier: 4.2.2(@babel/core@7.28.3) - ember-resources: 7.0.6(7e45a25ffdb3df2da8e6d27f36d1e0ce) + ember-resources: 7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6) form-data-utils: 0.6.0 - reactiveweb: 1.8.0(7f7ef56b9fddf0319c9eb9405fc14dbc) + reactiveweb: 1.8.0(d46a779a1ca6b0c0f22a9f4a5f7b9d82) should-handle-link: 1.3.0 tabster: 8.5.6 tracked-built-ins: 4.0.0(@babel/core@7.28.3) tracked-toolbox: 2.0.0(2ca2633f76fc7cda1bf7588b67493bc3) optionalDependencies: - '@ember/test-helpers': 5.2.2(731de5cfbb3f32d50726bf63427bba20) - '@glint/template': 1.5.2 + '@ember/test-helpers': 5.2.2(f9dfbf4fac3dbc0e0370b14ce6056988) + '@glint/template': 1.6.1 transitivePeerDependencies: - '@babel/core' - ember-source - supports-color - ember-primitives@file:ember-primitives(476e92d9efd9761c8ee687aec07344bc): + ember-qunit@9.0.3(68b07d0bf2007558cb96500995160331): dependencies: - '@babel/runtime': 7.28.4 - '@ember/test-waiters': 4.1.1(a556003fddcfdc6b00136115370fd4a2) + '@ember/test-helpers': 5.2.2(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) - '@floating-ui/dom': 1.7.4 - '@glimmer/component': 2.0.0 - decorator-transforms: 2.3.0(@babel/core@7.28.3) - ember-element-helper: 0.8.8 - ember-modifier: 4.2.2(@babel/core@7.28.3) - ember-resources: 7.0.6(f96b9c5b02315288858d60085fdcc77f) - form-data-utils: 0.6.0 - reactiveweb: 1.8.0(b1a0fac91039cc5a0cfc4db9534aa8ff) - should-handle-link: 1.3.0 - tabster: 8.5.6 - tracked-built-ins: 4.0.0(@babel/core@7.28.3) - tracked-toolbox: 2.0.0(2ca2633f76fc7cda1bf7588b67493bc3) - optionalDependencies: - '@ember/test-helpers': 5.2.2(a556003fddcfdc6b00136115370fd4a2) - '@glint/template': 1.6.0-alpha.3 - transitivePeerDependencies: - - '@babel/core' - - ember-source - - supports-color - - ember-qunit@9.0.3(14c1a5c233d9a15ad8455873a61dc84c): - dependencies: - '@ember/test-helpers': 5.2.2(731de5cfbb3f32d50726bf63427bba20) - '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) - qunit: 2.24.1 - qunit-theme-ember: 1.0.0 - transitivePeerDependencies: - - '@babel/core' - - '@glint/template' - - supports-color - - ember-qunit@9.0.3(5df52696f02fd33b4ce9aa07a8c5e644): - dependencies: - '@ember/test-helpers': 5.2.2(a556003fddcfdc6b00136115370fd4a2) - '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) qunit: 2.24.1 qunit-theme-ember: 1.0.0 transitivePeerDependencies: @@ -15313,12 +14921,12 @@ snapshots: - '@glint/template' - supports-color - ember-repl@6.0.0(d97e38db66a4cde03ab989926c12faab): + ember-repl@6.0.0(bcc72a692c3fcc14b8d277fbb7bea5f1): dependencies: '@babel/helper-plugin-utils': 7.27.1 '@babel/standalone': 7.28.3 '@embroider/addon-shim': 1.8.9 - '@embroider/macros': 1.16.9(731de5cfbb3f32d50726bf63427bba20) + '@embroider/macros': 1.16.9(f9dfbf4fac3dbc0e0370b14ce6056988) babel-import-util: 3.0.1 babel-plugin-ember-template-compilation: 2.4.1 broccoli-file-creator: 2.1.1 @@ -15326,7 +14934,7 @@ snapshots: common-tags: 1.8.2 content-tag: 3.1.3 decorator-transforms: 2.3.0(@babel/core@7.28.3) - ember-resources: 7.0.6(7e45a25ffdb3df2da8e6d27f36d1e0ce) + ember-resources: 7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6) line-column: 1.0.2 magic-string: 0.30.17 mdast: 3.0.0 @@ -15344,7 +14952,7 @@ snapshots: optionalDependencies: '@glimmer/compiler': 0.94.10 '@glimmer/syntax': 0.95.0 - '@glint/template': 1.5.2 + '@glint/template': 1.6.1 transitivePeerDependencies: - '@babel/core' - '@glimmer/component' @@ -15365,22 +14973,11 @@ snapshots: - '@babel/core' - supports-color - ember-resources@7.0.6(7e45a25ffdb3df2da8e6d27f36d1e0ce): + ember-resources@7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6): dependencies: '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) - '@glint/template': 1.5.2 - optionalDependencies: - '@glimmer/component': 2.0.0 - transitivePeerDependencies: - - '@babel/core' - - supports-color - - ember-resources@7.0.6(f96b9c5b02315288858d60085fdcc77f): - dependencies: - '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) - '@glint/template': 1.6.0-alpha.3 + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) + '@glint/template': 1.6.1 optionalDependencies: '@glimmer/component': 2.0.0 transitivePeerDependencies: @@ -15463,6 +15060,14 @@ snapshots: - rsvp - supports-color + ember-strict-application-resolver@0.1.0(@babel/core@7.28.3): + dependencies: + '@embroider/addon-shim': 1.10.0 + decorator-transforms: 2.3.0(@babel/core@7.28.3) + transitivePeerDependencies: + - '@babel/core' + - supports-color + ember-template-lint@7.9.2: dependencies: '@lint-todo/utils': 13.1.1 @@ -17633,22 +17238,22 @@ snapshots: known-css-properties@0.37.0: {} - kolay@3.9.1(43269d8c5833f7fe825e7dd55295ad3a): + kolay@3.9.1(dea7a95eed90345e2269e7fed0f09ad5): dependencies: - '@ember/test-waiters': 4.1.1(731de5cfbb3f32d50726bf63427bba20) + '@ember/test-waiters': 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/addon-shim': 1.10.0 '@glimmer/component': 2.0.0 - '@glint/template': 1.5.2 + '@glint/template': 1.6.1 common-tags: 1.8.2 decorator-transforms: 2.3.0(@babel/core@7.28.3) ember-modifier: 4.2.2(@babel/core@7.28.3) - ember-primitives: file:ember-primitives(2b647363f6cf74f7c2155e7905e05e08) - ember-repl: 6.0.0(d97e38db66a4cde03ab989926c12faab) - ember-resources: 7.0.6(7e45a25ffdb3df2da8e6d27f36d1e0ce) + ember-primitives: file:ember-primitives(8df3675981dac123b3b71482d1691d85) + ember-repl: 6.0.0(bcc72a692c3fcc14b8d277fbb7bea5f1) + ember-resources: 7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6) globby: 14.1.0 json5: 2.2.3 package-up: 5.0.0 - reactiveweb: 1.8.0(7f7ef56b9fddf0319c9eb9405fc14dbc) + reactiveweb: 1.8.0(d46a779a1ca6b0c0f22a9f4a5f7b9d82) send: 1.2.0 tracked-built-ins: 4.0.0(@babel/core@7.28.3) typedoc: 0.28.4(typescript@5.9.2) @@ -19338,28 +18943,14 @@ snapshots: minimist: 1.2.8 strip-json-comments: 2.0.1 - reactiveweb@1.8.0(7f7ef56b9fddf0319c9eb9405fc14dbc): - dependencies: - '@ember/test-waiters': 4.1.1(731de5cfbb3f32d50726bf63427bba20) - '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(731de5cfbb3f32d50726bf63427bba20) - decorator-transforms: 2.3.0(@babel/core@7.28.3) - ember-async-data: 2.0.1(731de5cfbb3f32d50726bf63427bba20) - ember-resources: 7.0.6(7e45a25ffdb3df2da8e6d27f36d1e0ce) - transitivePeerDependencies: - - '@babel/core' - - '@glimmer/component' - - '@glint/template' - - supports-color - - reactiveweb@1.8.0(b1a0fac91039cc5a0cfc4db9534aa8ff): + reactiveweb@1.8.0(d46a779a1ca6b0c0f22a9f4a5f7b9d82): dependencies: - '@ember/test-waiters': 4.1.1(a556003fddcfdc6b00136115370fd4a2) + '@ember/test-waiters': 4.1.1(f9dfbf4fac3dbc0e0370b14ce6056988) '@embroider/addon-shim': 1.10.0 - '@embroider/macros': 1.18.1(a556003fddcfdc6b00136115370fd4a2) + '@embroider/macros': 1.18.1(f9dfbf4fac3dbc0e0370b14ce6056988) decorator-transforms: 2.3.0(@babel/core@7.28.3) - ember-async-data: 2.0.1(a556003fddcfdc6b00136115370fd4a2) - ember-resources: 7.0.6(f96b9c5b02315288858d60085fdcc77f) + ember-async-data: 2.0.1(f9dfbf4fac3dbc0e0370b14ce6056988) + ember-resources: 7.0.6(bdc55e3c85e7d13ce720a4b2262fdff6) transitivePeerDependencies: - '@babel/core' - '@glimmer/component' @@ -21242,15 +20833,8 @@ snapshots: vscode-nls: 5.2.0 vscode-uri: 3.1.0 - vscode-jsonrpc@8.1.0: {} - vscode-jsonrpc@8.2.0: {} - vscode-languageserver-protocol@3.17.3: - dependencies: - vscode-jsonrpc: 8.1.0 - vscode-languageserver-types: 3.17.3 - vscode-languageserver-protocol@3.17.5: dependencies: vscode-jsonrpc: 8.2.0 @@ -21258,14 +20842,8 @@ snapshots: vscode-languageserver-textdocument@1.0.12: {} - vscode-languageserver-types@3.17.3: {} - vscode-languageserver-types@3.17.5: {} - vscode-languageserver@8.1.0: - dependencies: - vscode-languageserver-protocol: 3.17.3 - vscode-languageserver@9.0.1: dependencies: vscode-languageserver-protocol: 3.17.5 diff --git a/test-app/package.json b/test-app/package.json index ec4773f0c..1bab85000 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -19,7 +19,7 @@ "lint:hbs:fix": "pnpm -w exec lint hbs:fix", "lint:prettier:fix": "pnpm -w exec lint prettier:fix", "lint:prettier": "pnpm -w exec lint prettier", - "lint:types": "glint", + "lint:types": "ember-tsc", "start": "pnpm vite", "test": "vite build --mode test && ember test --path dist", "test:ember": "vite build --mode test && ember test --path dist" @@ -49,11 +49,9 @@ "@embroider/vite": "^1.1.5", "@floating-ui/dom": "^1.7.0", "@glimmer/component": "^2.0.0", - "@glint/core": "alpha", - "@glint/environment-ember-loose": "alpha", - "@glint/environment-ember-template-imports": "alpha", - "@glint/template": "alpha", - "@glint/tsserver-plugin": "alpha", + "@glint/ember-tsc": "1.0.3", + "@glint/template": "1.6.1", + "@glint/tsserver-plugin": "2.0.3", "@nullvoxpopuli/eslint-configs": "^5.3.3", "@rollup/plugin-babel": "^6.0.4", "@types/eslint__js": "^8.42.3", @@ -76,7 +74,7 @@ "ember-page-title": "^9.0.2", "ember-qunit": "^9.0.3", "ember-resolver": "^13.1.1", - "ember-source": "6.5.0-beta.1", + "ember-source": "6.7.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^7.7.0", "ember-try": "^4.0.0", diff --git a/test-app/tsconfig.json b/test-app/tsconfig.json index d406f911a..d2d2d2c39 100644 --- a/test-app/tsconfig.json +++ b/test-app/tsconfig.json @@ -1,9 +1,6 @@ { "extends": "@ember/app-tsconfig", "include": ["app", "tests", "types"], - "glint": { - "environment": ["ember-loose", "ember-template-imports"] - }, "compilerOptions": { "skipLibCheck": true, "paths": { @@ -11,6 +8,6 @@ "test-app/*": ["./app/*"], "*": ["./types/*"] }, - "types": ["ember-source/types", "@embroider/core/virtual"] + "types": ["ember-source/types", "@embroider/core/virtual", "@glint/ember-tsc/types"] } }