diff --git a/docs-app/package.json b/docs-app/package.json index 338bf368c..f6c4ff888 100644 --- a/docs-app/package.json +++ b/docs-app/package.json @@ -98,7 +98,7 @@ "ember-qunit": "^8.0.0", "ember-resolver": "^11.0.0", "ember-source": "~5.5.0", - "ember-template-imports": "^3.1.2", + "ember-template-imports": "^4.0.0", "ember-template-lint": "^5.8.0", "eslint": "^8.32.0", "eslint-config-prettier": "^8.5.0", diff --git a/packages/ember-toucan-core/package.json b/packages/ember-toucan-core/package.json index 9fdfb2055..9a13c239e 100644 --- a/packages/ember-toucan-core/package.json +++ b/packages/ember-toucan-core/package.json @@ -90,7 +90,7 @@ "concurrently": "^8.0.0", "ember-cli-htmlbars": "^6.1.1", "ember-source": "~5.5.0", - "ember-template-imports": "^3.4.2", + "ember-template-imports": "^4.0.0", "ember-template-lint": "^5.8.0", "eslint": "^8.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/packages/ember-toucan-form/package.json b/packages/ember-toucan-form/package.json index 3e04e6788..1e4a9c3a4 100644 --- a/packages/ember-toucan-form/package.json +++ b/packages/ember-toucan-form/package.json @@ -92,7 +92,7 @@ "ember-cli-htmlbars": "^6.1.1", "ember-headless-form": "^1.0.0-beta.3", "ember-source": "~5.5.0", - "ember-template-imports": "^3.4.2", + "ember-template-imports": "^4.0.0", "ember-template-lint": "^5.8.0", "eslint": "^8.32.0", "eslint-config-prettier": "^8.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 319be7e6c..77c54d272 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -122,7 +122,7 @@ importers: version: 1.0.2(@glimmer/component@1.1.2)(@glint/template@1.0.2)(@types/ember__array@4.0.3)(@types/ember__component@4.0.12)(@types/ember__controller@4.0.4)(@types/ember__object@4.0.5)(@types/ember__routing@4.0.12)(ember-cli-htmlbars@6.2.0)(ember-modifier@4.1.0) '@glint/environment-ember-template-imports': specifier: ^1.0.2 - version: 1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@3.4.1) + version: 1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__routing@4.0.12)(ember-template-imports@4.0.0) '@glint/template': specifier: ^1.0.2 version: 1.0.2 @@ -280,8 +280,8 @@ importers: specifier: ~5.5.0 version: 5.5.0(@babel/core@7.20.12)(@glimmer/component@1.1.2)(rsvp@4.8.5)(webpack@5.75.0) ember-template-imports: - specifier: ^3.1.2 - version: 3.4.1 + specifier: ^4.0.0 + version: 4.0.0 ember-template-lint: specifier: ^5.8.0 version: 5.8.0 @@ -407,7 +407,7 @@ importers: version: 1.0.2(@glimmer/component@1.1.2)(@glint/template@1.0.2)(@types/ember__array@4.0.3)(@types/ember__component@4.0.12)(@types/ember__controller@4.0.4)(@types/ember__object@4.0.5)(@types/ember__routing@4.0.12)(ember-cli-htmlbars@6.2.0)(ember-modifier@4.1.0) '@glint/environment-ember-template-imports': specifier: ^1.0.2 - version: 1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__helper@4.0.2)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@3.4.2) + version: 1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__helper@4.0.2)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@4.0.0) '@glint/template': specifier: ^1.0.2 version: 1.0.2 @@ -493,8 +493,8 @@ importers: specifier: ~5.5.0 version: 5.5.0(@babel/core@7.20.12)(@glimmer/component@1.1.2)(rsvp@4.8.5)(webpack@5.75.0) ember-template-imports: - specifier: ^3.4.2 - version: 3.4.2 + specifier: ^4.0.0 + version: 4.0.0 ember-template-lint: specifier: ^5.8.0 version: 5.8.0 @@ -539,7 +539,7 @@ importers: version: 3.4.0 rollup-plugin-glimmer-template-tag: specifier: ^0.4.1 - version: 0.4.1(@babel/core@7.20.12)(ember-source@5.5.0)(ember-template-imports@3.4.2) + version: 0.4.1(@babel/core@7.20.12)(ember-source@5.5.0)(ember-template-imports@4.0.0) rollup-plugin-ts: specifier: ^3.0.2 version: 3.2.0(@babel/core@7.20.12)(@babel/preset-typescript@7.18.6)(@babel/runtime@7.20.13)(rollup@3.12.1)(typescript@5.0.2) @@ -606,7 +606,7 @@ importers: version: 1.0.2(@glimmer/component@1.1.2)(@glint/template@1.0.2)(@types/ember__array@4.0.3)(@types/ember__component@4.0.12)(@types/ember__controller@4.0.4)(@types/ember__object@4.0.5)(@types/ember__routing@4.0.12)(ember-cli-htmlbars@6.2.0)(ember-modifier@4.1.0) '@glint/environment-ember-template-imports': specifier: ^1.0.2 - version: 1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__helper@4.0.2)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@3.4.2) + version: 1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__helper@4.0.2)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@4.0.0) '@glint/template': specifier: ^1.0.2 version: 1.0.2 @@ -695,8 +695,8 @@ importers: specifier: ~5.5.0 version: 5.5.0(@babel/core@7.21.4)(@glimmer/component@1.1.2)(rsvp@4.8.5) ember-template-imports: - specifier: ^3.4.2 - version: 3.4.2 + specifier: ^4.0.0 + version: 4.0.0 ember-template-lint: specifier: ^5.8.0 version: 5.8.0 @@ -741,7 +741,7 @@ importers: version: 3.4.0 rollup-plugin-glimmer-template-tag: specifier: ^0.4.1 - version: 0.4.1(@babel/core@7.21.4)(ember-source@5.5.0)(ember-template-imports@3.4.2) + version: 0.4.1(@babel/core@7.21.4)(ember-source@5.5.0)(ember-template-imports@4.0.0) rollup-plugin-ts: specifier: ^3.0.2 version: 3.2.0(@babel/core@7.21.4)(@babel/preset-typescript@7.18.6)(@babel/runtime@7.20.13)(rollup@3.12.1)(typescript@5.0.2) @@ -798,7 +798,7 @@ importers: version: 1.0.2(@glimmer/component@1.1.2)(@glint/template@1.0.2)(@types/ember__array@4.0.3)(@types/ember__component@4.0.12)(@types/ember__controller@4.0.4)(@types/ember__object@4.0.5)(@types/ember__routing@4.0.12)(ember-cli-htmlbars@6.2.0)(ember-modifier@4.1.0) '@glint/environment-ember-template-imports': specifier: ^1.0.2 - version: 1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@3.4.1) + version: 1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__helper@4.0.2)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@4.0.0) '@glint/template': specifier: ^1.0.2 version: 1.0.2 @@ -950,8 +950,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-template-imports: - specifier: ^3.1.2 - version: 3.4.1 + specifier: ^4.0.0 + version: 4.0.0 ember-template-lint: specifier: ^5.8.0 version: 5.8.0 @@ -5275,7 +5275,7 @@ packages: ember-cli-babel: 7.26.11 find-up: 5.0.0 lodash: 4.17.21 - resolve: 1.22.2 + resolve: 1.22.3 semver: 7.5.1 transitivePeerDependencies: - supports-color @@ -5711,7 +5711,7 @@ packages: ember-cli-htmlbars: 6.2.0 ember-modifier: 4.1.0(ember-source@5.5.0) - /@glint/environment-ember-template-imports@1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__helper@4.0.2)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@3.4.2): + /@glint/environment-ember-template-imports@1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__helper@4.0.2)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@4.0.0): resolution: {integrity: sha512-PAH7obVGXPFU7gLb04JVlqiNtz/j7Q29BBTAyhS7EVy99Hc6CPe+nV6+xhUPKu/S5GOVn3MWehVt/6gXPJ+cnA==} peerDependencies: '@glint/environment-ember-loose': ^1.0.2 @@ -5737,10 +5737,10 @@ packages: '@types/ember__helper': 4.0.2(@babel/core@7.20.12) '@types/ember__modifier': 4.0.3(@babel/core@7.20.12) '@types/ember__routing': 4.0.12(@babel/core@7.20.12) - ember-template-imports: 3.4.2 + ember-template-imports: 4.0.0 dev: true - /@glint/environment-ember-template-imports@1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__modifier@4.0.3)(@types/ember__routing@4.0.12)(ember-template-imports@3.4.1): + /@glint/environment-ember-template-imports@1.0.2(@glint/environment-ember-loose@1.0.2)(@glint/template@1.0.2)(@types/ember__component@4.0.12)(@types/ember__routing@4.0.12)(ember-template-imports@4.0.0): resolution: {integrity: sha512-PAH7obVGXPFU7gLb04JVlqiNtz/j7Q29BBTAyhS7EVy99Hc6CPe+nV6+xhUPKu/S5GOVn3MWehVt/6gXPJ+cnA==} peerDependencies: '@glint/environment-ember-loose': ^1.0.2 @@ -5763,9 +5763,8 @@ packages: '@glint/environment-ember-loose': 1.0.2(@glimmer/component@1.1.2)(@glint/template@1.0.2)(@types/ember__array@4.0.3)(@types/ember__component@4.0.12)(@types/ember__controller@4.0.4)(@types/ember__object@4.0.5)(@types/ember__routing@4.0.12)(ember-cli-htmlbars@6.2.0)(ember-modifier@4.1.0) '@glint/template': 1.0.2 '@types/ember__component': 4.0.12(@babel/core@7.20.12) - '@types/ember__modifier': 4.0.3(@babel/core@7.20.12) '@types/ember__routing': 4.0.12(@babel/core@7.20.12) - ember-template-imports: 3.4.1 + ember-template-imports: 4.0.0 dev: true /@glint/template@1.0.2: @@ -10047,6 +10046,10 @@ packages: safe-buffer: 5.2.1 dev: true + /content-tag@1.1.2: + resolution: {integrity: sha512-AZkfc6TUmW+/RbZJioPzOQPAHHXqyqK4B0GNckJDjBAPK3SyGrMfn21bfFky/qwi5uoLph5sjAHUkO3CL6/IgQ==} + dev: true + /content-type@1.0.5: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} @@ -11072,7 +11075,7 @@ packages: ember-cli-babel-plugin-helpers: 1.1.1 execa: 1.0.0 fs-extra: 7.0.1 - resolve: 1.22.2 + resolve: 1.22.3 rsvp: 4.8.5 semver: 6.3.1 stagehand: 1.0.1 @@ -11802,8 +11805,8 @@ packages: - webpack dev: true - /ember-template-imports@3.4.1: - resolution: {integrity: sha512-KXnBFTAVxCfXnSCUgd/iuic9ajWbmFkRUBEeorJAMqxvougsPoK22s5ygE9O3GnzYdPpMwn+8v+/NAGy8HRBGA==} + /ember-template-imports@3.4.2: + resolution: {integrity: sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==} engines: {node: 12.* || >= 14} dependencies: babel-import-util: 0.2.0 @@ -11819,19 +11822,13 @@ packages: - supports-color dev: true - /ember-template-imports@3.4.2: - resolution: {integrity: sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==} - engines: {node: 12.* || >= 14} + /ember-template-imports@4.0.0: + resolution: {integrity: sha512-Kw1FnFX3MrBesfsjJDFvVgOf1mANOvMprAH1ngDd5SvdlkltNWCF2UKI9WXKQV3lw5noQC1+n6S80L9Q03D3Hw==} + engines: {node: 16.* || >= 18} dependencies: - babel-import-util: 0.2.0 broccoli-stew: 3.0.0 - ember-cli-babel-plugin-helpers: 1.1.1 + content-tag: 1.1.2 ember-cli-version-checker: 5.1.2 - line-column: 1.0.2 - magic-string: 0.25.9 - parse-static-imports: 1.1.0 - string.prototype.matchall: 4.0.8 - validate-peer-dependencies: 1.2.0 transitivePeerDependencies: - supports-color dev: true @@ -17679,7 +17676,7 @@ packages: del: 5.1.0 dev: true - /rollup-plugin-glimmer-template-tag@0.4.1(@babel/core@7.20.12)(ember-source@5.5.0)(ember-template-imports@3.4.2): + /rollup-plugin-glimmer-template-tag@0.4.1(@babel/core@7.20.12)(ember-source@5.5.0)(ember-template-imports@4.0.0): resolution: {integrity: sha512-hz/xbxlcif0zCuapZ8YvZpZrag+KCHPnyf7b0lCJvNNapvTdHV6fvOFYZxcxTUOVuOxQLmmemy82jDSlpQ9ZVg==} engines: {node: ^16.0.0 || ^18.0.0 || ^20.0.0} peerDependencies: @@ -17689,10 +17686,10 @@ packages: dependencies: '@babel/core': 7.20.12 ember-source: 5.5.0(@babel/core@7.20.12)(@glimmer/component@1.1.2)(rsvp@4.8.5) - ember-template-imports: 3.4.2 + ember-template-imports: 4.0.0 dev: true - /rollup-plugin-glimmer-template-tag@0.4.1(@babel/core@7.21.4)(ember-source@5.5.0)(ember-template-imports@3.4.2): + /rollup-plugin-glimmer-template-tag@0.4.1(@babel/core@7.21.4)(ember-source@5.5.0)(ember-template-imports@4.0.0): resolution: {integrity: sha512-hz/xbxlcif0zCuapZ8YvZpZrag+KCHPnyf7b0lCJvNNapvTdHV6fvOFYZxcxTUOVuOxQLmmemy82jDSlpQ9ZVg==} engines: {node: ^16.0.0 || ^18.0.0 || ^20.0.0} peerDependencies: @@ -17702,7 +17699,7 @@ packages: dependencies: '@babel/core': 7.21.4 ember-source: 5.5.0(@babel/core@7.21.4)(@glimmer/component@1.1.2)(rsvp@4.8.5) - ember-template-imports: 3.4.2 + ember-template-imports: 4.0.0 dev: true /rollup-plugin-ts@3.2.0(@babel/core@7.20.12)(@babel/preset-typescript@7.18.6)(@babel/runtime@7.20.13)(rollup@3.12.1)(typescript@5.0.2): diff --git a/test-app/package.json b/test-app/package.json index a7e925409..f4968e0aa 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -92,7 +92,7 @@ "ember-resolver": "^11.0.0", "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", - "ember-template-imports": "^3.1.2", + "ember-template-imports": "^4.0.0", "ember-template-lint": "^5.8.0", "ember-try": "^3.0.0", "ember-velcro": "^2.1.0",