@plasmicapp/loader-react 1.0.342 → 1.0.343

package/dist/react-server.esm.js

@@ -185,11 +185,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 = (_a2 = from.activeSplits.filter((s) => !existingSplitIds.has(s.id))) != null ? _a2 : [];
   if (newSplits.length > 0) {
@@ -303,6 +298,18 @@ function getLookupSpecName(lookup) {
 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/component-lookup.ts
 function getFirstCompMeta(metas, lookup) {
@@ -458,7 +465,6 @@ var BaseInternalPlasmicComponentLoader = class {
       },
       components: [],
       globalGroups: [],
-      external: [],
       projects: [],
       activeSplits: [],
       bundleKey: null,
@@ -572,11 +578,50 @@ var BaseInternalPlasmicComponentLoader = class {
       return bundle;
     });
   }
-  mergeBundle(bundle) {
-    var _a2, _b;
-    this.bundle = bundle;
-    this.bundle.bundleKey = (_a2 = this.bundle.bundleKey) != null ? _a2 : null;
-    (_b = this.onBundleMerged) == null ? void 0 : _b.call(this);
+  mergeBundle(newBundle) {
+    var _a2, _b, _c, _d, _e;
+    newBundle.bundleKey = (_a2 = newBundle.bundleKey) != null ? _a2 : 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;
@@ -589,7 +634,6 @@ var BaseInternalPlasmicComponentLoader = class {
       },
       components: [],
       globalGroups: [],
-      external: [],
       projects: [],
       activeSplits: [],
       bundleKey: null,