@builder.io/sdk-solid 2.0.25 → 2.0.28

package/lib/node/dev.js

@@ -1,5 +1,5 @@
 import { delegateEvents, createComponent, spread, mergeProps, insert, effect, setAttribute, className, style, template, Dynamic, memo, use } from 'solid-js/web';
-import { createContext, useContext, Show, For, createSignal, createMemo, onMount, createEffect, on } from 'solid-js';
+import { createContext, useContext, Show, For, createMemo, onMount, createSignal, createEffect, on } from 'solid-js';
 import { createRequire } from 'node:module';
 
 // src/blocks/button/button.tsx
@@ -436,6 +436,8 @@ var getIvm = () => {
 function setIsolateContext(options = {
   memoryLimit: 128
 }) {
+  if (IVM_CONTEXT)
+    return IVM_CONTEXT;
   const ivm = getIvm();
   const isolate = new ivm.Isolate(options);
   const context = isolate.createContextSync();
@@ -449,10 +451,7 @@ function setIsolateContext(options = {
   return context;
 }
 var getIsolateContext = () => {
-  if (IVM_CONTEXT)
-    return IVM_CONTEXT;
-  const context = setIsolateContext();
-  return context;
+  return setIsolateContext();
 };
 var runInNode = ({
   code,
@@ -1826,15 +1825,20 @@ var getColumnsClass = (id) => {
 
 // src/blocks/columns/columns.tsx
 var _tmpl$3 = /* @__PURE__ */ template(`<div>`);
-var _tmpl$22 = /* @__PURE__ */ template(`<style>.div-46766f1c {
+var _tmpl$22 = /* @__PURE__ */ template(`<style>.div-a1dad3b8 {
   display: flex;
   line-height: normal;
 }`);
 function Columns(props) {
-  const [gutterSize, setGutterSize] = createSignal(typeof props.space === "number" ? props.space || 0 : 20);
-  const [cols, setCols] = createSignal(props.columns || []);
-  const [stackAt, setStackAt] = createSignal(props.stackColumnsAt || "tablet");
-  const [flexDir, setFlexDir] = createSignal(props.stackColumnsAt === "never" ? "row" : props.reverseColumnsWhenStacked ? "column-reverse" : "column");
+  const gutterSize = createMemo(() => {
+    return typeof props.space === "number" ? props.space || 0 : 20;
+  });
+  const cols = createMemo(() => {
+    return props.columns || [];
+  });
+  const stackAt = createMemo(() => {
+    return props.stackColumnsAt || "tablet";
+  });
   function getTagName(column) {
     return column.link ? props.builderLinkComponent || "a" : "div";
   }
@@ -1858,6 +1862,9 @@ function Columns(props) {
   }) {
     return stackAt() === "never" ? desktopStyle : stackedStyle;
   }
+  const flexDir = createMemo(() => {
+    return props.stackColumnsAt === "never" ? "row" : props.reverseColumnsWhenStacked ? "column-reverse" : "column";
+  });
   function columnsCssVars() {
     return {
       "--flex-dir": flexDir(),
@@ -1947,7 +1954,7 @@ function Columns(props) {
     const _el$ = _tmpl$3();
     spread(_el$, mergeProps({
       get ["class"]() {
-        return getColumnsClass(props.builderBlock?.id) + " div-46766f1c";
+        return getColumnsClass(props.builderBlock?.id) + " div-a1dad3b8";
       },
       get style() {
         return columnsCssVars();
@@ -4936,7 +4943,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.25";
+var SDK_VERSION = "2.0.28";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -5048,7 +5055,8 @@ var generateContentUrl = (options) => {
     cacheSeconds,
     staleCacheSeconds,
     sort,
-    includeUnpublished
+    includeUnpublished,
+    apiHost
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -5057,7 +5065,8 @@ var generateContentUrl = (options) => {
     throw new Error(`Invalid apiVersion: expected 'v3', received '${apiVersion}'`);
   }
   const noTraverse = limit !== 1;
-  const url = new URL(`https://cdn.builder.io/api/${apiVersion}/content/${model}`);
+  const baseUrl = apiHost || "https://cdn.builder.io";
+  const url = new URL(`${baseUrl}/api/${apiVersion}/content/${model}`);
   url.searchParams.set("apiKey", apiKey);
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
@@ -5345,7 +5354,10 @@ var createEvent = async ({
     ownerId: apiKey
   }
 });
-async function _track(eventProps) {
+async function _track({
+  apiHost,
+  ...eventProps
+}) {
   if (!eventProps.apiKey) {
     logger.error("Missing API key for track call. Please provide your API key.");
     return;
@@ -5359,7 +5371,8 @@ async function _track(eventProps) {
   if (!(isBrowser() || TARGET === "reactNative")) {
     return;
   }
-  return fetch(`https://cdn.builder.io/api/v1/track`, {
+  const baseUrl = apiHost || "https://cdn.builder.io";
+  return fetch(`${baseUrl}/api/v1/track`, {
     method: "POST",
     body: JSON.stringify({
       events: [await createEvent(eventProps)]
@@ -5803,6 +5816,7 @@ function EnableEditor(props) {
       const variationId = props.builderContextSignal.content?.testVariationId;
       const contentId = props.builderContextSignal.content?.id;
       _track({
+        apiHost: props.apiHost,
         type: "click",
         canTrack: getDefaultCanTrack(props.canTrack),
         contentId,
@@ -5862,7 +5876,7 @@ function EnableEditor(props) {
   emitStateUpdate();
   onMount(() => {
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && !props.isNestedRender) {
         window.addEventListener("message", processMessage);
         registerInsertMenu();
         setupBrowserForEditing({
@@ -5888,6 +5902,7 @@ function EnableEditor(props) {
         const contentId = props.builderContextSignal.content?.id;
         const apiKeyProp = props.apiKey;
         _track({
+          apiHost: props.apiHost,
           type: "impression",
           canTrack: true,
           contentId,
@@ -6136,6 +6151,9 @@ function ContentComponent(props) {
     },
     get children() {
       return createComponent(enable_editor_default, mergeProps({
+        get apiHost() {
+          return props.apiHost;
+        },
         get nonce() {
           return props.nonce;
         },
@@ -6177,6 +6195,9 @@ function ContentComponent(props) {
         },
         get trustedHosts() {
           return props.trustedHosts;
+        },
+        get isNestedRender() {
+          return props.isNestedRender;
         }
       }, {
         setBuilderContextSignal
@@ -6309,6 +6330,9 @@ function ContentVariants(props) {
         children: (variant, _index) => {
           _index();
           return createComponent(content_default, mergeProps({
+            get apiHost() {
+              return props.apiHost;
+            },
             get isNestedRender() {
               return props.isNestedRender;
             },
@@ -6373,6 +6397,9 @@ function ContentVariants(props) {
       })];
     }
   }), createComponent(content_default, mergeProps({
+    get apiHost() {
+      return props.apiHost;
+    },
     get nonce() {
       return props.nonce;
     },

package/lib/node/dev.jsx

@@ -75,7 +75,7 @@ function Button(props) {
 var button_default = Button;
 
 // src/blocks/columns/columns.tsx
-import { Show as Show7, For as For4, createSignal as createSignal7 } from "solid-js";
+import { Show as Show7, For as For4, createMemo as createMemo7 } from "solid-js";
 
 // src/components/blocks/blocks.tsx
 import { useContext, Show as Show6, For as For3 } from "solid-js";
@@ -431,6 +431,8 @@ var getIvm = () => {
 function setIsolateContext(options = {
   memoryLimit: 128
 }) {
+  if (IVM_CONTEXT)
+    return IVM_CONTEXT;
   const ivm = getIvm();
   const isolate = new ivm.Isolate(options);
   const context = isolate.createContextSync();
@@ -444,10 +446,7 @@ function setIsolateContext(options = {
   return context;
 }
 var getIsolateContext = () => {
-  if (IVM_CONTEXT)
-    return IVM_CONTEXT;
-  const context = setIsolateContext();
-  return context;
+  return setIsolateContext();
 };
 var runInNode = ({
   code,
@@ -1621,14 +1620,15 @@ var getColumnsClass = (id) => {
 
 // src/blocks/columns/columns.tsx
 function Columns(props) {
-  const [gutterSize, setGutterSize] = createSignal7(
-    typeof props.space === "number" ? props.space || 0 : 20
-  );
-  const [cols, setCols] = createSignal7(props.columns || []);
-  const [stackAt, setStackAt] = createSignal7(props.stackColumnsAt || "tablet");
-  const [flexDir, setFlexDir] = createSignal7(
-    props.stackColumnsAt === "never" ? "row" : props.reverseColumnsWhenStacked ? "column-reverse" : "column"
-  );
+  const gutterSize = createMemo7(() => {
+    return typeof props.space === "number" ? props.space || 0 : 20;
+  });
+  const cols = createMemo7(() => {
+    return props.columns || [];
+  });
+  const stackAt = createMemo7(() => {
+    return props.stackColumnsAt || "tablet";
+  });
   function getTagName(column) {
     return column.link ? props.builderLinkComponent || "a" : "div";
   }
@@ -1652,6 +1652,9 @@ function Columns(props) {
   }) {
     return stackAt() === "never" ? desktopStyle : stackedStyle;
   }
+  const flexDir = createMemo7(() => {
+    return props.stackColumnsAt === "never" ? "row" : props.reverseColumnsWhenStacked ? "column-reverse" : "column";
+  });
   function columnsCssVars() {
     return {
       "--flex-dir": flexDir(),
@@ -1741,7 +1744,7 @@ function Columns(props) {
   }
   return <>
     <div
-      class={getColumnsClass(props.builderBlock?.id) + " div-46766f1c"}
+      class={getColumnsClass(props.builderBlock?.id) + " div-a1dad3b8"}
       style={columnsCssVars()}
       {...{}}
     >
@@ -1770,7 +1773,7 @@ function Columns(props) {
         /></Dynamic_renderer_default>;
       }}</For4>
     </div>
-    <style>{`.div-46766f1c {
+    <style>{`.div-a1dad3b8 {
   display: flex;
   line-height: normal;
 }`}</style>
@@ -4426,7 +4429,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.25";
+var SDK_VERSION = "2.0.28";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4538,7 +4541,8 @@ var generateContentUrl = (options) => {
     cacheSeconds,
     staleCacheSeconds,
     sort,
-    includeUnpublished
+    includeUnpublished,
+    apiHost
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -4547,7 +4551,8 @@ var generateContentUrl = (options) => {
     throw new Error(`Invalid apiVersion: expected 'v3', received '${apiVersion}'`);
   }
   const noTraverse = limit !== 1;
-  const url = new URL(`https://cdn.builder.io/api/${apiVersion}/content/${model}`);
+  const baseUrl = apiHost || "https://cdn.builder.io";
+  const url = new URL(`${baseUrl}/api/${apiVersion}/content/${model}`);
   url.searchParams.set("apiKey", apiKey);
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
@@ -4835,7 +4840,10 @@ var createEvent = async ({
     ownerId: apiKey
   }
 });
-async function _track(eventProps) {
+async function _track({
+  apiHost,
+  ...eventProps
+}) {
   if (!eventProps.apiKey) {
     logger.error("Missing API key for track call. Please provide your API key.");
     return;
@@ -4849,7 +4857,8 @@ async function _track(eventProps) {
   if (!(isBrowser() || TARGET === "reactNative")) {
     return;
   }
-  return fetch(`https://cdn.builder.io/api/v1/track`, {
+  const baseUrl = apiHost || "https://cdn.builder.io";
+  return fetch(`${baseUrl}/api/v1/track`, {
     method: "POST",
     body: JSON.stringify({
       events: [await createEvent(eventProps)]
@@ -5292,6 +5301,7 @@ function EnableEditor(props) {
       const variationId = props.builderContextSignal.content?.testVariationId;
       const contentId = props.builderContextSignal.content?.id;
       _track({
+        apiHost: props.apiHost,
         type: "click",
         canTrack: getDefaultCanTrack(props.canTrack),
         contentId,
@@ -5361,7 +5371,7 @@ function EnableEditor(props) {
   emitStateUpdate();
   onMount6(() => {
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && !props.isNestedRender) {
         window.addEventListener("message", processMessage);
         registerInsertMenu();
         setupBrowserForEditing({
@@ -5392,6 +5402,7 @@ function EnableEditor(props) {
         const contentId = props.builderContextSignal.content?.id;
         const apiKeyProp = props.apiKey;
         _track({
+          apiHost: props.apiHost,
           type: "impression",
           canTrack: true,
           contentId,
@@ -5631,6 +5642,7 @@ function ContentComponent(props) {
       registeredComponents: registeredComponents()
     }}
   ><Enable_editor_default
+    apiHost={props.apiHost}
     nonce={props.nonce}
     content={props.content}
     data={props.data}
@@ -5645,6 +5657,7 @@ function ContentComponent(props) {
     contentWrapper={props.contentWrapper}
     contentWrapperProps={props.contentWrapperProps}
     trustedHosts={props.trustedHosts}
+    isNestedRender={props.isNestedRender}
     {...{
       setBuilderContextSignal
     }}
@@ -5723,6 +5736,7 @@ function ContentVariants(props) {
       <For9 each={getVariants(props.content)}>{(variant, _index) => {
         const index = _index();
         return <Content_default
+          apiHost={props.apiHost}
           isNestedRender={props.isNestedRender}
           key={variant.testVariationId}
           nonce={props.nonce}
@@ -5749,6 +5763,7 @@ function ContentVariants(props) {
       }}</For9>
     </Show15>
     <Content_default
+      apiHost={props.apiHost}
       nonce={props.nonce}
       isNestedRender={props.isNestedRender}
       {...{}}

package/lib/node/index.js

@@ -1,5 +1,5 @@
 import { delegateEvents, createComponent, spread, mergeProps, insert, effect, setAttribute, className, style, template, Dynamic, memo, use } from 'solid-js/web';
-import { createContext, useContext, Show, For, createSignal, createMemo, onMount, createEffect, on } from 'solid-js';
+import { createContext, useContext, Show, For, createMemo, onMount, createSignal, createEffect, on } from 'solid-js';
 import { createRequire } from 'node:module';
 
 // src/blocks/button/button.tsx
@@ -435,6 +435,8 @@ var getIvm = () => {
 function setIsolateContext(options = {
   memoryLimit: 128
 }) {
+  if (IVM_CONTEXT)
+    return IVM_CONTEXT;
   const ivm = getIvm();
   const isolate = new ivm.Isolate(options);
   const context = isolate.createContextSync();
@@ -447,10 +449,7 @@ function setIsolateContext(options = {
   return context;
 }
 var getIsolateContext = () => {
-  if (IVM_CONTEXT)
-    return IVM_CONTEXT;
-  const context = setIsolateContext();
-  return context;
+  return setIsolateContext();
 };
 var runInNode = ({
   code,
@@ -1820,15 +1819,20 @@ var getColumnsClass = (id) => {
 
 // src/blocks/columns/columns.tsx
 var _tmpl$3 = /* @__PURE__ */ template(`<div>`);
-var _tmpl$22 = /* @__PURE__ */ template(`<style>.div-46766f1c {
+var _tmpl$22 = /* @__PURE__ */ template(`<style>.div-a1dad3b8 {
   display: flex;
   line-height: normal;
 }`);
 function Columns(props) {
-  const [gutterSize, setGutterSize] = createSignal(typeof props.space === "number" ? props.space || 0 : 20);
-  const [cols, setCols] = createSignal(props.columns || []);
-  const [stackAt, setStackAt] = createSignal(props.stackColumnsAt || "tablet");
-  const [flexDir, setFlexDir] = createSignal(props.stackColumnsAt === "never" ? "row" : props.reverseColumnsWhenStacked ? "column-reverse" : "column");
+  const gutterSize = createMemo(() => {
+    return typeof props.space === "number" ? props.space || 0 : 20;
+  });
+  const cols = createMemo(() => {
+    return props.columns || [];
+  });
+  const stackAt = createMemo(() => {
+    return props.stackColumnsAt || "tablet";
+  });
   function getTagName(column) {
     return column.link ? props.builderLinkComponent || "a" : "div";
   }
@@ -1852,6 +1856,9 @@ function Columns(props) {
   }) {
     return stackAt() === "never" ? desktopStyle : stackedStyle;
   }
+  const flexDir = createMemo(() => {
+    return props.stackColumnsAt === "never" ? "row" : props.reverseColumnsWhenStacked ? "column-reverse" : "column";
+  });
   function columnsCssVars() {
     return {
       "--flex-dir": flexDir(),
@@ -1941,7 +1948,7 @@ function Columns(props) {
     const _el$ = _tmpl$3();
     spread(_el$, mergeProps({
       get ["class"]() {
-        return getColumnsClass(props.builderBlock?.id) + " div-46766f1c";
+        return getColumnsClass(props.builderBlock?.id) + " div-a1dad3b8";
       },
       get style() {
         return columnsCssVars();
@@ -4926,7 +4933,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.25";
+var SDK_VERSION = "2.0.28";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -5036,7 +5043,8 @@ var generateContentUrl = (options) => {
     cacheSeconds,
     staleCacheSeconds,
     sort,
-    includeUnpublished
+    includeUnpublished,
+    apiHost
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -5045,7 +5053,8 @@ var generateContentUrl = (options) => {
     throw new Error(`Invalid apiVersion: expected 'v3', received '${apiVersion}'`);
   }
   const noTraverse = limit !== 1;
-  const url = new URL(`https://cdn.builder.io/api/${apiVersion}/content/${model}`);
+  const baseUrl = apiHost || "https://cdn.builder.io";
+  const url = new URL(`${baseUrl}/api/${apiVersion}/content/${model}`);
   url.searchParams.set("apiKey", apiKey);
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
@@ -5331,7 +5340,10 @@ var createEvent = async ({
     ownerId: apiKey
   }
 });
-async function _track(eventProps) {
+async function _track({
+  apiHost,
+  ...eventProps
+}) {
   if (!eventProps.apiKey) {
     logger.error("Missing API key for track call. Please provide your API key.");
     return;
@@ -5345,7 +5357,8 @@ async function _track(eventProps) {
   if (!(isBrowser() || TARGET === "reactNative")) {
     return;
   }
-  return fetch(`https://cdn.builder.io/api/v1/track`, {
+  const baseUrl = apiHost || "https://cdn.builder.io";
+  return fetch(`${baseUrl}/api/v1/track`, {
     method: "POST",
     body: JSON.stringify({
       events: [await createEvent(eventProps)]
@@ -5787,6 +5800,7 @@ function EnableEditor(props) {
       const variationId = props.builderContextSignal.content?.testVariationId;
       const contentId = props.builderContextSignal.content?.id;
       _track({
+        apiHost: props.apiHost,
         type: "click",
         canTrack: getDefaultCanTrack(props.canTrack),
         contentId,
@@ -5845,7 +5859,7 @@ function EnableEditor(props) {
   emitStateUpdate();
   onMount(() => {
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && !props.isNestedRender) {
         window.addEventListener("message", processMessage);
         registerInsertMenu();
         setupBrowserForEditing({
@@ -5871,6 +5885,7 @@ function EnableEditor(props) {
         const contentId = props.builderContextSignal.content?.id;
         const apiKeyProp = props.apiKey;
         _track({
+          apiHost: props.apiHost,
           type: "impression",
           canTrack: true,
           contentId,
@@ -6119,6 +6134,9 @@ function ContentComponent(props) {
     },
     get children() {
       return createComponent(enable_editor_default, mergeProps({
+        get apiHost() {
+          return props.apiHost;
+        },
         get nonce() {
           return props.nonce;
         },
@@ -6160,6 +6178,9 @@ function ContentComponent(props) {
         },
         get trustedHosts() {
           return props.trustedHosts;
+        },
+        get isNestedRender() {
+          return props.isNestedRender;
         }
       }, {
         setBuilderContextSignal
@@ -6292,6 +6313,9 @@ function ContentVariants(props) {
         children: (variant, _index) => {
           _index();
           return createComponent(content_default, mergeProps({
+            get apiHost() {
+              return props.apiHost;
+            },
             get isNestedRender() {
               return props.isNestedRender;
             },
@@ -6356,6 +6380,9 @@ function ContentVariants(props) {
       })];
     }
   }), createComponent(content_default, mergeProps({
+    get apiHost() {
+      return props.apiHost;
+    },
     get nonce() {
       return props.nonce;
     },