@umijs/plugins 4.0.0-canary.20230201.1 → 4.0.0-canary.20230207.1

package/dist/mf.js

@@ -76,10 +76,11 @@ function mf(api) {
         (0, import_path.join)(api.paths.absTmpPath, "plugin-mf", mfSetupPathFileName)
       );
     }
+    const useHash = api.config.hash && api.env !== "development";
     const mfConfig = {
       name,
       remotes,
-      filename: api.config.hash ? "remote.[contenthash:8].js" : "remote.js",
+      filename: useHash ? "remote.[contenthash:8].js" : "remote.js",
       exposes,
       shared,
       library: api.config.mf.library
@@ -93,6 +94,19 @@ function mf(api) {
     );
     return config;
   });
+  api.modifyDefaultConfig(async (memo) => {
+    if (memo.mfsu) {
+      const exposes = await constructExposes();
+      if (!isEmpty(exposes)) {
+        memo.mfsu.remoteName = mfName();
+        memo.mfsu.mfName = `mf_${memo.mfsu.remoteName}`;
+      }
+      const remotes = formatRemotes();
+      memo.mfsu.remoteAliases = Object.keys(remotes);
+      memo.mfsu.shared = getShared();
+    }
+    return memo;
+  });
   api.onGenerateFiles(() => {
     api.writeTmpFile({
       content: `/* infer remote public */;
@@ -116,7 +130,7 @@ function mf(api) {
     });
   });
   function formatRemotes() {
-    const { remotes = [] } = api.config.mf;
+    const { remotes = [] } = api.userConfig.mf;
     const memo = {};
     remotes.forEach((remote) => {
       const aliasName = remote.aliasName || remote.name;
@@ -188,16 +202,21 @@ function mf(api) {
     return exposes;
   }
   function mfName() {
-    const name = api.config.mf.name;
+    const name = api.userConfig.mf.name;
     if (!name) {
       api.logger.warn(
         `module federation name is not defined , "unNamedMF" will be used`
       );
     }
+    if (!isValidIdentifyName(name)) {
+      throw new Error(
+        `module federation name '${name}' is not valid javascript identifier.`
+      );
+    }
     return name || "unNamedMF";
   }
   function getShared() {
-    const { shared = {} } = api.config.mf;
+    const { shared = {} } = api.userConfig.mf;
     return shared;
   }
   function changeUmiEntry(config) {
@@ -225,6 +244,76 @@ function mf(api) {
   function addMFEntry(config, mfName2, path) {
     config.entry[mfName2] = path;
   }
+  function isValidIdentifyName(name) {
+    const reservedKeywords = [
+      "abstract",
+      "await",
+      "boolean",
+      "break",
+      "byte",
+      "case",
+      "catch",
+      "char",
+      "class",
+      "const",
+      "continue",
+      "debugger",
+      "default",
+      "delete",
+      "do",
+      "double",
+      "else",
+      "enum",
+      "export",
+      "extends",
+      "false",
+      "final",
+      "finally",
+      "float",
+      "for",
+      "function",
+      "goto",
+      "if",
+      "implements",
+      "import",
+      "in",
+      "instanceof",
+      "int",
+      "interface",
+      "let",
+      "long",
+      "native",
+      "new",
+      "null",
+      "package",
+      "private",
+      "protected",
+      "public",
+      "return",
+      "short",
+      "static",
+      "super",
+      "switch",
+      "synchronized",
+      "this",
+      "throw",
+      "transient",
+      "true",
+      "try",
+      "typeof",
+      "var",
+      "void",
+      "volatile",
+      "while",
+      "with",
+      "yield"
+    ];
+    const regexIdentifierName = /^(?:[$_\p{ID_Start}])(?:[$_\u200C\u200D\p{ID_Continue}])*$/u;
+    if (reservedKeywords.includes(name) || !regexIdentifierName.test(name)) {
+      return false;
+    }
+    return true;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230201.1",
+  "version": "4.0.0-canary.20230207.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.20230201.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230207.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.20230201.1"
+    "umi": "4.0.0-canary.20230207.1"
   },
   "publishConfig": {
     "access": "public"