@builder.io/sdk-solid 2.0.24 → 2.0.26

package/lib/node/dev.js

@@ -4935,6 +4935,16 @@ function getPreviewContent(_searchParams) {
   return void 0;
 }
 
+// src/constants/sdk-version.ts
+var SDK_VERSION = "2.0.26";
+
+// src/helpers/sdk-headers.ts
+var getSdkHeaders = () => ({
+  "X-Builder-SDK": TARGET,
+  "X-Builder-SDK-GEN": "2",
+  "X-Builder-SDK-Version": SDK_VERSION
+});
+
 // src/functions/get-global-this.ts
 function getGlobalThis() {
   if (typeof globalThis !== "undefined") {
@@ -5038,7 +5048,8 @@ var generateContentUrl = (options) => {
     cacheSeconds,
     staleCacheSeconds,
     sort,
-    includeUnpublished
+    includeUnpublished,
+    apiHost
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -5047,7 +5058,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));
@@ -5117,7 +5129,14 @@ async function fetchOneEntry(options) {
 var _fetchContent = async (options) => {
   const url = generateContentUrl(options);
   const _fetch = options.fetch ?? fetch2;
-  const res = await _fetch(url.href, options.fetchOptions);
+  const fetchOptions = {
+    ...options.fetchOptions,
+    headers: {
+      ...options.fetchOptions?.headers,
+      ...getSdkHeaders()
+    }
+  };
+  const res = await _fetch(url.href, fetchOptions);
   const content = await res.json();
   return content;
 };
@@ -5328,7 +5347,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;
@@ -5342,13 +5364,15 @@ 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)]
     }),
     headers: {
-      "content-type": "application/json"
+      "content-type": "application/json",
+      ...getSdkHeaders()
     },
     mode: "cors"
   }).catch((err) => {
@@ -5428,9 +5452,6 @@ function isFromTrustedHost(trustedHosts, e) {
   return (trustedHosts || DEFAULT_TRUSTED_HOSTS).findIndex((trustedHost) => trustedHost.startsWith("*.") ? hostname.endsWith(trustedHost.slice(1)) : trustedHost === hostname) > -1;
 }
 
-// src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.24";
-
 // src/functions/register.ts
 var registry = {};
 function register(type, info) {
@@ -5788,6 +5809,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,
@@ -5847,7 +5869,7 @@ function EnableEditor(props) {
   emitStateUpdate();
   onMount(() => {
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && !props.isNestedRender) {
         window.addEventListener("message", processMessage);
         registerInsertMenu();
         setupBrowserForEditing({
@@ -5873,6 +5895,7 @@ function EnableEditor(props) {
         const contentId = props.builderContextSignal.content?.id;
         const apiKeyProp = props.apiKey;
         _track({
+          apiHost: props.apiHost,
           type: "impression",
           canTrack: true,
           contentId,
@@ -6121,6 +6144,9 @@ function ContentComponent(props) {
     },
     get children() {
       return createComponent(enable_editor_default, mergeProps({
+        get apiHost() {
+          return props.apiHost;
+        },
         get nonce() {
           return props.nonce;
         },
@@ -6162,6 +6188,9 @@ function ContentComponent(props) {
         },
         get trustedHosts() {
           return props.trustedHosts;
+        },
+        get isNestedRender() {
+          return props.isNestedRender;
         }
       }, {
         setBuilderContextSignal
@@ -6294,6 +6323,9 @@ function ContentVariants(props) {
         children: (variant, _index) => {
           _index();
           return createComponent(content_default, mergeProps({
+            get apiHost() {
+              return props.apiHost;
+            },
             get isNestedRender() {
               return props.isNestedRender;
             },
@@ -6358,6 +6390,9 @@ function ContentVariants(props) {
       })];
     }
   }), createComponent(content_default, mergeProps({
+    get apiHost() {
+      return props.apiHost;
+    },
     get nonce() {
       return props.nonce;
     },

package/lib/node/dev.jsx

@@ -4425,6 +4425,16 @@ function getPreviewContent(_searchParams) {
   return void 0;
 }
 
+// src/constants/sdk-version.ts
+var SDK_VERSION = "2.0.26";
+
+// src/helpers/sdk-headers.ts
+var getSdkHeaders = () => ({
+  "X-Builder-SDK": TARGET,
+  "X-Builder-SDK-GEN": "2",
+  "X-Builder-SDK-Version": SDK_VERSION
+});
+
 // src/functions/get-global-this.ts
 function getGlobalThis() {
   if (typeof globalThis !== "undefined") {
@@ -4528,7 +4538,8 @@ var generateContentUrl = (options) => {
     cacheSeconds,
     staleCacheSeconds,
     sort,
-    includeUnpublished
+    includeUnpublished,
+    apiHost
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -4537,7 +4548,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));
@@ -4607,7 +4619,14 @@ async function fetchOneEntry(options) {
 var _fetchContent = async (options) => {
   const url = generateContentUrl(options);
   const _fetch = options.fetch ?? fetch2;
-  const res = await _fetch(url.href, options.fetchOptions);
+  const fetchOptions = {
+    ...options.fetchOptions,
+    headers: {
+      ...options.fetchOptions?.headers,
+      ...getSdkHeaders()
+    }
+  };
+  const res = await _fetch(url.href, fetchOptions);
   const content = await res.json();
   return content;
 };
@@ -4818,7 +4837,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;
@@ -4832,13 +4854,15 @@ 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)]
     }),
     headers: {
-      "content-type": "application/json"
+      "content-type": "application/json",
+      ...getSdkHeaders()
     },
     mode: "cors"
   }).catch((err) => {
@@ -4918,9 +4942,6 @@ function isFromTrustedHost(trustedHosts, e) {
   return (trustedHosts || DEFAULT_TRUSTED_HOSTS).findIndex((trustedHost) => trustedHost.startsWith("*.") ? hostname.endsWith(trustedHost.slice(1)) : trustedHost === hostname) > -1;
 }
 
-// src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.24";
-
 // src/functions/register.ts
 var registry = {};
 function register(type, info) {
@@ -5277,6 +5298,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,
@@ -5346,7 +5368,7 @@ function EnableEditor(props) {
   emitStateUpdate();
   onMount6(() => {
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && !props.isNestedRender) {
         window.addEventListener("message", processMessage);
         registerInsertMenu();
         setupBrowserForEditing({
@@ -5377,6 +5399,7 @@ function EnableEditor(props) {
         const contentId = props.builderContextSignal.content?.id;
         const apiKeyProp = props.apiKey;
         _track({
+          apiHost: props.apiHost,
           type: "impression",
           canTrack: true,
           contentId,
@@ -5616,6 +5639,7 @@ function ContentComponent(props) {
       registeredComponents: registeredComponents()
     }}
   ><Enable_editor_default
+    apiHost={props.apiHost}
     nonce={props.nonce}
     content={props.content}
     data={props.data}
@@ -5630,6 +5654,7 @@ function ContentComponent(props) {
     contentWrapper={props.contentWrapper}
     contentWrapperProps={props.contentWrapperProps}
     trustedHosts={props.trustedHosts}
+    isNestedRender={props.isNestedRender}
     {...{
       setBuilderContextSignal
     }}
@@ -5708,6 +5733,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}
@@ -5734,6 +5760,7 @@ function ContentVariants(props) {
       }}</For9>
     </Show15>
     <Content_default
+      apiHost={props.apiHost}
       nonce={props.nonce}
       isNestedRender={props.isNestedRender}
       {...{}}

package/lib/node/index.js

@@ -4925,6 +4925,16 @@ function getPreviewContent(_searchParams) {
   return void 0;
 }
 
+// src/constants/sdk-version.ts
+var SDK_VERSION = "2.0.26";
+
+// src/helpers/sdk-headers.ts
+var getSdkHeaders = () => ({
+  "X-Builder-SDK": TARGET,
+  "X-Builder-SDK-GEN": "2",
+  "X-Builder-SDK-Version": SDK_VERSION
+});
+
 // src/functions/get-global-this.ts
 function getGlobalThis() {
   if (typeof globalThis !== "undefined") {
@@ -5026,7 +5036,8 @@ var generateContentUrl = (options) => {
     cacheSeconds,
     staleCacheSeconds,
     sort,
-    includeUnpublished
+    includeUnpublished,
+    apiHost
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -5035,7 +5046,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));
@@ -5105,7 +5117,14 @@ async function fetchOneEntry(options) {
 var _fetchContent = async (options) => {
   const url = generateContentUrl(options);
   const _fetch = options.fetch ?? fetch2;
-  const res = await _fetch(url.href, options.fetchOptions);
+  const fetchOptions = {
+    ...options.fetchOptions,
+    headers: {
+      ...options.fetchOptions?.headers,
+      ...getSdkHeaders()
+    }
+  };
+  const res = await _fetch(url.href, fetchOptions);
   const content = await res.json();
   return content;
 };
@@ -5314,7 +5333,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;
@@ -5328,13 +5350,15 @@ 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)]
     }),
     headers: {
-      "content-type": "application/json"
+      "content-type": "application/json",
+      ...getSdkHeaders()
     },
     mode: "cors"
   }).catch((err) => {
@@ -5413,9 +5437,6 @@ function isFromTrustedHost(trustedHosts, e) {
   return (trustedHosts || DEFAULT_TRUSTED_HOSTS).findIndex((trustedHost) => trustedHost.startsWith("*.") ? hostname.endsWith(trustedHost.slice(1)) : trustedHost === hostname) > -1;
 }
 
-// src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.24";
-
 // src/functions/register.ts
 var registry = {};
 function register(type, info) {
@@ -5772,6 +5793,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,
@@ -5830,7 +5852,7 @@ function EnableEditor(props) {
   emitStateUpdate();
   onMount(() => {
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && !props.isNestedRender) {
         window.addEventListener("message", processMessage);
         registerInsertMenu();
         setupBrowserForEditing({
@@ -5856,6 +5878,7 @@ function EnableEditor(props) {
         const contentId = props.builderContextSignal.content?.id;
         const apiKeyProp = props.apiKey;
         _track({
+          apiHost: props.apiHost,
           type: "impression",
           canTrack: true,
           contentId,
@@ -6104,6 +6127,9 @@ function ContentComponent(props) {
     },
     get children() {
       return createComponent(enable_editor_default, mergeProps({
+        get apiHost() {
+          return props.apiHost;
+        },
         get nonce() {
           return props.nonce;
         },
@@ -6145,6 +6171,9 @@ function ContentComponent(props) {
         },
         get trustedHosts() {
           return props.trustedHosts;
+        },
+        get isNestedRender() {
+          return props.isNestedRender;
         }
       }, {
         setBuilderContextSignal
@@ -6277,6 +6306,9 @@ function ContentVariants(props) {
         children: (variant, _index) => {
           _index();
           return createComponent(content_default, mergeProps({
+            get apiHost() {
+              return props.apiHost;
+            },
             get isNestedRender() {
               return props.isNestedRender;
             },
@@ -6341,6 +6373,9 @@ function ContentVariants(props) {
       })];
     }
   }), createComponent(content_default, mergeProps({
+    get apiHost() {
+      return props.apiHost;
+    },
     get nonce() {
       return props.nonce;
     },

package/lib/node/index.jsx

@@ -4415,6 +4415,16 @@ function getPreviewContent(_searchParams) {
   return void 0;
 }
 
+// src/constants/sdk-version.ts
+var SDK_VERSION = "2.0.26";
+
+// src/helpers/sdk-headers.ts
+var getSdkHeaders = () => ({
+  "X-Builder-SDK": TARGET,
+  "X-Builder-SDK-GEN": "2",
+  "X-Builder-SDK-Version": SDK_VERSION
+});
+
 // src/functions/get-global-this.ts
 function getGlobalThis() {
   if (typeof globalThis !== "undefined") {
@@ -4516,7 +4526,8 @@ var generateContentUrl = (options) => {
     cacheSeconds,
     staleCacheSeconds,
     sort,
-    includeUnpublished
+    includeUnpublished,
+    apiHost
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -4525,7 +4536,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));
@@ -4595,7 +4607,14 @@ async function fetchOneEntry(options) {
 var _fetchContent = async (options) => {
   const url = generateContentUrl(options);
   const _fetch = options.fetch ?? fetch2;
-  const res = await _fetch(url.href, options.fetchOptions);
+  const fetchOptions = {
+    ...options.fetchOptions,
+    headers: {
+      ...options.fetchOptions?.headers,
+      ...getSdkHeaders()
+    }
+  };
+  const res = await _fetch(url.href, fetchOptions);
   const content = await res.json();
   return content;
 };
@@ -4804,7 +4823,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;
@@ -4818,13 +4840,15 @@ 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)]
     }),
     headers: {
-      "content-type": "application/json"
+      "content-type": "application/json",
+      ...getSdkHeaders()
     },
     mode: "cors"
   }).catch((err) => {
@@ -4903,9 +4927,6 @@ function isFromTrustedHost(trustedHosts, e) {
   return (trustedHosts || DEFAULT_TRUSTED_HOSTS).findIndex((trustedHost) => trustedHost.startsWith("*.") ? hostname.endsWith(trustedHost.slice(1)) : trustedHost === hostname) > -1;
 }
 
-// src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.24";
-
 // src/functions/register.ts
 var registry = {};
 function register(type, info) {
@@ -5261,6 +5282,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,
@@ -5329,7 +5351,7 @@ function EnableEditor(props) {
   emitStateUpdate();
   onMount6(() => {
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && !props.isNestedRender) {
         window.addEventListener("message", processMessage);
         registerInsertMenu();
         setupBrowserForEditing({
@@ -5360,6 +5382,7 @@ function EnableEditor(props) {
         const contentId = props.builderContextSignal.content?.id;
         const apiKeyProp = props.apiKey;
         _track({
+          apiHost: props.apiHost,
           type: "impression",
           canTrack: true,
           contentId,
@@ -5599,6 +5622,7 @@ function ContentComponent(props) {
       registeredComponents: registeredComponents()
     }}
   ><Enable_editor_default
+    apiHost={props.apiHost}
     nonce={props.nonce}
     content={props.content}
     data={props.data}
@@ -5613,6 +5637,7 @@ function ContentComponent(props) {
     contentWrapper={props.contentWrapper}
     contentWrapperProps={props.contentWrapperProps}
     trustedHosts={props.trustedHosts}
+    isNestedRender={props.isNestedRender}
     {...{
       setBuilderContextSignal
     }}
@@ -5691,6 +5716,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}
@@ -5717,6 +5743,7 @@ function ContentVariants(props) {
       }}</For9>
     </Show15>
     <Content_default
+      apiHost={props.apiHost}
       nonce={props.nonce}
       isNestedRender={props.isNestedRender}
       {...{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-solid",
-  "version": "2.0.24",
+  "version": "2.0.26",
   "description": "",
   "files": [
     "dist",