@umijs/preset-umi 4.0.21 → 4.0.22

package/dist/commands/build.js

@@ -31,6 +31,7 @@ var import_getAssetsMap = require("./dev/getAssetsMap");
 var import_getBabelOpts = require("./dev/getBabelOpts");
 var import_getMarkupArgs = require("./dev/getMarkupArgs");
 var import_printMemoryUsage = require("./dev/printMemoryUsage");
+var import_fileSizeReporter = require("../utils/fileSizeReporter");
 var bundlerWebpack = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-webpack");
 var bundlerVite = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-vite");
 var build_default = (api) => {
@@ -128,7 +129,16 @@ umi build --clean
       if (api.config.vite) {
         stats = await bundlerVite.build(opts);
       } else {
+        const absOutputPath = (0, import_path.resolve)(opts.cwd, opts.config.outputPath || bundlerWebpack.DEFAULT_OUTPUT_PATH);
+        const previousFileSizes = (0, import_fileSizeReporter.measureFileSizesBeforeBuild)(absOutputPath);
         stats = await bundlerWebpack.build(opts);
+        console.log();
+        import_utils.logger.info("File sizes after gzip:\n");
+        (0, import_fileSizeReporter.printFileSizesAfterBuild)({
+          webpackStats: stats,
+          previousSizeMap: previousFileSizes,
+          buildFolder: absOutputPath
+        });
       }
       if (!api.config.mpa) {
         const assetsMap = api.config.vite ? {} : (0, import_getAssetsMap.getAssetsMap)({

package/dist/commands/dev/depBuildWorker/depBuilder.js

@@ -110,10 +110,10 @@ var DepBuilderInWorker = class {
         await this.buildWithWebpack(newOpts);
       }
     } catch (e) {
-      onBuildComplete();
       import_worker_threads.parentPort.postMessage({
         error: e
       });
+      onBuildComplete();
       throw e;
     }
   }

package/dist/features/classPropertiesLoose/classPropertiesLoose.d.ts

@@ -0,0 +1,3 @@
+import { IApi } from '../../types';
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/classPropertiesLoose/classPropertiesLoose.js

@@ -0,0 +1,41 @@
+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/features/classPropertiesLoose/classPropertiesLoose.ts
+var classPropertiesLoose_exports = {};
+__export(classPropertiesLoose_exports, {
+  default: () => classPropertiesLoose_default
+});
+module.exports = __toCommonJS(classPropertiesLoose_exports);
+var classPropertiesLoose_default = (api) => {
+  api.describe({
+    key: "classPropertiesLoose",
+    config: {
+      schema(joi) {
+        return joi.object();
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.modifyBabelPresetOpts((memo) => {
+    memo.classPropertiesLoose = {};
+    return memo;
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/configPlugins/configPlugins.js

@@ -60,8 +60,10 @@ var configPlugins_default = (api) => {
         "react-dom/client": reactDOMPath
       } : {},
       "react-dom": reactDOMPath,
-      "react-router": (0, import_path.dirname)(require.resolve("react-router/package.json")),
-      "react-router-dom": (0, import_path.dirname)(require.resolve("react-router-dom/package.json"))
+      ...userConfig.mpa ? {} : {
+        "react-router": (0, import_path.dirname)(require.resolve("react-router/package.json")),
+        "react-router-dom": (0, import_path.dirname)(require.resolve("react-router-dom/package.json"))
+      }
     },
     externals: {
       ...isLT18 && ((_a = userConfig.externals) == null ? void 0 : _a["react-dom"]) ? {

package/dist/features/monorepo/redirect.js

@@ -104,10 +104,16 @@ async function collectAllProjects(opts) {
 }
 var MONOREPO_FILE = ["pnpm-workspace.yaml", "lerna.json"];
 function isMonorepo(opts) {
-  const pkgExist = (0, import_fs.existsSync)((0, import_path.join)(opts.root, "package.json"));
-  return pkgExist && MONOREPO_FILE.some((file) => {
+  const pkgPath = (0, import_path.join)(opts.root, "package.json");
+  let pkg = {};
+  try {
+    pkg = require(pkgPath);
+  } catch (e) {
+  }
+  const pkgExist = (0, import_fs.existsSync)(pkgPath);
+  return pkgExist && (MONOREPO_FILE.some((file) => {
     return (0, import_fs.existsSync)((0, import_path.join)(opts.root, file));
-  });
+  }) || (pkg == null ? void 0 : pkg.workspaces));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/mpa/mpa.js

@@ -38,7 +38,9 @@ var mpa_default = (api) => {
       schema(Joi) {
         return Joi.object({
           template: Joi.string(),
-          getConfigFromEntryFile: Joi.boolean()
+          layout: Joi.string(),
+          getConfigFromEntryFile: Joi.boolean(),
+          entry: Joi.object()
         });
       }
     },
@@ -59,8 +61,9 @@ var mpa_default = (api) => {
     }
     const isReact18 = api.appData.react.version.startsWith("18.");
     api.appData.mpa.entry.forEach((entry) => {
-      const layoutImport = entry.layout ? `import Layout from '${entry.layout}';` : "";
-      const layoutJSX = entry.layout ? `<Layout><App /></Layout>` : `<App />`;
+      const layout = entry.layout || api.config.mpa.layout;
+      const layoutImport = layout ? `import Layout from '${layout}';` : "";
+      const layoutJSX = layout ? `<Layout><App /></Layout>` : `<App />`;
       const rootElement = `document.getElementById('${entry.mountElementId}')`;
       const renderer = isReact18 ? `ReactDOM.createRoot(${rootElement}).render(${layoutJSX});` : `ReactDOM.render(${layoutJSX}, ${rootElement});`;
       const reactDOMSource = isReact18 ? "react-dom/client" : "react-dom";
@@ -70,7 +73,7 @@ var mpa_default = (api) => {
         content: `
 import React from 'react';
 import ReactDOM from '${reactDOMSource}';
-import App from '${entry.file}';
+import App from '${(0, import_utils.winPath)(entry.file)}';
 ${layoutImport}
 ${renderer}
         `.trimStart()
@@ -121,19 +124,23 @@ async function collectEntryWithTimeCount(root, opts) {
 }
 async function collectEntry(root, opts) {
   return await (0, import_fs.readdirSync)(root).reduce(async (memoP, dir) => {
+    var _a;
     const memo = await memoP;
     const absDir = (0, import_path.join)(root, dir);
     if ((0, import_fs.existsSync)(absDir) && (0, import_fs.statSync)(absDir).isDirectory()) {
       const indexFile = getIndexFile(absDir);
       if (indexFile) {
         const config = opts.getConfigFromEntryFile ? await getConfigFromEntryFile(indexFile) : await getConfig(indexFile);
+        const name = dir;
+        const globalConfig = (_a = opts.entry) == null ? void 0 : _a[dir];
         memo.push({
-          name: dir,
+          name,
           file: indexFile,
           tmpFilePath: `mpa/${dir}${(0, import_path.extname)(indexFile)}`,
           mountElementId: "root",
+          ...globalConfig,
           ...config,
-          title: config.title || dir
+          title: (globalConfig == null ? void 0 : globalConfig.title) || config.title || dir
         });
       }
     }

package/dist/features/vite/vite.js

@@ -36,6 +36,12 @@ var vite_default = (api) => {
     memo.alias["@fs"] = api.cwd;
     return memo;
   });
+  api.modifyDefaultConfig((memo) => {
+    if (api.env === "development") {
+      memo.polyfill = false;
+    }
+    return memo;
+  });
   api.register({
     key: "onBeforeCompiler",
     stage: Number.POSITIVE_INFINITY,

package/dist/index.js

@@ -56,6 +56,7 @@ var src_default = () => {
       require.resolve("./features/monorepo/redirect"),
       require.resolve("./features/clickToComponent/clickToComponent"),
       require.resolve("./features/legacy/legacy"),
+      require.resolve("./features/classPropertiesLoose/classPropertiesLoose"),
       require.resolve("./commands/build"),
       require.resolve("./commands/config/config"),
       require.resolve("./commands/dev/dev"),

package/dist/utils/fileSizeReporter.d.ts

@@ -0,0 +1,13 @@
+import type { Stats } from '@umijs/bundler-webpack/compiled/webpack';
+interface ISizes {
+    root: string;
+    sizes: Record<string, number>;
+}
+export declare function printFileSizesAfterBuild(opts: {
+    webpackStats: Stats;
+    previousSizeMap: ISizes;
+    buildFolder: string;
+    suggestMaxSize?: number;
+}): void;
+export declare function measureFileSizesBeforeBuild(dir: string): ISizes;
+export {};

package/dist/utils/fileSizeReporter.js

@@ -0,0 +1,138 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/fileSizeReporter.ts
+var fileSizeReporter_exports = {};
+__export(fileSizeReporter_exports, {
+  measureFileSizesBeforeBuild: () => measureFileSizesBeforeBuild,
+  printFileSizesAfterBuild: () => printFileSizesAfterBuild
+});
+module.exports = __toCommonJS(fileSizeReporter_exports);
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_utils = require("@umijs/utils");
+var gzipSize = import_utils.gzipSize.sync;
+var WARN_GZIP_SIZE = 1024 * 1024;
+function printFileSizesAfterBuild(opts) {
+  var _a;
+  const {
+    webpackStats,
+    previousSizeMap,
+    buildFolder,
+    suggestMaxSize = WARN_GZIP_SIZE
+  } = opts;
+  const { root, sizes } = previousSizeMap;
+  const assets = (_a = webpackStats.toJson({ all: false, assets: true }).assets) == null ? void 0 : _a.filter((asset) => canReadAsset(asset.name)).map((asset) => {
+    const content = import_fs.default.readFileSync(import_path.default.join(root, asset.name), {
+      encoding: "utf-8"
+    });
+    const size = gzipSize(content);
+    const key = removeFileNameHash(root, asset.name);
+    const previousSize = sizes[key];
+    const difference = getDifferenceLabel(size, previousSize);
+    return {
+      folder: import_path.default.join(import_path.default.basename(buildFolder), import_path.default.dirname(asset.name)),
+      name: import_path.default.basename(asset.name),
+      size,
+      sizeLabel: (0, import_utils.filesize)(size) + (difference ? " (" + difference + ")" : "")
+    };
+  });
+  if (!(assets == null ? void 0 : assets.length)) {
+    return;
+  }
+  assets.sort((a, b) => b.size - a.size);
+  const longestSizeLabelLength = Math.max(...assets.map((a) => (0, import_utils.stripAnsi)(a.sizeLabel).length));
+  let suggestBundleSplitting = false;
+  assets.forEach((asset) => {
+    let sizeLabel = asset.sizeLabel;
+    const sizeLength = (0, import_utils.stripAnsi)(sizeLabel).length;
+    if (sizeLength < longestSizeLabelLength) {
+      const rightPadding = " ".repeat(longestSizeLabelLength - sizeLength);
+      sizeLabel += rightPadding;
+    }
+    const isLarge = asset.size > suggestMaxSize;
+    if (isLarge && import_path.default.extname(asset.name) === ".js") {
+      suggestBundleSplitting = true;
+    }
+    console.log("  " + (isLarge ? import_utils.chalk.yellow(sizeLabel) : sizeLabel) + "  " + import_utils.chalk.dim(asset.folder + import_path.default.sep) + import_utils.chalk.cyan(asset.name));
+  });
+  if (suggestBundleSplitting) {
+    console.log();
+    console.log(import_utils.chalk.yellow("The bundle size is significantly larger than recommended."));
+    console.log(import_utils.chalk.yellow("Consider reducing it with code splitting: "), import_utils.chalk.cyan("https://umijs.org/blog/code-splitting"));
+    console.log(import_utils.chalk.yellow("You can also analyze the project dependencies: "), import_utils.chalk.cyan("https://umijs.org/docs/guides/env-variables#analyze"));
+  }
+  console.log();
+}
+var FIFTY_KILOBYTES = 1024 * 50;
+function getDifferenceLabel(currentSize, previousSize) {
+  const difference = currentSize - previousSize;
+  const fileSize = !Number.isNaN(difference) ? (0, import_utils.filesize)(difference) : 0;
+  if (difference >= FIFTY_KILOBYTES) {
+    return import_utils.chalk.red("+" + fileSize);
+  } else if (difference < FIFTY_KILOBYTES && difference > 0) {
+    return import_utils.chalk.yellow("+" + fileSize);
+  } else if (difference < 0) {
+    return import_utils.chalk.green(fileSize);
+  } else {
+    return "";
+  }
+}
+function recursive(dir) {
+  const list = [];
+  if (import_fs.default.existsSync(dir) && import_fs.default.statSync(dir).isDirectory()) {
+    const files = import_fs.default.readdirSync(dir);
+    files.forEach((file) => {
+      const absPath = import_path.default.join(dir, file);
+      if (import_fs.default.statSync(absPath).isDirectory()) {
+        list.push(...recursive(absPath));
+        return;
+      }
+      list.push(absPath);
+    });
+    return list;
+  }
+  return list;
+}
+function canReadAsset(file) {
+  return /\.(js|css)$/.test(file) && !/service-worker\.js/.test(file) && !/precache-manifest\.[0-9a-f]+\.js/.test(file);
+}
+function removeFileNameHash(dir, fileName) {
+  return fileName.replace(dir, "").replace(/\\/g, "/").replace(/\/?(.*)(\.[0-9a-f]+)(\.chunk)?(\.js|\.css)/, (_match, p1, _p2, _p3, p4) => p1 + p4).replace(/^\//, "");
+}
+function measureFileSizesBeforeBuild(dir) {
+  const fileNames = recursive(dir);
+  const sizes = fileNames.filter(canReadAsset).reduce((memo, fileName) => {
+    const content = import_fs.default.readFileSync(fileName, { encoding: "utf-8" });
+    const key = removeFileNameHash(dir, fileName);
+    memo[key] = gzipSize(content);
+    return memo;
+  }, {});
+  return {
+    root: dir,
+    sizes
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  measureFileSizesBeforeBuild,
+  printFileSizesAfterBuild
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.21",
+  "version": "4.0.22",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -25,20 +25,19 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@types/multer": "1.4.7",
-    "@umijs/ast": "4.0.21",
-    "@umijs/babel-preset-umi": "4.0.21",
-    "@umijs/bundler-utils": "4.0.21",
-    "@umijs/bundler-vite": "4.0.21",
-    "@umijs/bundler-webpack": "4.0.21",
-    "@umijs/core": "4.0.21",
+    "@umijs/ast": "4.0.22",
+    "@umijs/babel-preset-umi": "4.0.22",
+    "@umijs/bundler-utils": "4.0.22",
+    "@umijs/bundler-vite": "4.0.22",
+    "@umijs/bundler-webpack": "4.0.22",
+    "@umijs/core": "4.0.22",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.21",
-    "@umijs/plugin-run": "4.0.21",
-    "@umijs/renderer-react": "4.0.21",
-    "@umijs/server": "4.0.21",
-    "@umijs/utils": "4.0.21",
+    "@umijs/mfsu": "4.0.22",
+    "@umijs/plugin-run": "4.0.22",
+    "@umijs/renderer-react": "4.0.22",
+    "@umijs/server": "4.0.22",
+    "@umijs/utils": "4.0.22",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",