@umijs/bundler-utoopack 4.6.52 → 4.6.54

package/dist/config.d.ts

@@ -6,6 +6,7 @@ export declare function getProdUtooPackConfig(opts: IOpts): Promise<BundleOption
 export declare function getSSRUtooPackConfig(opts: IOpts & {
     serverBuildPath: string;
     useHash?: boolean;
+    isDev?: boolean;
 }): Promise<BundleOptions>;
 export declare type IDevOpts = {
     afterMiddlewares?: any[];

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,16 +435,16 @@ 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
     )
   };
   return utooBundlerOpts;
 }
 async function getSSRUtooPackConfig(opts) {
-  var _a;
   const utooBundlerOpts = await getProdUtooPackConfig({
     ...opts,
     clean: false,
@@ -357,49 +454,6 @@ async function getSSRUtooPackConfig(opts) {
   const entryName = (entry == null ? void 0 : entry[0]) || "umi.server";
   const entryPath = entry == null ? void 0 : entry[1];
   const filename = opts.useHash ? "[name].[contenthash:8].js" : (0, import_path.basename)(opts.serverBuildPath);
-  const ssrAssetsLoader = {
-    loader: require.resolve("./ssrAssetsLoader"),
-    options: {
-      cwd: opts.cwd
-    }
-  };
-  const ssrStylesLoader = {
-    loader: require.resolve("./ssrStylesLoader"),
-    options: {
-      cwd: opts.cwd
-    }
-  };
-  const ssrAssetRules = [
-    "*.png",
-    "*.jpg",
-    "*.jpeg",
-    "*.gif",
-    "*.webp",
-    "*.avif",
-    "*.ico",
-    "*.woff",
-    "*.woff2",
-    "*.ttf",
-    "*.eot",
-    "*.mp3",
-    "*.mp4"
-  ].reduce((memo, key) => {
-    memo[key] = {
-      loaders: [ssrAssetsLoader],
-      as: "*.js"
-    };
-    return memo;
-  }, {});
-  const ssrStyleRules = ["*.css", "*.less", "*.sass", "*.scss"].reduce(
-    (memo, key) => {
-      memo[key] = {
-        loaders: [ssrStylesLoader],
-        as: "*.js"
-      };
-      return memo;
-    },
-    {}
-  );
   utooBundlerOpts.config = {
     ...utooBundlerOpts.config,
     entry: [
@@ -414,7 +468,8 @@ async function getSSRUtooPackConfig(opts) {
       path: (0, import_path.dirname)(opts.serverBuildPath),
       filename,
       chunkFilename: filename,
-      clean: false,
+      ...opts.isDev ? { assetModuleFilename: "[name].[contenthash:8]" } : {},
+      clean: true,
       copy: [],
       publicPath: "/"
     },
@@ -422,14 +477,6 @@ async function getSSRUtooPackConfig(opts) {
     sourceMaps: false,
     stats: true,
     nodePolyfill: false,
-    module: {
-      ...utooBundlerOpts.config.module,
-      rules: {
-        ...(_a = utooBundlerOpts.config.module) == null ? void 0 : _a.rules,
-        ...ssrAssetRules,
-        ...ssrStyleRules
-      }
-    },
     optimization: {
       ...utooBundlerOpts.config.optimization,
       minify: false
@@ -525,6 +572,7 @@ async function getDevUtooPackConfig(opts) {
           emotion
         },
         define,
+        stats: true,
         // Windows persistent cache restore is currently unstable in utoopack dev.
         persistentCaching: getDefaultPersistentCaching(),
         nodePolyfill: true,
@@ -535,9 +583,10 @@ async function getDevUtooPackConfig(opts) {
           react: {
             absoluteSourceFilename: true
           }
-        } : {},
-        ...getSvgModuleRules({ svgr, svgo, inlineLimit })
+        } : {}
       },
+      getExtraBabelModuleRules(opts),
+      getSvgModuleRules({ svgr, svgo, inlineLimit }),
       userUtoopackConfig
     ),
     watch: {

package/dist/index.d.ts

@@ -7,5 +7,6 @@ export declare function build(opts: IOpts): Promise<any>;
 export declare function buildSSR(opts: IOpts & {
     serverBuildPath: string;
     useHash?: boolean;
+    isDev?: boolean;
 }): Promise<any>;
 export declare function dev(opts: IDevOpts): Promise<any>;

package/dist/index.js

@@ -252,14 +252,16 @@ async function dev(opts) {
   const createStatsObject = () => {
     var _a;
     let stats;
+    const statsPath = import_path.default.join(
+      ((_a = utooPackConfig.config.output) == null ? void 0 : _a.path) || "dist",
+      "stats.json"
+    );
     try {
-      const statsPath = import_path.default.join(
-        ((_a = utooPackConfig.config.output) == null ? void 0 : _a.path) || "dist",
-        "stats.json"
-      );
       stats = JSON.parse(import_fs.default.readFileSync(statsPath, "utf-8"));
     } catch (e) {
-      throw new Error("File stats.json not found by utoopack dev");
+      throw new Error(
+        `File stats.json not found by utoopack dev at ${statsPath}: ${e.message}`
+      );
     }
     stats.hasErrors = () => false;
     stats.toJson = () => stats;

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.54",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.4.4",
+    "@utoo/pack": "1.4.6",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
@@ -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.54",
+    "@umijs/bundler-webpack": "4.6.54"
   },
   "devDependencies": {
     "father": "4.1.5"

package/dist/ssrAssetsLoader.d.ts

@@ -1 +0,0 @@
-export default function ssrAssetsLoader(this: any): string;

package/dist/ssrAssetsLoader.js

@@ -1,35 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/ssrAssetsLoader.ts
-var ssrAssetsLoader_exports = {};
-__export(ssrAssetsLoader_exports, {
-  default: () => ssrAssetsLoader
-});
-module.exports = __toCommonJS(ssrAssetsLoader_exports);
-var import_utils = require("@umijs/utils");
-function ensureLastSlash(path) {
-  return path.endsWith("/") ? path : path + "/";
-}
-function ssrAssetsLoader() {
-  var _a;
-  const options = ((_a = this.getOptions) == null ? void 0 : _a.call(this)) || {};
-  const cwd = (0, import_utils.winPath)(options.cwd || this.rootContext || process.cwd());
-  const filename = (0, import_utils.winPath)(this.resourcePath).replace(ensureLastSlash(cwd), "");
-  return `export default global.g_getAssets(${JSON.stringify(filename)});`;
-}

package/dist/ssrStylesLoader.d.ts

@@ -1,2 +0,0 @@
-/// <reference types="node" />
-export default function ssrStylesLoader(this: any, content: string | Buffer): string;

package/dist/ssrStylesLoader.js

@@ -1,54 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/ssrStylesLoader.ts
-var ssrStylesLoader_exports = {};
-__export(ssrStylesLoader_exports, {
-  default: () => ssrStylesLoader
-});
-module.exports = __toCommonJS(ssrStylesLoader_exports);
-var import_utils = require("@umijs/utils");
-function ensureLastSlash(path) {
-  return path.endsWith("/") ? path : path + "/";
-}
-function hashString(str) {
-  let hash = Buffer.from(str).toString("base64").replace(/=/g, "");
-  hash = hash.substring(hash.length - 5);
-  return hash;
-}
-function getClassNames(code) {
-  const classNames = /* @__PURE__ */ new Set();
-  const regexp = /\.([_a-zA-Z][\w-]*)/g;
-  let match;
-  while (match = regexp.exec(code)) {
-    classNames.add(match[1]);
-  }
-  return Array.from(classNames);
-}
-function ssrStylesLoader(content) {
-  var _a;
-  const options = ((_a = this.getOptions) == null ? void 0 : _a.call(this)) || {};
-  const cwd = (0, import_utils.winPath)(options.cwd || this.rootContext || process.cwd());
-  const filename = (0, import_utils.winPath)(this.resourcePath).replace(ensureLastSlash(cwd), "");
-  const code = Buffer.isBuffer(content) ? content.toString() : content;
-  const cssModuleObject = getClassNames(code).sort().reduce((memo, key) => {
-    memo[key] = `${key}___${hashString(`${filename}@${key}`)}`;
-    return memo;
-  }, {});
-  return `export default ${JSON.stringify(cssModuleObject)};`;
-}