@umijs/preset-umi 4.2.6-alpha.4 → 4.2.6-alpha.6

package/dist/commands/build.js

@@ -105,7 +105,10 @@ umi build --clean
           umi: (0, import_path.join)(api.paths.absTmpPath, "umi.ts")
         }
       });
-      const shouldUseAutomaticRuntime = ((_a = api.appData.react) == null ? void 0 : _a.version) && import_utils.semver.gte(api.appData.react.version, "16.14.0");
+      const shouldUseAutomaticRuntime = ((_a = api.appData.react) == null ? void 0 : _a.version) && // why not 16.14.0 ?
+      // 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 = {
         react: {
           runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"

package/dist/commands/dev/dev.js

@@ -309,7 +309,7 @@ PORT=8888 umi dev
           umi: (0, import_path.join)(api.paths.absTmpPath, "umi.ts")
         }
       });
-      const shouldUseAutomaticRuntime = ((_c = api.appData.react) == null ? void 0 : _c.version) && import_utils.semver.gte(api.appData.react.version, "16.14.0");
+      const shouldUseAutomaticRuntime = ((_c = api.appData.react) == null ? void 0 : _c.version) && import_utils.semver.gte(api.appData.react.version, "17.0.0");
       const opts = {
         react: {
           runtime: shouldUseAutomaticRuntime ? "automatic" : "classic"

package/dist/commands/dev/getBabelOpts.js

@@ -34,10 +34,7 @@ __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,
-    "16.14.0"
-  );
+  const shouldUseAutomaticRuntime = import_utils.semver.gte(opts.api.appData.react.version, "17.0.0");
   const babelPresetOpts = await opts.api.applyPlugins({
     key: "modifyBabelPresetOpts",
     initialValue: {

package/dist/features/configPlugins/configPlugins.js

@@ -55,8 +55,11 @@ var configPlugins_default = (api) => {
     cwd: api.cwd,
     dep: "react-dom"
   }) || (0, import_path.dirname)(require.resolve("react-dom/package.json"));
-  const reactDOMVersion = require((0, import_path.join)(reactDOMPath, "package.json")).version;
-  const isLT18 = !reactDOMVersion.startsWith("18.");
+  const isLT18 = (() => {
+    const reactDOMVersion = require((0, import_path.join)(reactDOMPath, "package.json")).version;
+    const majorVersion = parseInt(reactDOMVersion.split(".")[0], 10);
+    return majorVersion < 18;
+  })();
   const configDefaults = {
     alias: {
       umi: "@@/exports",

package/dist/features/esbuildHelperChecker/esbuildHelperChecker.d.ts

@@ -1,6 +1,7 @@
 import { IApi } from '../../types';
 export declare function getGlobalVars(opts: {
     content: string;
+    fileName: string;
 }): Promise<string[]>;
 declare const _default: (api: IApi) => void;
 export default _default;

package/dist/features/esbuildHelperChecker/esbuildHelperChecker.js

@@ -47,7 +47,8 @@ async function checkDir(opts) {
   const varMap = {};
   for (const jsFile of jsFiles) {
     const vars = await getGlobalVars({
-      content: import_fs.default.readFileSync(import_path.default.join(opts.dir, jsFile), "utf-8")
+      content: import_fs.default.readFileSync(import_path.default.join(opts.dir, jsFile), "utf-8"),
+      fileName: jsFile
     });
     for (const v of vars) {
       varMap[v] = varMap[v] || [];
@@ -69,23 +70,29 @@ async function checkDir(opts) {
   import_utils.logger.info(`[esbuildHelperChecker] No conflicts found.`);
 }
 async function getGlobalVars(opts) {
-  const ast = parser.parse(opts.content, {
-    sourceType: "module",
-    sourceFilename: "foo.js",
-    plugins: []
-  });
   const vars = [];
-  ast.program.body.forEach((node) => {
-    if (t.isVariableDeclaration(node)) {
-      node.declarations.forEach((declaration) => {
-        if (t.isVariableDeclarator(declaration)) {
-          if (t.isIdentifier(declaration.id)) {
-            vars.push(declaration.id.name);
+  try {
+    const ast = parser.parse(opts.content, {
+      sourceType: "module",
+      sourceFilename: "foo.js",
+      plugins: []
+    });
+    ast.program.body.forEach((node) => {
+      if (t.isVariableDeclaration(node)) {
+        node.declarations.forEach((declaration) => {
+          if (t.isVariableDeclarator(declaration)) {
+            if (t.isIdentifier(declaration.id)) {
+              vars.push(declaration.id.name);
+            }
           }
-        }
-      });
-    }
-  });
+        });
+      }
+    });
+  } catch (error) {
+    import_utils.logger.error(
+      `[esbuildHelperChecker] Failed to parse ${opts.fileName}, ${error.message}`
+    );
+  }
   return vars;
 }
 var esbuildHelperChecker_default = (api) => {

package/dist/features/forget/forget.d.ts

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

package/dist/features/forget/forget.js

@@ -0,0 +1,77 @@
+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(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/features/forget/forget.ts
+var forget_exports = {};
+__export(forget_exports, {
+  default: () => forget_default
+});
+module.exports = __toCommonJS(forget_exports);
+var forget_default = (api) => {
+  api.describe({
+    key: "forget",
+    config: {
+      schema({ zod }) {
+        return zod.object({
+          ReactCompilerConfig: zod.object({}).optional()
+        });
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.onCheckConfig(() => {
+    if (api.config.mfsu) {
+      throw new Error(
+        `forget is not compatible with mfsu, please disable mfsu first.`
+      );
+    }
+    if (api.config.mako) {
+      throw new Error(
+        `forget is not compatible with mako, please disable mako first.`
+      );
+    }
+  });
+  api.onCheck(() => {
+    let reactMajorVersion = api.appData.react.version.split(".")[0];
+    if (reactMajorVersion < 19) {
+      throw new Error(
+        `forget is only compatible with React 19 and above, please upgrade your React version.`
+      );
+    }
+  });
+  api.modifyConfig((memo) => {
+    let ReactCompilerConfig = api.userConfig.forget.ReactCompilerConfig || {};
+    return {
+      ...memo,
+      extraBabelPlugins: [
+        ...memo.extraBabelPlugins || [],
+        [require.resolve("babel-plugin-react-compiler"), ReactCompilerConfig]
+      ]
+    };
+  });
+};

package/dist/features/mako/mako.js

@@ -32,8 +32,8 @@ __export(mako_exports, {
   default: () => mako_default
 });
 module.exports = __toCommonJS(mako_exports);
-var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
+var import_utils = require("@umijs/utils");
 var mako_default = (api) => {
   api.describe({
     key: "mako",

package/dist/features/mpa/mpa.js

@@ -72,14 +72,14 @@ var mpa_default = (api) => {
         api.userConfig.mountElementId
       );
     }
-    const isReact18 = api.appData.react.version.startsWith("18.");
+    const isGTEReact18 = api.appData.react.version.split(".")[0] >= 18;
     api.appData.mpa.entry.forEach((entry) => {
       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";
+      const renderer = isGTEReact18 ? `ReactDOM.createRoot(${rootElement}).render(${layoutJSX});` : `ReactDOM.render(${layoutJSX}, ${rootElement});`;
+      const reactDOMSource = isGTEReact18 ? "react-dom/client" : "react-dom";
       api.writeTmpFile({
         path: entry.tmpFilePath,
         noPluginDir: true,

package/dist/features/prepare/prepare.js

@@ -41,10 +41,11 @@ var parser = (0, import_utils.importLazy)(
 var prepare_default = (api) => {
   function updateAppdata(prepareData) {
     var _a;
-    const buildResult = import_utils.lodash.cloneDeep(prepareData.buildResult);
-    (buildResult.outputFiles || []).forEach((file) => {
-      file == null ? true : delete file.contents;
-    });
+    const buildResult = {
+      ...prepareData.buildResult,
+      // we don't need output file in prepare stage
+      outputFiles: void 0
+    };
     const nextFileImports = prepareData.fileImports ?? ((_a = api.appData.prepare) == null ? void 0 : _a.fileImports);
     api.appData.prepare = {
       buildResult,

package/dist/features/routePreloadOnLoad/routePreloadOnLoad.js

@@ -23,6 +23,7 @@ __export(routePreloadOnLoad_exports, {
 });
 module.exports = __toCommonJS(routePreloadOnLoad_exports);
 var import_utils = require("@umijs/utils");
+var import_crypto = require("crypto");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_constants = require("../../constants");
@@ -149,6 +150,7 @@ async function getRoutePathFilesMap(routes, fileChunksMap, opts) {
 }
 var routePreloadOnLoad_default = (api) => {
   let routeChunkFilesMap;
+  let preloadJSFileExt = ".js";
   api.describe({
     enableBy: () => {
       var _a;
@@ -165,6 +167,8 @@ var routePreloadOnLoad_default = (api) => {
   api.addHTMLHeadScripts({
     fn: () => {
       if (api.name === "build" && routeChunkFilesMap) {
+        const { publicPath } = api.config;
+        const displayPublicPath = publicPath === "auto" ? "/" : publicPath;
         return api.config.tern ? (
           // map mode
           [
@@ -177,20 +181,7 @@ var routePreloadOnLoad_default = (api) => {
           // script mode
           [
             {
-              content: (0, import_fs.readFileSync)(
-                (0, import_path.join)(
-                  import_constants.TEMPLATES_DIR,
-                  "routePreloadOnLoad/preloadRouteFilesScp.js"
-                ),
-                "utf-8"
-              ).replace(
-                '"{{routeChunkFilesMap}}"',
-                JSON.stringify(routeChunkFilesMap)
-              ).replace("{{basename}}", api.config.base).replace(
-                '"{{publicPath}}"',
-                `${// handle runtimePublicPath
-                api.config.runtimePublicPath ? "window.publicPath||" : ""}"${api.config.publicPath}"`
-              )
+              src: `${displayPublicPath}${import_utils2.PRELOAD_ROUTE_HELPER}${preloadJSFileExt}`
             }
           ]
         );
@@ -231,6 +222,30 @@ var routePreloadOnLoad_default = (api) => {
           ).fromPairs().value()
         };
       }
+      if (api.name === "build" && routeChunkFilesMap && !api.config.tern) {
+        const content = (0, import_fs.readFileSync)(
+          (0, import_path.join)(import_constants.TEMPLATES_DIR, "routePreloadOnLoad/preloadRouteFilesScp.js"),
+          "utf-8"
+        ).replace(
+          '"{{routeChunkFilesMap}}"',
+          JSON.stringify(routeChunkFilesMap)
+        ).replace("{{basename}}", api.config.base).replace(
+          '"{{publicPath}}"',
+          `${// handle runtimePublicPath
+          api.config.runtimePublicPath ? "window.publicPath||" : ""}"${api.config.publicPath}"`
+        );
+        if (api.config.hash) {
+          preloadJSFileExt = `.${(0, import_crypto.createHash)("md5").update(content).digest("hex").substring(0, 8)}.js`;
+        }
+        (0, import_fs.writeFileSync)(
+          (0, import_path.join)(
+            api.paths.absOutputPath,
+            `${import_utils2.PRELOAD_ROUTE_HELPER}${preloadJSFileExt}`
+          ),
+          content,
+          "utf-8"
+        );
+      }
     }
   });
 };

package/dist/features/routePreloadOnLoad/utils.d.ts

@@ -9,6 +9,7 @@ export interface IPreloadRouteFile {
     attrs: ([string, string] | [string])[];
 }
 export declare const PRELOAD_ROUTE_MAP_SCP_TYPE = "umi-route-chunk-files-map";
+export declare const PRELOAD_ROUTE_HELPER = "preload_helper";
 export declare function getPreloadRouteFiles(path: string, map: IRouteChunkFilesMap, opts: {
     publicPath: string;
 }): IPreloadRouteFile[] | undefined;

package/dist/features/routePreloadOnLoad/utils.js

@@ -19,11 +19,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/features/routePreloadOnLoad/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  PRELOAD_ROUTE_HELPER: () => PRELOAD_ROUTE_HELPER,
   PRELOAD_ROUTE_MAP_SCP_TYPE: () => PRELOAD_ROUTE_MAP_SCP_TYPE,
   getPreloadRouteFiles: () => getPreloadRouteFiles
 });
 module.exports = __toCommonJS(utils_exports);
 var PRELOAD_ROUTE_MAP_SCP_TYPE = "umi-route-chunk-files-map";
+var PRELOAD_ROUTE_HELPER = "preload_helper";
 function getPreloadRouteFiles(path, map, opts) {
   var _a;
   const matched = (
@@ -52,6 +54,7 @@ function getPreloadRouteFiles(path, map, opts) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PRELOAD_ROUTE_HELPER,
   PRELOAD_ROUTE_MAP_SCP_TYPE,
   getPreloadRouteFiles
 });

package/dist/features/tmpFiles/routes.js

@@ -181,16 +181,20 @@ async function getRoutes(opts) {
   });
   return routes;
 }
+var IMPORT_EMPTY_ROUTE_CJS = `() => Promise.resolve(require('./EmptyRoute'))`;
+var IMPORT_EMPTY_ROUTE_ESM = `() => import('./EmptyRoute')`;
 async function getRouteComponents(opts) {
   const imports = Object.keys(opts.routes).map((key) => {
     var _a;
     const useSuspense = opts.api.appData.framework === "react" ? true : false;
     const route = opts.routes[key];
+    const useCjsModule = ((_a = opts.api.config.routeLoader) == null ? void 0 : _a.moduleType) === "cjs";
     if (!route.file) {
       if (process.env.NODE_ENV === "test") {
-        return `'${key}': require( './EmptyRoute').default,`;
+        return `'${key}': require('./EmptyRoute').default,`;
       }
-      return useSuspense ? `'${key}': React.lazy(() => import( './EmptyRoute')),` : `'${key}': () => import( './EmptyRoute'),`;
+      const importEmptyRoute = useCjsModule ? IMPORT_EMPTY_ROUTE_CJS : IMPORT_EMPTY_ROUTE_ESM;
+      return useSuspense ? `'${key}': React.lazy(${importEmptyRoute}),` : `'${key}': ${importEmptyRoute},`;
     }
     if (route.hasClientLoader) {
       route.file = (0, import_path.join)(
@@ -213,7 +217,7 @@ async function getRouteComponents(opts) {
     if (process.env.NODE_ENV === "test") {
       return `'${key}': require('${(0, import_utils.winPath)(path)}').default,`;
     }
-    if (((_a = opts.api.config.routeLoader) == null ? void 0 : _a.moduleType) === "cjs") {
+    if (useCjsModule) {
       return useSuspense ? `'${key}': React.lazy(() => Promise.resolve(require('${(0, import_utils.winPath)(
         path
       )}'))),` : `'${key}': () => Promise.resolve(require('${(0, import_utils.winPath)(path)}')),`;

package/dist/features/tmpFiles/tmpFiles.js

@@ -112,6 +112,7 @@ var tmpFiles_default = (api) => {
       },
       include: [
         `${baseUrl}.${frameworkName}rc.ts`,
+        `${baseUrl}.${frameworkName}rc.*.ts`,
         `${baseUrl}**/*.d.ts`,
         `${baseUrl}**/*.ts`,
         `${baseUrl}**/*.tsx`,
@@ -433,6 +434,9 @@ if (process.env.NODE_ENV === 'development') {
     const validKeys = await api.applyPlugins({
       key: "addRuntimePluginKey",
       initialValue: [
+        // why add default?
+        // ref: https://github.com/umijs/mako/issues/1026
+        ...process.env.OKAM ? ["default"] : [],
         "patchRoutes",
         "patchClientRoutes",
         "modifyContextOpts",

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.2.6-alpha.4",
+  "version": "4.2.6-alpha.6",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,10 +21,11 @@
   "dependencies": {
     "@iconify/utils": "2.1.1",
     "@svgr/core": "6.5.1",
-    "@umijs/bundler-mako": "0.4.18-canary.20240520.1",
+    "@umijs/bundler-mako": "0.4.17",
     "@umijs/es-module-parser": "0.0.7",
     "@umijs/history": "5.3.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
+    "babel-plugin-react-compiler": "0.0.0-experimental-c23de8d-20240515",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.34.0",
     "current-script-polyfill": "1.0.0",
@@ -40,21 +41,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/babel-preset-umi": "4.2.6-alpha.4",
-    "@umijs/bundler-vite": "4.2.6-alpha.4",
-    "@umijs/ast": "4.2.6-alpha.4",
-    "@umijs/bundler-esbuild": "4.2.6-alpha.4",
-    "@umijs/bundler-utils": "4.2.6-alpha.4",
-    "@umijs/bundler-webpack": "4.2.6-alpha.4",
-    "@umijs/mfsu": "4.2.6-alpha.4",
-    "@umijs/core": "4.2.6-alpha.4",
-    "@umijs/renderer-react": "4.2.6-alpha.4",
-    "@umijs/server": "4.2.6-alpha.4",
+    "@umijs/ast": "4.2.6-alpha.6",
+    "@umijs/bundler-utils": "4.2.6-alpha.6",
+    "@umijs/bundler-esbuild": "4.2.6-alpha.6",
+    "@umijs/babel-preset-umi": "4.2.6-alpha.6",
+    "@umijs/bundler-vite": "4.2.6-alpha.6",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/zod2ts": "4.2.6-alpha.4",
-    "@umijs/plugin-run": "4.2.6-alpha.4",
-    "@umijs/utils": "4.2.6-alpha.4",
-    "@umijs/ui": "3.0.1"
+    "@umijs/bundler-webpack": "4.2.6-alpha.6",
+    "@umijs/core": "4.2.6-alpha.6",
+    "@umijs/server": "4.2.6-alpha.6",
+    "@umijs/mfsu": "4.2.6-alpha.6",
+    "@umijs/plugin-run": "4.2.6-alpha.6",
+    "@umijs/renderer-react": "4.2.6-alpha.6",
+    "@umijs/ui": "3.0.1",
+    "@umijs/utils": "4.2.6-alpha.6",
+    "@umijs/zod2ts": "4.2.6-alpha.6"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",

package/templates/history.tpl

@@ -41,6 +41,12 @@ export function createHistory(opts: any) {
   return h;
 }
 
+export function setHistory(h: UmiHistory) {
+  if (h) {
+    history = h;
+  }
+}
+
 // Patch `to` to support basename
 // Refs:
 // https://github.com/remix-run/history/blob/3e9dab4/packages/history/index.ts#L484