Make babel loader resolve and require config file

facebook · Jun 10, 2020 · aba33b4 · aba33b4
1 parent 614f0f9
commit aba33b4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts
@@ -43,15 +43,10 @@ export function createBaseConfig(
   const totalPages = routesPaths.length;
   const isProd = process.env.NODE_ENV === 'production';
 
-  let customBabelConfiguration;
-  try {
-    customBabelConfiguration = require(path.join(
-      siteDir,
-      BABEL_CONFIG_FILE_NAME,
-    ));
-  } catch {
-    customBabelConfiguration = undefined;
-  }
+  const customBabelConfigurationPath = path.join(
+    siteDir,
+    BABEL_CONFIG_FILE_NAME,
+  );
 
   return {
     mode: isProd ? 'production' : 'development',
@@ -168,7 +163,12 @@ export function createBaseConfig(
           exclude: excludeJS,
           use: [
             getCacheLoader(isServer),
-            getBabelLoader(isServer, customBabelConfiguration),
+            getBabelLoader(
+              isServer,
+              fs.existsSync(customBabelConfigurationPath)
+                ? customBabelConfigurationPath
+                : undefined,
+            ),
           ].filter(Boolean) as Loader[],
         },
         {

diff --git a/packages/docusaurus/src/webpack/utils.ts b/packages/docusaurus/src/webpack/utils.ts
@@ -87,18 +87,28 @@ export function getCacheLoader(
 
 export function getBabelLoader(
   isServer: boolean,
-  babelOptions?: TransformOptions,
+  babelOptions?: TransformOptions | string,
 ): Loader {
-  const babelOptionsWithDocusaurusPreset = babelOptions ?? {
-    presets: [require.resolve('../babel/preset')],
-  };
-  return {
-    loader: require.resolve('babel-loader'),
-    options: Object.assign(babelOptionsWithDocusaurusPreset, {
+  let options: TransformOptions;
+  if (typeof babelOptions === 'string') {
+    options = {
       babelrc: false,
-      configFile: false,
+      configFile: babelOptions,
       caller: {name: isServer ? 'server' : 'client'},
-    }),
+    };
+  } else {
+    options = Object.assign(
+      babelOptions ?? {presets: [require.resolve('../babel/preset')]},
+      {
+        babelrc: false,
+        configFile: false,
+        caller: {name: isServer ? 'server' : 'client'},
+      },
+    );
+  }
+  return {
+    loader: require.resolve('babel-loader'),
+    options,
   };
 }