From 97118fd511a92af945a280d4be1138b46eac5b7d Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Tue, 8 Oct 2024 00:40:46 +0200 Subject: [PATCH] Allow peerDependency `@ember/test-helpers` v4 (#33) --- .changeset/wild-dodos-heal.md | 5 + .github/workflows/ci.yml | 1 + ember-provide-consume-context/package.json | 4 +- package-lock.json | 664 +++++++++++++++++---- test-app/config/ember-try.js | 8 + test-app/package.json | 2 +- 6 files changed, 578 insertions(+), 106 deletions(-) create mode 100644 .changeset/wild-dodos-heal.md diff --git a/.changeset/wild-dodos-heal.md b/.changeset/wild-dodos-heal.md new file mode 100644 index 0000000..ebc5193 --- /dev/null +++ b/.changeset/wild-dodos-heal.md @@ -0,0 +1,5 @@ +--- +"ember-provide-consume-context": minor +--- + +Update @ember/test-helpers to v4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca2a7fd..ade8b3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,6 +60,7 @@ jobs: - ember-release - ember-beta - ember-canary + - ember-test-helper-v3 - embroider-safe - embroider-optimized diff --git a/ember-provide-consume-context/package.json b/ember-provide-consume-context/package.json index 3389b0b..e5b25c2 100644 --- a/ember-provide-consume-context/package.json +++ b/ember-provide-consume-context/package.json @@ -64,7 +64,7 @@ }, "peerDependencies": { "ember-source": "^4.8.0 || ^5.0.0", - "@ember/test-helpers": "^2.9.1 || ^3.0.0" + "@ember/test-helpers": "^2.9.1 || ^3.0.0 || ^4.0.0" }, "devDependencies": { "@babel/core": "^7.17.0", @@ -73,7 +73,7 @@ "@babel/plugin-transform-class-static-block": "^7.20.0", "@babel/preset-typescript": "^7.18.6", "@babel/runtime": "^7.17.0", - "@ember/test-helpers": "^3.3.0", + "@ember/test-helpers": "^4.0.0", "@embroider/addon-dev": "^4.1.0", "@glimmer/interfaces": "^0.84.3", "@glimmer/runtime": "^0.84.3", diff --git a/package-lock.json b/package-lock.json index 3cefa39..4edbc0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "@babel/plugin-transform-class-static-block": "^7.20.0", "@babel/preset-typescript": "^7.18.6", "@babel/runtime": "^7.17.0", - "@ember/test-helpers": "^3.3.0", + "@ember/test-helpers": "^4.0.0", "@embroider/addon-dev": "^4.1.0", "@glimmer/interfaces": "^0.84.3", "@glimmer/runtime": "^0.84.3", @@ -79,10 +79,266 @@ "typescript": "^5.0.4" }, "peerDependencies": { - "@ember/test-helpers": "^2.9.1 || ^3.0.0", + "@ember/test-helpers": "^2.9.1 || ^3.0.0 || ^4.0.0", "ember-source": "^4.8.0 || ^5.0.0" } }, + "ember-provide-consume-context/node_modules/@ember/test-helpers": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@ember/test-helpers/-/test-helpers-4.0.4.tgz", + "integrity": "sha512-1mbOVyVEcLxYOGzBaeeaQkCrL1o9Av86QaHk/1RvrVBW24I6YUj1ILLEi2qLZT5PzcCy0TdfadHT3hKJwJ0GcQ==", + "dev": true, + "dependencies": { + "@ember/test-waiters": "^3.1.0", + "@embroider/addon-shim": "^1.8.7", + "@embroider/macros": "^1.16.5", + "@simple-dom/interface": "^1.4.0", + "decorator-transforms": "^2.0.0", + "dom-element-descriptors": "^0.5.0" + }, + "peerDependencies": { + "ember-source": ">= 4.0.0" + } + }, + "ember-provide-consume-context/node_modules/@embroider/macros": { + "version": "1.16.6", + "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.16.6.tgz", + "integrity": "sha512-aSdRetg0vY3c70G/3K85fOSlGtDzSV4ozwF9qD8ToQB+4RLZusxwItnctWEa+MKkhAYB6rbFiQ+bhFwEnaEazg==", + "dev": true, + "dependencies": { + "@embroider/shared-internals": "2.6.3", + "assert-never": "^1.2.1", + "babel-import-util": "^2.0.0", + "ember-cli-babel": "^7.26.6", + "find-up": "^5.0.0", + "lodash": "^4.17.21", + "resolve": "^1.20.0", + "semver": "^7.3.2" + }, + "engines": { + "node": "12.* || 14.* || >= 16" + }, + "peerDependencies": { + "@glint/template": "^1.0.0" + }, + "peerDependenciesMeta": { + "@glint/template": { + "optional": true + } + } + }, + "ember-provide-consume-context/node_modules/@embroider/shared-internals": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.6.3.tgz", + "integrity": "sha512-wyFQNSqN+RZWg5ckqsk0Qfun433aEd70L6sc16sY4FFf/AzDnolmc0t3eR7lkdyxltYSrO5eqkFN7hW7l/glaw==", + "dev": true, + "dependencies": { + "babel-import-util": "^2.0.0", + "debug": "^4.3.2", + "ember-rfc176-data": "^0.3.17", + "fs-extra": "^9.1.0", + "js-string-escape": "^1.0.1", + "lodash": "^4.17.21", + "minimatch": "^3.0.4", + "resolve-package-path": "^4.0.1", + "semver": "^7.3.5", + "typescript-memoize": "^1.0.1" + }, + "engines": { + "node": "12.* || 14.* || >= 16" + } + }, + "ember-provide-consume-context/node_modules/@glint/core": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@glint/core/-/core-1.4.0.tgz", + "integrity": "sha512-nq27a/1R6kc3lsuciz8z9IZO1NQCbNkEBxf5KJI7AUrnps6RzQzmq3pmwO24zQYmFcH4sqpod8fleNIpg8YEqg==", + "dev": true, + "dependencies": { + "@glimmer/syntax": "^0.84.3", + "escape-string-regexp": "^4.0.0", + "semver": "^7.5.2", + "silent-error": "^1.1.1", + "uuid": "^8.3.2", + "vscode-languageserver": "^8.0.1", + "vscode-languageserver-textdocument": "^1.0.5", + "vscode-uri": "^3.0.8", + "yargs": "^17.5.1" + }, + "bin": { + "glint": "bin/glint.js", + "glint-language-server": "bin/glint-language-server.js" + }, + "peerDependencies": { + "typescript": ">=4.8.0" + } + }, + "ember-provide-consume-context/node_modules/@glint/environment-ember-loose": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@glint/environment-ember-loose/-/environment-ember-loose-1.4.0.tgz", + "integrity": "sha512-vFR3qgPTisGzS36e04195wTUrtUc6GuVwm6hsC/XXx6PeRw/6rtMxhK08Aw/VtDc00UqQzM9sIEghPVKHwqVVQ==", + "dev": true, + "peerDependencies": { + "@glimmer/component": "^1.1.2", + "@glint/template": "^1.4.0", + "@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 + } + } + }, + "ember-provide-consume-context/node_modules/@glint/template": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@glint/template/-/template-1.1.0.tgz", + "integrity": "sha512-gK4tifrw7mIMYECzGeG5jrez2lY0TlwE584cnoYOFhzxXKrsuungdiebd7LDwjvfQpImQd1JUSQr3u/uF/XYJg==", + "dev": true + }, + "ember-provide-consume-context/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "ember-provide-consume-context/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "ember-provide-consume-context/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "ember-provide-consume-context/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "ember-provide-consume-context/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "ember-provide-consume-context/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "ember-provide-consume-context/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "ember-provide-consume-context/node_modules/resolve-package-path": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-4.0.3.tgz", + "integrity": "sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==", + "dev": true, + "dependencies": { + "path-root": "^0.1.1" + }, + "engines": { + "node": ">= 12" + } + }, + "ember-provide-consume-context/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", @@ -2358,6 +2614,7 @@ "resolved": "https://registry.npmjs.org/@ember/test-helpers/-/test-helpers-3.3.0.tgz", "integrity": "sha512-HEI28wtjnQuEj9+DstHUEEKPtqPAEVN9AAVr4EifVCd3DyEDy0m6hFT4qbap1WxAIktLja2QXGJg50lVWzZc5g==", "dev": true, + "peer": true, "dependencies": { "@ember/test-waiters": "^3.0.2", "@embroider/macros": "^1.10.0", @@ -2381,6 +2638,7 @@ "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz", "integrity": "sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==", "dev": true, + "peer": true, "dependencies": { "array-equal": "^1.0.0", "broccoli-plugin": "^4.0.7", @@ -3290,112 +3548,37 @@ }, "node_modules/@glimmer/vm": { "version": "0.84.3", - "resolved": "https://registry.npmjs.org/@glimmer/vm/-/vm-0.84.3.tgz", - "integrity": "sha512-3mBWvQLEbB8We2EwdmuALMT3zQEcE13ItfLJ0wxlSO2uj1uegeHat++mli8RMxeYNqex27DC+VuhHeWVve6Ngg==", - "dependencies": { - "@glimmer/interfaces": "0.84.3", - "@glimmer/util": "0.84.3" - } - }, - "node_modules/@glimmer/vm-babel-plugins": { - "version": "0.84.3", - "resolved": "https://registry.npmjs.org/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.84.3.tgz", - "integrity": "sha512-fucWuuN7Q9QFB0ODd+PCltcTkmH4fLqYyXGArrfLt/TYN8gLv0yo00mPwFOSY7MWti/MUx88xd20/PycvYtg8w==", - "peer": true, - "dependencies": { - "babel-plugin-debug-macros": "^0.3.4" - } - }, - "node_modules/@glimmer/wire-format": { - "version": "0.84.3", - "resolved": "https://registry.npmjs.org/@glimmer/wire-format/-/wire-format-0.84.3.tgz", - "integrity": "sha512-aZVfQhqv4k7tTo2vwjy+b4mAxKt7cHH75JR3zAeCilimApa+yYTYUyY73NDNSUVbelgAlQ5s6vTiMSQ55WwVow==", - "dependencies": { - "@glimmer/interfaces": "0.84.3", - "@glimmer/util": "0.84.3" - } - }, - "node_modules/@glint/core": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@glint/core/-/core-1.2.1.tgz", - "integrity": "sha512-25Zn65aLSN1M7s0D950sTNElZYRqa6HFA0xcT03iI/vQd1F6c3luMAXbFrsTSHlktZx2dqJ38c2dUnZJQBQgMw==", - "dev": true, - "dependencies": { - "@glimmer/syntax": "^0.84.2", - "escape-string-regexp": "^4.0.0", - "semver": "^7.5.2", - "silent-error": "^1.1.1", - "uuid": "^8.3.2", - "vscode-languageserver": "^8.0.1", - "vscode-languageserver-textdocument": "^1.0.5", - "vscode-uri": "^3.0.8", - "yargs": "^17.5.1" - }, - "bin": { - "glint": "bin/glint.js", - "glint-language-server": "bin/glint-language-server.js" - }, - "peerDependencies": { - "typescript": ">=4.8.0" - } - }, - "node_modules/@glint/core/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@glint/environment-ember-loose": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@glint/environment-ember-loose/-/environment-ember-loose-1.2.1.tgz", - "integrity": "sha512-ZA0Ht7vwd1FosVLtMFrB2Er62P1v6yX/UuS6z9UVR6DMPfrL5qx6vef+EGJPLBrBKZMlm7zMB6Fyca201y4hDA==", - "dev": true, - "peerDependencies": { - "@glimmer/component": "^1.1.2", - "@glint/template": "^1.2.1", - "@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 - } + "resolved": "https://registry.npmjs.org/@glimmer/vm/-/vm-0.84.3.tgz", + "integrity": "sha512-3mBWvQLEbB8We2EwdmuALMT3zQEcE13ItfLJ0wxlSO2uj1uegeHat++mli8RMxeYNqex27DC+VuhHeWVve6Ngg==", + "dependencies": { + "@glimmer/interfaces": "0.84.3", + "@glimmer/util": "0.84.3" + } + }, + "node_modules/@glimmer/vm-babel-plugins": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.84.3.tgz", + "integrity": "sha512-fucWuuN7Q9QFB0ODd+PCltcTkmH4fLqYyXGArrfLt/TYN8gLv0yo00mPwFOSY7MWti/MUx88xd20/PycvYtg8w==", + "peer": true, + "dependencies": { + "babel-plugin-debug-macros": "^0.3.4" + } + }, + "node_modules/@glimmer/wire-format": { + "version": "0.84.3", + "resolved": "https://registry.npmjs.org/@glimmer/wire-format/-/wire-format-0.84.3.tgz", + "integrity": "sha512-aZVfQhqv4k7tTo2vwjy+b4mAxKt7cHH75JR3zAeCilimApa+yYTYUyY73NDNSUVbelgAlQ5s6vTiMSQ55WwVow==", + "dependencies": { + "@glimmer/interfaces": "0.84.3", + "@glimmer/util": "0.84.3" } }, "node_modules/@glint/template": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@glint/template/-/template-1.2.1.tgz", "integrity": "sha512-rlYy/93fAhYjXmTchWcwCpPFMfrqBYEskzbDYawS2oz4DVwtf4fOITLKB0QddQMI7WUCjgXAiIGZqcNa/R4YeQ==", - "devOptional": true + "optional": true, + "peer": true }, "node_modules/@handlebars/parser": { "version": "2.0.0", @@ -9823,6 +10006,25 @@ "node": ">=4" } }, + "node_modules/decorator-transforms": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/decorator-transforms/-/decorator-transforms-2.2.0.tgz", + "integrity": "sha512-o+NZXfBpRQJCWZzdVN6nB0Bf4KnD0gZO8hSk80OktIoClvB1YmBZC6js2k34EFAwF+c+P3Q6vYmiDzGoXwp1OQ==", + "dev": true, + "dependencies": { + "@babel/plugin-syntax-decorators": "^7.23.3", + "babel-import-util": "^3.0.0" + } + }, + "node_modules/decorator-transforms/node_modules/babel-import-util": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-3.0.0.tgz", + "integrity": "sha512-4YNPkuVsxAW5lnSTa6cn4Wk49RX6GAB6vX+M6LqEtN0YePqoFczv1/x0EyLK/o+4E1j9jEuYj5Su7IEPab5JHQ==", + "dev": true, + "engines": { + "node": ">= 12.*" + } + }, "node_modules/deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -24548,7 +24750,7 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/string": "^3.0.1", - "@ember/test-helpers": "^3.3.0", + "@ember/test-helpers": "^4.0.0", "@embroider/test-setup": "^3.0.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -24623,6 +24825,71 @@ "node": "16.* || >= 18" } }, + "test-app/node_modules/@ember/test-helpers": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@ember/test-helpers/-/test-helpers-4.0.4.tgz", + "integrity": "sha512-1mbOVyVEcLxYOGzBaeeaQkCrL1o9Av86QaHk/1RvrVBW24I6YUj1ILLEi2qLZT5PzcCy0TdfadHT3hKJwJ0GcQ==", + "dev": true, + "dependencies": { + "@ember/test-waiters": "^3.1.0", + "@embroider/addon-shim": "^1.8.7", + "@embroider/macros": "^1.16.5", + "@simple-dom/interface": "^1.4.0", + "decorator-transforms": "^2.0.0", + "dom-element-descriptors": "^0.5.0" + }, + "peerDependencies": { + "ember-source": ">= 4.0.0" + } + }, + "test-app/node_modules/@embroider/macros": { + "version": "1.16.6", + "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-1.16.6.tgz", + "integrity": "sha512-aSdRetg0vY3c70G/3K85fOSlGtDzSV4ozwF9qD8ToQB+4RLZusxwItnctWEa+MKkhAYB6rbFiQ+bhFwEnaEazg==", + "dev": true, + "dependencies": { + "@embroider/shared-internals": "2.6.3", + "assert-never": "^1.2.1", + "babel-import-util": "^2.0.0", + "ember-cli-babel": "^7.26.6", + "find-up": "^5.0.0", + "lodash": "^4.17.21", + "resolve": "^1.20.0", + "semver": "^7.3.2" + }, + "engines": { + "node": "12.* || 14.* || >= 16" + }, + "peerDependencies": { + "@glint/template": "^1.0.0" + }, + "peerDependenciesMeta": { + "@glint/template": { + "optional": true + } + } + }, + "test-app/node_modules/@embroider/shared-internals": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-2.6.3.tgz", + "integrity": "sha512-wyFQNSqN+RZWg5ckqsk0Qfun433aEd70L6sc16sY4FFf/AzDnolmc0t3eR7lkdyxltYSrO5eqkFN7hW7l/glaw==", + "dev": true, + "dependencies": { + "babel-import-util": "^2.0.0", + "debug": "^4.3.2", + "ember-rfc176-data": "^0.3.17", + "fs-extra": "^9.1.0", + "js-string-escape": "^1.0.1", + "lodash": "^4.17.21", + "minimatch": "^3.0.4", + "resolve-package-path": "^4.0.1", + "semver": "^7.3.5", + "typescript-memoize": "^1.0.1" + }, + "engines": { + "node": "12.* || 14.* || >= 16" + } + }, "test-app/node_modules/@glimmer/vm-babel-plugins": { "version": "0.84.2", "resolved": "https://registry.npmjs.org/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.84.2.tgz", @@ -24632,6 +24899,76 @@ "babel-plugin-debug-macros": "^0.3.4" } }, + "test-app/node_modules/@glint/core": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@glint/core/-/core-1.4.0.tgz", + "integrity": "sha512-nq27a/1R6kc3lsuciz8z9IZO1NQCbNkEBxf5KJI7AUrnps6RzQzmq3pmwO24zQYmFcH4sqpod8fleNIpg8YEqg==", + "dev": true, + "dependencies": { + "@glimmer/syntax": "^0.84.3", + "escape-string-regexp": "^4.0.0", + "semver": "^7.5.2", + "silent-error": "^1.1.1", + "uuid": "^8.3.2", + "vscode-languageserver": "^8.0.1", + "vscode-languageserver-textdocument": "^1.0.5", + "vscode-uri": "^3.0.8", + "yargs": "^17.5.1" + }, + "bin": { + "glint": "bin/glint.js", + "glint-language-server": "bin/glint-language-server.js" + }, + "peerDependencies": { + "typescript": ">=4.8.0" + } + }, + "test-app/node_modules/@glint/environment-ember-loose": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@glint/environment-ember-loose/-/environment-ember-loose-1.4.0.tgz", + "integrity": "sha512-vFR3qgPTisGzS36e04195wTUrtUc6GuVwm6hsC/XXx6PeRw/6rtMxhK08Aw/VtDc00UqQzM9sIEghPVKHwqVVQ==", + "dev": true, + "peerDependencies": { + "@glimmer/component": "^1.1.2", + "@glint/template": "^1.4.0", + "@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 + } + } + }, + "test-app/node_modules/@glint/template": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@glint/template/-/template-1.1.0.tgz", + "integrity": "sha512-gK4tifrw7mIMYECzGeG5jrez2lY0TlwE584cnoYOFhzxXKrsuungdiebd7LDwjvfQpImQd1JUSQr3u/uF/XYJg==", + "dev": true + }, "test-app/node_modules/@tsconfig/ember": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@tsconfig/ember/-/ember-3.0.3.tgz", @@ -24947,6 +25284,18 @@ "@glimmer/component": "^1.1.2" } }, + "test-app/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "test-app/node_modules/eslint-config-prettier": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", @@ -25006,6 +25355,37 @@ "node": ">=4.0" } }, + "test-app/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "test-app/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "test-app/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -25024,6 +25404,75 @@ "node >= 0.4.0" ] }, + "test-app/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "test-app/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "test-app/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "test-app/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "test-app/node_modules/resolve-package-path": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-4.0.3.tgz", + "integrity": "sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==", + "dev": true, + "dependencies": { + "path-root": "^0.1.1" + }, + "engines": { + "node": ">= 12" + } + }, "test-app/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -25035,6 +25484,15 @@ "engines": { "node": ">=8" } + }, + "test-app/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } } } } diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js index 66d92b6..978de21 100644 --- a/test-app/config/ember-try.js +++ b/test-app/config/ember-try.js @@ -38,6 +38,14 @@ module.exports = async function () { }, }, }, + { + name: 'ember-test-helper-v3', + npm: { + overrides: { + '@ember/test-helpers': '^3.3.0', + }, + }, + }, { name: 'ember-release', npm: { diff --git a/test-app/package.json b/test-app/package.json index 046dff0..601c1f1 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/string": "^3.0.1", - "@ember/test-helpers": "^3.3.0", + "@ember/test-helpers": "^4.0.0", "@embroider/test-setup": "^3.0.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2",