From 0dd8c12c4bbf51b3eaa76382766890cc886df39a Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Wed, 8 Mar 2023 20:51:22 +0100 Subject: [PATCH] support tracked-toolbox v2 (#1895) * support tracked-toolbox v2 * must define Bootstrap version --- .github/workflows/ci.yml | 2 ++ config/ember-try.js | 9 +++++++++ package.json | 2 +- yarn.lock | 28 +++++++++------------------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89c6f9493..52c7aec3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,6 +83,8 @@ jobs: browser: Firefox bootstrap: 5 - scenario: node-tests + - scenario: tracked-toolbox-v1 + bootstrap: 5 steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/config/ember-try.js b/config/ember-try.js index ddaee670e..70413aa04 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -92,6 +92,15 @@ module.exports = async function () { name: 'node-tests', command: 'yarn run nodetest', }, + { + name: 'tracked-toolbox-v1', + npm: { + devDependencies: { + bootstrap: bootstrapVersion, + 'tracked-toolbox': '^1.2.3', + }, + }, + }, embroiderSafe({ env: { FASTBOOT_DISABLED: true, diff --git a/package.json b/package.json index 9b1f53808..0874b4fb6 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "resolve": "^1.18.1", "rsvp": "^4.0.1", "silent-error": "^1.0.1", - "tracked-toolbox": "^1.2.3" + "tracked-toolbox": "^1.2.3 || ^2.0.0" }, "devDependencies": { "@ember/optional-features": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 718959026..231926ef9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1083,7 +1083,7 @@ ember-cli-version-checker "^5.1.2" semver "^7.3.5" -"@embroider/addon-shim@^1.0.0", "@embroider/addon-shim@^1.8.4": +"@embroider/addon-shim@^1.0.0", "@embroider/addon-shim@^1.6.0", "@embroider/addon-shim@^1.8.4": version "1.8.4" resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.4.tgz#0e7f32c5506bf0f3eb0840506e31c36c7053763c" integrity sha512-sFhfWC0vI18KxVenmswQ/ShIvBg4juL8ubI+Q3NTSdkCTeaPQ/DIOUF6oR5DCQ8eO/TkIaw+kdG3FkTY6yNJqA== @@ -1239,7 +1239,7 @@ "@handlebars/parser" "~2.0.0" simple-html-tokenizer "^0.5.11" -"@glimmer/tracking@1.1.2", "@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.4": +"@glimmer/tracking@1.1.2", "@glimmer/tracking@^1.0.4": version "1.1.2" resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.1.2.tgz#74e71be07b0a7066518d24044d2665d0cf8281eb" integrity sha512-cyV32zsHh+CnftuRX84ALZpd2rpbDrhLhJnTXn9W//QpqdRZ5rdMsxSY9fOsj0CKEc706tmEU299oNnDc0d7tA== @@ -4957,7 +4957,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1: resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879" integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw== -ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3: +ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3: version "7.26.11" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f" integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA== @@ -5090,7 +5090,7 @@ ember-cli-get-component-path-option@^1.0.0: resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771" integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E= -ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1: +ember-cli-htmlbars@^5.7.1: version "5.7.2" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8" integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg== @@ -13672,23 +13672,13 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= -tracked-maps-and-sets@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tracked-maps-and-sets/-/tracked-maps-and-sets-2.2.1.tgz#323dd40540c561e8b0ffdec8bf129c68ec5025f9" - integrity sha512-XYrXh6L/GpGmVmG3KcN/qoDyi4FxHh8eZY/BA/RuoxynskV+GZSfwrX3R+5DR2CIkzkCx4zi4kkDRg1AMDfDhg== - dependencies: - "@glimmer/tracking" "^1.0.0" - ember-cli-babel "^7.17.2" - -tracked-toolbox@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/tracked-toolbox/-/tracked-toolbox-1.2.3.tgz#66ee74b948b270958f9401e93d8a69635ed294f9" - integrity sha512-0axTjBYinHurXoat9Qk71GbCxR2GZWDbhV3aGQmeGr7FxGXvfz+/mvuG69Nl3omkOdYy5GRjy7lYXJbDz8lPMA== +"tracked-toolbox@^1.2.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/tracked-toolbox/-/tracked-toolbox-2.0.0.tgz#7862575527b4c633ef8f9b4111d9d64c07ef2a49" + integrity sha512-adZtX+RGN6F+pWs/5JqVuDxLhuia4uhqmQp+UlUaxpykWjDFETtAdQR+LdDJiFPXFAXnS6FBqn/tnSLJQCm3Yw== dependencies: + "@embroider/addon-shim" "^1.6.0" ember-cache-primitive-polyfill "^1.0.0" - ember-cli-babel "^7.21.0" - ember-cli-htmlbars "^5.3.1" - tracked-maps-and-sets "^2.0.0" tree-sync@^1.2.2: version "1.4.0"