@umijs/plugins 4.0.0-canary.20240626.1 → 4.0.0-canary.20240812.1

package/dist/initial-state.js

@@ -65,7 +65,7 @@ export default function InitialStateProvider(props: any) {
       appLoaded.current = true;
     }
   }, [loading]);
-  if (loading && !appLoaded.current) {
+  if (loading && !appLoaded.current && typeof window !== 'undefined') {
     return <Loading />;
   }
   return props.children;

package/dist/layout.js

@@ -388,11 +388,13 @@ ${icons.map((icon) => {
 export default { ${icons.join(", ")} };
       `
     });
+    const isIconsFeatureEnable = api.isPluginEnable("icons");
     api.writeTmpFile({
       path: "runtime.tsx",
       content: `
 import React from 'react';
 import icons from './icons';
+${isIconsFeatureEnable ? `import { Icon, getIconComponent } from '@umijs/max';` : ""}
 
 function formatIcon(name: string) {
   return name
@@ -406,6 +408,12 @@ export function patchRoutes({ routes }) {
   Object.keys(routes).forEach(key => {
     const { icon } = routes[key];
     if (icon && typeof icon === 'string') {
+      ${isIconsFeatureEnable ? `const Component = getIconComponent(icon)
+      if (Component) {
+        routes[key].icon = <Icon icon={icon} width={14} height={14} />;
+        return;
+      }` : ""}
+
       const upperIcon = formatIcon(icon);
       if (icons[upperIcon] || icons[upperIcon + 'Outlined']) {
         routes[key].icon = React.createElement(icons[upperIcon] || icons[upperIcon + 'Outlined']);

package/dist/qiankun/master.js

@@ -219,6 +219,16 @@ export { MicroAppWithMemoHistory } from './MicroAppWithMemoHistory';
       `
     });
   });
+  api.chainWebpack((config, { ssr }) => {
+    if (ssr) {
+      const originalExternals = config.get("externals");
+      config.externals({
+        ...originalExternals,
+        qiankun: "fs"
+      });
+    }
+    return config;
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/qiankun/slave.js

@@ -171,7 +171,10 @@ export interface IRuntimeConfig {
       `window.publicPath = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || "${api.config.publicPath || "/"}";`
     ];
   });
-  api.chainWebpack((config) => {
+  api.chainWebpack((config, { ssr }) => {
+    if (ssr) {
+      return;
+    }
     (0, import_assert.default)(api.pkg.name, "You should have name in package.json.");
     const {
       shouldNotAddLibraryChunkName = api.env === "production" || !Boolean(api.config.mfsu)
@@ -201,11 +204,14 @@ export interface IRuntimeConfig {
   });
   api.addEntryCode(() => [
     `
-export const bootstrap = qiankun_genBootstrap(render);
-export const mount = qiankun_genMount('${api.config.mountElementId}');
-export const unmount = qiankun_genUnmount('${api.config.mountElementId}');
-export const update = qiankun_genUpdate();
-if (!window.__POWERED_BY_QIANKUN__) {
+const qiankun_noop = () => new Error('qiankun lifecycle is not available for server runtime!');
+const isServer = typeof window === 'undefined';
+export const bootstrap = isServer ? qiankun_noop: qiankun_genBootstrap(render);
+export const mount = isServer ? qiankun_noop : qiankun_genMount('${api.config.mountElementId}');
+export const unmount = isServer ? qiankun_noop : qiankun_genUnmount('${api.config.mountElementId}');
+export const update = isServer ? qiankun_noop : qiankun_genUpdate();
+// 增加 ssr 的判断
+if (!isServer && !window.__POWERED_BY_QIANKUN__) {
   bootstrap().then(mount);
 }
     `

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -77,6 +77,10 @@ function patchMicroAppRouteComponent(routes: any[]) {
 }
 
 export async function render(oldRender: typeof noop) {
+  // 在 ssr 的场景下，直接返回旧的 render
+  if (typeof window === 'undefined') {
+    return oldRender();
+  }
   const runtimeOptions = await getMasterRuntime();
   let masterOptions: MasterOptions = {
     ...getMasterOptions(),
@@ -138,6 +142,10 @@ export async function render(oldRender: typeof noop) {
 }
 
 export function patchClientRoutes({ routes }: { routes: any[] }) {
+  // 在 ssr 的场景下，不执行主应用的 patchClientRoutes
+  if (typeof window === 'undefined') {
+    return;
+  }
   const microAppRoutes = [].concat(
     deepFilterLeafRoutes(routes),
     deepFilterLeafRoutes(microAppRuntimeRoutes),

package/libs/qiankun/slave/slaveRuntimePlugin.ts

@@ -3,6 +3,10 @@ import { createHistory } from '@@/core/history';
 import qiankunRender, { contextOptsStack } from './lifecycles';
 
 export function render(oldRender: any) {
+  // 在 ssr 的场景下，直接返回旧的 render
+  if (typeof window === 'undefined') {
+    return oldRender();
+  }
   return qiankunRender().then(oldRender);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20240626.1",
+  "version": "4.0.0-canary.20240812.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -46,11 +46,11 @@
     "tslib": "^2",
     "warning": "^4.0.3",
     "@umijs/valtio": "1.0.4",
-    "@umijs/bundler-utils": "4.0.0-canary.20240626.1"
+    "@umijs/bundler-utils": "4.0.0-canary.20240812.1"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.0-canary.20240626.1"
+    "umi": "4.0.0-canary.20240812.1"
   },
   "publishConfig": {
     "access": "public"