@fulgurjs/federation 5.7.0 → 5.8.0

package/dist/bridge-app-react.cjs

@@ -79,8 +79,12 @@ function defineBridgeApp(factory, options = {}) {
       entriesByEl.set(el, entry);
       const promise = (async () => {
         const reactDomClient = await import("react-dom/client");
+        const createRoot = reactDomClient.createRoot ?? reactDomClient.default?.createRoot;
         if (entry.status === "abort" || entriesByEl.get(el) !== entry) return;
-        const root = reactDomClient.createRoot(el);
+        if (typeof createRoot !== "function") throw new Error(
+          "react-dom/client \u672A\u5BFC\u51FA createRoot\u3002\u8BF7\u6838\u5BF9 React \u4E0E renderer \u7248\u672C\u53CA\u5171\u4EAB\u5B50\u8DEF\u5F84\u914D\u7F6E\u3002"
+        );
+        const root = createRoot(el);
         entry.root = root;
         entry.status = "live";
         const phaseRef = { current: "pending" };

package/dist/bridge-app-react.js

@@ -45,8 +45,12 @@ function defineBridgeApp(factory, options = {}) {
       entriesByEl.set(el, entry);
       const promise = (async () => {
         const reactDomClient = await import("react-dom/client");
+        const createRoot = reactDomClient.createRoot ?? reactDomClient.default?.createRoot;
         if (entry.status === "abort" || entriesByEl.get(el) !== entry) return;
-        const root = reactDomClient.createRoot(el);
+        if (typeof createRoot !== "function") throw new Error(
+          "react-dom/client \u672A\u5BFC\u51FA createRoot\u3002\u8BF7\u6838\u5BF9 React \u4E0E renderer \u7248\u672C\u53CA\u5171\u4EAB\u5B50\u8DEF\u5F84\u914D\u7F6E\u3002"
+        );
+        const root = createRoot(el);
         entry.root = root;
         entry.status = "live";
         const phaseRef = { current: "pending" };

package/dist/{chunk-OLQGJR2Z.js → chunk-GLASM5EX.js}

@@ -550,12 +550,14 @@ function createRuntime() {
           if (pick.version === localVersion) {
             pick.value = instance;
             pick.loaded = true;
-          } else if (opts.singleton) {
-            pick.value = instance;
-            pick.loaded = true;
-            console.warn(
-              `[fulgurjs:MFU-010] \u5171\u4EAB\u5355\u4F8B "${key}" \u7684\u9996\u6B21\u6D88\u8D39\u8005\u4EE5\u672C\u5730\u7248\u672C ${localVersion} \u63A5\u7BA1\u4E86 ${pick.from} \u58F0\u660E\u7684 ${pick.version} \u69FD\u4F4D\uFF08\u8BE5\u7248\u672C\u5C1A\u672A\u52A0\u8F7D\uFF09\u3002`
-            );
+          } else if (opts.singleton && !pick.pendingGet) {
+            registerShare2(scopeName, key, localVersion, () => Promise.resolve(instance), {
+              from: "fulgurjs:local-fallback",
+              loaded: true
+            });
+            const local = scope[key][localVersion];
+            local.value = instance;
+            local.loaded = true;
           }
         }
       } catch {
@@ -573,7 +575,9 @@ function createRuntime() {
     const scopeName = opts.shareScope || "default";
     const shareKey = opts.shareKey || name;
     const byName = getScope(scopeName)[shareKey] || {};
-    let entry = selectShareEntry(name, opts);
+    const requestKey = shareRequestKey(name, opts);
+    const snapshot = hooks.resolveShare ? resolvedShareSnapshots.get(requestKey) : void 0;
+    let entry = snapshot || selectShareEntry(name, opts);
     if (!entry) {
       if (opts.fallback) {
         const instance2 = await opts.fallback();
@@ -590,7 +594,7 @@ function createRuntime() {
       emitError({ remote: shareKey, error: err });
       throw err;
     }
-    if (hooks.resolveShare) {
+    if (hooks.resolveShare && !snapshot) {
       const picked = await hooks.resolveShare({
         shareKey,
         shareScope: scopeName,
@@ -599,6 +603,7 @@ function createRuntime() {
         available: Object.values(byName)
       });
       if (picked) entry = picked;
+      resolvedShareSnapshots.set(requestKey, entry);
     }
     if (entry.value !== void 0) {
       resolvedShareSnapshots.set(shareRequestKey(name, opts), entry);
@@ -622,6 +627,7 @@ function createRuntime() {
         return entry.value;
       }
       entry.loaded = false;
+      if (resolvedShareSnapshots.get(requestKey) === entry) resolvedShareSnapshots.delete(requestKey);
       throw e;
     } finally {
       if (entry.pendingGet === pending) entry.pendingGet = void 0;
@@ -644,7 +650,7 @@ function createRuntime() {
       const snapKey = shareRequestKey(name, opts);
       const snap = resolvedShareSnapshots.get(snapKey);
       if (snap && snap.value !== void 0) return { kind: "ready", value: snap.value };
-      const pickedRaw = hooks.resolveShare({
+      const pickedRaw = snap || hooks.resolveShare({
         shareKey,
         shareScope: scopeName,
         requiredVersion: opts.requiredVersion,
@@ -652,11 +658,13 @@ function createRuntime() {
         available: Object.values(getScope(scopeName)[shareKey] || {})
       });
       if (pickedRaw && typeof pickedRaw.then === "function") {
+        void Promise.resolve(pickedRaw).catch(() => {
+        });
         throw new FgError(
           ErrorCodes.SHARE_NOT_AVAILABLE,
           `\u73B0\u8C61\uFF1AresolveShare \u5BF9\u5171\u4EAB "${shareKey}" \u8FD4\u56DE\u4E86 Promise\uFF0C\u4F46\u8BE5\u5171\u4EAB\u6B63\u88AB\u540C\u6B65\u9759\u6001\u5BFC\u5165\u6D88\u8D39\uFF08Vite 8 \u540C\u6B65\u534F\u5546\u95E8\u9762\uFF09\u3002
 \u539F\u56E0\uFF1A\u6A21\u5757\u6C42\u503C\u671F\u65E0\u6CD5\u7B49\u5F85\u5F02\u6B65\u51B3\u7B56\uFF1B\u9759\u6001\u5BFC\u5165\u4E0D\u80FD\u9759\u9ED8\u5FFD\u7565 hook \u51B3\u7B56\u3002
-\u4FEE\u6CD5\uFF1A\u8BA9 resolveShare \u5BF9\u8BE5\u952E\u540C\u6B65\u8FD4\u56DE picked\uFF08\u4ECE available \u4E2D\u9009\u62E9\uFF09\uFF1B\u6216\u8BA9\u9996\u6B21\u6D88\u8D39\u5148\u7ECF\u4E00\u6B21\u52A8\u6001 loadShare \u5B8C\u6210\u534F\u5546\uFF08\u6210\u529F\u5FEB\u7167\u4F1A\u88AB\u9759\u6001\u5BFC\u5165\u590D\u7528\uFF09\u3002`,
+\u4FEE\u6CD5\uFF1AVite 8 HTML \u5165\u53E3\u4F1A\u5148\u5B8C\u6210\u5F02\u6B65\u534F\u5546\uFF1B\u5176\u4ED6\u5165\u53E3\u8BF7\u5148\u52A8\u6001 loadShare \u5EFA\u7ACB\u5FEB\u7167\uFF0C\u518D\u5BFC\u5165\u6D88\u8D39\u8005\uFF0C\u6216\u8BA9\u8BE5\u952E\u540C\u6B65\u8FD4\u56DE picked\u3002`,
           { shareKey, requiredVersion: opts.requiredVersion, syncUnsupported: true }
         );
       }
@@ -669,8 +677,9 @@ function createRuntime() {
         if (picked.version !== void 0 && picked.version === opts.localVersion) return { kind: "local" };
         throw new FgError(
           ErrorCodes.SHARE_NOT_AVAILABLE,
-          `\u73B0\u8C61\uFF1AresolveShare \u4E3A\u5171\u4EAB "${shareKey}" \u9009\u62E9\u4E86 ${picked.version ?? "\u672A\u5C31\u7EEA\u6761\u76EE"}\uFF08\u5C1A\u672A\u52A0\u8F7D\uFF09\uFF0C\u540C\u6B65\u9759\u6001\u5BFC\u5165\u65E0\u6CD5\u7B49\u5F85\u5176\u5B9E\u4F8B\u5C31\u7EEA\u3002
-\u4FEE\u6CD5\uFF1A\u8BA9 hook \u4F18\u5148\u9009\u62E9\u5DF2\u5C31\u7EEA\u5B9E\u4F8B\u6216\u672C\u5E94\u7528\u672C\u5730\u7248\u672C\uFF08${opts.localVersion ?? "\u672A\u58F0\u660E"}\uFF09\uFF0C\u6216\u5148\u7ECF\u52A8\u6001 loadShare \u5B8C\u6210\u534F\u5546\u3002`,
+          `\u73B0\u8C61\uFF1AresolveShare \u4E3A "${shareKey}" \u9009\u62E9\u4E86\u672A\u5C31\u7EEA\u7684 ${picked.version ?? "\u6761\u76EE"}\u3002
+\u539F\u56E0\uFF1A\u540C\u6B65\u6D88\u8D39\u4E0D\u80FD\u7B49\u5F85\u52A0\u8F7D\u3002
+\u4FEE\u6CD5\uFF1A\u5148\u52A8\u6001 loadShare \u518D\u5BFC\u5165\u6D88\u8D39\u8005\uFF0C\u6216\u9009\u62E9\u5DF2\u5C31\u7EEA\u5B9E\u4F8B/\u672C\u5730\u7248\u672C ${opts.localVersion ?? "\u672A\u58F0\u660E"}\u3002`,
           { shareKey, requiredVersion: opts.requiredVersion, syncUnsupported: true }
         );
       }
@@ -679,12 +688,12 @@ function createRuntime() {
     if (!entry) return { kind: "local" };
     if (entry.value !== void 0) return { kind: "ready", value: entry.value };
     if (entry.version !== void 0 && entry.version === opts.localVersion) return { kind: "local" };
-    if (opts.singleton) {
-      if (opts.strictVersion) {
+    if (opts.singleton || opts.strictVersion && opts.requiredVersion && (!opts.localVersion || !satisfies(opts.localVersion, opts.requiredVersion))) {
+      if (opts.strictVersion || entry.pendingGet) {
         throw new FgError(
           ErrorCodes.SHARE_NOT_AVAILABLE,
-          `\u73B0\u8C61\uFF1A\u5171\u4EAB\u5355\u4F8B "${shareKey}" \u9009\u4E2D\u4E86 ${entry.from} \u63D0\u4F9B\u7684 ${entry.version}\uFF08\u5C1A\u672A\u52A0\u8F7D\uFF09\uFF0C\u540C\u6B65\u9759\u6001\u5BFC\u5165\u65E0\u6CD5\u7B49\u5F85\u5176\u5B9E\u4F8B\u5C31\u7EEA\u3002
-\u539F\u56E0\uFF1A\u5355\u4F8B\u5FC5\u987B\u5168\u9875\u4E00\u81F4\uFF0C\u4E0D\u80FD\u9759\u9ED8\u6539\u7528\u672C\u5730\u526F\u672C\u5206\u88C2\u5B9E\u4F8B\u3002
+          `\u73B0\u8C61\uFF1A\u5171\u4EAB "${shareKey}" \u9009\u4E2D\u4E86 ${entry.from} \u63D0\u4F9B\u7684 ${entry.version}\uFF08\u5C1A\u672A\u52A0\u8F7D\uFF09\uFF0C\u540C\u6B65\u9759\u6001\u5BFC\u5165\u65E0\u6CD5\u7B49\u5F85\u5176\u5B9E\u4F8B\u5C31\u7EEA\u3002
+\u539F\u56E0\uFF1A\u4E0D\u80FD\u6539\u7528\u4E0D\u517C\u5BB9\u7684\u672C\u5730\u526F\u672C\u6216\u5206\u88C2\u5355\u4F8B\u3002
 \u4FEE\u6CD5\uFF1A\u8BA9\u8BE5\u5171\u4EAB\u7684\u9996\u6B21\u6D88\u8D39\u5148\u7ECF\u4E00\u6B21\u52A8\u6001 loadShare \u5B8C\u6210\u52A0\u8F7D\uFF0C\u6216\u5C06\u672C\u5E94\u7528\u7248\u672C\u4E0E\u4F5C\u7528\u57DF\u63D0\u4F9B\u7248\u672C\u5BF9\u9F50\u3002`,
           { shareKey, requiredVersion: opts.requiredVersion, syncUnsupported: true }
         );
@@ -699,10 +708,27 @@ function createRuntime() {
       return { kind: "local" };
     }
     console.warn(
-      `[fulgurjs] \u5171\u4EAB "${shareKey}" \u7684\u540C\u6B65\u9759\u6001\u6D88\u8D39\u4F7F\u7528\u672C\u5730\u526F\u672C ${opts.localVersion ?? ""}\uFF08\u4F5C\u7528\u57DF\u4E2D\u6EE1\u8DB3\u8981\u6C42\u7684\u53E6\u4E00\u7248\u672C ${entry.version} \u5C1A\u672A\u5C31\u7EEA\uFF0C\u65E0\u6CD5\u540C\u6B65\u7B49\u5F85\uFF09\uFF1B\u975E\u5355\u4F8B\u5141\u8BB8\u591A\u7248\u672C\u5171\u5B58\u3002`
+      `[fulgurjs] \u5171\u4EAB "${shareKey}"\uFF1A\u975E\u5355\u4F8B\u540C\u6B65\u6D88\u8D39\u4F7F\u7528\u672C\u5730 ${opts.localVersion ?? ""}\uFF0C\u8FDC\u7A0B ${entry.version} \u5C1A\u672A\u5C31\u7EEA\u3002`
     );
     return { kind: "local" };
   }
+  async function prepareShares2(requests) {
+    if (!hooks.resolveShare) return;
+    for (const { name, opts } of requests) {
+      const key = shareRequestKey(name, opts);
+      if (resolvedShareSnapshots.has(key)) continue;
+      const entry = selectShareEntry(name, opts);
+      const picked = await hooks.resolveShare({
+        shareKey: opts.shareKey || name,
+        shareScope: opts.shareScope || "default",
+        requiredVersion: opts.requiredVersion,
+        picked: entry,
+        available: Object.values(getScope(opts.shareScope || "default")[opts.shareKey || name] || {})
+      }) || entry;
+      if (picked) resolvedShareSnapshots.set(key, picked);
+    }
+    for (const { name, opts } of requests) await loadShare2(name, opts);
+  }
   function sanitizeUrl(u) {
     try {
       const x = new URL(u, typeof location < "u" ? location.href : "http://f.invalid");
@@ -1138,6 +1164,7 @@ ${hints.join("\n")}`,
     registerPlugins: registerPlugins2,
     loadShare: loadShare2,
     loadShareSync: loadShareSync2,
+    prepareShares: prepareShares2,
     getLoadedShare: getLoadedShare2,
     pinLoadedShare: pinLoadedShare2,
     loadRemote: loadRemote2,
@@ -1161,6 +1188,9 @@ var registerRemote = runtime.registerRemote;
 var registerPlugins = runtime.registerPlugins;
 var loadShare = runtime.loadShare;
 var getLoadedShare = runtime.getLoadedShare;
+var prepareShares = runtime.prepareShares || (async (requests) => {
+  for (const { name, opts } of requests) await runtime.loadShare(name, opts);
+});
 var loadShareSync = runtime.loadShareSync;
 var pinLoadedShare = runtime.pinLoadedShare;
 var loadRemote = runtime.loadRemote;

package/dist/{chunk-NHSQHAS4.js → chunk-V6EASSCR.js}

@@ -10,7 +10,7 @@ import {
   releaseBridgeSession,
   resolveBridgeContext,
   withBridgeTimeout
-} from "./chunk-OLQGJR2Z.js";
+} from "./chunk-GLASM5EX.js";
 
 // src/bridge-host-vue.ts
 import { defineComponent, h, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, shallowRef, toRaw, watch } from "vue";

package/dist/{chunk-WOYDFERL.js → chunk-X34EJB4H.js}

@@ -10,7 +10,7 @@ import {
   releaseBridgeSession,
   resolveBridgeContext,
   withBridgeTimeout
-} from "./chunk-OLQGJR2Z.js";
+} from "./chunk-GLASM5EX.js";
 
 // src/bridge-host-react.ts
 import {