@umijs/preset-umi 4.0.82 → 4.0.84

package/dist/features/devTool/devTool.js

@@ -93,5 +93,3 @@ var devTool_default = (api) => {
     ];
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/features/overrides/overrides.js

@@ -46,7 +46,7 @@ var overrides_default = (api) => {
               if (selector === "html") {
                 return `html:first-child`;
               } else if (/^body([\s+~>[:]|$)/.test(selector)) {
-                return `* + ${selector}`;
+                return `html ${selector}`;
               }
               return prefixedSelector;
             }

package/dist/features/tmpFiles/routes.js

@@ -94,10 +94,43 @@ async function getRoutes(opts) {
       return path;
     }
   }
+  const absLayoutPath = ((_c = opts.api.config) == null ? void 0 : _c.conventionLayout) === false ? false : (0, import_utils.tryPaths)([
+    (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.tsx"),
+    (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.vue"),
+    (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.jsx"),
+    (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.js")
+  ]);
+  const layouts = await opts.api.applyPlugins({
+    key: "addLayouts",
+    initialValue: [
+      absLayoutPath && {
+        id: "@@/global-layout",
+        file: (0, import_utils.winPath)(absLayoutPath),
+        test(route) {
+          return route.layout !== false;
+        }
+      }
+    ].filter(Boolean)
+  });
+  for (const layout of layouts) {
+    (0, import_core.addParentRoute)({
+      addToAll: true,
+      target: {
+        id: layout.id,
+        path: "/",
+        file: layout.file,
+        parentId: void 0,
+        absPath: "/",
+        isLayout: true
+      },
+      routes,
+      test: layout.test
+    });
+  }
   for (const id of Object.keys(routes)) {
     if (routes[id].file) {
       let file = routes[id].file;
-      const basedir = ((_c = opts.api.config.conventionRoutes) == null ? void 0 : _c.base) || opts.api.paths.absPagesPath;
+      const basedir = ((_d = opts.api.config.conventionRoutes) == null ? void 0 : _d.base) || opts.api.paths.absPagesPath;
       if (!(0, import_path.isAbsolute)(file)) {
         if (file.startsWith("@/")) {
           file = file.replace("@/", "../");
@@ -108,9 +141,11 @@ async function getRoutes(opts) {
         });
       }
       const isJSFile = /.[jt]sx?$/.test(file);
-      routes[id].__content = (0, import_fs.readFileSync)(file, "utf-8");
+      if (!routes[id].isLayout) {
+        routes[id].__content = (0, import_fs.readFileSync)(file, "utf-8");
+        routes[id].__isJSFile = isJSFile;
+      }
       routes[id].__absFile = (0, import_utils.winPath)(file);
-      routes[id].__isJSFile = isJSFile;
       const enableSSR = opts.api.config.ssr;
       const enableClientLoader = opts.api.config.clientLoader;
       const enableRouteProps = !opts.api.userConfig.routes;
@@ -131,39 +166,6 @@ async function getRoutes(opts) {
       }
     }
   }
-  const absLayoutPath = ((_d = opts.api.config) == null ? void 0 : _d.conventionLayout) === false ? false : (0, import_utils.tryPaths)([
-    (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.tsx"),
-    (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.vue"),
-    (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.jsx"),
-    (0, import_path.join)(opts.api.paths.absSrcPath, "layouts/index.js")
-  ]);
-  const layouts = await opts.api.applyPlugins({
-    key: "addLayouts",
-    initialValue: [
-      absLayoutPath && {
-        id: "@@/global-layout",
-        file: (0, import_utils.winPath)(absLayoutPath),
-        test(route) {
-          return route.layout !== false;
-        }
-      }
-    ].filter(Boolean)
-  });
-  for (const layout of layouts) {
-    (0, import_core.addParentRoute)({
-      addToAll: true,
-      target: {
-        id: layout.id,
-        path: "/",
-        file: layout.file,
-        parentId: void 0,
-        absPath: "/",
-        isLayout: true
-      },
-      routes,
-      test: layout.test
-    });
-  }
   for (const id of Object.keys(routes)) {
     await opts.api.applyPlugins({
       key: "onPatchRoute",

package/dist/features/tmpFiles/tmpFiles.js

@@ -407,6 +407,22 @@ if (process.env.NODE_ENV === 'development') {
       key: "addRuntimePlugin",
       initialValue: [(_c = api.appData.appJS) == null ? void 0 : _c.path].filter(Boolean)
     });
+    function checkDuplicatePluginKeys(arr) {
+      const duplicates = [];
+      arr.reduce((prev, curr) => {
+        if (prev[curr]) {
+          duplicates.push(curr);
+        } else {
+          prev[curr] = true;
+        }
+        return prev;
+      }, {});
+      if (duplicates.length) {
+        throw new Error(
+          `The plugin key cannot be duplicated. (${duplicates.join(", ")})`
+        );
+      }
+    }
     const validKeys = await api.applyPlugins({
       key: "addRuntimePluginKey",
       initialValue: [
@@ -424,6 +440,7 @@ if (process.env.NODE_ENV === 'development') {
         "onRouteChange"
       ]
     });
+    checkDuplicatePluginKeys(validKeys);
     const appPluginRegExp = /(\/|\\)app.(ts|tsx|jsx|js)$/;
     api.writeTmpFile({
       noPluginDir: true,
@@ -654,5 +671,3 @@ if (process.env.NODE_ENV === 'development') {
     stage: 1e4
   });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/package.json

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

package/templates/server.tpl

@@ -4,7 +4,7 @@ import { createHistory as createClientHistory } from './core/history';
 import { getPlugins as getClientPlugins } from './core/plugin';
 import { ServerInsertedHTMLContext } from './core/serverInsertedHTMLContext';
 import { PluginManager } from '{{{ umiPluginPath }}}';
-import createRequestHandler, { createMarkupGenerator } from '{{{ umiServerPath }}}';
+import createRequestHandler, { createMarkupGenerator, createUmiHandler, createUmiServerLoader } from '{{{ umiServerPath }}}';
 
 let helmetContext;
 
@@ -54,6 +54,8 @@ const createOpts = {
   ServerInsertedHTMLContext,
 };
 const requestHandler = createRequestHandler(createOpts);
+export const renderRoot = createUmiHandler(createOpts);
+export const serverLoader = createUmiServerLoader(createOpts);
 
 export const _markupGenerator = createMarkupGenerator(createOpts);