@umijs/preset-umi 4.4.10 → 4.4.11

package/dist/commands/build.js

@@ -33,7 +33,6 @@ var import_getBabelOpts = require("./dev/getBabelOpts");
 var import_getMarkupArgs = require("./dev/getMarkupArgs");
 var import_printMemoryUsage = require("./dev/printMemoryUsage");
 var bundlerWebpack = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-webpack");
-var bundlerVite = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-vite");
 var build_default = (api) => {
   api.registerCommand({
     name: "build",
@@ -109,7 +108,7 @@ umi build --clean
       // it will break the config of externals, when externals
       // does not handle the react/runtime
       import_utils.semver.gte(api.appData.react.version, "17.0.0");
-      const opts = {
+      let opts = {
         react: {
           runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"
         },
@@ -136,22 +135,29 @@ umi build --clean
       };
       await api.applyPlugins({
         key: "onBeforeCompiler",
-        args: { compiler: api.config.vite ? "vite" : "webpack", opts }
+        args: { compiler: api.appData.bundler, opts }
       });
-      let stats;
-      if (api.config.vite) {
-        stats = await bundlerVite.build(opts);
-      } else if (api.config.mako) {
-        require("@umijs/bundler-webpack/dist/requireHook");
-        const { build } = require(process.env.OKAM);
-        stats = await build(opts);
-      } else {
+      opts = await api.applyPlugins({
+        key: "modifyUniBundlerOpts",
+        initialValue: opts,
+        args: {
+          bundler: api.appData.bundler
+        }
+      });
+      const bundler = await api.applyPlugins({
+        key: "modifyUniBundler",
+        args: {
+          bundler: api.appData.bundler,
+          opts
+        }
+      });
+      const stats = await bundler.build(opts);
+      if (!api.config.vite && !api.config.mako) {
         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)({

package/dist/commands/dev/dev.js

@@ -38,7 +38,6 @@ var import_path = require("path");
 var import_worker_threads = require("worker_threads");
 var import_constants = require("../../constants");
 var import_LazySourceCodeCache = require("../../libs/folderCache/LazySourceCodeCache");
-var import_lazyImportFromCurrentPkg = require("../../utils/lazyImportFromCurrentPkg");
 var import_projectFileList = require("../../utils/projectFileList");
 var import_createRouteMiddleware = require("./createRouteMiddleware");
 var import_faviconMiddleware = require("./faviconMiddleware");
@@ -46,8 +45,6 @@ var import_getBabelOpts = require("./getBabelOpts");
 var import_ViteHtmlPlugin = __toESM(require("./plugins/ViteHtmlPlugin"));
 var import_printMemoryUsage = require("./printMemoryUsage");
 var import_watch = require("./watch");
-var bundlerWebpack = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-webpack");
-var bundlerVite = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-vite");
 var MFSU_EAGER_DEFAULT_INCLUDE = [
   "react",
   "react-error-overlay",
@@ -341,7 +338,7 @@ PORT=8888 umi dev
         }
       });
       const shouldUseAutomaticRuntime = ((_c = api.appData.react) == null ? void 0 : _c.version) && import_utils.semver.gte(api.appData.react.version, "17.0.0");
-      const opts = {
+      let opts = {
         react: {
           runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"
         },
@@ -411,19 +408,25 @@ PORT=8888 umi dev
           });
         }
       };
+      opts = await api.applyPlugins({
+        key: "modifyUniBundlerOpts",
+        initialValue: opts,
+        args: {
+          bundler: api.appData.bundler
+        }
+      });
       await api.applyPlugins({
         key: "onBeforeCompiler",
-        args: { compiler: enableVite ? "vite" : "webpack", opts }
+        args: { compiler: api.appData.bundler, opts }
       });
-      if (enableVite) {
-        await bundlerVite.dev(opts);
-      } else if (api.config.mako) {
-        require("@umijs/bundler-webpack/dist/requireHook");
-        const { dev } = require(process.env.OKAM);
-        await dev(opts);
-      } else {
-        await bundlerWebpack.dev(opts);
-      }
+      const bundler = await api.applyPlugins({
+        key: "modifyUniBundler",
+        args: {
+          bundler: api.appData.bundler,
+          opts
+        }
+      });
+      await bundler.dev(opts);
     }
   });
   api.modifyAppData(async (memo) => {

package/dist/commands/dev/getBabelOpts.js

@@ -34,7 +34,10 @@ __export(getBabelOpts_exports, {
 module.exports = __toCommonJS(getBabelOpts_exports);
 var import_utils = require("@umijs/utils");
 async function getBabelOpts(opts) {
-  const shouldUseAutomaticRuntime = import_utils.semver.gte(opts.api.appData.react.version, "17.0.0");
+  const shouldUseAutomaticRuntime = import_utils.semver.gte(
+    opts.api.appData.react.version,
+    "17.0.0"
+  );
   const babelPresetOpts = await opts.api.applyPlugins({
     key: "modifyBabelPresetOpts",
     initialValue: {
@@ -45,7 +48,7 @@ async function getBabelOpts(opts) {
         ...shouldUseAutomaticRuntime ? {} : { importSource: void 0 }
       },
       presetTypeScript: {},
-      pluginTransformRuntime: {},
+      pluginTransformRuntime: opts.api.config.transformRuntime || {},
       pluginLockCoreJS: {},
       pluginDynamicImportNode: false,
       pluginAutoCSSModules: opts.api.config.autoCSSModules

package/dist/features/bundler/bundler.d.ts

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

package/dist/features/bundler/bundler.js

@@ -0,0 +1,43 @@
+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/bundler/bundler.ts
+var bundler_exports = {};
+__export(bundler_exports, {
+  default: () => bundler_default
+});
+module.exports = __toCommonJS(bundler_exports);
+var import_lazyImportFromCurrentPkg = require("../../utils/lazyImportFromCurrentPkg");
+var bundlerWebpack = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-webpack");
+var bundlerVite = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-vite");
+var bundler_default = (api) => {
+  api.describe({
+    // Don't occupy proprietary terms
+    key: "preset-umi:bundler"
+  });
+  api.modifyUniBundler((_, { bundler }) => {
+    if (bundler === "mako") {
+      require("@umijs/bundler-webpack/dist/requireHook");
+      return require(process.env.OKAM);
+    }
+    if (bundler === "vite") {
+      return bundlerVite;
+    }
+    return bundlerWebpack;
+  });
+};

package/dist/index.js

@@ -89,6 +89,7 @@ var src_default = () => {
       require.resolve("./features/hmrGuardian/hmrGuardian"),
       require.resolve("./features/routePreloadOnLoad/routePreloadOnLoad"),
       require.resolve("./features/forget/forget"),
+      require.resolve("./features/bundler/bundler"),
       // commands
       require.resolve("./commands/build"),
       require.resolve("./commands/config/config"),

package/dist/registerMethods.js

@@ -87,7 +87,10 @@ var registerMethods_default = (api) => {
     "modifyServerRendererPath",
     "modifyRoutes",
     "modifyBabelPresetOpts",
-    "modifyTSConfig"
+    "modifyTSConfig",
+    // support custom bundler
+    "modifyUniBundler",
+    "modifyUniBundlerOpts"
   ].forEach((name) => {
     api.registerMethod({ name });
   });

package/dist/types.d.ts

@@ -82,6 +82,22 @@ export declare type GenerateFilesFn = (opts: IOnGenerateFiles) => Promise<void>;
 export declare type OnConfigChangeFn = (opts: {
     generate: GenerateFilesFn;
 }) => void | Promise<void>;
+export interface IUniBundlerInstance {
+    dev: (opts: any) => Promise<void>;
+    build: (opts: any) => Promise<any>;
+    [key: string]: any;
+}
+export interface IBundlerOpts {
+    config: IConfig;
+    cwd: string;
+    entry: Record<string, string>;
+    pkg: Record<string, any>;
+    rootDir: string;
+    ip: string;
+    port: number;
+    host: string;
+    [key: string]: any;
+}
 export declare type IApi = PluginAPI & IServicePluginAPI & {
     addApiMiddlewares: IAdd<null, IApiMiddleware>;
     addBeforeBabelPlugins: IAdd<null, any>;
@@ -139,6 +155,13 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
     modifyRoutes: IModify<Record<string, IRoute>, {}>;
     modifyServerRendererPath: IModify<string, {}>;
     modifyTSConfig: IModify<Record<string, any>, {}>;
+    modifyUniBundler: IModify<IUniBundlerInstance, {
+        bundler: string;
+        opts: IBundlerOpts;
+    }>;
+    modifyUniBundlerOpts: IModify<IBundlerOpts, {
+        bundler: string;
+    }>;
     modifyViteConfig: IModify<ViteInlineConfig, {
         env: Env;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.4.10",
+  "version": "4.4.11",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -41,21 +41,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.4.10",
-    "@umijs/babel-preset-umi": "4.4.10",
-    "@umijs/bundler-utils": "4.4.10",
-    "@umijs/bundler-vite": "4.4.10",
-    "@umijs/bundler-webpack": "4.4.10",
-    "@umijs/core": "4.4.10",
+    "@umijs/ast": "4.4.11",
+    "@umijs/babel-preset-umi": "4.4.11",
+    "@umijs/bundler-esbuild": "4.4.11",
+    "@umijs/bundler-utils": "4.4.11",
+    "@umijs/bundler-vite": "4.4.11",
+    "@umijs/bundler-webpack": "4.4.11",
+    "@umijs/core": "4.4.11",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/plugin-run": "4.4.10",
-    "@umijs/renderer-react": "4.4.10",
-    "@umijs/server": "4.4.10",
-    "@umijs/mfsu": "4.4.10",
-    "@umijs/utils": "4.4.10",
+    "@umijs/mfsu": "4.4.11",
+    "@umijs/server": "4.4.11",
+    "@umijs/renderer-react": "4.4.11",
+    "@umijs/plugin-run": "4.4.11",
     "@umijs/ui": "3.0.1",
-    "@umijs/bundler-esbuild": "4.4.10",
-    "@umijs/zod2ts": "4.4.10"
+    "@umijs/utils": "4.4.11",
+    "@umijs/zod2ts": "4.4.11"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",