Merge pull request #1578 from embroider-build/update-babel-loader

Update babel-loader to 9
embroider-build · Aug 16, 2023 · 2cbaf7c · 2cbaf7c
2 parents b49b5e2 + cb7e563
commit 2cbaf7c
Show file tree

Hide file tree

Showing 6 changed files with 1,058 additions and 311 deletions.
diff --git a/ember-primitives b/ember-primitives
diff --git a/packages/babel-loader-8/index.js → packages/babel-loader-9/index.js b/packages/babel-loader-8/index.js → packages/babel-loader-9/index.js
diff --git a/packages/babel-loader-8/package.json → packages/babel-loader-9/package.json b/packages/babel-loader-8/package.json → packages/babel-loader-9/package.json
@@ -1,16 +1,16 @@
 {
-  "name": "@embroider/babel-loader-8",
+  "name": "@embroider/babel-loader-9",
   "version": "3.0.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/embroider-build/embroider.git",
-    "directory": "packages/babel-loader-8"
+    "directory": "packages/babel-loader-9"
   },
   "license": "MIT",
   "main": "index.js",
   "dependencies": {
     "@babel/core": "^7.14.5",
-    "babel-loader": "8"
+    "babel-loader": "^9.0.0"
   },
   "devDependencies": {
     "@embroider/core": "workspace:^"

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -19,7 +19,7 @@
   "scripts": {},
   "dependencies": {
     "@babel/core": "^7.14.5",
-    "@embroider/babel-loader-8": "workspace:*",
+    "@embroider/babel-loader-9": "workspace:*",
     "@embroider/hbs-loader": "workspace:*",
     "@embroider/shared-internals": "workspace:*",
     "@types/supports-color": "^8.1.0",

diff --git a/packages/webpack/src/ember-webpack.ts b/packages/webpack/src/ember-webpack.ts
@@ -207,7 +207,7 @@ const Webpack: PackagerConstructor<Options> = class Webpack implements Packager
       this.extraBabelLoaderOptions
     );
 
-    let babelLoaderPrefix = `babel-loader-8?${JSON.stringify(babelLoaderOptions.options)}!`;
+    let babelLoaderPrefix = `babel-loader-9?${JSON.stringify(babelLoaderOptions.options)}!`;
 
     return {
       mode: variant.optimizeForProduction ? 'production' : 'development',
@@ -287,7 +287,7 @@ const Webpack: PackagerConstructor<Options> = class Webpack implements Packager
           // not overriding the default loader resolution rules in case the app also
           // wants to control those.
           'thread-loader': require.resolve('thread-loader'),
-          'babel-loader-8': require.resolve('@embroider/babel-loader-8'),
+          'babel-loader-9': require.resolve('@embroider/babel-loader-9'),
           'css-loader': require.resolve('css-loader'),
           'style-loader': require.resolve('style-loader'),
         },
@@ -673,7 +673,7 @@ function warmUp(extraOptions: object | false | undefined) {
 
   threadLoaderWarmup(Object.assign({}, threadLoaderOptions, extraOptions), [
     require.resolve('@embroider/hbs-loader'),
-    require.resolve('@embroider/babel-loader-8'),
+    require.resolve('@embroider/babel-loader-9'),
   ]);
 }
 
@@ -718,7 +718,7 @@ function makeBabelLoaderOptions(
     ...extraOptions,
   };
   return {
-    loader: 'babel-loader-8',
+    loader: 'babel-loader-9',
     options,
   };
 }