From 299b323d9a8c1f3545ecbe5de93471e9739bc2b5 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 27 Feb 2024 10:48:30 +0100 Subject: [PATCH] DEV: Update ember-cli to 5.6.0 (#25886) --- .github/workflows/tests.yml | 1 - .../admin/config/ember-cli-update.json | 20 -- app/assets/javascripts/admin/package.json | 6 +- .../javascripts/bootstrap-json/package.json | 2 +- .../deprecation-silencer/package.json | 2 +- .../javascripts/dialog-holder/package.json | 2 +- .../config/ember-cli-update.json | 20 -- .../javascripts/discourse-common/package.json | 6 +- .../config/ember-cli-update.json | 20 -- .../javascripts/discourse-hbr/package.json | 6 +- .../javascripts/discourse-i18n/package.json | 2 +- .../discourse-markdown-it/package.json | 2 +- .../discourse-plugins/package.json | 5 +- .../config/ember-cli-update.json | 20 -- .../discourse-widget-hbs/package.json | 6 +- app/assets/javascripts/discourse/.ember-cli | 8 - .../discourse/config/ember-cli-update.json | 20 -- app/assets/javascripts/discourse/package.json | 6 +- .../discourse/tests/helpers/index.js | 2 +- .../float-kit/config/ember-cli-update.json | 20 -- app/assets/javascripts/float-kit/package.json | 6 +- .../pretty-text/config/ember-cli-update.json | 20 -- .../javascripts/pretty-text/package.json | 6 +- .../select-kit/config/ember-cli-update.json | 20 -- .../javascripts/select-kit/package.json | 6 +- .../javascripts/theme-transpiler/package.json | 2 +- .../config/ember-cli-update.json | 20 -- .../javascripts/truth-helpers/package.json | 6 +- package.json | 2 +- patches/@ember+test-helpers+2.9.4.patch | 80 ------ patches/ember-cli+5.0.0.patch | 16 -- yarn.lock | 241 ++++++------------ 32 files changed, 120 insertions(+), 481 deletions(-) delete mode 100644 app/assets/javascripts/admin/config/ember-cli-update.json delete mode 100644 app/assets/javascripts/discourse-common/config/ember-cli-update.json delete mode 100644 app/assets/javascripts/discourse-hbr/config/ember-cli-update.json delete mode 100644 app/assets/javascripts/discourse-widget-hbs/config/ember-cli-update.json delete mode 100644 app/assets/javascripts/discourse/config/ember-cli-update.json delete mode 100644 app/assets/javascripts/float-kit/config/ember-cli-update.json delete mode 100644 app/assets/javascripts/pretty-text/config/ember-cli-update.json delete mode 100644 app/assets/javascripts/select-kit/config/ember-cli-update.json delete mode 100644 app/assets/javascripts/truth-helpers/config/ember-cli-update.json delete mode 100644 patches/@ember+test-helpers+2.9.4.patch delete mode 100644 patches/ember-cli+5.0.0.patch diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aa52c8ba0fc..e3017cc196f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -368,7 +368,6 @@ jobs: key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-cachev2 - name: Yarn install - working-directory: ./app/assets/javascripts/discourse run: yarn install --frozen-lockfile - name: Ember Build diff --git a/app/assets/javascripts/admin/config/ember-cli-update.json b/app/assets/javascripts/admin/config/ember-cli-update.json deleted file mode 100644 index 994928cd9c9..00000000000 --- a/app/assets/javascripts/admin/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "addon", - "outputRepo": "https://github.com/ember-cli/ember-addon-output", - "codemodsSource": "ember-addon-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json index 457cfcf9baf..01d3709fbae 100644 --- a/app/assets/javascripts/admin/package.json +++ b/app/assets/javascripts/admin/package.json @@ -14,6 +14,7 @@ "start": "ember serve" }, "dependencies": { + "@babel/core": "^7.23.7", "discourse-common": "1.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", @@ -22,14 +23,13 @@ "devDependencies": { "@babel/core": "^7.23.9", "@ember/optional-features": "^2.1.0", - "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.3", "@glimmer/component": "^1.1.2", "@types/jquery": "^3.5.29", "@types/qunit": "^2.19.10", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -42,7 +42,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/bootstrap-json/package.json b/app/assets/javascripts/bootstrap-json/package.json index 6da1a50c7fe..aee951f4a4c 100644 --- a/app/assets/javascripts/bootstrap-json/package.json +++ b/app/assets/javascripts/bootstrap-json/package.json @@ -25,7 +25,7 @@ "node-fetch": "^3.3.2" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } diff --git a/app/assets/javascripts/deprecation-silencer/package.json b/app/assets/javascripts/deprecation-silencer/package.json index 022c60c9990..b5df17dd718 100644 --- a/app/assets/javascripts/deprecation-silencer/package.json +++ b/app/assets/javascripts/deprecation-silencer/package.json @@ -7,7 +7,7 @@ "license": "GPL-2.0-only", "keywords": [], "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } diff --git a/app/assets/javascripts/dialog-holder/package.json b/app/assets/javascripts/dialog-holder/package.json index c21cff8c3c9..7c79a527674 100644 --- a/app/assets/javascripts/dialog-holder/package.json +++ b/app/assets/javascripts/dialog-holder/package.json @@ -20,7 +20,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } diff --git a/app/assets/javascripts/discourse-common/config/ember-cli-update.json b/app/assets/javascripts/discourse-common/config/ember-cli-update.json deleted file mode 100644 index 994928cd9c9..00000000000 --- a/app/assets/javascripts/discourse-common/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "addon", - "outputRepo": "https://github.com/ember-cli/ember-addon-output", - "codemodsSource": "ember-addon-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index 5227e26e4df..5dac3305dc8 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -14,7 +14,7 @@ "start": "ember serve" }, "dependencies": { - "@ember/string": "^3.1.1", + "@babel/core": "^7.23.7", "@uppy/aws-s3": "3.0.6", "@uppy/aws-s3-multipart": "3.1.3", "@uppy/core": "3.0.4", @@ -37,7 +37,7 @@ "@types/qunit": "^2.19.10", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -49,7 +49,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-hbr/config/ember-cli-update.json b/app/assets/javascripts/discourse-hbr/config/ember-cli-update.json deleted file mode 100644 index 994928cd9c9..00000000000 --- a/app/assets/javascripts/discourse-hbr/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "addon", - "outputRepo": "https://github.com/ember-cli/ember-addon-output", - "codemodsSource": "ember-addon-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json index e003bb167e8..279538bd0cf 100644 --- a/app/assets/javascripts/discourse-hbr/package.json +++ b/app/assets/javascripts/discourse-hbr/package.json @@ -14,6 +14,7 @@ "start": "ember serve" }, "dependencies": { + "@babel/core": "^7.23.7", "ember-auto-import": "^2.7.2", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", @@ -22,11 +23,10 @@ "devDependencies": { "@babel/core": "^7.23.9", "@ember/optional-features": "^2.1.0", - "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.3", "@glimmer/component": "^1.1.2", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -39,7 +39,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-i18n/package.json b/app/assets/javascripts/discourse-i18n/package.json index eaf4b83a46a..5a45e0b9082 100644 --- a/app/assets/javascripts/discourse-i18n/package.json +++ b/app/assets/javascripts/discourse-i18n/package.json @@ -20,7 +20,7 @@ "@embroider/addon-shim": "^1.8.7" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-markdown-it/package.json b/app/assets/javascripts/discourse-markdown-it/package.json index cb7fa97f209..cfc7fae9e1a 100644 --- a/app/assets/javascripts/discourse-markdown-it/package.json +++ b/app/assets/javascripts/discourse-markdown-it/package.json @@ -29,7 +29,7 @@ "xss": "*" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-plugins/package.json b/app/assets/javascripts/discourse-plugins/package.json index a8b16b4f42f..d9c93692069 100644 --- a/app/assets/javascripts/discourse-plugins/package.json +++ b/app/assets/javascripts/discourse-plugins/package.json @@ -8,6 +8,7 @@ "ember-addon" ], "dependencies": { + "@babel/core": "^7.23.7", "deprecation-silencer": "1.0.0", "discourse-widget-hbs": "1.0.0", "ember-cli-babel": "^8.2.0", @@ -17,11 +18,11 @@ }, "devDependencies": { "@babel/core": "^7.23.9", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-widget-hbs/config/ember-cli-update.json b/app/assets/javascripts/discourse-widget-hbs/config/ember-cli-update.json deleted file mode 100644 index 994928cd9c9..00000000000 --- a/app/assets/javascripts/discourse-widget-hbs/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "addon", - "outputRepo": "https://github.com/ember-cli/ember-addon-output", - "codemodsSource": "ember-addon-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json index a7fe2484a2c..1126ff0a7e6 100644 --- a/app/assets/javascripts/discourse-widget-hbs/package.json +++ b/app/assets/javascripts/discourse-widget-hbs/package.json @@ -14,6 +14,7 @@ "start": "ember serve" }, "dependencies": { + "@babel/core": "^7.23.7", "ember-auto-import": "^2.7.2", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", @@ -22,12 +23,11 @@ "devDependencies": { "@babel/core": "^7.23.9", "@ember/optional-features": "^2.1.0", - "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.3", "@glimmer/component": "^1.1.2", "@glimmer/syntax": "^0.88.1", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -40,7 +40,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse/.ember-cli b/app/assets/javascripts/discourse/.ember-cli index 8c1812cff8f..465c4050deb 100644 --- a/app/assets/javascripts/discourse/.ember-cli +++ b/app/assets/javascripts/discourse/.ember-cli @@ -1,12 +1,4 @@ { - /** - Ember CLI sends analytics information by default. The data is completely - anonymous, but there are times when you might want to disable this behavior. - - Setting `disableAnalytics` to true will prevent any data from being sent. - */ - "disableAnalytics": false, - /** Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript rather than JavaScript by default, when a TypeScript version of a given blueprint is available. diff --git a/app/assets/javascripts/discourse/config/ember-cli-update.json b/app/assets/javascripts/discourse/config/ember-cli-update.json deleted file mode 100644 index a218fcf5e18..00000000000 --- a/app/assets/javascripts/discourse/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "app", - "outputRepo": "https://github.com/ember-cli/ember-new-output", - "codemodsSource": "ember-app-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index d45da158442..f749fe3bbf5 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -38,7 +38,7 @@ "@ember/optional-features": "^2.1.0", "@ember/render-modifiers": "^2.1.0", "@ember/string": "^3.1.1", - "@ember/test-helpers": "^2.9.4", + "@ember/test-helpers": "^3.3.0", "@embroider/compat": "^3.4.4", "@embroider/core": "^3.4.4", "@embroider/macros": "^1.13.1", @@ -74,7 +74,7 @@ "ember-auto-import": "^2.7.2", "ember-buffered-proxy": "^2.1.1", "ember-cached-decorator-polyfill": "^1.0.2", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-app-version": "^6.0.1", "ember-cli-babel": "^8.2.0", "ember-cli-deprecation-workflow": "^2.2.0", @@ -124,7 +124,7 @@ "xss": "^1.0.14" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse/tests/helpers/index.js b/app/assets/javascripts/discourse/tests/helpers/index.js index 3d0a13d2aaa..41feaae60f1 100644 --- a/app/assets/javascripts/discourse/tests/helpers/index.js +++ b/app/assets/javascripts/discourse/tests/helpers/index.js @@ -4,7 +4,7 @@ import { setupTest as upstreamSetupTest, } from "ember-qunit"; -// This file exists to provide wrappers around ember-qunit's / ember-mocha's +// This file exists to provide wrappers around ember-qunit's // test setup functions. This way, you can easily extend the setup that is // needed per test type. diff --git a/app/assets/javascripts/float-kit/config/ember-cli-update.json b/app/assets/javascripts/float-kit/config/ember-cli-update.json deleted file mode 100644 index 994928cd9c9..00000000000 --- a/app/assets/javascripts/float-kit/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "addon", - "outputRepo": "https://github.com/ember-cli/ember-addon-output", - "codemodsSource": "ember-addon-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/float-kit/package.json b/app/assets/javascripts/float-kit/package.json index 42fe019c29a..6952c4fcf64 100644 --- a/app/assets/javascripts/float-kit/package.json +++ b/app/assets/javascripts/float-kit/package.json @@ -14,6 +14,7 @@ "start": "ember serve" }, "dependencies": { + "@babel/core": "^7.23.7", "ember-auto-import": "^2.7.2", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", @@ -22,14 +23,13 @@ "devDependencies": { "@babel/core": "^7.23.9", "@ember/optional-features": "^2.1.0", - "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.3", "@glimmer/component": "^1.1.2", "@types/jquery": "^3.5.29", "@types/qunit": "^2.19.10", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -42,7 +42,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/pretty-text/config/ember-cli-update.json b/app/assets/javascripts/pretty-text/config/ember-cli-update.json deleted file mode 100644 index 994928cd9c9..00000000000 --- a/app/assets/javascripts/pretty-text/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "addon", - "outputRepo": "https://github.com/ember-cli/ember-addon-output", - "codemodsSource": "ember-addon-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json index e27d0d7c69f..4cdc8f6e167 100644 --- a/app/assets/javascripts/pretty-text/package.json +++ b/app/assets/javascripts/pretty-text/package.json @@ -14,6 +14,7 @@ "start": "ember serve" }, "dependencies": { + "@babel/core": "^7.23.7", "discourse-common": "1.0.0", "ember-auto-import": "^2.7.2", "ember-cli-babel": "^8.2.0", @@ -22,14 +23,13 @@ "devDependencies": { "@babel/core": "^7.23.9", "@ember/optional-features": "^2.1.0", - "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.3", "@glimmer/component": "^1.1.2", "@types/jquery": "^3.5.29", "@types/qunit": "^2.19.10", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -42,7 +42,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/select-kit/config/ember-cli-update.json b/app/assets/javascripts/select-kit/config/ember-cli-update.json deleted file mode 100644 index 994928cd9c9..00000000000 --- a/app/assets/javascripts/select-kit/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "addon", - "outputRepo": "https://github.com/ember-cli/ember-addon-output", - "codemodsSource": "ember-addon-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json index 98414497c02..d9274ad3275 100644 --- a/app/assets/javascripts/select-kit/package.json +++ b/app/assets/javascripts/select-kit/package.json @@ -14,6 +14,7 @@ "start": "ember serve" }, "dependencies": { + "@babel/core": "^7.23.7", "ember-auto-import": "^2.7.2", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", @@ -22,14 +23,13 @@ "devDependencies": { "@babel/core": "^7.23.9", "@ember/optional-features": "^2.1.0", - "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.3", "@glimmer/component": "^1.1.2", "@types/jquery": "^3.5.29", "@types/qunit": "^2.19.10", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -42,7 +42,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/theme-transpiler/package.json b/app/assets/javascripts/theme-transpiler/package.json index 96cd10c4178..aae6f38504c 100644 --- a/app/assets/javascripts/theme-transpiler/package.json +++ b/app/assets/javascripts/theme-transpiler/package.json @@ -22,7 +22,7 @@ "terser": "^5.28.1" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } diff --git a/app/assets/javascripts/truth-helpers/config/ember-cli-update.json b/app/assets/javascripts/truth-helpers/config/ember-cli-update.json deleted file mode 100644 index 994928cd9c9..00000000000 --- a/app/assets/javascripts/truth-helpers/config/ember-cli-update.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "schemaVersion": "1.0.0", - "packages": [ - { - "name": "ember-cli", - "version": "5.0.0", - "blueprints": [ - { - "name": "addon", - "outputRepo": "https://github.com/ember-cli/ember-addon-output", - "codemodsSource": "ember-addon-codemods-manifest@1", - "isBaseBlueprint": true, - "options": [ - "--no-welcome" - ] - } - ] - } - ] -} diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json index d416e74f321..96f2b3a45ba 100644 --- a/app/assets/javascripts/truth-helpers/package.json +++ b/app/assets/javascripts/truth-helpers/package.json @@ -14,6 +14,7 @@ "start": "ember serve" }, "dependencies": { + "@babel/core": "^7.23.7", "ember-auto-import": "^2.7.2", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0" @@ -21,11 +22,10 @@ "devDependencies": { "@babel/core": "^7.23.9", "@ember/optional-features": "^2.1.0", - "@ember/string": "^3.1.1", "@embroider/test-setup": "^3.0.3", "@glimmer/component": "^1.1.2", "broccoli-asset-rev": "^3.0.0", - "ember-cli": "~5.0.0", + "ember-cli": "~5.6.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -38,7 +38,7 @@ "webpack": "^5.90.3" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/package.json b/package.json index ddccd391edd..ef4dcec8fca 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "**/unset-value": "2.0.1" }, "engines": { - "node": "16.* || >= 18", + "node": ">= 18", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } diff --git a/patches/@ember+test-helpers+2.9.4.patch b/patches/@ember+test-helpers+2.9.4.patch deleted file mode 100644 index 36d50b9d4fb..00000000000 --- a/patches/@ember+test-helpers+2.9.4.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/node_modules/@ember/test-helpers/addon-test-support/@ember/test-helpers/setup-rendering-context.js b/node_modules/@ember/test-helpers/addon-test-support/@ember/test-helpers/setup-rendering-context.js -index 4079777..b3a3cc2 100644 ---- a/node_modules/@ember/test-helpers/addon-test-support/@ember/test-helpers/setup-rendering-context.js -+++ b/node_modules/@ember/test-helpers/addon-test-support/@ember/test-helpers/setup-rendering-context.js -@@ -54,7 +54,7 @@ let templateId = 0; - Renders the provided template and appends it to the DOM. - - @public -- @param {Template|Component} templateOrComponent the component (or template) to render -+ @param {Template|Component} templateFactoryOrComponent the component (or template) to render - @param {RenderOptions} options options hash containing engine owner ({ owner: engineOwner }) - @returns {Promise} resolves when settled - -@@ -64,9 +64,9 @@ let templateId = 0; - - await render(hbs`
`); - */ --export function render(templateOrComponent, options) { -+export function render(templateFactoryOrComponent, options) { - let context = getContext(); -- if (!templateOrComponent) { -+ if (!templateFactoryOrComponent) { - throw new Error('you must pass a template to `render()`'); - } - return Promise.resolve().then(() => runHooks('render', 'start')).then(() => { -@@ -88,16 +88,12 @@ export function render(templateOrComponent, options) { - if (macroCondition(dependencySatisfies('ember-source', '<3.24.0'))) { - // Pre 3.24, we just don't support rendering components at all, so we error - // if we find anything that isn't a template. -- const isTemplate = '__id' in templateOrComponent && '__meta' in templateOrComponent || 'id' in templateOrComponent && 'meta' in templateOrComponent; -+ const isTemplate = '__id' in templateFactoryOrComponent && '__meta' in templateFactoryOrComponent || 'id' in templateFactoryOrComponent && 'meta' in templateFactoryOrComponent; - if (!isTemplate) { - throw new Error(`Using \`render\` with something other than a pre-compiled template is not supported until Ember 3.24 (you are on ${Ember.VERSION}).`); - } -- templateId += 1; -- let templateFullName = `template:-undertest-${templateId}`; -- ownerToRenderFrom.register(templateFullName, templateOrComponent); -- templateOrComponent = lookupTemplate(ownerToRenderFrom, templateFullName); - } else { -- if (isComponent(templateOrComponent, owner)) { -+ if (isComponent(templateFactoryOrComponent, owner)) { - // We use this to track when `render` is used with a component so that we can throw an - // assertion if `this.{set,setProperty} is used in the same test - ComponentRenderMap.set(context, true); -@@ -105,18 +101,18 @@ export function render(templateOrComponent, options) { - if (setCalls !== undefined) { - assert(`You cannot call \`this.set\` or \`this.setProperties\` when passing a component to \`render\`, but they were called for the following properties:\n${setCalls.map(key => ` - ${key}`).join('\n')}`); - } -- let ProvidedComponent = ensureSafeComponent(templateOrComponent, context); - context = { -- ProvidedComponent -+ ProvidedComponent: templateFactoryOrComponent, - }; -- templateOrComponent = INVOKE_PROVIDED_COMPONENT; -- } else { -- templateId += 1; -- let templateFullName = `template:-undertest-${templateId}`; -- ownerToRenderFrom.register(templateFullName, templateOrComponent); -- templateOrComponent = lookupTemplate(ownerToRenderFrom, templateFullName); -+ templateFactoryOrComponent = INVOKE_PROVIDED_COMPONENT; - } - } -+ -+ templateId += 1; -+ let templateFullName = `template:-undertest-${templateId}`; -+ ownerToRenderFrom.register(templateFullName, templateFactoryOrComponent); -+ let template = lookupTemplate(ownerToRenderFrom, templateFullName); -+ - let outletState = { - render: { - owner, -@@ -138,7 +134,7 @@ export function render(templateOrComponent, options) { - name: 'index', - controller: context, - ViewClass: undefined, -- template: templateOrComponent, -+ template, - outlets: {} - }, - outlets: {} diff --git a/patches/ember-cli+5.0.0.patch b/patches/ember-cli+5.0.0.patch deleted file mode 100644 index ac0250a6bad..00000000000 --- a/patches/ember-cli+5.0.0.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/node_modules/ember-cli/lib/models/project.js b/node_modules/ember-cli/lib/models/project.js -index 7b3c7c9..e0c5fb9 100644 ---- a/node_modules/ember-cli/lib/models/project.js -+++ b/node_modules/ember-cli/lib/models/project.js -@@ -716,6 +716,11 @@ class Project { - logger.info('getProjectRoot %s -> %s', process.cwd(), directory); - return directory; - } -+ -+ // Allows us to use recent ember-cli with ember-source 3.28.12 -+ bowerDependencies(){ -+ return []; -+ } - } - - class NotFoundError extends Error { diff --git a/yarn.lock b/yarn.lock index 6c8455c8b34..04282a8ea9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,7 +28,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== -"@babel/core@^7.12.0", "@babel/core@^7.14.5", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.18.6", "@babel/core@^7.20.12", "@babel/core@^7.21.4", "@babel/core@^7.23.6", "@babel/core@^7.23.9", "@babel/core@^7.3.4": +"@babel/core@^7.12.0", "@babel/core@^7.14.5", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.18.6", "@babel/core@^7.20.12", "@babel/core@^7.23.6", "@babel/core@^7.23.7", "@babel/core@^7.23.9", "@babel/core@^7.3.4": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== @@ -58,7 +58,7 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.1" -"@babel/generator@^7.23.6": +"@babel/generator@7.23.6", "@babel/generator@^7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== @@ -93,22 +93,7 @@ lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.10", "@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.22.5", "@babel/helper-create-class-features-plugin@^7.5.5": - version "7.23.7" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz#b2e6826e0e20d337143655198b79d58fdc9bd43d" - integrity sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-member-expression-to-functions" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.20" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - semver "^6.3.1" - -"@babel/helper-create-class-features-plugin@^7.23.9": +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.10", "@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.22.5", "@babel/helper-create-class-features-plugin@^7.23.9", "@babel/helper-create-class-features-plugin@^7.5.5": version "7.23.10" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz#25d55fafbaea31fd0e723820bb6cc3df72edf7ea" integrity sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw== @@ -239,7 +224,7 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.23.4": +"@babel/helper-string-parser@^7.22.5", "@babel/helper-string-parser@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== @@ -1046,7 +1031,7 @@ "@babel/parser" "^7.23.9" "@babel/types" "^7.23.9" -"@babel/traverse@^7.14.5", "@babel/traverse@^7.23.9", "@babel/traverse@^7.4.5": +"@babel/traverse@7.23.9", "@babel/traverse@^7.14.5", "@babel/traverse@^7.23.9", "@babel/traverse@^7.4.5": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950" integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg== @@ -1062,6 +1047,15 @@ debug "^4.3.1" globals "^11.1.0" +"@babel/types@7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" + integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.4", "@babel/types@^7.7.2": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002" @@ -1211,21 +1205,22 @@ dependencies: ember-cli-babel "^7.26.6" -"@ember/test-helpers@^2.9.4": - version "2.9.4" - resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.4.tgz#985022e9ba05cfc918bcf08b77cbb355f85b723e" - integrity sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA== +"@ember/test-helpers@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-3.3.0.tgz#abf83ff2b111493d25266cb90327134498cb9090" + integrity sha512-HEI28wtjnQuEj9+DstHUEEKPtqPAEVN9AAVr4EifVCd3DyEDy0m6hFT4qbap1WxAIktLja2QXGJg50lVWzZc5g== dependencies: - "@ember/test-waiters" "^3.0.0" + "@ember/test-waiters" "^3.0.2" "@embroider/macros" "^1.10.0" - "@embroider/util" "^1.9.0" + "@simple-dom/interface" "^1.4.0" broccoli-debug "^0.6.5" broccoli-funnel "^3.0.8" + dom-element-descriptors "^0.5.0" + ember-auto-import "^2.6.0" ember-cli-babel "^7.26.11" - ember-cli-htmlbars "^6.1.1" - ember-destroyable-polyfill "^2.0.3" + ember-cli-htmlbars "^6.2.0" -"@ember/test-waiters@^3.0.0", "@ember/test-waiters@^3.0.2": +"@ember/test-waiters@^3.0.2": version "3.1.0" resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.1.0.tgz#61399919cbf793978da0b8bfdfdb7bca0cb80e9e" integrity sha512-bb9h95ktG2wKY9+ja1sdsFBdOms2lB19VWs8wmNpzgHv1NCetonBoV5jHBV4DHt0uS1tg9z66cZqhUVlYs96KQ== @@ -1334,7 +1329,7 @@ resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-3.0.3.tgz#73eee9a54fa893d4f48b7ffe05c40c26cb491dae" integrity sha512-sI2K3/III1WGGxS+aIf8uW5tgcNiE7APNhThn2ZTwqU47fK20Uz8TJZhst0GfNZFsCsmuQMRUikRJvQU8naSWA== -"@embroider/macros@1.13.5", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.11.0", "@embroider/macros@^1.13.1", "@embroider/macros@^1.8.3": +"@embroider/macros@1.13.5", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.1", "@embroider/macros@^1.8.3": version "1.13.5" resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.5.tgz#fe2efa3c87cf52889ac64585626b10efbe10ab29" integrity sha512-OzYyM+bOcyV9IWma1qSraIyuBmGv6U8sCIHumHCe0oDDypvIvVA3csuDjoS3BGhUWV56VpzBSwVEDdIHXmqQ2w== @@ -1379,15 +1374,6 @@ lodash "^4.17.21" resolve "^1.20.0" -"@embroider/util@^1.9.0": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.11.1.tgz#622390932542e6b7f8d5d28e956891306e664eb3" - integrity sha512-IqzlEQahM2cfLvo4PULA2WyvROqr9jRmeSv0GGZzpitWCh6l4FDwweOLSArdlKSXdQxHkKhwBMCi//7DhKjRlg== - dependencies: - "@embroider/macros" "^1.11.0" - broccoli-funnel "^3.0.5" - ember-cli-babel "^7.26.11" - "@embroider/webpack@^3.2.2": version "3.2.2" resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-3.2.2.tgz#f09d45454f05d2801581076e42e65e7a3a2f584b" @@ -2046,6 +2032,26 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== +"@pnpm/constants@7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@pnpm/constants/-/constants-7.1.1.tgz#3db261425fe15425aa213a2b003f4f60c9378b43" + integrity sha512-31pZqMtjwV+Vaq7MaPrT1EoDFSYwye3dp6BiHIGRJmVThCQwySRKM7hCvqqI94epNkqFAAYoWrNynWoRYosGdw== + +"@pnpm/error@5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@pnpm/error/-/error-5.0.3.tgz#4dbb9f4acb0b30c373b3ca5024cdf495f03f4380" + integrity sha512-ONJU5cUeoeJSy50qOYsMZQHTA/9QKmGgh1ATfEpCLgtbdwqUiwD9MxHNeXUYYI/pocBCz6r1ZCFqiQvO+8SUKA== + dependencies: + "@pnpm/constants" "7.1.1" + +"@pnpm/find-workspace-dir@^6.0.2": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@pnpm/find-workspace-dir/-/find-workspace-dir-6.0.3.tgz#a09262f3bb83106ef055ad0c1088feeb56fb7ce4" + integrity sha512-0iJnNkS4T8lJE4ldOhRERgER1o59iHA1nMlvpUI5lxNC9SUruH6peRUOlP4/rNcDg+UQ9u0rt5loYOnWKCojtw== + dependencies: + "@pnpm/error" "5.0.3" + find-up "^5.0.0" + "@popperjs/core@^2.11.8": version "2.11.8" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" @@ -4032,7 +4038,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.2: symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.7, broccoli-funnel@^3.0.8: +broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.7, broccoli-funnel@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b" integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ== @@ -5114,7 +5120,7 @@ date-fns@^2.30.0: dependencies: "@babel/runtime" "^7.21.0" -debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -5291,6 +5297,11 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dom-element-descriptors@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/dom-element-descriptors/-/dom-element-descriptors-0.5.0.tgz#78c37d2a2d3566b1e2b83804ba04a21536a99ab8" + integrity sha512-CVzntLid1oFVHTKdTp/Qu7Kz+wSm8uO30TSQyAJ6n4Dz09yTzVQn3S1oRhVhUubxdMuKs1DjDqt88pubHagbPw== + dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" @@ -5356,7 +5367,7 @@ electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.601: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.610.tgz#e17b22203f4aa2e1ed77759c720546d95a51186f" integrity sha512-mqi2oL1mfeHYtOdCxbPQYV/PL7YrQlxbvFEZ0Ee8GbDdShimqt2/S6z2RWqysuvlwdOrQdqvE0KZrBTipAeJzg== -ember-auto-import@^2.5.0, ember-auto-import@^2.6.3, ember-auto-import@^2.7.0, ember-auto-import@^2.7.2: +ember-auto-import@^2.5.0, ember-auto-import@^2.6.0, ember-auto-import@^2.6.3, ember-auto-import@^2.7.0, ember-auto-import@^2.7.2: version "2.7.2" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.7.2.tgz#5e74b6a8839fab25e23af6cff6f74b1b424d8f25" integrity sha512-pkWIljmJClYL17YBk8FjO7NrZPQoY9v0b+FooJvaHf/xlDQIBYVP7OaDHbNuNbpj7+wAwSDAnnwxjCoLsmm4cw== @@ -5545,7 +5556,7 @@ ember-cli-htmlbars@^5.7.1: strip-bom "^4.0.0" walk-sync "^2.2.0" -ember-cli-htmlbars@^6.1.1, ember-cli-htmlbars@^6.2.0, ember-cli-htmlbars@^6.3.0: +ember-cli-htmlbars@^6.2.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== @@ -5738,12 +5749,12 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2: semver "^7.3.4" silent-error "^1.1.1" -ember-cli@~5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-5.0.0.tgz#9a42aea5699c9c34b262dfca614c4f15fb8ef0f5" - integrity sha512-poklpwf+GrDhkFRTYvYmpkSA5R0pNy4Vahxjvji5jUl82tot+J95ZY1QH1yx//QzQ7zb1XlcOnceieyd2j1Rbw== +ember-cli@~5.6.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-5.6.0.tgz#0f54c8b0783de515df1885ac133aedf974c3deb8" + integrity sha512-9ARiTnNgQDX6RPC37PjlEc58/e8p7pgmNu6GcmARq4iBLeTWWW+2mgw3HKoFd91ob1EdRiglskLYzgboRxtBBw== dependencies: - "@babel/core" "^7.21.4" + "@pnpm/find-workspace-dir" "^6.0.2" broccoli "^3.5.2" broccoli-builder "^0.18.14" broccoli-concat "^4.2.5" @@ -5760,7 +5771,7 @@ ember-cli@~5.0.0: calculate-cache-key-for-tree "^2.0.0" capture-exit "^2.0.0" chalk "^4.1.2" - ci-info "^3.7.0" + ci-info "^3.8.0" clean-base-url "^1.0.0" compression "^1.7.4" configstore "^5.0.1" @@ -5773,11 +5784,12 @@ ember-cli@~5.0.0: ember-cli-normalize-entity-name "^1.0.0" ember-cli-preprocess-registry "^5.0.1" ember-cli-string-utils "^1.1.0" + ember-template-tag "^2.3.8" ensure-posix-path "^1.1.1" execa "^5.1.1" exit "^0.1.2" express "^4.18.1" - filesize "^10.0.5" + filesize "^10.0.8" find-up "^5.0.0" find-yarn-workspace-root "^2.0.0" fixturify-project "^2.1.1" @@ -5796,8 +5808,6 @@ ember-cli@~5.0.0: is-git-url "^1.0.0" is-language-code "^3.1.0" isbinaryfile "^5.0.0" - js-yaml "^4.1.0" - leek "0.0.24" lodash.template "^4.5.0" markdown-it "^13.0.1" markdown-it-terminal "^0.4.0" @@ -5814,7 +5824,7 @@ ember-cli@~5.0.0: remove-types "^1.0.0" resolve "^1.22.1" resolve-package-path "^4.0.3" - safe-stable-stringify "^2.4.2" + safe-stable-stringify "^2.4.3" sane "^5.0.1" semver "^7.3.5" silent-error "^1.1.1" @@ -5824,7 +5834,6 @@ ember-cli@~5.0.0: testem "^3.10.1" tiny-lr "^2.0.0" tree-sync "^2.1.0" - uuid "^9.0.0" walk-sync "^3.0.0" watch-detector "^1.0.2" workerpool "^6.4.0" @@ -5850,15 +5859,6 @@ ember-decorators@^6.1.1: "@ember-decorators/object" "^6.1.1" ember-cli-babel "^7.7.3" -ember-destroyable-polyfill@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1" - integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw== - dependencies: - ember-cli-babel "^7.22.1" - ember-cli-version-checker "^5.1.1" - ember-compatibility-helpers "^1.2.1" - ember-disable-prototype-extensions@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e" @@ -6118,6 +6118,16 @@ ember-template-recast@^6.1.4: tmp "^0.2.1" workerpool "^6.4.0" +ember-template-tag@^2.3.8: + version "2.3.16" + resolved "https://registry.yarnpkg.com/ember-template-tag/-/ember-template-tag-2.3.16.tgz#56e871abf82005208b5d793c67b8d05c6659b198" + integrity sha512-G6bIBcT4VnLlBUogkXxEXIzVvdYXhmLe+Io2yJzRYYZeHrdxKa6u2ZHXF4qII298grgqnqGo6tNqqgtD4AAS5g== + dependencies: + "@babel/generator" "7.23.6" + "@babel/traverse" "7.23.9" + "@babel/types" "7.23.0" + "@glimmer/syntax" "^0.88.1" + ember-test-selectors@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-6.0.0.tgz#ba9bb19550d9dec6e4037d86d2b13c2cfd329341" @@ -6942,10 +6952,10 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -filesize@^10.0.5, filesize@^10.0.7: - version "10.0.9" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.0.9.tgz#7371841907fd6060eb583a38bac8494c2fd75f2a" - integrity sha512-BzSxJtyq7ZEBjQPEC6u7GNrK58xwaITCvHPaH7e5145eowrMwLfm5LMu/7PeHTTKxP4joIyNmxCbVJVXv7xPGQ== +filesize@^10.0.7, filesize@^10.0.8: + version "10.1.0" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.0.tgz#846f5cd8d16e073c5d6767651a8264f6149183cd" + integrity sha512-GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ== fill-range@^4.0.0: version "4.0.0" @@ -7938,15 +7948,7 @@ http-proxy-agent@^4.0.1: agent-base "6" debug "4" -http-proxy-agent@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673" - integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ== - dependencies: - agent-base "^7.1.0" - debug "^4.3.4" - -http-proxy-agent@^7.0.1: +http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.1: version "7.0.2" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig== @@ -8902,15 +8904,6 @@ lcid@^3.0.0: dependencies: invert-kv "^3.0.0" -leek@0.0.24: - version "0.0.24" - resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda" - integrity sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ== - dependencies: - debug "^2.1.0" - lodash.assign "^3.2.0" - rsvp "^3.0.21" - lefthook-darwin-arm64@1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.6.2.tgz#1d3540abe6c127c20ec1b0d5beaa8d7c589075e5" @@ -9100,19 +9093,6 @@ locate-path@^7.1.0: dependencies: p-locate "^6.0.0" -lodash._baseassign@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" - integrity sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ== - dependencies: - lodash._basecopy "^3.0.0" - lodash.keys "^3.0.0" - -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - integrity sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ== - lodash._baseflatten@^3.0.0: version "3.1.4" resolved "https://registry.yarnpkg.com/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz#0770ff80131af6e34f3b511796a7ba5214e65ff7" @@ -9121,20 +9101,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._bindcallback@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ== - -lodash._createassigner@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" - integrity sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw== - dependencies: - lodash._bindcallback "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash.restparam "^3.0.0" - lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" @@ -9150,15 +9116,6 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== -lodash.assign@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa" - integrity sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA== - dependencies: - lodash._baseassign "^3.0.0" - lodash._createassigner "^3.0.0" - lodash.keys "^3.0.0" - lodash.assignin@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" @@ -9234,15 +9191,6 @@ lodash.kebabcase@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - integrity sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ== - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.merge@^4.6.0, lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -9253,11 +9201,6 @@ lodash.omit@^4.1.0: resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" integrity sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg== -lodash.restparam@^3.0.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw== - lodash.template@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" @@ -11189,7 +11132,7 @@ router_js@^8.0.3: dependencies: "@glimmer/env" "^0.1.7" -rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0: +rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.6, rsvp@^3.1.0: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== @@ -11276,7 +11219,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -safe-stable-stringify@^2.3.1, safe-stable-stringify@^2.4.2: +safe-stable-stringify@^2.3.1, safe-stable-stringify@^2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== @@ -11360,7 +11303,7 @@ schema-utils@^4.0.0: ajv-formats "^2.1.1" ajv-keywords "^5.1.0" -semver@7.6.0: +semver@7.6.0, semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3: version "7.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== @@ -11377,13 +11320,6 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -11814,7 +11750,7 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -streamx@^2.13.0: +streamx@^2.13.0, streamx@^2.15.0: version "2.16.1" resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614" integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ== @@ -11824,14 +11760,6 @@ streamx@^2.13.0: optionalDependencies: bare-events "^2.2.0" -streamx@^2.15.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.1.tgz#396ad286d8bc3eeef8f5cea3f029e81237c024c6" - integrity sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA== - dependencies: - fast-fifo "^1.1.0" - queue-tick "^1.0.1" - string-template@~0.2.0, string-template@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" @@ -12694,11 +12622,6 @@ uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" - integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== - v8-compile-cache@^2.3.0: version "2.4.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"