@umijs/plugins 4.0.67 → 4.0.68

package/dist/mf.js

@@ -22,6 +22,7 @@ __export(mf_exports, {
   default: () => mf
 });
 module.exports = __toCommonJS(mf_exports);
+var import_bundler_utils = require("@umijs/bundler-utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_plugin_utils = require("umi/plugin-utils");
@@ -66,7 +67,7 @@ function mf(api) {
       return config;
     }
     if (!isEmpty(remotes)) {
-      if (!api.config.mfsu) {
+      if (api.env === "production" || !api.config.mfsu) {
         changeUmiEntry(config);
       }
     }
@@ -125,13 +126,48 @@ function mf(api) {
       },
       tplPath: (0, import_plugin_utils.winPath)((0, import_path.join)(MF_TEMPLATES_DIR, "runtime.ts.tpl"))
     });
-    if (api.env === "development" && api.config.mfsu) {
-      return;
+  });
+  api.register({
+    key: "onGenerateFiles",
+    // ensure after generate tpm files
+    stage: 10001,
+    fn: async () => {
+      if (api.env === "development" && api.config.mfsu) {
+        return;
+      }
+      const entry = (0, import_path.join)(api.paths.absTmpPath, "umi.ts");
+      const content = (0, import_fs.readFileSync)(
+        (0, import_path.join)(api.paths.absTmpPath, "umi.ts"),
+        "utf-8"
+      );
+      const [_imports, exports] = await (0, import_bundler_utils.parseModule)({ content, path: entry });
+      const mfEntryContent = [];
+      let hasDefaultExport = false;
+      if (exports.length) {
+        mfEntryContent.push(
+          `const umiExports = await import('${(0, import_plugin_utils.winPath)(entry)}')`
+        );
+        for (const exportName of exports) {
+          if (exportName === "default") {
+            hasDefaultExport = true;
+            mfEntryContent.push(`export default umiExports.${exportName}`);
+          } else {
+            mfEntryContent.push(
+              `export const ${exportName} = umiExports.${exportName}`
+            );
+          }
+        }
+      } else {
+        mfEntryContent.push(`import('${(0, import_plugin_utils.winPath)(entry)}')`);
+      }
+      if (!hasDefaultExport) {
+        mfEntryContent.push("export default 1");
+      }
+      api.writeTmpFile({
+        content: mfEntryContent.join("\n"),
+        path: mfAsyncEntryFileName
+      });
     }
-    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.userConfig.mf;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.67",
+  "version": "4.0.68",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -40,15 +40,15 @@
     "react-intl": "3.12.1",
     "react-redux": "^8.0.5",
     "redux": "^4.2.1",
-    "styled-components": "6.0.0-beta.9",
+    "styled-components": "6.0.0-rc.0",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.67",
-    "@umijs/valtio": "1.0.3"
+    "@umijs/valtio": "1.0.3",
+    "@umijs/bundler-utils": "4.0.68"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.67"
+    "umi": "4.0.68"
   },
   "publishConfig": {
     "access": "public"

package/templates/locale/localeExports.tpl

@@ -79,7 +79,7 @@ export const addLocale = (
   messages: Object,
   extraLocales: {
     momentLocale:string;
-    antd:string
+    antd: import('antd/es/locale').Locale
   },
 ) => {
   if (!name) {