From c9a0fd0d2caaf50fdf17d87de2126b84d66019e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:29:38 +0000 Subject: [PATCH 1/3] [skip netlify]: Bump @ember/test-helpers from 3.3.1 to 4.0.2 Bumps [@ember/test-helpers](https://github.com/emberjs/ember-test-helpers) from 3.3.1 to 4.0.2. - [Release notes](https://github.com/emberjs/ember-test-helpers/releases) - [Changelog](https://github.com/emberjs/ember-test-helpers/blob/master/CHANGELOG.md) - [Commits](https://github.com/emberjs/ember-test-helpers/commits) --- updated-dependencies: - dependency-name: "@ember/test-helpers" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 35 +++++++++++------------------------ 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 6fb46153..3df2be04 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@babel/plugin-transform-class-static-block": "^7.24.7", "@ember/optional-features": "^2.1.0", "@ember/string": "^3.0.1", - "@ember/test-helpers": "^3.3.1", + "@ember/test-helpers": "^4.0.2", "@embroider/test-setup": "^4.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", diff --git a/yarn.lock b/yarn.lock index 6af62786..4c7f4b93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2199,30 +2199,17 @@ dependencies: ember-cli-babel "^7.26.6" -"@ember/test-helpers@^3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-3.3.1.tgz#b19287dbb7ba169a2033574bb5021c0490b199b9" - integrity sha512-h4uFBy4pquBtHsHI+tx9S0wtMmn1L+8dkXiDiyoqG1+3e0Awk6GBujiFM9s4ANq6wC8uIhC3wEFyts10h2OAoQ== +"@ember/test-helpers@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-4.0.2.tgz#728fab314280381b04f70a1fd1014f5db6c24aca" + integrity sha512-9vV5nDx1ZzmTmexzTudRk9M04JY6mqB3NxJB116vkjGQWIRTgiAVUgBkFIudRXvX1QiOGTo6IPxQRXZRS+v28w== dependencies: - "@ember/test-waiters" "^3.0.2" - "@embroider/macros" "^1.10.0" + "@ember/test-waiters" "^3.1.0" + "@embroider/addon-shim" "^1.8.7" + "@embroider/macros" "^1.16.5" "@simple-dom/interface" "^1.4.0" - broccoli-debug "^0.6.5" - broccoli-funnel "^3.0.8" + decorator-transforms "^2.0.0" dom-element-descriptors "^0.5.0" - ember-auto-import "^2.6.0" - ember-cli-babel "^8.2.0" - ember-cli-htmlbars "^6.2.0" - -"@ember/test-waiters@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.2.tgz#5b950c580a1891ed1d4ee64f9c6bacf49a15ea6f" - integrity sha512-H8Q3Xy9rlqhDKnQpwt2pzAYDouww4TZIGSI1pZJhM7mQIGufQKuB0ijzn/yugA6Z+bNdjYp1HioP8Y4hn2zazQ== - dependencies: - calculate-cache-key-for-tree "^2.0.0" - ember-cli-babel "^7.26.6" - ember-cli-version-checker "^5.1.2" - semver "^7.3.5" "@ember/test-waiters@^3.1.0": version "3.1.0" @@ -2257,7 +2244,7 @@ resolve "^1.20.0" semver "^7.3.2" -"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.1", "@embroider/macros@^1.16.1": +"@embroider/macros@^1.0.0", "@embroider/macros@^1.13.1", "@embroider/macros@^1.16.1", "@embroider/macros@^1.16.5": version "1.16.5" resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.16.5.tgz#871addab2103b554c6b6a3a337c00e3f0a0462ac" integrity sha512-Oz8bUZvZzOV1Gk3qSgIzZJJzs6acclSTcEFyB+KdKbKqjTC3uebn53aU2gAlLU7/YdTRZrg2gNbQuwAp+tGkGg== @@ -6961,7 +6948,7 @@ ember-auto-import@^1.10.1, ember-auto-import@^1.11.3: walk-sync "^0.3.3" webpack "^4.43.0" -"ember-auto-import@^1.11.3 || ^2.0.0", ember-auto-import@^2.6.0, ember-auto-import@^2.6.3: +"ember-auto-import@^1.11.3 || ^2.0.0", ember-auto-import@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a" integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ== @@ -7202,7 +7189,7 @@ ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1: strip-bom "^4.0.0" walk-sync "^2.2.0" -ember-cli-htmlbars@^6.2.0, ember-cli-htmlbars@^6.3.0: +ember-cli-htmlbars@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.3.0.tgz#ac85f2bbd09788992ab7f9ca832cd044fb8e5798" integrity sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag== From 35e80bbca6aea861ece34dd8b2b7ccdb2b3839fd Mon Sep 17 00:00:00 2001 From: Jordan Hawker Date: Mon, 26 Aug 2024 11:30:08 -0700 Subject: [PATCH 2/3] Add @ember/test-helpers to peerDependencies --- package.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package.json b/package.json index 3df2be04..570aa41a 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,14 @@ "ember-modifier": "^3.0.0 || ^4.0.0", "intersection-observer-admin": "^0.3.4" }, + "peerDependencies": { + "@ember/test-helpers": "^3.0.0 || ^4.0.0" + }, + "peerDependenciesMeta": { + "@ember/test-helpers": { + "optional": false + } + }, "devDependencies": { "@babel/eslint-parser": "^7.25.1", "@babel/plugin-proposal-decorators": "^7.24.7", From 47ece62bd7821dd1d6ca8c64b9549c4a995aca28 Mon Sep 17 00:00:00 2001 From: Jordan Hawker Date: Mon, 26 Aug 2024 11:45:04 -0700 Subject: [PATCH 3/3] Add @ember/test-helpers v3 ember-try scenario --- .github/workflows/ci.yml | 1 + package.json | 8 +++----- tests/dummy/config/ember-try.js | 8 ++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f210caa3..a4473c8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,6 +56,7 @@ jobs: - ember-lts-4.8 - ember-lts-4.12 - ember-lts-5.4 + - ember-test-helpers-v3 - ember-release - embroider-safe experimental: [false] diff --git a/package.json b/package.json index 570aa41a..0cdfe6a6 100644 --- a/package.json +++ b/package.json @@ -38,11 +38,12 @@ "intersection-observer-admin": "^0.3.4" }, "peerDependencies": { - "@ember/test-helpers": "^3.0.0 || ^4.0.0" + "@ember/test-helpers": ">=3.0.0", + "ember-source": "^4.0.0 || ^5.0.0" }, "peerDependenciesMeta": { "@ember/test-helpers": { - "optional": false + "optional": true } }, "devDependencies": { @@ -101,9 +102,6 @@ "fastbootDependencies": [ "crypto" ], - "peerDependencies": { - "ember-source": "^4.0.0 || ^5.0.0" - }, "engines": { "node": "16.* || >= 18" }, diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js index 152a3d5a..7764a2f3 100644 --- a/tests/dummy/config/ember-try.js +++ b/tests/dummy/config/ember-try.js @@ -39,6 +39,14 @@ module.exports = async function () { }, }, }, + { + name: 'ember-test-helpers-v3', + npm: { + devDependencies: { + '@ember/test-helpers': '^3.3.1', + }, + }, + }, { name: 'ember-release', npm: {