diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ccb6abda..c41ea149 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + overrides: '@types/eslint': ^7.29.0 @@ -59,7 +63,7 @@ importers: version: 1.1.2 '@glint/environment-ember-loose': specifier: ^1.0.2 - version: 1.0.2(@glimmer/component@1.1.2)(@glint/template@1.0.2)(@types/ember__array@4.0.4)(@types/ember__component@4.0.14)(@types/ember__controller@4.0.5)(@types/ember__object@4.0.6)(@types/ember__routing@4.0.13)(ember-cli-htmlbars@6.2.0)(ember-modifier@3.2.7) + version: 1.0.2(@glimmer/component@1.1.2)(@glint/template@1.0.2)(ember-cli-htmlbars@6.1.1)(ember-modifier@3.2.7) '@glint/template': specifier: ^1.0.2 version: 1.0.2 @@ -161,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.0.0(ember-source@4.12.3)(webpack@5.85.0) '@embroider/compat': specifier: ^1.9.0 version: 1.9.0(@embroider/core@1.9.0) @@ -303,7 +307,7 @@ importers: version: 7.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.0.0)(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) @@ -2214,24 +2218,23 @@ 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.0.0(ember-source@4.12.3)(webpack@5.85.0): + resolution: {integrity: sha512-NmzAEouZZmw7kXu+crZ8RN21Fz/Ka0j7uQLpVg3+pCLCfee2WnkFHWd7bBU4wiCS3D8V7tc5nGrojnLOyZw3hQ==} + engines: {node: 16.* || >= 18} peerDependencies: - ember-source: '>=3.8.0' + ember-source: ^4.0.0 dependencies: '@ember/test-waiters': 3.0.2 '@embroider/macros': 1.10.0 - '@embroider/util': 1.9.0(ember-source@4.12.3) broccoli-debug: 0.6.5 broccoli-funnel: 3.0.8 + ember-auto-import: 2.6.3(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) transitivePeerDependencies: - - '@babel/core' - supports-color + - webpack dev: true /@ember/test-waiters@3.0.2: @@ -2466,20 +2469,6 @@ packages: resolve: 1.22.1 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@1.9.0(@embroider/core@1.9.0)(webpack@5.85.0): resolution: {integrity: sha512-/jq+Tr6Lbp86vT9+PuTT8l7+xXURBmN0fQcRdMSClRlgJhjgz+f/NT0Yn9UUsEe3tRQVo9u8dnnlBo67loyhaA==} engines: {node: 12.* || 14.* || >= 16} @@ -2827,6 +2816,40 @@ packages: ember-modifier: 3.2.7(@babel/core@7.22.5) dev: true + /@glint/environment-ember-loose@1.0.2(@glimmer/component@1.1.2)(@glint/template@1.0.2)(ember-cli-htmlbars@6.1.1)(ember-modifier@3.2.7): + resolution: {integrity: sha512-tVLYzAx6c/4vcSaijiAubwR27/+K2tujuozArxeNud58MTwncGxhUkCHSM9xl+wn4VJjsjkzI6+nmzjEdkszSg==} + peerDependencies: + '@glimmer/component': ^1.1.2 + '@glint/template': ^1.0.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 + dependencies: + '@glimmer/component': 1.1.2(@babel/core@7.21.0) + '@glint/template': 1.0.2 + ember-cli-htmlbars: 6.1.1 + ember-modifier: 3.2.7(@babel/core@7.21.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.14)(@types/ember__routing@4.0.13)(ember-template-imports@3.4.2): resolution: {integrity: sha512-PAH7obVGXPFU7gLb04JVlqiNtz/j7Q29BBTAyhS7EVy99Hc6CPe+nV6+xhUPKu/S5GOVn3MWehVt/6gXPJ+cnA==} peerDependencies: @@ -3162,15 +3185,15 @@ packages: '@types/ember__application': 4.0.6(@babel/core@7.21.0) '@types/ember__array': 4.0.4(@babel/core@7.21.0) '@types/ember__component': 4.0.14(@babel/core@7.21.0) - '@types/ember__controller': 4.0.5(@babel/core@7.22.5) - '@types/ember__debug': 4.0.4(@babel/core@7.22.5) - '@types/ember__engine': 4.0.5(@babel/core@7.22.5) + '@types/ember__controller': 4.0.5 + '@types/ember__debug': 4.0.4(@babel/core@7.21.0) + '@types/ember__engine': 4.0.5 '@types/ember__error': 4.0.3 - '@types/ember__object': 4.0.6(@babel/core@7.22.5) + '@types/ember__object': 4.0.6(@babel/core@7.21.0) '@types/ember__polyfills': 4.0.2 '@types/ember__routing': 4.0.13(@babel/core@7.21.0) '@types/ember__runloop': 4.0.3(@babel/core@7.21.0) - '@types/ember__service': 4.0.3(@babel/core@7.22.5) + '@types/ember__service': 4.0.3 '@types/ember__string': 3.0.11 '@types/ember__template': 4.0.2 '@types/ember__test': 4.0.2(@babel/core@7.21.0) @@ -3213,8 +3236,8 @@ packages: dependencies: '@glimmer/component': 1.1.2(@babel/core@7.21.0) '@types/ember': 4.0.4(@babel/core@7.21.0) - '@types/ember__engine': 4.0.5(@babel/core@7.22.5) - '@types/ember__object': 4.0.6(@babel/core@7.22.5) + '@types/ember__engine': 4.0.5 + '@types/ember__object': 4.0.6(@babel/core@7.21.0) '@types/ember__owner': 4.0.4 '@types/ember__routing': 4.0.13(@babel/core@7.21.0) transitivePeerDependencies: @@ -3240,7 +3263,7 @@ packages: resolution: {integrity: sha512-nMg0+2ooumlfHJjwmI1tnVTBg8TfORhXT4OdzJzCjweFjBCA25L7K0W9J/NKzTUTryJsaDil6VMbY3dCXpyBvA==} dependencies: '@types/ember': 4.0.4(@babel/core@7.21.0) - '@types/ember__object': 4.0.6(@babel/core@7.22.5) + '@types/ember__object': 4.0.6(@babel/core@7.21.0) transitivePeerDependencies: - '@babel/core' - supports-color @@ -3250,7 +3273,7 @@ packages: resolution: {integrity: sha512-nMg0+2ooumlfHJjwmI1tnVTBg8TfORhXT4OdzJzCjweFjBCA25L7K0W9J/NKzTUTryJsaDil6VMbY3dCXpyBvA==} dependencies: '@types/ember': 4.0.4(@babel/core@7.22.5) - '@types/ember__object': 4.0.6(@babel/core@7.22.5) + '@types/ember__object': 4.0.6(@babel/core@7.21.0) transitivePeerDependencies: - '@babel/core' - supports-color @@ -3260,7 +3283,7 @@ packages: resolution: {integrity: sha512-qqEJOCxxPJrfYpgs8+8Zjrc8uRzpbhALtsG6nf/LoB4DkXisSd+C6a3n04ACvGfDa+1uVA3SZ8sTqKPgx6nM9g==} dependencies: '@types/ember': 4.0.4(@babel/core@7.21.0) - '@types/ember__object': 4.0.6(@babel/core@7.22.5) + '@types/ember__object': 4.0.6(@babel/core@7.21.0) transitivePeerDependencies: - '@babel/core' - supports-color @@ -3270,12 +3293,18 @@ packages: resolution: {integrity: sha512-qqEJOCxxPJrfYpgs8+8Zjrc8uRzpbhALtsG6nf/LoB4DkXisSd+C6a3n04ACvGfDa+1uVA3SZ8sTqKPgx6nM9g==} dependencies: '@types/ember': 4.0.4(@babel/core@7.22.5) - '@types/ember__object': 4.0.6(@babel/core@7.22.5) + '@types/ember__object': 4.0.6(@babel/core@7.21.0) transitivePeerDependencies: - '@babel/core' - supports-color dev: true + /@types/ember__controller@4.0.5: + resolution: {integrity: sha512-sjTYCkVO/JO0JTHU+Xz8TtDotpTCoJZ+esoSSSgHAjHOV4rYioeBzHSSaZk5s9NoNt9X0jqJhdY+oUJfJ1/rkw==} + dependencies: + '@types/ember__object': 4.0.6(@babel/core@7.21.0) + dev: true + /@types/ember__controller@4.0.5(@babel/core@7.22.5): resolution: {integrity: sha512-sjTYCkVO/JO0JTHU+Xz8TtDotpTCoJZ+esoSSSgHAjHOV4rYioeBzHSSaZk5s9NoNt9X0jqJhdY+oUJfJ1/rkw==} dependencies: @@ -3331,6 +3360,13 @@ packages: resolution: {integrity: sha512-QxyRhCOlQmc056tbWvHOQZ7vIjlFOFYMOU82P3pcCFfxyi55+NRhj4ySruymcBCfrzKQmVQLCbbOGhyFMLqq0Q==} dev: true + /@types/ember__engine@4.0.5: + resolution: {integrity: sha512-yx4d2xhCzu5ZwDib++0plLIMv8G6/l9TUAWWmQMsz0L/ETK9jIH0H7uEzyWZSTR2ETcP230oAkPzTk2J3IQAmg==} + dependencies: + '@types/ember__object': 4.0.6(@babel/core@7.21.0) + '@types/ember__owner': 4.0.4 + dev: true + /@types/ember__engine@4.0.5(@babel/core@7.22.5): resolution: {integrity: sha512-yx4d2xhCzu5ZwDib++0plLIMv8G6/l9TUAWWmQMsz0L/ETK9jIH0H7uEzyWZSTR2ETcP230oAkPzTk2J3IQAmg==} dependencies: @@ -3388,9 +3424,9 @@ packages: resolution: {integrity: sha512-CNBx6RmGzZpe8ahuy6+aPYKc/EelmbkndqgCigGkkrqvV5B+ayb3rdeKa2XojyXIqSjvjmcYyj9TTvian0yDgg==} dependencies: '@types/ember': 4.0.4(@babel/core@7.21.0) - '@types/ember__controller': 4.0.5(@babel/core@7.22.5) - '@types/ember__object': 4.0.6(@babel/core@7.22.5) - '@types/ember__service': 4.0.3(@babel/core@7.22.5) + '@types/ember__controller': 4.0.5 + '@types/ember__object': 4.0.6(@babel/core@7.21.0) + '@types/ember__service': 4.0.3 transitivePeerDependencies: - '@babel/core' - supports-color @@ -3400,9 +3436,9 @@ packages: resolution: {integrity: sha512-CNBx6RmGzZpe8ahuy6+aPYKc/EelmbkndqgCigGkkrqvV5B+ayb3rdeKa2XojyXIqSjvjmcYyj9TTvian0yDgg==} dependencies: '@types/ember': 4.0.4(@babel/core@7.22.5) - '@types/ember__controller': 4.0.5(@babel/core@7.22.5) - '@types/ember__object': 4.0.6(@babel/core@7.22.5) - '@types/ember__service': 4.0.3(@babel/core@7.22.5) + '@types/ember__controller': 4.0.5 + '@types/ember__object': 4.0.6(@babel/core@7.21.0) + '@types/ember__service': 4.0.3 transitivePeerDependencies: - '@babel/core' - supports-color @@ -3426,6 +3462,12 @@ packages: - supports-color dev: true + /@types/ember__service@4.0.3: + resolution: {integrity: sha512-LH+gI8Ha2PGM7sJ1Ap4+Ml62vejc8tlwE2xJCqklfH39DPKxAZanCdJCHOL13Ak1xoRZ2KKT4pXhxJIXaI2PWA==} + dependencies: + '@types/ember__object': 4.0.6(@babel/core@7.21.0) + dev: true + /@types/ember__service@4.0.3(@babel/core@7.22.5): resolution: {integrity: sha512-LH+gI8Ha2PGM7sJ1Ap4+Ml62vejc8tlwE2xJCqklfH39DPKxAZanCdJCHOL13Ak1xoRZ2KKT4pXhxJIXaI2PWA==} dependencies: @@ -7122,7 +7164,7 @@ packages: lodash: 4.17.21 mini-css-extract-plugin: 2.6.1(webpack@5.85.0) parse5: 6.0.1 - resolve: 1.22.1 + resolve: 1.22.2 resolve-package-path: 4.0.3 semver: 7.3.8 style-loader: 2.0.0(webpack@5.85.0) @@ -7628,18 +7670,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'} @@ -7738,7 +7768,7 @@ packages: - supports-color 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.0.0)(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: @@ -7746,7 +7776,7 @@ 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.0.0(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 @@ -14741,7 +14771,6 @@ packages: resolution: {directory: ember-velcro, type: directory} id: file:ember-velcro name: ember-velcro - version: 2.1.0 engines: {node: 14.* || >= 16} peerDependencies: ember-modifier: ^3.2.7 || >= 4.0.0 diff --git a/test-app/package.json b/test-app/package.json index f7169ca7..8a005ca5 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -41,7 +41,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": "^1.9.0", "@embroider/core": "^1.9.0", "@embroider/test-setup": "^1.8.3",