chore: update ember-cli-babel to 8.x (#8800)

* chore: update ember-cli-babel to 8.x * update more babel * remove ts override * Revert "remove ts override" This reverts commit 0e4a4ee. * fix ember-cli-babel
emberjs · Aug 27, 2023 · a95a7a3 · a95a7a3
1 parent aafb7c5
commit a95a7a3
Show file tree

Hide file tree

Showing 35 changed files with 1,674 additions and 1,697 deletions.
diff --git a/package.json b/package.json
@@ -31,11 +31,11 @@
     "test-external:ember-data-relationship-tracker": "node ./scripts/test-external-partner-project.js ember-data-relationship-tracker https://github.com/ef4/ember-data-relationship-tracker.git"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/eslint-parser": "^7.22.10",
     "@babel/plugin-proposal-decorators": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
-    "@babel/runtime": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@ember/edition-utils": "^1.2.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
@@ -112,8 +112,10 @@
       "@embroider/macros": "^1.12.2",
       "broccoli-funnel": "^3.0.8",
       "broccoli-merge-trees": "^4.2.0",
-      "ember-cli-babel": "^7.26.11",
-      "ember-cli-htmlbars": "^6.3.0"
+      "ember-cli-babel": "^8.0.0",
+      "ember-cli-htmlbars": "^6.3.0",
+      "ember-cli-typescript": "^5.2.1",
+      "ember-compatibility-helpers": "^1.2.6"
     },
     "peerDependencyRules": {
       "ignoreMissing": [
@@ -125,6 +127,10 @@
         "ember-source",
         "typescript"
       ]
+    },
+    "patchedDependencies": {
+      "ember-compatibility-helpers@1.2.6": "patches/ember-compatibility-helpers@1.2.6.patch",
+      "ember-cli-babel@8.0.0": "patches/ember-cli-babel@8.0.0.patch"
     }
   }
 }
diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
@@ -76,7 +76,7 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@ember/string": "^3.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",

diff --git a/packages/active-record/package.json b/packages/active-record/package.json
@@ -49,14 +49,14 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.2.1",

diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -51,15 +51,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@glimmer/component": "^1.1.2",
     "@rollup/plugin-babel": "^6.0.3",

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -29,7 +29,8 @@
     "@embroider/macros": "^1.13.1",
     "ember-auto-import": "^2.6.3",
     "webpack": "^5.88.2",
-    "ember-cli-babel": "^8.0.0"
+    "ember-cli-babel": "^8.0.0",
+    "@babel/core": "^7.22.11"
   },
   "engines": {
     "node": "16.* || >= 18.*"

diff --git a/packages/graph/package.json b/packages/graph/package.json
@@ -47,15 +47,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@glimmer/component": "^1.1.2",
     "@rollup/plugin-babel": "^6.0.3",

diff --git a/packages/json-api/package.json b/packages/json-api/package.json
@@ -52,15 +52,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@glimmer/component": "^1.1.2",
     "@rollup/plugin-babel": "^6.0.3",

diff --git a/packages/legacy-compat/package.json b/packages/legacy-compat/package.json
@@ -63,15 +63,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.2.1",

diff --git a/packages/model/package.json b/packages/model/package.json
@@ -71,15 +71,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@glimmer/component": "^1.1.2",
     "@rollup/plugin-babel": "^6.0.3",

diff --git a/packages/private-build-infra/package.json b/packages/private-build-infra/package.json
@@ -12,9 +12,9 @@
   "directories": {},
   "scripts": {},
   "dependencies": {
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-transform-block-scoping": "^7.22.10",
-    "@babel/runtime": "^7.22.10",
+    "@babel/runtime": "^7.22.11",
     "@ember/edition-utils": "^1.2.0",
     "@embroider/macros": "^1.13.1",
     "babel-import-util": "^1.4.1",

diff --git a/packages/request-utils/package.json b/packages/request-utils/package.json
@@ -45,14 +45,14 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.2.1",

diff --git a/packages/request/package.json b/packages/request/package.json
@@ -52,15 +52,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.2.1",

diff --git a/packages/rest/package.json b/packages/rest/package.json
@@ -49,14 +49,14 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.2.1",

diff --git a/packages/serializer/package.json b/packages/serializer/package.json
@@ -50,15 +50,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@ember-data/store": "workspace:5.4.0-alpha.3",
     "@embroider/addon-dev": "^4.1.0",
     "@glimmer/component": "^1.1.2",

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -52,15 +52,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@glimmer/component": "^1.1.2",
     "@rollup/plugin-babel": "^6.0.3",

diff --git a/packages/tracking/package.json b/packages/tracking/package.json
@@ -52,15 +52,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-proposal-decorators": "^7.22.10",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-private-methods": "^7.22.5",
     "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/plugin-transform-typescript": "^7.22.10",
+    "@babel/plugin-transform-typescript": "^7.22.11",
     "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime": "^7.22.10",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@embroider/addon-dev": "^4.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-node-resolve": "^15.2.1",

diff --git a/packages/unpublished-test-infra/package.json b/packages/unpublished-test-infra/package.json
@@ -41,8 +41,8 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.22.10",
-    "@babel/runtime": "^7.22.10",
+    "@babel/core": "^7.22.11",
+    "@babel/runtime": "^7.22.11",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^3.2.0",
     "@ember/string": "^3.1.1",

diff --git a/patches/ember-cli-babel@8.0.0.patch b/patches/ember-cli-babel@8.0.0.patch
@@ -0,0 +1,17 @@
+diff --git a/index.js b/index.js
+index 9460485df9f86b0897ead0abac6de52f485849c3..3993956f96ba2d4bf67819ec10ac72264bd2fa2b 100644
+--- a/index.js
++++ b/index.js
+@@ -181,6 +181,12 @@ module.exports = {
+       },
+     };
+
++    Object.keys(options.babel).forEach((key) => {
++      if (options.babel[key] === undefined) {
++        delete options.babel[key];
++      }
++    });
++
+     let output;
+
+     const customAddonConfig = config['ember-cli-babel'];
diff --git a/patches/ember-compatibility-helpers@1.2.6.patch b/patches/ember-compatibility-helpers@1.2.6.patch
@@ -0,0 +1,13 @@
+diff --git a/index.js b/index.js
+index c4c64a8c50480c3c453686492de8f87fa54ae139..ebf8a35dd29bba78484aca3e6423c61790a2cb2a 100644
+--- a/index.js
++++ b/index.js
+@@ -52,7 +52,7 @@ module.exports = {
+     const emberBabelChecker = this.parentChecker.for('ember-cli-babel', 'npm');
+
+     this._usingBabel6 = emberBabelChecker.satisfies('^6.0.0-beta.1');
+-    this._usingBabel7 = emberBabelChecker.satisfies('^7.0.0-beta.1');
++    this._usingBabel7 = emberBabelChecker.satisfies('^7.0.0-beta.1') || emberBabelChecker.satisfies('^8.0.0-beta.1');
+
+     if (!this._usingBabel6 && !this._usingBabel7) {
+       host.project.ui.writeWarnLine(