@umijs/bundler-utoopack 4.6.52 → 4.6.53

package/dist/config.js

@@ -98,6 +98,103 @@ function getModularizeImports(extraBabelPlugins) {
     {}
   );
 }
+function getBabelPluginName(plugin) {
+  const name = Array.isArray(plugin) ? plugin[0] : plugin;
+  return typeof name === "string" ? name : "";
+}
+function isModularizeImportPlugin(plugin) {
+  return /^import$|babel-plugin-import/.test(getBabelPluginName(plugin));
+}
+function isEmotionBabelPlugin(plugin) {
+  const name = getBabelPluginName(plugin);
+  return name === "@emotion" || name.endsWith("@emotion/babel-plugin");
+}
+function getExtraBabelPlugins(opts) {
+  return [
+    ...opts.beforeBabelPlugins || [],
+    ...opts.extraBabelPlugins || [],
+    ...opts.config.extraBabelPlugins || []
+  ].filter(Boolean).filter(isSerializableBabelItem);
+}
+function getExtraBabelPresets(opts) {
+  return [
+    ...opts.beforeBabelPresets || [],
+    ...opts.extraBabelPresets || [],
+    ...opts.config.extraBabelPresets || []
+  ].filter(Boolean).filter(isSerializableBabelItem);
+}
+function dropUndefinedValues(value) {
+  if (Array.isArray(value)) {
+    return value.map(dropUndefinedValues);
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).filter(([, item]) => item !== void 0).map(([key, item]) => [key, dropUndefinedValues(item)])
+    );
+  }
+  return value;
+}
+function isSerializableBabelItem(item) {
+  const normalized = dropUndefinedValues(item);
+  try {
+    return import_utils.lodash.isEqual(normalized, JSON.parse(JSON.stringify(normalized)));
+  } catch (e) {
+    return false;
+  }
+}
+function getExtraBabelModuleRules(opts) {
+  var _a;
+  if (((_a = opts.config.utoopack) == null ? void 0 : _a.babelLoader) !== true) {
+    return {};
+  }
+  const plugins = getExtraBabelPlugins(opts).filter((plugin) => {
+    return !isModularizeImportPlugin(plugin) && !isEmotionBabelPlugin(plugin);
+  });
+  const extraPresets = getExtraBabelPresets(opts);
+  if (!plugins.length && !extraPresets.length) {
+    return {};
+  }
+  const presets = [opts.babelPreset, ...extraPresets].filter(Boolean);
+  const rule = {
+    condition: {
+      all: [
+        { not: "foreign" },
+        {
+          not: {
+            path: /[\\/]src[\\/]\.umi(?:-[^\\/]*)?[\\/]/
+          }
+        }
+      ]
+    },
+    loaders: [
+      {
+        loader: require.resolve("@umijs/bundler-webpack/compiled/babel-loader"),
+        options: dropUndefinedValues({
+          sourceType: "unambiguous",
+          babelrc: false,
+          configFile: false,
+          cacheDirectory: false,
+          browserslistConfigFile: false,
+          targets: opts.config.targets,
+          customize: opts.config.babelLoaderCustomize,
+          presets,
+          plugins
+        })
+      }
+    ],
+    as: "*.js"
+  };
+  return {
+    module: {
+      rules: Object.fromEntries(
+        ["js", "mjs", "cjs", "jsx", "ts", "tsx"].map((ext) => [
+          `**/src/**/*.${ext}`,
+          rule
+        ])
+      )
+    }
+  };
+}
 function getNormalizedAlias(alias, rootDir) {
   const newAlias = { ...alias };
   for (const [key, value] of Object.entries(newAlias)) {
@@ -251,7 +348,7 @@ function mergeExtraPostcssPlugins(postcssConfig, extraPlugins = []) {
   }, postcssConfig);
 }
 function getUserUtoopackConfig(utoopackConfig = {}) {
-  return import_utils.lodash.omit(utoopackConfig, ["root"]);
+  return import_utils.lodash.omit(utoopackConfig, ["babelLoader", "root"]);
 }
 function getDefaultPersistentCaching() {
   return process.platform !== "win32";
@@ -338,9 +435,10 @@ async function getProdUtooPackConfig(opts) {
         define,
         nodePolyfill: true,
         mdx: !!mdx,
-        externals: getNormalizedExternals(userExternals),
-        ...getSvgModuleRules({ svgr, svgo, inlineLimit })
+        externals: getNormalizedExternals(userExternals)
       },
+      getExtraBabelModuleRules(opts),
+      getSvgModuleRules({ svgr, svgo, inlineLimit }),
       userUtoopackConfig
     )
   };
@@ -535,9 +633,10 @@ async function getDevUtooPackConfig(opts) {
           react: {
             absoluteSourceFilename: true
           }
-        } : {},
-        ...getSvgModuleRules({ svgr, svgo, inlineLimit })
+        } : {}
       },
+      getExtraBabelModuleRules(opts),
+      getSvgModuleRules({ svgr, svgo, inlineLimit }),
       userUtoopackConfig
     ),
     watch: {

package/dist/types.d.ts

@@ -1,6 +1,7 @@
 import type { IOpts as IConfigOpts } from '@umijs/bundler-webpack';
 import type { ConfigComplete } from '@utoo/pack';
 export declare type IUtoopackUserConfig = ConfigComplete & {
+    babelLoader?: boolean;
     root?: string;
 };
 export declare type IOpts = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.52",
+  "version": "4.6.53",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,8 +20,8 @@
     "resolve-url-loader": "5.0.0",
     "sass": "1.54.0",
     "sass-loader": "13.2.0",
-    "@umijs/bundler-utils": "4.6.52",
-    "@umijs/bundler-webpack": "4.6.52"
+    "@umijs/bundler-utils": "4.6.53",
+    "@umijs/bundler-webpack": "4.6.53"
   },
   "devDependencies": {
     "father": "4.1.5"