From 876424232d9a9877d4ef7791203c471ecf848eab Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Wed, 4 Dec 2024 10:18:58 +0100 Subject: [PATCH 1/4] Remove the glimmer packages from our dependencies It seems this is one of those magic virtual dependencies, so we don't need it as a dependency even though we import from it. This is how the v1 blueprint does it. --- package-lock.json | 2 -- package.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5cf107fb..61ffadc34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,8 +13,6 @@ "@duetds/date-picker": "^1.4.0", "@embroider/macros": "^1.9.0", "@floating-ui/dom": "^1.1.0", - "@glimmer/component": "^1.1.2", - "@glimmer/tracking": "^1.1.2", "ember-auto-import": "^2.8.1", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", diff --git a/package.json b/package.json index ee78caa1d..0b3f58878 100644 --- a/package.json +++ b/package.json @@ -84,8 +84,6 @@ "@duetds/date-picker": "^1.4.0", "@embroider/macros": "^1.9.0", "@floating-ui/dom": "^1.1.0", - "@glimmer/component": "^1.1.2", - "@glimmer/tracking": "^1.1.2", "ember-auto-import": "^2.8.1", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", From 8527ca2caac75df97d0c08ced97a0ade51a91b74 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Wed, 4 Dec 2024 10:23:31 +0100 Subject: [PATCH 2/4] Update to ember-file-upload v9 There are no breaking API changes and we only support Ember v4.12 so the 3.25 version drop doesn't affect us. --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61ffadc34..16da34bf5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "ember-cli-htmlbars": "^6.3.0", "ember-cli-version-checker": "^5.1.2", "ember-concurrency": "^3.1.0 || ^4.0.2", - "ember-file-upload": "^8.4.0", + "ember-file-upload": "^9.1.0", "ember-focus-trap": "^1.1.0", "ember-modifier": "^4.1.0", "ember-template-imports": "^4.1.1", @@ -23028,9 +23028,9 @@ } }, "node_modules/ember-file-upload": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/ember-file-upload/-/ember-file-upload-8.4.0.tgz", - "integrity": "sha512-iiE3iE/7hncBiU5cvjitpc0whfeAMvdyW2ReiDCzKe9ByVZlgG7Hnp89EPE6c8aSvTLXCQ3X6SsF1U4LTgh75g==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/ember-file-upload/-/ember-file-upload-9.1.0.tgz", + "integrity": "sha512-2t/LRpdbYP3GUnkUexjpWs/hE2QZeLh+Y3vM8GTzsyg+uYOaVNd4JFWrlFkazmo0Vp6Lf0rL+1Yj4tiefc+djQ==", "dependencies": { "@ember/test-waiters": "^3.0.0", "@embroider/addon-shim": "^1.5.0", @@ -23041,7 +23041,7 @@ "node": "16.* || >= 18" }, "peerDependencies": { - "@ember/test-helpers": "^2.9.3 || ^3.0.3", + "@ember/test-helpers": "^2.9.3 || ^3.0.3 || ^4.0.4", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "ember-cli-mirage": "*", diff --git a/package.json b/package.json index 0b3f58878..e32e9ece0 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "ember-cli-htmlbars": "^6.3.0", "ember-cli-version-checker": "^5.1.2", "ember-concurrency": "^3.1.0 || ^4.0.2", - "ember-file-upload": "^8.4.0", + "ember-file-upload": "^9.1.0", "ember-focus-trap": "^1.1.0", "ember-modifier": "^4.1.0", "ember-template-imports": "^4.1.1", From 06015d3fa67a7350f00659ad204ffac5b7cce6c4 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Wed, 4 Dec 2024 10:41:59 +0100 Subject: [PATCH 3/4] Remove `ember-test-selectors` Even when we add it as a dependency the app has the final say if the selectors should be stripped, so we simply move that responsibility to apps now. --- package-lock.json | 234 ---------------------------------------------- package.json | 1 - 2 files changed, 235 deletions(-) diff --git a/package-lock.json b/package-lock.json index 16da34bf5..f4ad6fc81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,6 @@ "ember-focus-trap": "^1.1.0", "ember-modifier": "^4.1.0", "ember-template-imports": "^4.1.1", - "ember-test-selectors": "^6.0.0", "ember-truth-helpers": "^3.1.1 || ^4.0.3", "inputmask": "^5.0.9", "merge-anything": "^5.1.3", @@ -25757,239 +25756,6 @@ "node": ">=8.17.0" } }, - "node_modules/ember-test-selectors": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ember-test-selectors/-/ember-test-selectors-6.0.0.tgz", - "integrity": "sha512-PgYcI9PeNvtKaF0QncxfbS68olMYM1idwuI8v/WxsjOGqUx5bmsu6V17vy/d9hX4mwmjgsBhEghrVasGSuaIgw==", - "dependencies": { - "calculate-cache-key-for-tree": "^2.0.0", - "ember-cli-babel": "^7.26.4", - "ember-cli-version-checker": "^5.1.2" - }, - "engines": { - "node": "12.* || 14.* || >= 16.*" - } - }, - "node_modules/ember-test-selectors/node_modules/babel-plugin-ember-modules-api-polyfill": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz", - "integrity": "sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==", - "dependencies": { - "ember-rfc176-data": "^0.3.17" - }, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/ember-test-selectors/node_modules/babel-plugin-module-resolver": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz", - "integrity": "sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==", - "dependencies": { - "find-babel-config": "^1.1.0", - "glob": "^7.1.2", - "pkg-up": "^2.0.0", - "reselect": "^3.0.1", - "resolve": "^1.4.0" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/ember-test-selectors/node_modules/broccoli-babel-transpiler": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.1.tgz", - "integrity": "sha512-6IXBgfRt7HZ61g67ssBc6lBb3Smw3DPZ9dEYirgtvXWpRZ2A9M22nxy6opEwJDgDJzlu/bB7ToppW33OFkA1gA==", - "dependencies": { - "@babel/core": "^7.12.0", - "@babel/polyfill": "^7.11.5", - "broccoli-funnel": "^2.0.2", - "broccoli-merge-trees": "^3.0.2", - "broccoli-persistent-filter": "^2.2.1", - "clone": "^2.1.2", - "hash-for-dep": "^1.4.7", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.9", - "json-stable-stringify": "^1.0.1", - "rsvp": "^4.8.4", - "workerpool": "^3.1.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/ember-test-selectors/node_modules/broccoli-source": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/broccoli-source/-/broccoli-source-2.1.2.tgz", - "integrity": "sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/ember-test-selectors/node_modules/ember-cli-babel": { - "version": "7.26.11", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz", - "integrity": "sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==", - "dependencies": { - "@babel/core": "^7.12.0", - "@babel/helper-compilation-targets": "^7.12.0", - "@babel/plugin-proposal-class-properties": "^7.16.5", - "@babel/plugin-proposal-decorators": "^7.13.5", - "@babel/plugin-proposal-private-methods": "^7.16.5", - "@babel/plugin-proposal-private-property-in-object": "^7.16.5", - "@babel/plugin-transform-modules-amd": "^7.13.0", - "@babel/plugin-transform-runtime": "^7.13.9", - "@babel/plugin-transform-typescript": "^7.13.0", - "@babel/polyfill": "^7.11.5", - "@babel/preset-env": "^7.16.5", - "@babel/runtime": "7.12.18", - "amd-name-resolver": "^1.3.1", - "babel-plugin-debug-macros": "^0.3.4", - "babel-plugin-ember-data-packages-polyfill": "^0.1.2", - "babel-plugin-ember-modules-api-polyfill": "^3.5.0", - "babel-plugin-module-resolver": "^3.2.0", - "broccoli-babel-transpiler": "^7.8.0", - "broccoli-debug": "^0.6.4", - "broccoli-funnel": "^2.0.2", - "broccoli-source": "^2.1.2", - "calculate-cache-key-for-tree": "^2.0.0", - "clone": "^2.1.2", - "ember-cli-babel-plugin-helpers": "^1.1.1", - "ember-cli-version-checker": "^4.1.0", - "ensure-posix-path": "^1.0.2", - "fixturify-project": "^1.10.0", - "resolve-package-path": "^3.1.0", - "rimraf": "^3.0.1", - "semver": "^5.5.0" - }, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/ember-test-selectors/node_modules/ember-cli-babel/node_modules/ember-cli-version-checker": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz", - "integrity": "sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==", - "dependencies": { - "resolve-package-path": "^2.0.0", - "semver": "^6.3.0", - "silent-error": "^1.1.1" - }, - "engines": { - "node": "8.* || 10.* || >= 12.*" - } - }, - "node_modules/ember-test-selectors/node_modules/ember-cli-babel/node_modules/ember-cli-version-checker/node_modules/resolve-package-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-2.0.0.tgz", - "integrity": "sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==", - "dependencies": { - "path-root": "^0.1.1", - "resolve": "^1.13.1" - }, - "engines": { - "node": "8.* || 10.* || >= 12" - } - }, - "node_modules/ember-test-selectors/node_modules/ember-cli-babel/node_modules/ember-cli-version-checker/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/ember-test-selectors/node_modules/find-babel-config": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz", - "integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==", - "dependencies": { - "json5": "^0.5.1", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/ember-test-selectors/node_modules/find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", - "dependencies": { - "locate-path": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/ember-test-selectors/node_modules/json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==", - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/ember-test-selectors/node_modules/pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", - "integrity": "sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==", - "dependencies": { - "find-up": "^2.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/ember-test-selectors/node_modules/reselect": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz", - "integrity": "sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==" - }, - "node_modules/ember-test-selectors/node_modules/resolve-package-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz", - "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==", - "dependencies": { - "path-root": "^0.1.1", - "resolve": "^1.17.0" - }, - "engines": { - "node": "10.* || >= 12" - } - }, - "node_modules/ember-test-selectors/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/ember-test-selectors/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/ember-test-selectors/node_modules/workerpool": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-3.1.2.tgz", - "integrity": "sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==", - "dependencies": { - "@babel/core": "^7.3.4", - "object-assign": "4.1.1", - "rsvp": "^4.8.4" - } - }, "node_modules/ember-tracked-storage-polyfill": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ember-tracked-storage-polyfill/-/ember-tracked-storage-polyfill-1.0.0.tgz", diff --git a/package.json b/package.json index e32e9ece0..96eb9561b 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,6 @@ "ember-focus-trap": "^1.1.0", "ember-modifier": "^4.1.0", "ember-template-imports": "^4.1.1", - "ember-test-selectors": "^6.0.0", "ember-truth-helpers": "^3.1.1 || ^4.0.3", "inputmask": "^5.0.9", "merge-anything": "^5.1.3", From 2121ba2e69d1c587e55808ed88a3a48face612b8 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Wed, 4 Dec 2024 11:24:13 +0100 Subject: [PATCH 4/4] Update `merge-anything` to v6 --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index f4ad6fc81..5b9d0735a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "ember-template-imports": "^4.1.1", "ember-truth-helpers": "^3.1.1 || ^4.0.3", "inputmask": "^5.0.9", - "merge-anything": "^5.1.3", + "merge-anything": "^6.0.2", "tracked-toolbox": "^2.0.0" }, "devDependencies": { @@ -31722,11 +31722,11 @@ } }, "node_modules/is-what": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.7.tgz", - "integrity": "sha512-DBVOQNiPKnGMxRMLIYSwERAS5MVY1B7xYiGnpgctsOFvVDz9f9PFXXxMcTOHuoqYp4NK9qFYQaIC1NRRxLMpBQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.0.2.tgz", + "integrity": "sha512-vI7Ui0qzNQ2ClDZd0bC7uqRk3T1imbX5cZODmVlqqdqiwmSIUX3CNSiRgFjFMJ987sVCMSa7xZeEDtpJduPg4A==", "engines": { - "node": ">=12.13" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/mesqueeb" @@ -33637,14 +33637,14 @@ } }, "node_modules/merge-anything": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-5.1.3.tgz", - "integrity": "sha512-pMb85+QShjqye+99Dkrg9m6EbTjDXwZFQbPysx/lNkuwjT+UJZlQvpnOy0P8kgGXzUx8iWSoNQel5QJjoyWHmQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-6.0.2.tgz", + "integrity": "sha512-U8x6DL/YVudOcf82B6hd8GFg+6gF6hEHYwzqdo67GrH6vnDZ5YBq6BYX3hHWyCnG3CcqJDB1a9tj9fzMI3RL9Q==", "dependencies": { - "is-what": "^4.1.7" + "is-what": "^5.0.1" }, "engines": { - "node": ">=12.13" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/mesqueeb" diff --git a/package.json b/package.json index 96eb9561b..89379553a 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "ember-template-imports": "^4.1.1", "ember-truth-helpers": "^3.1.1 || ^4.0.3", "inputmask": "^5.0.9", - "merge-anything": "^5.1.3", + "merge-anything": "^6.0.2", "tracked-toolbox": "^2.0.0" }, "devDependencies": {