@umijs/bundler-utoopack 4.6.53 → 4.6.55

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

@@ -445,7 +445,6 @@ async function getProdUtooPackConfig(opts) {
   return utooBundlerOpts;
 }
 async function getSSRUtooPackConfig(opts) {
-  var _a;
   const utooBundlerOpts = await getProdUtooPackConfig({
     ...opts,
     clean: false,
@@ -455,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: [
@@ -512,7 +468,7 @@ async function getSSRUtooPackConfig(opts) {
       path: (0, import_path.dirname)(opts.serverBuildPath),
       filename,
       chunkFilename: filename,
-      clean: false,
+      clean: true,
       copy: [],
       publicPath: "/"
     },
@@ -520,14 +476,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
@@ -623,6 +571,7 @@ async function getDevUtooPackConfig(opts) {
           emotion
         },
         define,
+        stats: true,
         // Windows persistent cache restore is currently unstable in utoopack dev.
         persistentCaching: getDefaultPersistentCaching(),
         nodePolyfill: true,

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/util.d.ts

@@ -1,3 +1,4 @@
+import type { WebpackConfig } from '@utoo/pack';
 declare type IDevBannerOpts = {
     duration?: number;
     host?: string;
@@ -13,6 +14,26 @@ declare type IBuildBannerOpts = {
     packVersion?: string;
 };
 export declare function getPackVersion(packVersion?: string): any;
+export declare function getCssOutputFilenames(opts: {
+    entry: Record<string, string>;
+    config: Record<string, any>;
+    webpackConfig: WebpackConfig;
+    useHash: boolean;
+}): {
+    cssChunkFilename: string;
+    cssFilename?: string | undefined;
+};
+export declare function getSSRCssSplitChunks(config: Record<string, any>): {
+    splitChunks?: undefined;
+} | {
+    splitChunks: {
+        css: {
+            minChunkSize: number;
+            maxChunkCountPerGroup: number;
+            maxMergeChunkSize: number;
+        };
+    };
+};
 export declare function getDevBanner({ protocol, host, port, ip, packVersion, duration, }: IDevBannerOpts): string;
 export declare function getBuildBanner({ packVersion, duration, outputPath, assetCount, }: IBuildBannerOpts): string;
 export {};

package/dist/util.js

@@ -20,8 +20,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var util_exports = {};
 __export(util_exports, {
   getBuildBanner: () => getBuildBanner,
+  getCssOutputFilenames: () => getCssOutputFilenames,
   getDevBanner: () => getDevBanner,
-  getPackVersion: () => getPackVersion
+  getPackVersion: () => getPackVersion,
+  getSSRCssSplitChunks: () => getSSRCssSplitChunks
 });
 module.exports = __toCommonJS(util_exports);
 var import_utils = require("@umijs/utils");
@@ -56,6 +58,67 @@ function formatDuration(duration) {
   }
   return `${Math.max(0, Math.round(duration))}ms`;
 }
+function normalizeUtoopackFilenameTemplate(filename) {
+  return filename.replace(
+    /\[(?:hash|chunkhash)(?::(\d+))?\]/g,
+    (_, length) => `[contenthash${length ? `:${length}` : ""}]`
+  );
+}
+function getMiniCssExtractPluginOptions(webpackConfig) {
+  var _a;
+  const plugin = (_a = webpackConfig.plugins) == null ? void 0 : _a.find((p) => {
+    var _a2;
+    return p && typeof p === "object" && ((_a2 = p.constructor) == null ? void 0 : _a2.name) === "MiniCssExtractPlugin";
+  });
+  return plugin == null ? void 0 : plugin.options;
+}
+function getEntryCssFilename(entry, filenameTemplate, replaceName) {
+  const normalizedFilenameTemplate = normalizeUtoopackFilenameTemplate(filenameTemplate);
+  if (!replaceName) {
+    return normalizedFilenameTemplate;
+  }
+  const entryNames = Object.keys(entry || {});
+  if (entryNames.length !== 1) {
+    return void 0;
+  }
+  return normalizedFilenameTemplate.replace(/\[name\]/g, entryNames[0]);
+}
+function getCssOutputFilenames(opts) {
+  const miniCssExtractOptions = getMiniCssExtractPluginOptions(
+    opts.webpackConfig
+  );
+  const hash = opts.useHash ? ".[contenthash:8]" : "";
+  const cssFilenameTemplate = typeof (miniCssExtractOptions == null ? void 0 : miniCssExtractOptions.filename) === "string" ? miniCssExtractOptions.filename : `[name]${hash}.css`;
+  let cssChunkFilenameTemplate = typeof (miniCssExtractOptions == null ? void 0 : miniCssExtractOptions.chunkFilename) === "string" ? miniCssExtractOptions.chunkFilename : void 0;
+  if (!cssChunkFilenameTemplate) {
+    cssChunkFilenameTemplate = opts.config.ssr ? `umi${hash}.css` : `[name]${hash}.chunk.css`;
+  }
+  const cssFilename = getEntryCssFilename(
+    opts.entry,
+    cssFilenameTemplate,
+    !!opts.config.ssr
+  );
+  return {
+    ...cssFilename ? { cssFilename } : {},
+    cssChunkFilename: normalizeUtoopackFilenameTemplate(
+      cssChunkFilenameTemplate
+    )
+  };
+}
+function getSSRCssSplitChunks(config) {
+  if (!config.ssr) {
+    return {};
+  }
+  return {
+    splitChunks: {
+      css: {
+        minChunkSize: 1e8,
+        maxChunkCountPerGroup: 1,
+        maxMergeChunkSize: 1e8
+      }
+    }
+  };
+}
 function getDevBanner({
   protocol,
   host,
@@ -125,6 +188,8 @@ function getBuildBanner({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getBuildBanner,
+  getCssOutputFilenames,
   getDevBanner,
-  getPackVersion
+  getPackVersion,
+  getSSRCssSplitChunks
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.53",
+  "version": "4.6.55",
   "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.7",
     "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.53",
-    "@umijs/bundler-webpack": "4.6.53"
+    "@umijs/bundler-utils": "4.6.55",
+    "@umijs/bundler-webpack": "4.6.55"
   },
   "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)};`;
-}