@umijs/preset-umi 4.0.32 → 4.0.34

package/dist/commands/build.js

@@ -120,7 +120,8 @@ umi build --clean
             args: opts2
           });
         },
-        clean: true
+        clean: true,
+        htmlFiles: []
       };
       await api.applyPlugins({
         key: "onBeforeCompiler",
@@ -141,6 +142,7 @@ umi build --clean
           buildFolder: absOutputPath
         });
       }
+      let htmlFiles = [];
       if (!api.config.mpa) {
         const assetsMap = api.config.vite ? {} : (0, import_getAssetsMap.getAssetsMap)({
           stats,
@@ -161,7 +163,7 @@ umi build --clean
           esmScript: !!opts.config.esm || vite,
           path: "/"
         };
-        const htmlFiles = await api.applyPlugins({
+        htmlFiles = await api.applyPlugins({
           key: "modifyExportHTMLFiles",
           initialValue: [
             {
@@ -180,7 +182,10 @@ umi build --clean
       }
       await api.applyPlugins({
         key: "onBuildHtmlComplete",
-        args: opts
+        args: {
+          ...opts,
+          htmlFiles
+        }
       });
     }
   });

package/dist/commands/config/set.d.ts

@@ -1,2 +1,2 @@
 import { IApi } from '../../types';
-export declare function set(api: IApi, name: string, value: any): void;
+export declare function set(api: IApi, name: string, value: string): void;

package/dist/commands/dev/getAssetsMap.js

@@ -35,22 +35,22 @@ function getAssetsMap(opts) {
   const { stats, publicPath } = opts;
   const displayPublicPath = publicPath === "auto" ? "/" : publicPath;
   let ret = {};
-  let json = stats.toJson();
-  const entrypoints = json.entrypoints || json.children[0].entrypoints;
-  for (const asset of entrypoints["umi"].assets) {
-    if (!asset.name.includes(HOT_UPDATE)) {
-      if (UMI_ASSETS_REG.js.test(asset.name)) {
-        ret["umi.js"] = [`${displayPublicPath}${asset.name}`];
+  const realStats = stats.stats ? stats.stats[0] : stats;
+  const assets = Object.keys(realStats.compilation.assets);
+  for (const asset of assets) {
+    if (!asset.includes(HOT_UPDATE)) {
+      if (UMI_ASSETS_REG.js.test(asset)) {
+        ret["umi.js"] = [`${displayPublicPath}${asset}`];
       }
-      if (FRAMEWORK_ASSETS_REG.js.test(asset.name)) {
-        ret["framework.js"] = [`${displayPublicPath}${asset.name}`];
+      if (FRAMEWORK_ASSETS_REG.js.test(asset)) {
+        ret["framework.js"] = [`${displayPublicPath}${asset}`];
       }
     }
-    if (UMI_ASSETS_REG.css.test(asset.name)) {
-      ret["umi.css"] = [`${displayPublicPath}${asset.name}`];
+    if (UMI_ASSETS_REG.css.test(asset)) {
+      ret["umi.css"] = [`${displayPublicPath}${asset}`];
     }
-    if (FRAMEWORK_ASSETS_REG.css.test(asset.name)) {
-      ret["framework.css"] = [`${displayPublicPath}${asset.name}`];
+    if (FRAMEWORK_ASSETS_REG.css.test(asset)) {
+      ret["framework.css"] = [`${displayPublicPath}${asset}`];
     }
   }
   return ret;

package/dist/commands/generators/precommit.js

@@ -80,7 +80,9 @@ var precommit_default = (api) => {
 npx --no-install ${cliName} verify-commit $1
 `.trimStart());
         import_utils.logger.info("Write commit-msg");
-        import_utils.execa.execaCommandSync("chmod +x .husky/commit-msg");
+        if (process.platform !== "win32") {
+          import_utils.execa.execaCommandSync("chmod +x .husky/commit-msg");
+        }
       }
       if (!(0, import_fs.existsSync)((0, import_path.join)(api.cwd, ".husky/pre-commit"))) {
         (0, import_fs.writeFileSync)((0, import_path.join)(api.cwd, ".husky/pre-commit"), `
@@ -90,7 +92,9 @@ npx --no-install ${cliName} verify-commit $1
 npx --no-install lint-staged --quiet
 `.trimStart());
         import_utils.logger.info("Write pre-commit");
-        import_utils.execa.execaCommandSync("chmod +x .husky/pre-commit");
+        if (process.platform !== "win32") {
+          import_utils.execa.execaCommandSync("chmod +x .husky/pre-commit");
+        }
       }
       h.installDeps();
     }

package/dist/features/apiRoute/request.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { IncomingMessage } from 'http';
 import type { IRoute } from '../../types';
 declare class UmiApiRequest {

package/dist/features/codeSplitting/codeSplitting.js

@@ -99,12 +99,13 @@ var codeSplitting_default = (api) => {
           },
           lib: {
             test(module2) {
-              return module2.size() > 16e4 && /node_modules[/\\]/.test(module2.identifier());
+              return !isModuleCSS(module2) && module2.size() > 16e4 && /node_modules[/\\]/.test(module2.identifier());
             },
             name(module2) {
               const rawRequest = module2.rawRequest && module2.rawRequest.replace(/^@(\w+)[/\\]/, "$1-");
-              if (rawRequest)
-                return `${rawRequest}-lib`;
+              if (rawRequest) {
+                return `${rawRequest.replace(/\./g, "_").replace(/\//g, "-")}-lib`;
+              }
               const identifier = module2.identifier();
               const trimmedIdentifier = /(?:^|[/\\])node_modules[/\\](.*)/.exec(identifier);
               const processedIdentifier = trimmedIdentifier && trimmedIdentifier[1].replace(/^@(\w+)[/\\]/, "$1-");
@@ -119,7 +120,7 @@ var codeSplitting_default = (api) => {
             name(_module, chunks) {
               const cryptoName = import_crypto.default.createHash("sha1").update(chunks.reduce((acc, chunk) => {
                 return acc + chunk.name;
-              }, "")).digest("base64").replace(/\//g, "");
+              }, "")).digest("base64").replace(/\//g, "").replace(/\+/g, "-").replace(/=/g, "_");
               return `shared-${cryptoName}`;
             },
             chunks: "async",
@@ -136,5 +137,8 @@ var codeSplitting_default = (api) => {
     return memo;
   });
 };
+function isModuleCSS(module2) {
+  return module2.type === `css/mini-extract` || module2.type === `css/extract-chunks` || module2.type === `css/extract-css-chunks`;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/configPlugins/schema.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(schema_exports);
 var import_utils = require("@umijs/utils");
 function getSchemas() {
   return {
-    base: (Joi) => Joi.string().label("base").pattern(/\/$/, { name: `"endsWith '/'"` }),
+    base: (Joi) => Joi.string(),
     conventionRoutes: (Joi) => Joi.object({
       base: Joi.string(),
       exclude: Joi.array().items(Joi.any())

package/dist/features/favicons/favicons.js

@@ -54,7 +54,7 @@ var favicons_default = (api) => {
   });
   api.addBeforeMiddlewares(() => [
     (req, res, next) => {
-      const iconFile = (api.appData.faviconFiles || []).find((file) => req.path === `/${file}`);
+      const iconFile = (api.appData.faviconFiles || []).find((file) => req.path === `${api.config.publicPath}${file}`);
       if (!iconFile) {
         next();
       } else {

package/dist/features/monorepo/redirect.d.ts

@@ -1,3 +1,7 @@
 import type { IApi } from '../../types';
 declare const _default: (api: IApi) => void;
 export default _default;
+interface IOpts {
+    root: string;
+}
+export declare function isMonorepo(opts: IOpts): any;

package/dist/features/monorepo/redirect.js

@@ -22,7 +22,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/features/monorepo/redirect.ts
 var redirect_exports = {};
 __export(redirect_exports, {
-  default: () => redirect_default
+  default: () => redirect_default,
+  isMonorepo: () => isMonorepo
 });
 module.exports = __toCommonJS(redirect_exports);
 var import_utils = require("@umijs/utils");
@@ -118,4 +119,6 @@ function isMonorepo(opts) {
   }) || (pkg == null ? void 0 : pkg.workspaces));
 }
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+0 && (module.exports = {
+  isMonorepo
+});

package/dist/features/polyfill/polyfill.js

@@ -65,7 +65,9 @@ export {};
       ],
       plugins: [
         require.resolve("@umijs/babel-preset-umi/dist/plugins/lockCoreJS")
-      ]
+      ],
+      babelrc: false,
+      configFile: false
     });
     api.writeTmpFile({
       path: "core/polyfill.ts",

package/dist/features/test/test.js

@@ -37,6 +37,9 @@ var test_default = (api) => {
       schema(Joi) {
         return Joi.object();
       }
+    },
+    enableBy() {
+      return api.appData.framework === "react";
     }
   });
   api.onGenerateFiles(async () => {

package/dist/features/tmpFiles/routes.js

@@ -29,6 +29,7 @@ var import_core = require("@umijs/core");
 var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
+var import_redirect = require("../monorepo/redirect");
 var import_getModuleExports = require("./getModuleExports");
 async function getApiRoutes(opts) {
   const routes = (0, import_core.getConventionRoutes)({
@@ -199,8 +200,21 @@ ${imports}
 function lastSlash(str) {
   return str[str.length - 1] === "/" ? str : `${str}/`;
 }
-function componentToChunkName(component, cwd) {
-  return typeof component === "string" ? component.replace(new RegExp(`^${import_utils.lodash.escapeRegExp(lastSlash((0, import_utils.winPath)(cwd || "/")))}`), "").replace(/^.(\/|\\)/, "").replace(/(\/|\\)/g, "__").replace(/@/g, "_").replace(/\.jsx?$/, "").replace(/\.tsx?$/, "").replace(/\.vue?$/, "").replace(/^src__/, "").replace(/\.\.__/g, "").replace(/[\[\]]/g, "").replace(/^node_modules__/, "nm__").replace(/^.umi-production__/, "t__").replace(/^\./, "").replace(/^pages__/, "p__") : "";
+function getProjectRootCwd(cwd) {
+  const splittedCwd = cwd.split("/");
+  for (let level = -1; level >= -3; level -= 1) {
+    const rootCwd = splittedCwd.slice(0, level).join("/");
+    if (!rootCwd)
+      break;
+    if ((0, import_redirect.isMonorepo)({ root: rootCwd })) {
+      return rootCwd;
+    }
+  }
+  return cwd;
+}
+function componentToChunkName(component, cwd = "/") {
+  cwd = (0, import_utils.winPath)(cwd);
+  return typeof component === "string" ? component.replace(new RegExp(`^(${import_utils.lodash.escapeRegExp(lastSlash(cwd))}|${import_utils.lodash.escapeRegExp(lastSlash(getProjectRootCwd(cwd)))})`), "").replace(/^.(\/|\\)/, "").replace(/(\/|\\)/g, "__").replace(/@/g, "_").replace(/\.jsx?$/, "").replace(/\.tsx?$/, "").replace(/\.vue?$/, "").replace(/^src__/, "").replace(/\.\.__/g, "").replace(/[\[\]]/g, "").replace(/^node_modules__/, "nm__").replace(/^.umi-production__/, "t__").replace(/^\./, "").replace(/^pages__/, "p__") : "";
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/tmpFiles/tmpFiles.js

@@ -337,6 +337,7 @@ export default function EmptyRoute() {
         "patchRoutes",
         "patchClientRoutes",
         "modifyContextOpts",
+        "modifyClientRenderOpts",
         "rootContainer",
         "innerProvider",
         "i18nProvider",
@@ -452,8 +453,10 @@ export default function EmptyRoute() {
           path: "@@/core/terminal.ts"
         });
       }
-      if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
-        exports.push(`export { TestBrowser } from './testBrowser';`);
+      if (api.appData.framework === "react") {
+        if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
+          exports.push(`export { TestBrowser } from './testBrowser';`);
+        }
       }
       exports.push("// plugins");
       const allPlugins = (0, import_fs.readdirSync)(api.paths.absTmpPath).filter((file) => file.startsWith("plugin-"));

package/dist/libs/folderCache/LazySourceCodeCache.js

@@ -163,7 +163,8 @@ async function esbuildTransform(files, opts) {
         ".js": "tsx",
         ".jsx": "tsx"
       },
-      logLevel: "error"
+      logLevel: "error",
+      tsconfig: (0, import_path.join)(__dirname, "empty.tsconfig.json")
     });
   } catch (e) {
     if (((_a = e.errors) == null ? void 0 : _a.length) || ((_b = e.warnings) == null ? void 0 : _b.length)) {

package/dist/libs/folderCache/empty.tsconfig.json

@@ -0,0 +1 @@
+{}

package/dist/types.d.ts

@@ -42,7 +42,7 @@ export declare type ILink = Partial<{
 }>;
 export declare type IMeta = Partial<{
     content: string;
-    httpEquiv: string;
+    'http-equiv': string;
     name: string;
     scheme: string;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.32",
+  "version": "4.0.34",
   "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.32",
-    "@umijs/babel-preset-umi": "4.0.32",
-    "@umijs/bundler-utils": "4.0.32",
-    "@umijs/bundler-vite": "4.0.32",
-    "@umijs/bundler-webpack": "4.0.32",
-    "@umijs/core": "4.0.32",
+    "@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/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.32",
-    "@umijs/plugin-run": "4.0.32",
-    "@umijs/renderer-react": "4.0.32",
-    "@umijs/server": "4.0.32",
-    "@umijs/utils": "4.0.32",
+    "@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",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",

package/templates/TestBrowser.tpl

@@ -43,7 +43,7 @@ export function TestBrowser(props: TestBrowserProps) {
         type: 'memory',
         basename,
       });
-      return {
+      const context = {
         routes,
 {{#hydrate}}
         hydrate: true,
@@ -63,6 +63,12 @@ export function TestBrowser(props: TestBrowserProps) {
         basename,
         components: true,
       };
+      const modifiedContext = pluginManager.applyPlugins({
+        key: 'modifyClientRenderOpts',
+        type: ApplyPluginsType.modify,
+        initialValue: context,
+      });
+      return modifiedContext;
     };
     genContext().then((context) => {
       setContext(context);

package/templates/history.tpl

@@ -18,10 +18,10 @@ export function createHistory(opts: any) {
   history = {
     ...h,
     push(to, state) {
-      h.push(patchTo(to), state);
+      h.push(patchTo(to, h), state);
     },
     replace(to, state) {
-      h.replace(patchTo(to), state);
+      h.replace(patchTo(to, h), state);
     },
     get location() {
       return h.location;
@@ -38,13 +38,16 @@ export function createHistory(opts: any) {
 // Refs:
 // https://github.com/remix-run/history/blob/3e9dab4/packages/history/index.ts#L484
 // https://github.com/remix-run/history/blob/dev/docs/api-reference.md#to
-function patchTo(to: any) {
+function patchTo(to: any, h: History) {
   if (typeof to === 'string') {
     return `${stripLastSlash(basename)}${to}`;
-  } else if (typeof to === 'object' && to.pathname) {
+  } else if (typeof to === 'object') {
+
+    const currentPathname = h.location.pathname;
+
     return {
       ...to,
-      pathname: `${stripLastSlash(basename)}${to.pathname}`,
+      pathname: to.pathname? `${stripLastSlash(basename)}${to.pathname}` : currentPathname,
     };
   } else {
     throw new Error(`Unexpected to: ${to}`);

package/templates/umi.tpl

@@ -59,8 +59,14 @@ async function render() {
           ...contextOpts.historyOpts,
         }),
         basename,
+        callback: contextOpts.callback,
       };
-      return renderClient(context);
+      const modifiedContext = pluginManager.applyPlugins({
+        key: 'modifyClientRenderOpts',
+        type: ApplyPluginsType.modify,
+        initialValue: context,
+      });
+      return renderClient(modifiedContext);
     },
   }))();
 }