diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eda5d54a..25e0c7e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,7 +93,7 @@ importers: version: 3.2.7(@babel/core@7.22.5) ember-source: specifier: ~4.12.0 - version: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) + version: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0) ember-template-lint: specifier: ^4.10.1 version: 4.15.0 @@ -165,8 +165,8 @@ importers: specifier: ^3.1.1 version: 3.1.1 '@ember/test-helpers': - specifier: ^2.9.4 - version: 2.9.4(@babel/core@7.22.5)(ember-source@4.12.3) + specifier: ^3.0.0 + version: 3.2.0(@glint/template@1.0.2)(ember-source@4.12.3)(webpack@5.85.0) '@embroider/compat': specifier: ^3.0.0 version: 3.2.1(@embroider/core@3.2.1)(@glint/template@1.0.2) @@ -274,7 +274,7 @@ importers: version: 8.2.0 ember-auto-import: specifier: ^2.6.3 - version: 2.6.3(webpack@5.85.0) + version: 2.6.3(@glint/template@1.0.2)(webpack@5.85.0) ember-cli: specifier: ~4.12.1 version: 4.12.1 @@ -310,13 +310,13 @@ importers: version: 8.0.0 ember-qunit: specifier: ^6.2.0 - version: 6.2.0(@ember/test-helpers@2.9.4)(ember-source@4.12.3)(qunit@2.19.4)(webpack@5.85.0) + version: 6.2.0(@ember/test-helpers@3.2.0)(@glint/template@1.0.2)(ember-source@4.12.3)(qunit@2.19.4)(webpack@5.85.0) ember-resolver: specifier: ^9.0.1 version: 9.0.1(ember-source@4.12.3) ember-source: specifier: ^4.12.3 - version: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) + version: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0) ember-source-channel-url: specifier: ^3.0.0 version: 3.0.0 @@ -1884,24 +1884,25 @@ packages: - supports-color dev: true - /@ember/test-helpers@2.9.4(@babel/core@7.22.5)(ember-source@4.12.3): - resolution: {integrity: sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA==} - engines: {node: 10.* || 12.* || 14.* || 15.* || >= 16.*} + /@ember/test-helpers@3.2.0(@glint/template@1.0.2)(ember-source@4.12.3)(webpack@5.85.0): + resolution: {integrity: sha512-3yWpPsK5O77tUdCwW3HayrAcdlRitIRYMvLIG69Pkal1JMIGdNYVTvJ2R1lenhQh2syd/WFmGM07vQuDAtotQw==} + engines: {node: 16.* || >= 18} peerDependencies: - ember-source: '>=3.8.0' + ember-source: ^4.0.0 || ^5.0.0 dependencies: '@ember/test-waiters': 3.0.2 - '@embroider/macros': 1.10.0 - '@embroider/util': 1.9.0(ember-source@4.12.3) + '@embroider/macros': 1.13.1(@glint/template@1.0.2) + '@simple-dom/interface': 1.4.0 broccoli-debug: 0.6.5 broccoli-funnel: 3.0.8 + ember-auto-import: 2.6.3(@glint/template@1.0.2)(webpack@5.85.0) ember-cli-babel: 7.26.11 ember-cli-htmlbars: 6.2.0 - ember-destroyable-polyfill: 2.0.3(@babel/core@7.22.5) - ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) + ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0) transitivePeerDependencies: - - '@babel/core' + - '@glint/template' - supports-color + - webpack dev: true /@ember/test-waiters@3.0.2: @@ -2075,21 +2076,6 @@ packages: webpack: 5.85.0 dev: true - /@embroider/macros@1.10.0: - resolution: {integrity: sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==} - engines: {node: 12.* || 14.* || >= 16} - dependencies: - '@embroider/shared-internals': 2.0.0 - assert-never: 1.2.1 - babel-import-util: 1.3.0 - ember-cli-babel: 7.26.11 - find-up: 5.0.0 - lodash: 4.17.21 - resolve: 1.22.2 - semver: 7.5.4 - transitivePeerDependencies: - - supports-color - /@embroider/macros@1.13.1(@glint/template@1.0.2): resolution: {integrity: sha512-4htraP/rNIht8uCxXoc59Bw2EsBFfc4YUQD9XSpzJ4xUr1V0GQf9wL/noeSuYSxIhwRfZOErnJhsdyf1hH+I/A==} engines: {node: 12.* || 14.* || >= 16} @@ -2110,7 +2096,6 @@ packages: semver: 7.5.4 transitivePeerDependencies: - supports-color - dev: true /@embroider/shared-internals@1.8.3: resolution: {integrity: sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w==} @@ -2153,7 +2138,6 @@ packages: typescript-memoize: 1.1.1 transitivePeerDependencies: - supports-color - dev: true /@embroider/shared-internals@2.4.0(supports-color@8.1.1): resolution: {integrity: sha512-pFE05ebenWMC9XAPRjadYCXXb6VmqjkhYN5uqkhPo+VUmMHnx7sZYYxqGjxfVuhC/ghS/BNlOffOCXDOoE7k7g==} @@ -2194,20 +2178,6 @@ packages: resolve: 1.22.2 dev: true - /@embroider/util@1.9.0(ember-source@4.12.3): - resolution: {integrity: sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==} - engines: {node: 12.* || 14.* || >= 16} - peerDependencies: - ember-source: '*' - dependencies: - '@embroider/macros': 1.10.0 - broccoli-funnel: 3.0.8 - ember-cli-babel: 7.26.11 - ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) - transitivePeerDependencies: - - supports-color - dev: true - /@embroider/webpack@3.1.5(@embroider/core@3.2.1)(webpack@5.85.0): resolution: {integrity: sha512-J4NinNlxPzM4GeUoqnDzOVex2TxtEYjq7fVSxOKefj1bm/V3vzR6Dqwq2sxJmGfNbaTXbMVz6kpbz4bxZz8DOw==} engines: {node: 12.* || 14.* || >= 16} @@ -2499,7 +2469,6 @@ packages: /@glint/template@1.0.2: resolution: {integrity: sha512-kFWfJrS7XM0NjC5YSN0CWA9FiN0mhUvWVlQ2O7YRz/uhrO8+TVYNLst0WKELRbfCXbdI7wyYQkazNgz6FoL9CA==} - dev: true /@gwhitney/detect-indent@7.0.1: resolution: {integrity: sha512-7bQW+gkKa2kKZPeJf6+c6gFK9ARxQfn+FKy9ScTBppyKRWH2KzsmweXUoklqeEiHiNVWaeP5csIdsNq6w7QhzA==} @@ -4364,7 +4333,6 @@ packages: /babel-import-util@2.0.0: resolution: {integrity: sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==} engines: {node: '>= 12.*'} - dev: true /babel-loader@8.2.5(@babel/core@7.22.5)(webpack@5.85.0): resolution: {integrity: sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==} @@ -6780,7 +6748,7 @@ packages: /electron-to-chromium@1.4.281: resolution: {integrity: sha512-yer0w5wCYdFoZytfmbNhwiGI/3cW06+RV7E23ln4490DVMxs7PvYpbsrSmAiBn/V6gode8wvJlST2YfWgvzWIg==} - /ember-auto-import@2.6.3(webpack@5.85.0): + /ember-auto-import@2.6.3(@glint/template@1.0.2)(webpack@5.85.0): resolution: {integrity: sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==} engines: {node: 12.* || 14.* || >= 16} dependencies: @@ -6788,7 +6756,7 @@ packages: '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.5) '@babel/plugin-proposal-decorators': 7.19.3(@babel/core@7.22.5) '@babel/preset-env': 7.19.4(@babel/core@7.22.5) - '@embroider/macros': 1.10.0 + '@embroider/macros': 1.13.1(@glint/template@1.0.2) '@embroider/shared-internals': 2.0.0 babel-loader: 8.2.5(@babel/core@7.22.5)(webpack@5.85.0) babel-plugin-ember-modules-api-polyfill: 3.5.0 @@ -6816,6 +6784,7 @@ packages: typescript-memoize: 1.1.1 walk-sync: 3.0.0 transitivePeerDependencies: + - '@glint/template' - supports-color - webpack @@ -6826,7 +6795,7 @@ packages: ember-source: ^3.28.0 || >= 4.0.0 dependencies: ember-cli-babel: 7.26.11 - ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) + ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0) git-repo-info: 2.1.1 transitivePeerDependencies: - supports-color @@ -7261,18 +7230,6 @@ packages: - '@babel/core' - supports-color - /ember-destroyable-polyfill@2.0.3(@babel/core@7.22.5): - resolution: {integrity: sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw==} - engines: {node: 10.* || >= 12} - dependencies: - ember-cli-babel: 7.26.11 - ember-cli-version-checker: 5.1.2 - ember-compatibility-helpers: 1.2.6(@babel/core@7.22.5) - transitivePeerDependencies: - - '@babel/core' - - supports-color - dev: true - /ember-fetch@8.1.2: resolution: {integrity: sha512-TVx24/jrvDIuPL296DV0hBwp7BWLcSMf0I8464KGz01sPytAB+ZAePbc9ooBTJDkKZEGFgatJa4nj3yF1S9Bpw==} engines: {node: '>= 10'} @@ -7305,7 +7262,7 @@ packages: ember-cli-babel: 7.26.11 ember-cli-typescript: 5.1.1 ember-cli-version-checker: 5.1.2 - ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) + ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0) transitivePeerDependencies: - supports-color dev: false @@ -7341,7 +7298,7 @@ packages: '@embroider/addon-shim': 1.8.3 dev: true - /ember-qunit@6.2.0(@ember/test-helpers@2.9.4)(ember-source@4.12.3)(qunit@2.19.4)(webpack@5.85.0): + /ember-qunit@6.2.0(@ember/test-helpers@3.2.0)(@glint/template@1.0.2)(ember-source@4.12.3)(qunit@2.19.4)(webpack@5.85.0): resolution: {integrity: sha512-mC+0bp8DwWzJLn8SW3GS8KDZIkl4yLsNYwMi5Dw6+aFllq7FM2crd/dfY4MuOIHK7GKdjtmWJTMGnjSpeSayaw==} engines: {node: 14.* || 16.* || >= 18} peerDependencies: @@ -7349,19 +7306,20 @@ packages: ember-source: '>=3.28' qunit: ^2.13.0 dependencies: - '@ember/test-helpers': 2.9.4(@babel/core@7.22.5)(ember-source@4.12.3) + '@ember/test-helpers': 3.2.0(@glint/template@1.0.2)(ember-source@4.12.3)(webpack@5.85.0) broccoli-funnel: 3.0.8 broccoli-merge-trees: 3.0.2 common-tags: 1.8.2 - ember-auto-import: 2.6.3(webpack@5.85.0) + ember-auto-import: 2.6.3(@glint/template@1.0.2)(webpack@5.85.0) ember-cli-babel: 7.26.11 ember-cli-test-loader: 3.0.0 - ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) + ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0) qunit: 2.19.4 resolve-package-path: 4.0.3 silent-error: 1.1.1 validate-peer-dependencies: 2.2.0 transitivePeerDependencies: + - '@glint/template' - supports-color - webpack dev: true @@ -7376,7 +7334,7 @@ packages: optional: true dependencies: ember-cli-babel: 7.26.11 - ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) + ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0) transitivePeerDependencies: - supports-color dev: true @@ -7404,7 +7362,7 @@ packages: - encoding dev: true - /ember-source@4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0): + /ember-source@4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0): resolution: {integrity: sha512-UuFpMWf931pEWBPuujkaMYhsoPvFyZc+tMYjlUn7um20uL+hWs+k2n/TxMVuxydSzJLnxrXz81nTwbYIlgRWdw==} engines: {node: '>= 14.*'} peerDependencies: @@ -7424,7 +7382,7 @@ packages: broccoli-funnel: 3.0.8 broccoli-merge-trees: 4.2.0 chalk: 4.1.2 - ember-auto-import: 2.6.3(webpack@5.85.0) + ember-auto-import: 2.6.3(@glint/template@1.0.2)(webpack@5.85.0) ember-cli-babel: 7.26.11 ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 @@ -7440,6 +7398,7 @@ packages: silent-error: 1.1.1 transitivePeerDependencies: - '@babel/core' + - '@glint/template' - supports-color - webpack @@ -14386,7 +14345,7 @@ packages: '@floating-ui/dom': 1.4.3 ember-functions-as-helper-polyfill: 2.1.1(ember-source@4.12.3) ember-modifier: 3.2.7(@babel/core@7.22.5) - ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.85.0) + ember-source: 4.12.3(@babel/core@7.22.5)(@glimmer/component@1.1.2)(@glint/template@1.0.2)(webpack@5.85.0) transitivePeerDependencies: - supports-color dev: false diff --git a/test-app/package.json b/test-app/package.json index 2675c57a..4eca8216 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -42,7 +42,7 @@ "@babel/eslint-parser": "^7.11.0", "@ember/optional-features": "^2.0.0", "@ember/string": "^3.1.1", - "@ember/test-helpers": "^2.9.4", + "@ember/test-helpers": "^3.0.0", "@embroider/compat": "^3.0.0", "@embroider/core": "^3.0.0", "@embroider/test-setup": "^3.0.0",