Merge remote-tracking branch 'origin/master' into feature/new-unio-ssr

umijs · Apr 1, 2024 · 9d2e626 · 9d2e626
2 parents a1e5cee + ac85e52
commit 9d2e626
Show file tree

Hide file tree

Showing 29 changed files with 634 additions and 3,207 deletions.
diff --git a/examples/antd-pro-create/package.json b/examples/antd-pro-create/package.json
@@ -85,7 +85,7 @@
     "prettier": "^2.8.4",
     "start-server-and-test": "^1.15.2",
     "swagger-ui-dist": "^4.14.2",
-    "umi-presets-pro": "^1.0.5",
+    "umi-presets-pro": "^2.0.3",
     "umi-serve": "^1.9.11"
   },
   "engines": {

diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
-  "version": "4.1.5",
+  "version": "4.1.6",
   "workspaces": ["packages/*"]
 }
diff --git a/packages/ast/package.json b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/ast",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/ast",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/ast#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/babel-preset-umi/package.json b/packages/babel-preset-umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/babel-preset-umi",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "Official babel preset for umi.",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/babel-preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/bundler-esbuild/package.json b/packages/bundler-esbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-esbuild",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/bundler-esbuild",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-esbuild#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/bundler-utils/package.json b/packages/bundler-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utils",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {

diff --git a/packages/bundler-vite/package.json b/packages/bundler-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-vite",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/bundler-vite",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-vite#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {

diff --git a/packages/create-umi/package.json b/packages/create-umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-umi",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "create-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/create-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/lint/package.json b/packages/lint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/lint",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/lint",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/lint#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/max/package.json b/packages/max/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/max",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/max",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/max#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/mfsu/package.json b/packages/mfsu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/plugin-docs/package.json b/packages/plugin-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugin-docs",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/plugin-docs",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugin-docs#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/plugin-run/package.json b/packages/plugin-run/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugin-run",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/plugin-run",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugin-run#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/plugins/package.json b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/preset-umi/package.json b/packages/preset-umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/preset-umi/src/features/devTool/devTool.ts b/packages/preset-umi/src/features/devTool/devTool.ts
@@ -80,17 +80,21 @@ export default (api: IApi) => {
           }
         }
 
-        // bundle status
-        const isDone =
-          api.appData.bundleStatus.done &&
-          (enableVite ||
-            api.config.mfsu === false ||
-            api.appData.mfsuBundleStatus.done);
-
-        if (!isDone) {
-          res.setHeader('Content-Type', 'text/html');
-          res.send(loadingHtml);
-          return;
+        if (
+          req.headers.accept?.includes('text/html') ||
+          req.headers.accept === '*/*'
+        ) {
+          // bundle status
+          const isDone =
+            api.appData.bundleStatus.done &&
+            (enableVite ||
+              api.config.mfsu === false ||
+              api.appData.mfsuBundleStatus.done);
+          if (!isDone) {
+            res.setHeader('Content-Type', 'text/html');
+            res.send(loadingHtml);
+            return;
+          }
         }
 
         return next();

diff --git a/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts
@@ -219,44 +219,47 @@ export default (api: IApi) => {
       api.config.routeLoader?.moduleType === 'esm',
   });
 
-  api.addHTMLHeadScripts(() => {
-    if (api.name === 'build' && routeChunkFilesMap) {
-      // internal tern app use map mode
-      return api.config.tern
-        ? // map mode
-          [
-            {
-              type: PRELOAD_ROUTE_MAP_SCP_TYPE,
-              content: JSON.stringify(routeChunkFilesMap),
-            },
-          ]
-        : // script mode
-          [
-            {
-              content: readFileSync(
-                join(
-                  TEMPLATES_DIR,
-                  'routePreloadOnLoad/preloadRouteFilesScp.js',
-                ),
-                'utf-8',
-              )
-                .replace(
-                  '"{{routeChunkFilesMap}}"',
-                  JSON.stringify(routeChunkFilesMap),
+  api.addHTMLHeadScripts({
+    fn: () => {
+      if (api.name === 'build' && routeChunkFilesMap) {
+        // internal tern app use map mode
+        return api.config.tern
+          ? // map mode
+            [
+              {
+                type: PRELOAD_ROUTE_MAP_SCP_TYPE,
+                content: JSON.stringify(routeChunkFilesMap),
+              },
+            ]
+          : // script mode
+            [
+              {
+                content: readFileSync(
+                  join(
+                    TEMPLATES_DIR,
+                    'routePreloadOnLoad/preloadRouteFilesScp.js',
+                  ),
+                  'utf-8',
                 )
-                .replace('{{basename}}', api.config.base)
-                .replace(
-                  '"{{publicPath}}"',
-                  `${
-                    // handle runtimePublicPath
-                    api.config.runtimePublicPath ? 'window.publicPath||' : ''
-                  }"${api.config.publicPath}"`,
-                ),
-            },
-          ];
-    }
-
-    return [];
+                  .replace(
+                    '"{{routeChunkFilesMap}}"',
+                    JSON.stringify(routeChunkFilesMap),
+                  )
+                  .replace('{{basename}}', api.config.base)
+                  .replace(
+                    '"{{publicPath}}"',
+                    `${
+                      // handle runtimePublicPath
+                      api.config.runtimePublicPath ? 'window.publicPath||' : ''
+                    }"${api.config.publicPath}"`,
+                  ),
+              },
+            ];
+      }
+
+      return [];
+    },
+    stage: Infinity,
   });
 
   api.onBuildComplete(async ({ err, stats }) => {

diff --git a/packages/preset-vue/package.json b/packages/preset-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-vue",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/preset-vue",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-vue#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/renderer-react/package.json b/packages/renderer-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/renderer-react/src/dataFetcher.ts b/packages/renderer-react/src/dataFetcher.ts
@@ -12,7 +12,10 @@ export function fetchServerLoader({
     url: window.location.href,
   }).toString();
   // 在有basename的情况下__serverLoader的请求路径需要加上basename
-  const url = `${withEndSlash(basename)}__serverLoader?${query}`;
+  // FIXME: 先临时解自定义 serverLoader 请求路径的问题，后续改造 serverLoader 时再提取成类似 runtimeServerLoader 的配置项
+  const url = `${withEndSlash(
+    (window as any).umiServerLoaderPath || basename,
+  )}__serverLoader?${query}`;
   fetch(url, {
     credentials: 'include',
   })

diff --git a/packages/renderer-vue/package.json b/packages/renderer-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-vue",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/renderer-vue",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-vue#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/test",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/test",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/testing#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/umi/package.json b/packages/umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/utils",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {

diff --git a/packages/zod2ts/package.json b/packages/zod2ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/zod2ts",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/zod2ts",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/zod2ts#readme",
   "bugs": "https://github.com/umijs/umi/issues",