@umijs/plugins 4.2.5 → 4.2.6-alpha.0

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

@@ -36,7 +36,6 @@ var import_fs = require("fs");
 var import_path = require("path");
 var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
-var import_npmClient = require("./utils/npmClient");
 var import_resolveProjectDep = require("./utils/resolveProjectDep");
 var import_withTmpPath = require("./utils/withTmpPath");
 var antIconsPath = (0, import_plugin_utils.winPath)(
@@ -119,7 +118,14 @@ var layout_default = (api) => {
     return memo;
   });
   api.onGenerateFiles(() => {
-    const isFlattedDepsDir = (0, import_npmClient.isFlattedNodeModulesDir)(api);
+    var _a;
+    let realNpmClient = api.appData.npmClient;
+    if (api.appData.npmClient === import_plugin_utils.NpmClientEnum.tnpm && ((_a = api.pkg.tnpm) == null ? void 0 : _a.mode) && [import_plugin_utils.NpmClientEnum.npm, import_plugin_utils.NpmClientEnum.yarn].includes(api.pkg.tnpm.mode)) {
+      realNpmClient = api.pkg.tnpm.mode;
+    }
+    const isFlattedDepsDir = [import_plugin_utils.NpmClientEnum.npm, import_plugin_utils.NpmClientEnum.yarn].includes(
+      realNpmClient
+    );
     const PKG_TYPE_REFERENCE = `
 /// <reference types="${isFlattedDepsDir ? ANT_PRO_COMPONENT : resolvedPkgPath}" />
 ${isFlattedDepsDir ? '/// <reference types="antd" />' : ""}

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/dist/react-query.js

@@ -24,20 +24,25 @@ __export(react_query_exports, {
 module.exports = __toCommonJS(react_query_exports);
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
-var import_npmClient = require("./utils/npmClient");
 var import_resolveProjectDep = require("./utils/resolveProjectDep");
 var import_withTmpPath = require("./utils/withTmpPath");
-var reactQueryInfo;
-var REACT_QUERY_DEP_NAME = "@tanstack/react-query";
-var REACT_QUERY_DEVTOOLS_DEP_NAME = "@tanstack/react-query-devtools";
-var REACT_QUERY_CORE_DEP_NAME = "@tanstack/query-core";
-var getReactQueryPkgInfo = (api) => {
-  if (reactQueryInfo) {
-    return reactQueryInfo;
-  }
+var react_query_default = (api) => {
+  api.describe({
+    key: "reactQuery",
+    config: {
+      schema({ zod }) {
+        return zod.object({
+          devtool: zod.union([zod.record(zod.any()), zod.boolean()]),
+          queryClient: zod.union([zod.record(zod.any()), zod.boolean()])
+        }).deepPartial();
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
   let pkgPath;
   let devtoolsPkgPath;
-  let corePath;
+  const REACT_QUERY_DEP_NAME = "@tanstack/react-query";
+  const REACT_QUERY_DEVTOOLS_DEP_NAME = "@tanstack/react-query-devtools";
   const defaultPkgPath = (0, import_utils.winPath)(
     (0, import_path.dirname)(require.resolve(`${REACT_QUERY_DEP_NAME}/package.json`))
   );
@@ -56,16 +61,6 @@ var getReactQueryPkgInfo = (api) => {
       `[reactQuery] package '${REACT_QUERY_DEP_NAME}' resolve failed, ${e.message}`
     );
   }
-  try {
-    corePath = (0, import_utils.winPath)(
-      (0, import_path.dirname)(
-        require.resolve(`${REACT_QUERY_CORE_DEP_NAME}/package.json`, {
-          paths: [pkgPath]
-        })
-      )
-    );
-  } catch {
-  }
   try {
     const localDevtoolsPkgPath = (0, import_resolveProjectDep.resolveProjectDep)({
       pkg: api.pkg,
@@ -87,35 +82,7 @@ var getReactQueryPkgInfo = (api) => {
   const useV5 = pkgVersion.startsWith("5");
   const useV5Devtools = devtoolsVersion.startsWith("5");
   const canUseDevtools = useV4 && useV4Devtools || useV5 && useV5Devtools;
-  reactQueryInfo = {
-    pkgPath,
-    devtoolsPkgPath,
-    defaultPkgPath,
-    defaultDevtoolPkgPath,
-    pkgVersion,
-    canUseDevtools,
-    useV4,
-    useV5,
-    corePath
-  };
-  return reactQueryInfo;
-};
-var react_query_default = (api) => {
-  api.describe({
-    key: "reactQuery",
-    config: {
-      schema({ zod }) {
-        return zod.object({
-          devtool: zod.union([zod.record(zod.any()), zod.boolean()]),
-          queryClient: zod.union([zod.record(zod.any()), zod.boolean()])
-        }).deepPartial();
-      }
-    },
-    enableBy: api.EnableBy.config
-  });
   api.onStart(() => {
-    getReactQueryPkgInfo(api);
-    const { pkgPath, defaultPkgPath, pkgVersion } = reactQueryInfo;
     if (pkgPath !== defaultPkgPath && !process.env.IS_UMI_BUILD_WORKER) {
       api.logger.info(`[reactQuery] use local package, version: ${pkgVersion}`);
     }
@@ -127,7 +94,6 @@ var react_query_default = (api) => {
     return ["reactQuery"];
   });
   api.modifyConfig((memo) => {
-    const { pkgPath, devtoolsPkgPath, canUseDevtools } = getReactQueryPkgInfo(api);
     memo.alias[REACT_QUERY_DEP_NAME] = pkgPath;
     if (canUseDevtools) {
       memo.alias[REACT_QUERY_DEVTOOLS_DEP_NAME] = devtoolsPkgPath;
@@ -136,7 +102,6 @@ var react_query_default = (api) => {
   });
   api.onGenerateFiles(() => {
     var _a;
-    const { pkgPath, devtoolsPkgPath, canUseDevtools, useV4, useV5 } = getReactQueryPkgInfo(api);
     const enableDevTools = api.config.reactQuery.devtool !== false && canUseDevtools;
     const enableQueryClient = api.config.reactQuery.queryClient !== false;
     const reactQueryRuntimeCode = ((_a = api.appData.appJS) == null ? void 0 : _a.exports.includes(
@@ -169,105 +134,60 @@ export function rootContainer(container) {
     </QueryClientProvider>
   );
 }
-      ` : "export {}"
+      ` : ""
     });
-    const exportMembers = [
-      // from @tanstack/query-core
-      "QueryClient",
-      "QueryCache",
-      "MutationCache",
-      "QueryObserver",
-      "InfiniteQueryObserver",
-      "QueriesObserver",
-      "MutationObserver",
-      // from @tanstack/react-query
-      "useQuery",
-      "useQueries",
-      "useInfiniteQuery",
-      "useMutation",
-      "useIsFetching",
-      "useIsMutating",
-      ...useV5 ? [
-        "useMutationState",
-        "useSuspenseQuery",
-        "useSuspenseInfiniteQuery",
-        "useSuspenseQueries",
-        "queryOptions",
-        "infiniteQueryOptions"
-      ] : [],
-      "QueryClientProvider",
-      "useQueryClient",
-      "QueryErrorResetBoundary",
-      "useQueryErrorResetBoundary",
-      "useIsRestoring",
-      "IsRestoringProvider"
-    ].filter(Boolean);
     api.writeTmpFile({
       path: "index.tsx",
       content: `
 export {
-  ${exportMembers.join(",\n  ")}
+  // from @tanstack/query-core
+  QueryClient,
+  MutationObserver,
+  MutationCache,
+  InfiniteQueryObserver,
+  QueriesObserver,
+  QueryObserver,
+  QueryCache,
+  // from @tanstack/react-query
+  useIsRestoring,
+  IsRestoringProvider,
+  useInfiniteQuery,
+  useIsMutating,
+  useIsFetching,
+  useMutation,
+  useQueries,
+  useQuery,
+  QueryClientProvider,
+  useQueryClient,
+  QueryErrorResetBoundary,
+  useQueryErrorResetBoundary,
+  ${useV5 ? "queryOptions," : ""}
 } from '${pkgPath}';
       `
     });
-    const exportTypes = [
-      // from @tanstack/query-core
-      "Query",
-      "QueryState",
-      "Mutation",
-      // from @tanstack/react-query
-      "QueriesResults",
-      "QueriesOptions",
-      "QueryErrorResetBoundaryProps",
-      "QueryClientProviderProps",
-      useV4 && "ContextOptions as QueryContextOptions,",
-      "UseQueryOptions",
-      "UseBaseQueryOptions",
-      "UseQueryResult",
-      "UseBaseQueryResult",
-      "UseInfiniteQueryOptions",
-      "UseMutationResult",
-      "UseMutateFunction",
-      "UseMutateAsyncFunction",
-      "UseBaseMutationResult"
-    ].filter(Boolean);
     api.writeTmpFile({
       path: "types.d.ts",
       content: `
 export type {
-  ${exportTypes.join(",\n  ")}
+  // from @tanstack/query-core
+  Query, QueryState, Mutation,
+  // from @tanstack/react-query
+  QueriesResults,
+  QueriesOptions,
+  QueryErrorResetBoundaryProps,
+  QueryClientProviderProps,
+  ${useV4 ? "ContextOptions as QueryContextOptions," : ""}
+  UseQueryOptions,
+  UseBaseQueryOptions,
+  UseQueryResult,
+  UseBaseQueryResult,
+  UseInfiniteQueryOptions,
+  UseMutationResult,
+  UseMutateFunction,
+  UseMutateAsyncFunction,
+  UseBaseMutationResult,
 } from '${pkgPath}';
       `
     });
-    api.writeTmpFile({
-      path: "types.d.ts",
-      content: enableQueryClient ? `
-import React from 'react';
-import { QueryClientConfig } from '${pkgPath}';
-${enableDevTools ? `
-import { ReactQueryDevtools } from '${devtoolsPkgPath}';
-` : ""}
-
-export type RuntimeReactQueryType = {
-  ${enableDevTools ? `
-  devtool?: React.ComponentProps<typeof ReactQueryDevtools>
-` : ""}
-  queryClient?: QueryClientConfig
-}` : "export type RuntimeReactQueryType = {}"
-    });
   });
-  const isFlattedDepsDir = (0, import_npmClient.isFlattedNodeModulesDir)(api);
-  if (!isFlattedDepsDir) {
-    api.modifyTSConfig((config) => {
-      const { corePath, useV5 } = getReactQueryPkgInfo(api);
-      if (useV5 && (corePath == null ? void 0 : corePath.length)) {
-        import_utils.lodash.set(
-          config,
-          `compilerOptions.paths["${REACT_QUERY_CORE_DEP_NAME}"]`,
-          [corePath]
-        );
-      }
-      return config;
-    });
-  }
 };

package/libs/qiankun/master/MicroApp.tsx

@@ -167,13 +167,6 @@ export const MicroApp = forwardRef(
       props: { settings: settingsFromConfig = {}, ...propsFromConfig } = {},
     } = appConfig || {};
 
-    const __globalRoutesInfo = {
-      appNameKeyAlias,
-      masterHistoryType,
-      base: globalSettings.base,
-      microAppRoutes: globalSettings.microAppRoutes,
-    };
-
     useEffect(() => {
       setComponentError(null);
       setLoading(true);
@@ -192,7 +185,12 @@ export const MicroApp = forwardRef(
             ...propsFromConfig,
             ...stateForSlave,
             ...propsFromParams,
-            __globalRoutesInfo,
+            __globalRoutesInfo: {
+              appNameKeyAlias,
+              masterHistoryType,
+              base: globalSettings.base,
+              microAppRoutes: globalSettings.microAppRoutes,
+            },
             setLoading,
           },
         },
@@ -265,7 +263,6 @@ export const MicroApp = forwardRef(
                 ...propsFromConfig,
                 ...stateForSlave,
                 ...propsFromParams,
-                __globalRoutesInfo,
                 setLoading,
               };
 

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.2.5",
+  "version": "4.2.6-alpha.0",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -45,12 +45,12 @@
     "styled-components": "6.1.1",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.2.5",
+    "@umijs/bundler-utils": "4.2.6-alpha.0",
     "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.2.5"
+    "umi": "4.2.6-alpha.0"
   },
   "publishConfig": {
     "access": "public"

package/dist/utils/npmClient.d.ts

@@ -1,2 +0,0 @@
-import type { IApi } from 'umi';
-export declare const isFlattedNodeModulesDir: (api: IApi) => boolean;

package/dist/utils/npmClient.js

@@ -1,45 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/utils/npmClient.ts
-var npmClient_exports = {};
-__export(npmClient_exports, {
-  isFlattedNodeModulesDir: () => isFlattedNodeModulesDir
-});
-module.exports = __toCommonJS(npmClient_exports);
-var import_plugin_utils = require("umi/plugin-utils");
-var FLATTED_NPM_CLIENT = [
-  import_plugin_utils.NpmClientEnum.npm,
-  import_plugin_utils.NpmClientEnum.yarn
-];
-var isFlattedNodeModulesDir = (api) => {
-  var _a;
-  let currentNpmClient = api.appData.npmClient;
-  const tnpmCompatMode = api.appData.npmClient === import_plugin_utils.NpmClientEnum.tnpm && ((_a = api.pkg.tnpm) == null ? void 0 : _a.mode);
-  if (tnpmCompatMode) {
-    if (FLATTED_NPM_CLIENT.includes(api.pkg.tnpm.mode)) {
-      return true;
-    }
-  }
-  const isFlattedDir = FLATTED_NPM_CLIENT.includes(currentNpmClient);
-  return isFlattedDir;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  isFlattedNodeModulesDir
-});