@umijs/preset-umi 4.0.34 → 4.0.35

package/dist/commands/build.js

@@ -152,14 +152,8 @@ umi build --clean
         const markupArgs = await (0, import_getMarkupArgs.getMarkupArgs)({ api });
         const finalMarkUpArgs = {
           ...markupArgs,
-          styles: markupArgs.styles.concat(api.config.vite ? [] : [
-            ...(assetsMap["framework.css"] || []).map((src) => ({ src })),
-            ...(assetsMap["umi.css"] || []).map((src) => ({ src }))
-          ]),
-          scripts: (api.config.vite ? [] : [
-            ...(assetsMap["framework.js"] || []).map((src) => ({ src })),
-            ...(assetsMap["umi.js"] || []).map((src) => ({ src }))
-          ]).concat(markupArgs.scripts),
+          styles: markupArgs.styles.concat(api.config.vite ? [] : [...(assetsMap["umi.css"] || []).map((src) => ({ src }))]),
+          scripts: (api.config.vite ? [] : [...(assetsMap["umi.js"] || []).map((src) => ({ src }))]).concat(markupArgs.scripts),
           esmScript: !!opts.config.esm || vite,
           path: "/"
         };

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

@@ -32,7 +32,7 @@ setupWorkerEnv();
 var bundlerWebpackPath = (0, import_path.dirname)(require.resolve("@umijs/bundler-webpack"));
 var bufferedRequest = [];
 async function start() {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   let builder = null;
   function build(deps) {
     import_utils.logger.info("[MFSU][eager] build worker start to build");
@@ -92,7 +92,7 @@ async function start() {
     tmpBase,
     mfName: ((_f = opts.config.mfsu) == null ? void 0 : _f.mfName) || import_mfsu.DEFAULT_MF_NAME,
     shared: ((_g = opts.config.mfsu) == null ? void 0 : _g.shared) || {},
-    buildDepWithESBuild: false,
+    buildDepWithESBuild: !!((_h = opts.config.mfsu) == null ? void 0 : _h.esbuild),
     depEsBuildConfig,
     externals
   });

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

@@ -69,7 +69,10 @@ var DepBuilderInWorker = class {
     var _a;
     const alias = { ...(_a = this.opts.depConfig.resolve) == null ? void 0 : _a.alias };
     const externals = this.opts.depConfig.externals;
-    const entryContent = (0, import_getESBuildEntry.getESBuildEntry)({ deps: opts.deps });
+    const entryContent = (0, import_getESBuildEntry.getESBuildEntry)({
+      mfName: this.opts.mfName,
+      deps: opts.deps
+    });
     const ENTRY_FILE = "esbuild-entry.js";
     const tmpDir = this.opts.tmpBase;
     const entryPath = (0, import_path.join)(tmpDir, ENTRY_FILE);

package/dist/commands/dev/getAssetsMap.js

@@ -26,10 +26,6 @@ var UMI_ASSETS_REG = {
   js: /^umi(\..+)?\.js$/,
   css: /^umi(\..+)?\.css$/
 };
-var FRAMEWORK_ASSETS_REG = {
-  js: /^framework(\..+)?\.js$/,
-  css: /^framework(\..+)?\.css$/
-};
 var HOT_UPDATE = ".hot-update.";
 function getAssetsMap(opts) {
   const { stats, publicPath } = opts;
@@ -42,16 +38,10 @@ function getAssetsMap(opts) {
       if (UMI_ASSETS_REG.js.test(asset)) {
         ret["umi.js"] = [`${displayPublicPath}${asset}`];
       }
-      if (FRAMEWORK_ASSETS_REG.js.test(asset)) {
-        ret["framework.js"] = [`${displayPublicPath}${asset}`];
-      }
     }
     if (UMI_ASSETS_REG.css.test(asset)) {
       ret["umi.css"] = [`${displayPublicPath}${asset}`];
     }
-    if (FRAMEWORK_ASSETS_REG.css.test(asset)) {
-      ret["framework.css"] = [`${displayPublicPath}${asset}`];
-    }
   }
   return ret;
 }

package/dist/features/check/check.js

@@ -26,6 +26,7 @@ __export(check_exports, {
 });
 module.exports = __toCommonJS(check_exports);
 var import_assert = __toESM(require("assert"));
+var import_utils = require("@umijs/utils");
 var check_default = (api) => {
   api.onCheck(async () => {
     (0, import_assert.default)(api.appData.routes, `routes not found, you may be run umi on the wrong directory.`);
@@ -58,6 +59,11 @@ var check_default = (api) => {
   });
   api.onCheckConfig(({ config }) => {
     if (config.publicPath.startsWith("./") && api.env === "development") {
+      console.log(`
+${import_utils.chalk.red(`\`publicPath\` does not support start with ${import_utils.chalk.bold.blue("./")} in development environment.`)}
+  You should use :
+    ${import_utils.chalk.green(`publicPath: process.env.NODE_ENV === 'production' ? './' : '/'`)}
+`);
       throw new Error(`publicPath can not start with './' in development environment.`);
     }
   });

package/dist/features/codeSplitting/codeSplitting.js

@@ -123,10 +123,10 @@ var codeSplitting_default = (api) => {
               }, "")).digest("base64").replace(/\//g, "").replace(/\+/g, "-").replace(/=/g, "_");
               return `shared-${cryptoName}`;
             },
-            chunks: "async",
             priority: 10,
             minChunks: 2,
-            reuseExistingChunk: true
+            reuseExistingChunk: true,
+            chunks: "async"
           }
         }
       });

package/dist/features/configPlugins/configPlugins.js

@@ -92,6 +92,9 @@ var configPlugins_default = (api) => {
     if (key in configDefaults) {
       config.default = configDefaults[key];
     }
+    if (["routes"].includes(key)) {
+      config.onChange = api.ConfigChangeType.regenerateTmpFiles;
+    }
     api.registerPlugins([
       {
         id: `virtual: config-${key}`,

package/dist/features/configPlugins/schema.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(schema_exports);
 var import_utils = require("@umijs/utils");
 function getSchemas() {
   return {
+    analyze: (Joi) => Joi.object(),
     base: (Joi) => Joi.string(),
     conventionRoutes: (Joi) => Joi.object({
       base: Joi.string(),

package/dist/features/tmpFiles/tmpFiles.js

@@ -453,7 +453,7 @@ export default function EmptyRoute() {
           path: "@@/core/terminal.ts"
         });
       }
-      if (api.appData.framework === "react") {
+      if (api.config.test !== false && api.appData.framework === "react") {
         if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
           exports.push(`export { TestBrowser } from './testBrowser';`);
         }

package/dist/features/webpack/webpack.d.ts

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

package/dist/features/webpack/webpack.js

@@ -0,0 +1,86 @@
+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/webpack/webpack.ts
+var webpack_exports = {};
+__export(webpack_exports, {
+  default: () => webpack_default
+});
+module.exports = __toCommonJS(webpack_exports);
+var webpack_default = (api) => {
+  api.describe({
+    key: "preset-umi:webpack",
+    enableBy: () => api.env === "production"
+  });
+  const assets = {
+    js: [],
+    css: []
+  };
+  class HtmlWebpackPlugin {
+    apply(compiler) {
+      compiler.hooks.emit.tapPromise("UmiHtmlGeneration", async (compilation) => {
+        const entryPointFiles = compilation.entrypoints.get("umi").getFiles();
+        const entryPointPublicPathMap = {};
+        const extensionRegexp = /\.(css|js|mjs)(\?|$)/;
+        const UMI_ASSETS_REG = {
+          js: /^umi(\..+)?\.js$/,
+          css: /^umi(\..+)?\.css$/
+        };
+        entryPointFiles.forEach((entryPointPublicPath) => {
+          const extMatch = extensionRegexp.exec(entryPointPublicPath);
+          if (!extMatch) {
+            return;
+          }
+          if (entryPointPublicPath.includes(".hot-update")) {
+            return;
+          }
+          if (entryPointPublicPathMap[entryPointPublicPath]) {
+            return;
+          }
+          if (UMI_ASSETS_REG.js.test(entryPointPublicPath) || UMI_ASSETS_REG.css.test(entryPointPublicPath)) {
+            return;
+          }
+          entryPointPublicPathMap[entryPointPublicPath] = true;
+          const ext = extMatch[1] === "mjs" ? "js" : extMatch[1];
+          assets[ext].push(entryPointPublicPath);
+        });
+      });
+    }
+  }
+  api.modifyWebpackConfig((config) => {
+    var _a;
+    (_a = config.plugins) == null ? void 0 : _a.push(new HtmlWebpackPlugin());
+    return config;
+  });
+  api.addHTMLStyles(() => {
+    const { publicPath } = api.config;
+    const displayPublicPath = publicPath === "auto" ? "/" : publicPath;
+    return assets.css.map((css) => {
+      return `${displayPublicPath}${css}`;
+    });
+  });
+  api.addHTMLHeadScripts(() => {
+    const { publicPath } = api.config;
+    const displayPublicPath = publicPath === "auto" ? "/" : publicPath;
+    return assets.js.map((js) => {
+      return `${displayPublicPath}${js}`;
+    });
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/index.js

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

package/dist/types.d.ts

@@ -55,6 +55,10 @@ export declare type IEntryImport = {
     specifier?: string;
 };
 export declare type IRoute = ICoreRoute;
+export declare type IFileInfo = Array<{
+    event: string;
+    path: string;
+}>;
 export declare type IApi = PluginAPI & IServicePluginAPI & {
     addApiMiddlewares: IAdd<null, IApiMiddleware>;
     addBeforeBabelPlugins: IAdd<null, any>;
@@ -161,10 +165,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         time: number;
     }>;
     onGenerateFiles: IEvent<{
-        files?: {
-            event: string;
-            path: string;
-        } | null;
+        files?: IFileInfo | null;
         isFirstTime?: boolean;
     }>;
     onPatchRoute: IEvent<{

package/package.json

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

package/templates/umi.tpl

@@ -27,16 +27,24 @@ async function render() {
     },
   });
 
+  const contextOpts = pluginManager.applyPlugins({
+    key: 'modifyContextOpts',
+    type: ApplyPluginsType.modify,
+    initialValue: {},
+  });
+
+  const basename = contextOpts.basename || '{{{ basename }}}';
+
+  const history = createHistory({
+    type: contextOpts.historyType || '{{{ historyType }}}',
+    basename,
+    ...contextOpts.historyOpts,
+  });
+
   return (pluginManager.applyPlugins({
     key: 'render',
     type: ApplyPluginsType.compose,
     initialValue() {
-      const contextOpts = pluginManager.applyPlugins({
-        key: 'modifyContextOpts',
-        type: ApplyPluginsType.modify,
-        initialValue: {},
-      });
-      const basename = contextOpts.basename || '{{{ basename }}}';
       const context = {
 {{#hydrate}}
         hydrate: true,
@@ -53,11 +61,7 @@ async function render() {
 {{/loadingComponent}}
         publicPath,
         runtimePublicPath,
-        history: createHistory({
-          type: contextOpts.historyType || '{{{ historyType }}}',
-          basename,
-          ...contextOpts.historyOpts,
-        }),
+        history,
         basename,
         callback: contextOpts.callback,
       };