@plasmicapp/loader-react 1.0.342 → 1.0.343

package/dist/index.d.ts

@@ -84,7 +84,7 @@ declare abstract class BaseInternalPlasmicComponentLoader {
     private fetchMissingData;
     private maybeReportClientSideFetch;
     private fetchAllData;
-    mergeBundle(bundle: LoaderBundleOutput): void;
+    mergeBundle(newBundle: LoaderBundleOutput): void;
     getBundle(): LoaderBundleOutput;
     clearCache(): void;
     registerModules(modules: Record<string, any>): void;

package/dist/index.esm.js

@@ -217,6 +217,18 @@ function MaybeWrap(props) {
 function uniq(elements) {
   return Array.from(new Set(elements));
 }
+function uniqBy(elements, iterator) {
+  const vis = /* @__PURE__ */ new Set();
+  const filtered = [];
+  for (const elt of elements) {
+    const key = iterator(elt);
+    if (!vis.has(key)) {
+      vis.add(key);
+      filtered.push(elt);
+    }
+  }
+  return filtered;
+}
 
 // src/variation.ts
 function getPlasmicCookieValues() {
@@ -300,7 +312,7 @@ function PlasmicRootProvider(props) {
   } = props;
   const loader = props.loader.__internal;
   if (prefetchedData) {
-    loader.registerPrefetchedBundle(prefetchedData == null ? void 0 : prefetchedData.bundle);
+    loader.registerPrefetchedBundle(prefetchedData.bundle);
   }
   const [splits, setSplits] = React2.useState(loader.getActiveSplits());
   const forceUpdate = useForceUpdate();
@@ -317,6 +329,66 @@ function PlasmicRootProvider(props) {
     loader.subscribePlasmicRoot(watcher);
     return () => loader.unsubscribePlasmicRoot(watcher);
   }, [watcher, loader]);
+  const currentContextValue = React2.useContext(PlasmicRootContext);
+  const { user, userAuthToken, isUserLoading, authRedirectUri } = props;
+  const value = React2.useMemo(() => {
+    var _a, _b, _c;
+    const withCurrentContextValueFallback = (v, key) => {
+      return v !== void 0 ? v : currentContextValue == null ? void 0 : currentContextValue[key];
+    };
+    return {
+      globalVariants: [
+        ...mergeGlobalVariantsSpec(
+          globalVariants != null ? globalVariants : [],
+          getGlobalVariantsFromSplits(splits, variation != null ? variation : {})
+        ),
+        ...(_a = currentContextValue == null ? void 0 : currentContextValue.globalVariants) != null ? _a : []
+      ],
+      globalContextsProps: __spreadValues(__spreadValues({}, (_b = currentContextValue == null ? void 0 : currentContextValue.globalContextsProps) != null ? _b : {}), globalContextsProps != null ? globalContextsProps : {}),
+      loader: withCurrentContextValueFallback(loader, "loader"),
+      variation: __spreadValues(__spreadValues({}, (_c = currentContextValue == null ? void 0 : currentContextValue.variation) != null ? _c : {}), variation != null ? variation : {}),
+      translator: withCurrentContextValueFallback(translator, "translator"),
+      Head: withCurrentContextValueFallback(Head, "Head"),
+      Link: withCurrentContextValueFallback(Link, "Link"),
+      user: withCurrentContextValueFallback(user, "user"),
+      userAuthToken: withCurrentContextValueFallback(
+        userAuthToken,
+        "userAuthToken"
+      ),
+      isUserLoading: withCurrentContextValueFallback(
+        isUserLoading,
+        "isUserLoading"
+      ),
+      authRedirectUri: withCurrentContextValueFallback(
+        authRedirectUri,
+        "authRedirectUri"
+      ),
+      suspenseFallback: withCurrentContextValueFallback(
+        suspenseFallback,
+        "suspenseFallback"
+      ),
+      disableLoadingBoundary: withCurrentContextValueFallback(
+        disableLoadingBoundary,
+        "disableLoadingBoundary"
+      )
+    };
+  }, [
+    globalVariants,
+    variation,
+    globalContextsProps,
+    loader,
+    splits,
+    translator,
+    Head,
+    Link,
+    user,
+    userAuthToken,
+    isUserLoading,
+    authRedirectUri,
+    suspenseFallback,
+    disableLoadingBoundary,
+    currentContextValue
+  ]);
   React2.useEffect(() => {
     ensureVariationCookies(variation);
     loader.trackRender({
@@ -326,46 +398,9 @@ function PlasmicRootProvider(props) {
         teamIds: loader.getTeamIds(),
         projectIds: loader.getProjectIds()
       },
-      variation
+      variation: value.variation
     });
-  }, [loader, variation]);
-  const { user, userAuthToken, isUserLoading, authRedirectUri } = props;
-  const value = React2.useMemo(
-    () => ({
-      globalVariants: mergeGlobalVariantsSpec(
-        globalVariants != null ? globalVariants : [],
-        getGlobalVariantsFromSplits(splits, variation != null ? variation : {})
-      ),
-      globalContextsProps,
-      loader,
-      variation,
-      translator,
-      Head,
-      Link,
-      user,
-      userAuthToken,
-      isUserLoading,
-      authRedirectUri,
-      suspenseFallback,
-      disableLoadingBoundary
-    }),
-    [
-      globalVariants,
-      variation,
-      globalContextsProps,
-      loader,
-      splits,
-      translator,
-      Head,
-      Link,
-      user,
-      userAuthToken,
-      isUserLoading,
-      authRedirectUri,
-      suspenseFallback,
-      disableLoadingBoundary
-    ]
-  );
+  }, [loader, value]);
   const reactMajorVersion = +React2.version.split(".")[0];
   return /* @__PURE__ */ React2.createElement(
     PlasmicQueryDataProvider,
@@ -585,11 +620,6 @@ function mergeBundles(target, from) {
       globalGroups: [...target.globalGroups, ...newGlobals]
     });
   }
-  const existingExternals = new Set(target.external);
-  const newExternals = target.external.filter((x) => !existingExternals.has(x));
-  if (newExternals.length > 0) {
-    target = __spreadProps(__spreadValues({}, target), { external: [...target.external, ...newExternals] });
-  }
   const existingSplitIds = new Set(target.activeSplits.map((s) => s.id));
   const newSplits = (_a = from.activeSplits.filter((s) => !existingSplitIds.has(s.id))) != null ? _a : [];
   if (newSplits.length > 0) {
@@ -709,7 +739,6 @@ var BaseInternalPlasmicComponentLoader = class {
       },
       components: [],
       globalGroups: [],
-      external: [],
       projects: [],
       activeSplits: [],
       bundleKey: null,
@@ -823,11 +852,50 @@ var BaseInternalPlasmicComponentLoader = class {
       return bundle;
     });
   }
-  mergeBundle(bundle) {
-    var _a, _b;
-    this.bundle = bundle;
-    this.bundle.bundleKey = (_a = this.bundle.bundleKey) != null ? _a : null;
-    (_b = this.onBundleMerged) == null ? void 0 : _b.call(this);
+  mergeBundle(newBundle) {
+    var _a, _b, _c, _d, _e;
+    newBundle.bundleKey = (_a = newBundle.bundleKey) != null ? _a : null;
+    if (newBundle.bundleKey && this.bundle.bundleKey && newBundle.bundleKey !== this.bundle.bundleKey) {
+      console.warn(
+        `Plasmic Error: Different code export hashes. This can happen if your app is using different loaders with different project IDs or project versions.
+Conflicting values:
+${newBundle.bundleKey}
+${this.bundle.bundleKey}`
+      );
+    }
+    const bundles = [this.bundle, newBundle];
+    this.bundle = {
+      activeSplits: uniqBy(
+        bundles.flatMap((bundle) => bundle.activeSplits),
+        (split) => split.id
+      ),
+      components: uniqBy(
+        bundles.flatMap((bundle) => bundle.components),
+        (c) => c.id
+      ),
+      globalGroups: uniqBy(
+        bundles.flatMap((bundle) => bundle.globalGroups),
+        (g) => g.id
+      ),
+      modules: {
+        browser: uniqBy(
+          bundles.flatMap((bundle) => bundle.modules.browser),
+          (m) => m.fileName
+        ),
+        server: uniqBy(
+          bundles.flatMap((bundle) => bundle.modules.server),
+          (m) => m.fileName
+        )
+      },
+      projects: uniqBy(
+        bundles.flatMap((bundle) => bundle.projects),
+        (p) => p.id
+      ),
+      // Avoid `undefined` as it cannot be serialized as JSON
+      bundleKey: (_c = (_b = newBundle.bundleKey) != null ? _b : this.bundle.bundleKey) != null ? _c : null,
+      deferChunksByDefault: (_d = newBundle.deferChunksByDefault) != null ? _d : false
+    };
+    (_e = this.onBundleMerged) == null ? void 0 : _e.call(this);
   }
   getBundle() {
     return this.bundle;
@@ -840,7 +908,6 @@ var BaseInternalPlasmicComponentLoader = class {
       },
       components: [],
       globalGroups: [],
-      external: [],
       projects: [],
       activeSplits: [],
       bundleKey: null,