@umijs/plugins 4.0.0-canary.20220727.1 → 4.0.0-canary.20220729.1

package/dist/access.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// access.ts
+// src/access.ts
 var access_exports = {};
 __export(access_exports, {
   default: () => access_default

package/dist/analytics.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// analytics.ts
+// src/analytics.ts
 var analytics_exports = {};
 __export(analytics_exports, {
   default: () => analytics_default

package/dist/antd.js

@@ -33,7 +33,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// antd.ts
+// src/antd.ts
 var antd_exports = {};
 __export(antd_exports, {
   default: () => antd_default

package/dist/dva.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// dva.ts
+// src/dva.ts
 var dva_exports = {};
 __export(dva_exports, {
   default: () => dva_default,

package/dist/icons.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// icons.ts
+// src/icons.ts
 var icons_exports = {};
 __export(icons_exports, {
   default: () => icons_default

package/dist/initial-state.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// initial-state.ts
+// src/initial-state.ts
 var initial_state_exports = {};
 __export(initial_state_exports, {
   default: () => initial_state_default

package/dist/layout.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// layout.ts
+// src/layout.ts
 var layout_exports = {};
 __export(layout_exports, {
   default: () => layout_default
@@ -247,17 +247,36 @@ const { formatMessage } = useIntl();
     api.writeTmpFile({
       path: "types.d.ts",
       content: `
-    import type { ProLayoutProps } from "${pkgPath || "@ant-design/pro-layout"}";
+    import type { ProLayoutProps, HeaderProps } from "${pkgPath || "@ant-design/pro-layout"}";
     ${hasInitialStatePlugin ? `import type InitialStateType from '@@/plugin-initialState/@@initialState';
            type InitDataType = ReturnType<typeof InitialStateType>;
         ` : "type InitDataType = any;"}
-
-    export type RunTimeLayoutConfig = (
-      initData: InitDataType,
-    ) => ProLayoutProps & {
-      childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode,
-      noAccessible?: JSX.Element,
-      notFound?: JSX.Element,
+    import { IConfigFromPlugins } from '@@/core/pluginConfig';
+    
+    export type RunTimeLayoutConfig = (initData: InitDataType) => Omit<
+      ProLayoutProps,
+      'rightContentRender'
+    > & {
+      childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode;
+      noAccessible?: JSX.Element;
+      notFound?: JSX.Element;
+      logout?: (initialState: InitDataType['initialState']) => Promise<void> | void;
+      rightContentRender?: (
+        headerProps: HeaderProps,
+        dom: JSX.Element,
+        props: {
+          userConfig: IConfigFromPlugins['layout'];
+          runtimeConfig: RunTimeLayoutConfig;
+          loading: InitDataType['loading'];
+          initialState: InitDataType['initialState'];
+          setInitialState: InitDataType['setInitialState'];
+        },
+      ) => JSX.Element;
+      rightRender?: (
+        initialState: InitDataType['initialState'],
+        setInitialState: InitDataType['setInitialState'],
+        runtimeConfig: RunTimeLayoutConfig,
+      ) => JSX.Element;
     };
     `
     });

package/dist/locale.js

@@ -36,7 +36,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// locale.ts
+// src/locale.ts
 var locale_exports = {};
 __export(locale_exports, {
   default: () => locale_default,
@@ -202,8 +202,8 @@ var locale_default = (api) => {
     api.writeTmpFile({
       path: "index.ts",
       content: `
-export { addLocale, setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage, getAllLocales } from './localeExports.ts';
-export { SelectLang } from './SelectLang.tsx';
+export { addLocale, setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage, getAllLocales } from './localeExports';
+export { SelectLang } from './SelectLang';
 `
     });
   });

package/dist/mf.d.ts

@@ -0,0 +1,2 @@
+import type { IApi } from 'umi';
+export default function mf(api: IApi): void;

package/dist/mf.js

@@ -0,0 +1,197 @@
+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/mf.ts
+var mf_exports = {};
+__export(mf_exports, {
+  default: () => mf
+});
+module.exports = __toCommonJS(mf_exports);
+var import_fs = require("fs");
+var import_path = require("path");
+var import_plugin_utils = require("umi/plugin-utils");
+var { isEmpty } = import_plugin_utils.lodash;
+var mfSetupPathFileName = "_mf_setup-public-path.js";
+var mfAsyncEntryFileName = "asyncEntry.ts";
+function mf(api) {
+  api.describe({
+    key: "mf",
+    config: {
+      schema(Joi) {
+        return Joi.object({
+          name: Joi.string(),
+          remotes: Joi.array().items(Joi.object({
+            aliasName: Joi.string(),
+            name: Joi.string().required(),
+            entry: Joi.string(),
+            entries: Joi.object(),
+            keyResolver: Joi.string()
+          })),
+          shared: Joi.object(),
+          library: Joi.object()
+        });
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.modifyWebpackConfig(async (config, { webpack }) => {
+    const exposes = await constructExposes();
+    const remotes = formatRemotes();
+    const shared = getShared();
+    if (isEmpty(remotes) && isEmpty(exposes)) {
+      api.logger.warn("ModuleFederation exposes and remotes are empty, plugin will not work");
+      return config;
+    }
+    if (!isEmpty(remotes)) {
+      if (!api.config.mfsu) {
+        changeUmiEntry(config);
+      }
+    }
+    let name = "_";
+    if (!isEmpty(exposes)) {
+      name = mfName();
+      addMFEntry(config, name, (0, import_path.join)(api.paths.absTmpPath, "plugin-mf", mfSetupPathFileName));
+    }
+    const mfConfig = {
+      name,
+      remotes,
+      filename: "remote.js",
+      exposes,
+      shared,
+      library: api.config.mf.library
+    };
+    const { ModuleFederationPlugin } = webpack.container;
+    config.plugins.push(new ModuleFederationPlugin(mfConfig));
+    api.logger.debug(`ModuleFederationPlugin is enabled with config ${JSON.stringify(mfConfig)}`);
+    return config;
+  });
+  api.onGenerateFiles(() => {
+    api.writeTmpFile({
+      content: `/* infer remote public */;
+      __webpack_public_path__ = document.currentScript.src + '/../';`,
+      path: mfSetupPathFileName
+    });
+    if (api.env === "development" && api.config.mfsu) {
+      return;
+    }
+    api.writeTmpFile({
+      content: `import('${(0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, "umi.ts"))}')`,
+      path: mfAsyncEntryFileName
+    });
+  });
+  function formatRemotes() {
+    const { remotes = [] } = api.config.mf;
+    const memo = {};
+    remotes.forEach((remote) => {
+      const aliasName = remote.aliasName || remote.name;
+      const r = formatRemote(remote);
+      if (memo[aliasName]) {
+        return api.logger.error(`${aliasName} already set as ${memo[aliasName]}, new value ${r} will be ignored`);
+      }
+      memo[aliasName] = r;
+    });
+    return memo;
+  }
+  function formatRemote(remote) {
+    if (remote.entry) {
+      return `${remote.name}@${remote.entry}`;
+    }
+    if (remote.entries && remote.keyResolver) {
+      const dynamicUrl = `promise new Promise(resolve => {
+  const entries = ${JSON.stringify(remote.entries)};
+  const key = ${remote.keyResolver};
+
+  const remoteUrlWithVersion = entries[key];
+  const script = document.createElement('script')
+  script.src = remoteUrlWithVersion
+  script.onload = () => {
+    // the injected script has loaded and is available on window
+    // we can now resolve this Promise
+    const proxy = {
+      get: (request) => window.${remote.name}.get(request),
+      init: (arg) => {
+        try {
+          return window.${remote.name}.init(arg)
+        } catch(e) {
+          console.log('remote container already initialized')
+        }
+      }
+    }
+    resolve(proxy)
+  }
+  // inject this script with the src set to the versioned remoteEntry.js
+  document.head.appendChild(script);
+})
+`;
+      return dynamicUrl;
+    } else {
+      api.logger.error("you should provider entry or entries and keyResolver");
+      throw Error("Wrong MF#remotes config");
+    }
+  }
+  async function constructExposes() {
+    const exposes = {};
+    const exposesPath = (0, import_path.join)(api.paths.absSrcPath, "exposes");
+    if (!(0, import_fs.existsSync)(exposesPath)) {
+      return exposes;
+    }
+    const dir = (0, import_fs.opendirSync)(exposesPath);
+    for await (const dirent of dir) {
+      if (dirent.isDirectory()) {
+        exposes["./" + dirent.name] = (0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absSrcPath, "exposes", dirent.name));
+      } else {
+        api.logger.warn(`${dirent.name} is not a directory, ignore in ModuleFederation expose`);
+      }
+    }
+    return exposes;
+  }
+  function mfName() {
+    const name = api.config.mf.name;
+    if (!name) {
+      api.logger.warn(`module federation name is not defined , "unNamedMF" will be used`);
+    }
+    return name || "unNamedMF";
+  }
+  function getShared() {
+    const { shared = {} } = api.config.mf;
+    return shared;
+  }
+  function changeUmiEntry(config) {
+    const { entry } = config;
+    const asyncEntryPath = (0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, "plugin-mf", mfAsyncEntryFileName));
+    if (entry.umi) {
+      if (typeof entry.umi === "string") {
+        entry.umi = asyncEntryPath;
+      } else if (Array.isArray(entry.umi)) {
+        const i = entry.umi.findIndex((f) => f.endsWith("umi.ts"));
+        if (i >= 0) {
+          entry.umi[i] = asyncEntryPath;
+        } else {
+          api.logger.info(`umi.ts not found in entry.umi ${JSON.stringify(entry.umi)}`);
+        }
+      }
+    } else {
+      api.logger.warn("umi entry not found");
+    }
+  }
+  function addMFEntry(config, mfName2, path) {
+    config.entry[mfName2] = path;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/model.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// model.ts
+// src/model.ts
 var model_exports = {};
 __export(model_exports, {
   default: () => model_default

package/dist/moment2dayjs.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// moment2dayjs.ts
+// src/moment2dayjs.ts
 var moment2dayjs_exports = {};
 __export(moment2dayjs_exports, {
   default: () => moment2dayjs_default

package/dist/qiankun/constants.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// constants.ts
+// src/qiankun/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
   MODEL_EXPORT_NAME: () => MODEL_EXPORT_NAME,

package/dist/qiankun/master.js

@@ -36,7 +36,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// master.ts
+// src/qiankun/master.ts
 var master_exports = {};
 __export(master_exports, {
   default: () => master_default,

package/dist/qiankun/slave.js

@@ -36,7 +36,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// slave.ts
+// src/qiankun/slave.ts
 var slave_exports = {};
 __export(slave_exports, {
   default: () => slave_default

package/dist/qiankun.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// qiankun.ts
+// src/qiankun.ts
 var qiankun_exports = {};
 __export(qiankun_exports, {
   default: () => qiankun_default

package/dist/request.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// request.ts
+// src/request.ts
 var request_exports = {};
 __export(request_exports, {
   default: () => request_default
@@ -153,7 +153,7 @@ interface IErrorHandler {
 }
 type IRequestInterceptorAxios = (config: RequestOptions) => RequestOptions;
 type IRequestInterceptorUmiRequest = (url: string, config : RequestOptions) => { url: string, options: RequestOptions };
-type IRequestInterceptor = IRequestInterceptorAxios;
+type IRequestInterceptor = IRequestInterceptorAxios | IRequestInterceptorUmiRequest;
 type IErrorInterceptor = (error: Error) => Promise<Error>;
 type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosResponse<T> ;
 type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor

package/dist/tailwindcss.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// tailwindcss.ts
+// src/tailwindcss.ts
 var tailwindcss_exports = {};
 __export(tailwindcss_exports, {
   default: () => tailwindcss_default

package/dist/unocss.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unocss.ts
+// src/unocss.ts
 var unocss_exports = {};
 __export(unocss_exports, {
   default: () => unocss_default

package/dist/utils/astUtils.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// astUtils.ts
+// src/utils/astUtils.ts
 var astUtils_exports = {};
 __export(astUtils_exports, {
   getIdentifierDeclaration: () => getIdentifierDeclaration

package/dist/utils/localeUtils.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// localeUtils.ts
+// src/utils/localeUtils.ts
 var localeUtils_exports = {};
 __export(localeUtils_exports, {
   exactLocalePaths: () => exactLocalePaths,

package/dist/utils/modelUtils.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// modelUtils.ts
+// src/utils/modelUtils.ts
 var modelUtils_exports = {};
 __export(modelUtils_exports, {
   Model: () => Model,

package/dist/utils/resolveProjectDep.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// resolveProjectDep.ts
+// src/utils/resolveProjectDep.ts
 var resolveProjectDep_exports = {};
 __export(resolveProjectDep_exports, {
   resolveProjectDep: () => resolveProjectDep

package/dist/utils/withTmpPath.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// withTmpPath.ts
+// src/utils/withTmpPath.ts
 var withTmpPath_exports = {};
 __export(withTmpPath_exports, {
   withTmpPath: () => withTmpPath

package/libs/locale/localeExports.tpl

@@ -262,6 +262,9 @@ http://j.mp/37Fkd5Q
     );
     firstWaring = false;
   }
+  if (!g_intl) {
+    setIntl(getLocale());
+  }
   return g_intl.formatMessage(descriptor, values);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220727.1",
+  "version": "4.0.0-canary.20220729.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -25,7 +25,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^7.0.1-beta.28",
-    "@umijs/bundler-utils": "4.0.0-canary.20220727.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220729.1",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220727.1"
+    "umi": "4.0.0-canary.20220729.1"
   },
   "publishConfig": {
     "access": "public"