@umijs/plugins 4.6.28 → 4.6.30

package/dist/mf.js

@@ -46,7 +46,8 @@ function mf(api) {
               name: zod.string(),
               entry: zod.string().optional(),
               entries: zod.object({}).optional(),
-              keyResolver: zod.string().optional()
+              keyResolver: zod.string().optional(),
+              runtimeEntryPath: zod.object({}).optional()
             })
           ),
           shared: zod.record(zod.any()),
@@ -187,16 +188,41 @@ function mf(api) {
   }
   function formatRemote(remote) {
     if (remote.entry) {
-      return `${remote.name}@${remote.entry}`;
+      if (!remote.runtimeEntryPath) {
+        return `${remote.name}@${remote.entry}`;
+      }
+      return `promise new Promise(resolve => {
+
+  const script = document.createElement('script');
+  script.src = window["mf_${remote.name}EntryPath"];
+  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);
+})
+`;
     }
     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
+  const remoteUrlWithVersion = ${remote.runtimeEntryPath ? `window["mf_${remote.name}EntryPath"]` : "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
@@ -204,13 +230,13 @@ function mf(api) {
       get: (request) => window.${remote.name}.get(request),
       init: (arg) => {
         try {
-          return window.${remote.name}.init(arg)
+          return window.${remote.name}.init(arg);
         } catch(e) {
-          console.log('remote container already initialized')
+          console.log('remote container already initialized');
         }
       }
     }
-    resolve(proxy)
+    resolve(proxy);
   }
   // inject this script with the src set to the versioned remoteEntry.js
   document.head.appendChild(script);

package/dist/utils/mfUtils.d.ts

@@ -2,12 +2,14 @@ declare type SimpleRemote = {
     entry: string;
     name: string;
     aliasName?: string;
+    runtimeEntryPath?: object;
 };
 declare type RemoteEntries = {
     name: string;
     entries: object;
     keyResolver: string;
     aliasName?: string;
+    runtimeEntryPath?: object;
 };
 declare type Remote = SimpleRemote | RemoteEntries;
 export declare function toRemotesCodeString(remotes: Remote[]): string;

package/dist/utils/mfUtils.js

@@ -36,15 +36,15 @@ function toRemotesCodeString(remotes) {
     if (isSimpleRemote(r)) {
       res.push(`${aliasName}: {
   aliasName: "${aliasName}",
-  remoteName: "${remoteName}",        
-  entry: "${r.entry}"
+  remoteName: "${remoteName}",
+  entry: ${r.runtimeEntryPath ? `window["mf_${r.name}EntryPath"]` : `"${r.entry}"`}
 }`);
     }
     if (isRemoteEntries(r)) {
       res.push(`${aliasName}: {
   aliasName: "${aliasName}",
-  remoteName: "${remoteName}",        
-  entry: (${JSON.stringify(r.entries)})[${r.keyResolver}]
+  remoteName: "${remoteName}",
+  entry: ${r.runtimeEntryPath ? `window["mf_${r.name}EntryPath"]` : `(${JSON.stringify(r.entries)})[${r.keyResolver}]`}
 }`);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.6.28",
+  "version": "4.6.30",
   "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.6.28",
+    "@umijs/bundler-utils": "4.6.30",
     "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.6.28"
+    "umi": "4.6.30"
   },
   "publishConfig": {
     "access": "public"