@plasmicapp/loader-react 1.0.344 → 1.0.346

package/dist/react-server.esm.js

@@ -73,6 +73,109 @@ import { getActiveVariation, getExternalIds } from "@plasmicapp/loader-splits";
 import {
   getBundleSubset
 } from "@plasmicapp/loader-core";
+
+// src/utils.tsx
+import pascalcase from "pascalcase";
+import * as React from "react";
+var isBrowser = typeof window !== "undefined";
+function isNameSpec(lookup) {
+  return "name" in lookup;
+}
+function toFullLookup(lookup) {
+  const namePart = typeof lookup === "string" ? lookup : lookup.name;
+  const projectId = typeof lookup === "string" ? void 0 : lookup.projectId;
+  const codeComponent = typeof lookup === "string" ? void 0 : lookup.isCode;
+  if (codeComponent !== true && namePart.startsWith("/")) {
+    return { path: normalizePath(namePart), projectId };
+  } else {
+    return {
+      name: codeComponent ? namePart : normalizeName(namePart),
+      rawName: namePart.trim(),
+      projectId,
+      isCode: codeComponent
+    };
+  }
+}
+function normalizePath(path) {
+  return path.trim();
+}
+function normalizeName(name) {
+  return pascalcase(name).trim();
+}
+function matchesPagePath(pattern, path) {
+  const normalizedPattern = "/" + pattern.replace(/^\/|\/$/g, "");
+  const normalizedPath = "/" + path.replace(/^\/|\/$/g, "");
+  const regexString = normalizedPattern.replace(/\/\[\[\.\.\.([^\]^]+)]]/g, "(?:/([^]*))?").replace(/\/\[\.\.\.([^\]^]+)]/g, "/([^]*)").replace(/\[([^\]^]+)]/g, "([^/]+)").replace(/\//g, "\\/");
+  const regex = new RegExp(`^/?${regexString}$`);
+  const match = normalizedPath.match(regex);
+  if (!match)
+    return false;
+  const slugNames = [...pattern.matchAll(/\[\.?\.?\.?([^[\]]+)]/g)].map(
+    (m) => m[1]
+  );
+  const params = {};
+  for (let i = 0; i < slugNames.length; i++) {
+    const slugName = slugNames[i];
+    const value = match[i + 1];
+    if (pattern.includes(`[[...${slugName}]]`)) {
+      params[slugName] = value ? value.split("/").filter(Boolean) : [];
+    } else if (pattern.includes(`[...${slugName}]`)) {
+      params[slugName] = value.split("/").filter(Boolean);
+    } else if (value !== void 0) {
+      params[slugName] = value;
+    }
+  }
+  return { params };
+}
+function isDynamicPagePath(path) {
+  return !!path.match(/\[[^/]*\]/);
+}
+function matchesCompMeta(lookup, meta) {
+  if (lookup.projectId && meta.projectId !== lookup.projectId) {
+    return false;
+  }
+  return isNameSpec(lookup) ? (lookup.name === meta.name || lookup.rawName === meta.name || lookup.rawName === meta.displayName) && (lookup.isCode == null || lookup.isCode === meta.isCode) : !!(meta.path && matchesPagePath(meta.path, lookup.path));
+}
+function getCompMetas(metas, lookup) {
+  const full = toFullLookup(lookup);
+  return metas.filter((meta) => matchesCompMeta(full, meta)).map(
+    (meta) => {
+      if (isNameSpec(full) || !meta.path) {
+        return meta;
+      }
+      const match = matchesPagePath(meta.path, full.path);
+      if (!match) {
+        return meta;
+      }
+      return __spreadProps(__spreadValues({}, meta), { params: match.params });
+    }
+  ).sort(
+    (meta1, meta2) => (
+      // We sort the matched component metas by the number of path params, so
+      // if there are two pages `/products/foo` and `/products/[slug]`,
+      // the first one will have higher precedence.
+      Array.from(Object.keys(meta1.params || {})).length - Array.from(Object.keys(meta2.params || {})).length
+    )
+  );
+}
+function getLookupSpecName(lookup) {
+  if (typeof lookup === "string") {
+    return lookup;
+  } else if (lookup.projectId) {
+    return `${lookup.name} (project ${lookup.projectId})`;
+  } else {
+    return lookup.name;
+  }
+}
+function uniq(elements) {
+  return Array.from(new Set(elements));
+}
+function intersect(a, b) {
+  const setB = new Set(b);
+  return a.filter((elt) => setB.has(elt));
+}
+
+// src/bundles.ts
 function getUsedComps(allComponents, entryCompIds) {
   const q = [...entryCompIds];
   const seenIds = new Set(entryCompIds);
@@ -141,14 +244,7 @@ function prepComponentData(bundle, compMetas, opts) {
   };
 }
 function mergeBundles(target, from) {
-  var _a2;
-  const existingCompIds = new Set(target.components.map((c) => c.id));
-  const newCompMetas = from.components.filter(
-    (m) => !existingCompIds.has(m.id)
-  );
-  if (newCompMetas.length > 0) {
-    target = __spreadProps(__spreadValues({}, target), { components: [...target.components, ...newCompMetas] });
-  }
+  var _a2, _b, _c, _d, _e;
   const existingProjects = new Set(target.projects.map((p) => p.id));
   const newProjects = from.projects.filter((p) => !existingProjects.has(p.id));
   if (newProjects.length > 0) {
@@ -156,6 +252,35 @@ function mergeBundles(target, from) {
       projects: [...target.projects, ...newProjects]
     });
   }
+  const existingCompIds = new Set(target.components.map((c) => c.id));
+  function shouldIncludeComponentInBundle(c) {
+    if (existingCompIds.has(c.id)) {
+      return false;
+    }
+    if (!existingProjects.has(c.projectId)) {
+      return true;
+    }
+    if (!target.filteredIds[c.projectId]) {
+      return true;
+    }
+    return target.filteredIds[c.projectId].includes(c.id);
+  }
+  const newCompMetas = from.components.filter(
+    (m) => shouldIncludeComponentInBundle(m)
+  );
+  if (newCompMetas.length > 0) {
+    target = __spreadProps(__spreadValues({}, target), { components: [...target.components, ...newCompMetas] });
+    Object.entries(from.filteredIds).forEach(([projectId, ids]) => {
+      if (!target.filteredIds[projectId]) {
+        target.filteredIds[projectId] = [...ids];
+      } else {
+        target.filteredIds[projectId] = intersect(
+          target.filteredIds[projectId],
+          ids
+        );
+      }
+    });
+  }
   const existingModules = {
     browser: new Set(target.modules.browser.map((m) => m.fileName)),
     server: new Set(target.modules.server.map((m) => m.fileName))
@@ -186,12 +311,18 @@ function mergeBundles(target, from) {
     });
   }
   const existingSplitIds = new Set(target.activeSplits.map((s) => s.id));
-  const newSplits = (_a2 = from.activeSplits.filter((s) => !existingSplitIds.has(s.id))) != null ? _a2 : [];
+  const newSplits = (_a2 = from.activeSplits.filter(
+    // Don't include splits belonging to projects already present
+    // in the target bundle
+    (s) => !existingSplitIds.has(s.id) && !existingProjects.has(s.projectId)
+  )) != null ? _a2 : [];
   if (newSplits.length > 0) {
     target = __spreadProps(__spreadValues({}, target), {
       activeSplits: [...target.activeSplits, ...newSplits]
     });
   }
+  target.bundleKey = (_c = (_b = target.bundleKey) != null ? _b : from.bundleKey) != null ? _c : null;
+  target.deferChunksByDefault = (_e = (_d = target.deferChunksByDefault) != null ? _d : from.deferChunksByDefault) != null ? _e : false;
   return target;
 }
 var convertBundlesToComponentRenderData = (bundles, compMetas) => {
@@ -202,115 +333,6 @@ var convertBundlesToComponentRenderData = (bundles, compMetas) => {
   return prepComponentData(mergedBundles, compMetas);
 };
 
-// src/utils.tsx
-import pascalcase from "pascalcase";
-import * as React from "react";
-var isBrowser = typeof window !== "undefined";
-function isNameSpec(lookup) {
-  return "name" in lookup;
-}
-function toFullLookup(lookup) {
-  const namePart = typeof lookup === "string" ? lookup : lookup.name;
-  const projectId = typeof lookup === "string" ? void 0 : lookup.projectId;
-  const codeComponent = typeof lookup === "string" ? void 0 : lookup.isCode;
-  if (codeComponent !== true && namePart.startsWith("/")) {
-    return { path: normalizePath(namePart), projectId };
-  } else {
-    return {
-      name: codeComponent ? namePart : normalizeName(namePart),
-      rawName: namePart.trim(),
-      projectId,
-      isCode: codeComponent
-    };
-  }
-}
-function normalizePath(path) {
-  return path.trim();
-}
-function normalizeName(name) {
-  return pascalcase(name).trim();
-}
-function matchesPagePath(pattern, path) {
-  const normalizedPattern = "/" + pattern.replace(/^\/|\/$/g, "");
-  const normalizedPath = "/" + path.replace(/^\/|\/$/g, "");
-  const regexString = normalizedPattern.replace(/\/\[\[\.\.\.([^\]^]+)]]/g, "(?:/([^]*))?").replace(/\/\[\.\.\.([^\]^]+)]/g, "/([^]*)").replace(/\[([^\]^]+)]/g, "([^/]+)").replace(/\//g, "\\/");
-  const regex = new RegExp(`^/?${regexString}$`);
-  const match = normalizedPath.match(regex);
-  if (!match)
-    return false;
-  const slugNames = [...pattern.matchAll(/\[\.?\.?\.?([^[\]]+)]/g)].map(
-    (m) => m[1]
-  );
-  const params = {};
-  for (let i = 0; i < slugNames.length; i++) {
-    const slugName = slugNames[i];
-    const value = match[i + 1];
-    if (pattern.includes(`[[...${slugName}]]`)) {
-      params[slugName] = value ? value.split("/").filter(Boolean) : [];
-    } else if (pattern.includes(`[...${slugName}]`)) {
-      params[slugName] = value.split("/").filter(Boolean);
-    } else if (value !== void 0) {
-      params[slugName] = value;
-    }
-  }
-  return { params };
-}
-function isDynamicPagePath(path) {
-  return !!path.match(/\[[^/]*\]/);
-}
-function matchesCompMeta(lookup, meta) {
-  if (lookup.projectId && meta.projectId !== lookup.projectId) {
-    return false;
-  }
-  return isNameSpec(lookup) ? (lookup.name === meta.name || lookup.rawName === meta.name || lookup.rawName === meta.displayName) && (lookup.isCode == null || lookup.isCode === meta.isCode) : !!(meta.path && matchesPagePath(meta.path, lookup.path));
-}
-function getCompMetas(metas, lookup) {
-  const full = toFullLookup(lookup);
-  return metas.filter((meta) => matchesCompMeta(full, meta)).map(
-    (meta) => {
-      if (isNameSpec(full) || !meta.path) {
-        return meta;
-      }
-      const match = matchesPagePath(meta.path, full.path);
-      if (!match) {
-        return meta;
-      }
-      return __spreadProps(__spreadValues({}, meta), { params: match.params });
-    }
-  ).sort(
-    (meta1, meta2) => (
-      // We sort the matched component metas by the number of path params, so
-      // if there are two pages `/products/foo` and `/products/[slug]`,
-      // the first one will have higher precedence.
-      Array.from(Object.keys(meta1.params || {})).length - Array.from(Object.keys(meta2.params || {})).length
-    )
-  );
-}
-function getLookupSpecName(lookup) {
-  if (typeof lookup === "string") {
-    return lookup;
-  } else if (lookup.projectId) {
-    return `${lookup.name} (project ${lookup.projectId})`;
-  } else {
-    return lookup.name;
-  }
-}
-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) {
   const filtered = getCompMetas(metas, lookup);
@@ -468,7 +490,8 @@ var BaseInternalPlasmicComponentLoader = class {
       projects: [],
       activeSplits: [],
       bundleKey: null,
-      deferChunksByDefault: false
+      deferChunksByDefault: false,
+      filteredIds: {}
     };
     this.opts = args.opts;
     this.fetcher = args.fetcher;
@@ -579,7 +602,7 @@ var BaseInternalPlasmicComponentLoader = class {
     });
   }
   mergeBundle(newBundle) {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b;
     newBundle.bundleKey = (_a2 = newBundle.bundleKey) != null ? _a2 : null;
     if (newBundle.bundleKey && this.bundle.bundleKey && newBundle.bundleKey !== this.bundle.bundleKey) {
       console.warn(
@@ -589,39 +612,8 @@ ${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);
+    this.bundle = mergeBundles(newBundle, this.bundle);
+    (_b = this.onBundleMerged) == null ? void 0 : _b.call(this);
   }
   getBundle() {
     return this.bundle;
@@ -637,7 +629,8 @@ ${this.bundle.bundleKey}`
       projects: [],
       activeSplits: [],
       bundleKey: null,
-      deferChunksByDefault: false
+      deferChunksByDefault: false,
+      filteredIds: {}
     };
     this.registry.clear();
   }