@umijs/plugins 4.0.0-canary.20230216.1 → 4.0.0-canary.20230223.1

package/dist/access.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/dva.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/layout.js

@@ -318,7 +318,7 @@ const { formatMessage } = useIntl();
       unAccessible?: JSX.Element;
       noFound?: JSX.Element;
       logout?: (initialState: InitDataType['initialState']) => Promise<void> | void;
-      rightContentRender?: (
+      rightContentRender?: ((
         headerProps: HeaderProps,
         dom: JSX.Element,
         props: {
@@ -328,7 +328,7 @@ const { formatMessage } = useIntl();
           initialState: InitDataType['initialState'];
           setInitialState: InitDataType['setInitialState'];
         },
-      ) => JSX.Element;
+      ) => JSX.Element) | false;
       rightRender?: (
         initialState: InitDataType['initialState'],
         setInitialState: InitDataType['setInitialState'],
@@ -399,7 +399,7 @@ export function patchRoutes({ routes }) {
     const rightRenderContent = `
 import React from 'react';
 import { Avatar, version, Dropdown, Menu, Spin } from 'antd';
-import { LogoutOutlined } from '@ant-design/icons';
+import { LogoutOutlined } from '${antIconsPath}';
 {{#Locale}}
 import { SelectLang } from '@@/plugin-locale';
 {{/Locale}}

package/dist/locale.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/mf.js

@@ -109,6 +109,7 @@ function mf(api) {
   });
   api.onGenerateFiles(() => {
     api.writeTmpFile({
+      // ref https://webpack.js.org/concepts/module-federation/#infer-publicpath-from-script
       content: `/* infer remote public */;
       __webpack_public_path__ = document.currentScript.src + '/../';`,
       path: mfSetupPathFileName

package/dist/model.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/moment2dayjs.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -38,6 +42,7 @@ var moment2dayjs_default = (api) => {
         return Joi.alternatives().try(
           Joi.object({
             preset: Joi.string(),
+            // 'antd' | 'antdv3 | 'none'
             plugins: Joi.array()
           }),
           Joi.boolean().invalid(true)

package/dist/qiankun/master.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -130,6 +134,7 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
     });
     api.writeTmpFile({
       path: "MicroAppLoader.tsx",
+      // 开启了 antd 插件的时候，使用 antd 的 loader 组件，否则提示用户必须设置一个自定义的 loader 组件
       content: api.isPluginEnable("antd") ? getFileContent("AntdLoader.tsx") : `export default function Loader() { console.warn(\`[plugins/qiankun]: Seems like you'r not using @umijs/plugin-antd, you need to provide a custom loader or set autoSetLoading false to shut down this warning!\`); return null; }`
     });
     [
@@ -150,6 +155,8 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
           context: {
             dynamicRoot: false,
             hasModelPlugin: api.isPluginEnable("model")
+            // dynamicRoot:
+            //   api.config.exportStatic && api.config.exportStatic.dynamicRoot,
           }
         });
       } else {

package/dist/qiankun/slave.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -51,7 +55,7 @@ function handleOriginalHtml(api, microAppEntry, originalHtml) {
   );
   const $ = import_utils.cheerio.load(originalHtml);
   $("head").prepend(
-    `<script>window.__QIANKUN_DEVELOPMENT__=true<\/script>
+    `<script>window.__QIANKUN_DEVELOPMENT__=true</script>
     <script type="extra-qiankun-config">${JSON.stringify({
       master: {
         apps: [
@@ -71,7 +75,7 @@ function handleOriginalHtml(api, microAppEntry, originalHtml) {
         ],
         prefetch: false
       }
-    })}<\/script>`
+    })}</script>`
   );
   return api.applyPlugins({
     key: "modifyMasterHTML",
@@ -139,6 +143,7 @@ export interface IRuntimeConfig {
     };
     const modifiedDefaultConfig = {
       ...memo,
+      // 默认开启 runtimePublicPath，避免出现 dynamic import 场景子应用资源地址出问题
       runtimePublicPath: true,
       qiankun: {
         ...memo.qiankun,

package/dist/qiankun.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/react-query.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/styled-components.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/utils/astUtils.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/dist/utils/localeUtils.js

@@ -91,6 +91,8 @@ var getLocaleList = async (opts) => {
     return {
       lang,
       name,
+      // react-intl Function.supportedLocalesOf
+      // Uncaught RangeError: Incorrect locale information provided
       locale: name.split(separator).join("-"),
       country,
       antdLocale,

package/dist/utils/modelUtils.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));
@@ -210,6 +214,7 @@ ${modelProps.join("\n")}
   }
 };
 var ModelUtils = _ModelUtils;
+// https://github.com/umijs/umi/issues/9837
 ModelUtils.topologicalSort = (models) => {
   const graph = [];
   const namespaceToNode = {};

package/dist/valtio.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   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
 ));

package/libs/qiankun/master/MicroApp.tsx

@@ -144,7 +144,7 @@ export const MicroApp = forwardRef(
     const stateForSlave = (useModel || noop)(
       qiankunStateForSlaveModelNamespace,
     );
-    const { entry, props: propsFromConfig = {} } = appConfig || {};
+    const { entry, props: { settings: settingsFromConfig = {}, ...propsFromConfig } = {} } = appConfig || {};
 
     useEffect(() => {
       setComponentError(null);
@@ -152,6 +152,7 @@ export const MicroApp = forwardRef(
       const configuration = {
         globalContext: window,
         ...globalSettings,
+        ...settingsFromConfig,
         ...settingsFromProps,
       };
       microAppRef.current = loadMicroApp(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230216.1",
+  "version": "4.0.0-canary.20230223.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -29,7 +29,7 @@
     "@ant-design/pro-components": "^2.0.1",
     "@tanstack/react-query": "^4.22.0",
     "@tanstack/react-query-devtools": "^4.22.0",
-    "@umijs/bundler-utils": "4.0.0-canary.20230216.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230223.1",
     "@umijs/valtio": "^1.0.3",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.0-canary.20230216.1"
+    "umi": "4.0.0-canary.20230223.1"
   },
   "publishConfig": {
     "access": "public"