@builder.io/sdk-solid 1.1.2 → 2.0.1

package/dist/index.d.ts

@@ -510,6 +510,7 @@ interface BuilderContextInterface extends Pick<BlocksWrapperProps, 'BlocksWrappe
     apiVersion: ApiVersion | undefined;
     componentInfos: Dictionary<ComponentInfo>;
     inheritedStyles: Record<string, unknown>;
+    nonce: string;
     canTrack?: boolean;
 }
 
@@ -708,6 +709,10 @@ interface ContentVariantsPrps {
      * List of hosts to allow editing content from.
      */
     trustedHosts?: string[];
+    /**
+     * A CSP nonce to use for the SDK's inlined `<script>` and `<style>` tags.
+     */
+    nonce?: string;
 }
 
 type VariantsProviderProps = ContentVariantsPrps & {
@@ -731,6 +736,7 @@ declare const _default: solid_js.Context<{
     inheritedStyles: {};
     BlocksWrapper: string;
     BlocksWrapperProps: {};
+    nonce: string;
 }>;
 
 type QueryObject = Record<string, string | string[]>;

package/lib/browser/dev.js

@@ -113,7 +113,8 @@ var builder_context_default = createContext({
   componentInfos: {},
   inheritedStyles: {},
   BlocksWrapper: "div",
-  BlocksWrapperProps: {}
+  BlocksWrapperProps: {},
+  nonce: ""
 });
 var components_context_default = createContext({ registeredComponents: {} });
 
@@ -784,56 +785,33 @@ var getRepeatItemData = ({
   }));
   return repeatArray;
 };
-var applyDefaults = (shouldReceiveBuilderProps) => {
-  return {
-    // once we bump to a major version, toggle this to `false`.
-    builderBlock: true,
-    // once we bump to a major version, toggle this to `false`.
-    builderContext: true,
-    builderComponents: false,
-    builderLinkComponent: false,
-    ...shouldReceiveBuilderProps
-  };
-};
 var provideLinkComponent = (block, linkComponent) => {
-  if (!block)
-    return {};
-  const shouldReceiveProp = applyDefaults(block.shouldReceiveBuilderProps).builderLinkComponent;
-  if (!shouldReceiveProp)
-    return {};
-  return {
-    builderLinkComponent: linkComponent
-  };
+  if (block?.shouldReceiveBuilderProps?.builderLinkComponent)
+    return {
+      builderLinkComponent: linkComponent
+    };
+  return {};
 };
 var provideRegisteredComponents = (block, registeredComponents) => {
-  if (!block)
-    return {};
-  const shouldReceiveProp = applyDefaults(block.shouldReceiveBuilderProps).builderComponents;
-  if (!shouldReceiveProp)
-    return {};
-  return {
-    builderComponents: registeredComponents
-  };
+  if (block?.shouldReceiveBuilderProps?.builderComponents)
+    return {
+      builderComponents: registeredComponents
+    };
+  return {};
 };
 var provideBuilderBlock = (block, builderBlock) => {
-  if (!block)
-    return {};
-  const shouldReceiveProp = applyDefaults(block.shouldReceiveBuilderProps).builderBlock;
-  if (!shouldReceiveProp)
-    return {};
-  return {
-    builderBlock
-  };
+  if (block?.shouldReceiveBuilderProps?.builderBlock)
+    return {
+      builderBlock
+    };
+  return {};
 };
 var provideBuilderContext = (block, context) => {
-  if (!block)
-    return {};
-  const shouldReceiveProp = applyDefaults(block.shouldReceiveBuilderProps).builderContext;
-  if (!shouldReceiveProp)
-    return {};
-  return {
-    builderContext: context
-  };
+  if (block?.shouldReceiveBuilderProps?.builderContext)
+    return {
+      builderContext: context
+    };
+  return {};
 };
 
 // src/constants/device-sizes.ts
@@ -889,13 +867,15 @@ function InlinedStyles(props) {
   return (() => {
     const _el$ = _tmpl$();
     effect((_p$) => {
-      const _v$ = props.styles, _v$2 = props.id;
+      const _v$ = props.styles, _v$2 = props.id, _v$3 = props.nonce;
       _v$ !== _p$._v$ && (_el$.innerHTML = _p$._v$ = _v$);
       _v$2 !== _p$._v$2 && setAttribute(_el$, "data-id", _p$._v$2 = _v$2);
+      _v$3 !== _p$._v$3 && setAttribute(_el$, "nonce", _p$._v$3 = _v$3);
       return _p$;
     }, {
       _v$: void 0,
-      _v$2: void 0
+      _v$2: void 0,
+      _v$3: void 0
     });
     return _el$;
   })();
@@ -978,6 +958,9 @@ function BlockStyles(props) {
         id: "builderio-block",
         get styles() {
           return css();
+        },
+        get nonce() {
+          return props.context.nonce;
         }
       });
     }
@@ -1580,7 +1563,7 @@ var getColumnsClass = (id) => {
 
 // src/blocks/columns/columns.tsx
 var _tmpl$3 = /* @__PURE__ */ template(`<div>`);
-var _tmpl$22 = /* @__PURE__ */ template(`<style>.div-f2f53158 {
+var _tmpl$22 = /* @__PURE__ */ template(`<style>.div-5b8fb3ac {
   display: flex;
   line-height: normal;
 }`);
@@ -1596,8 +1579,9 @@ function Columns(props) {
     return cols()[index]?.width || 100 / cols().length;
   }
   function getColumnCssWidth(index) {
-    const subtractWidth = gutterSize() * (cols().length - 1) / cols().length;
-    return `calc(${getWidth(index)}% - ${subtractWidth}px)`;
+    const width = getWidth(index);
+    const subtractWidth = gutterSize() * (cols().length - 1) * (width / 100);
+    return `calc(${width}% - ${subtractWidth}px)`;
   }
   function getTabletStyle({
     stackedStyle,
@@ -1699,7 +1683,7 @@ function Columns(props) {
     const _el$ = _tmpl$3();
     spread(_el$, mergeProps({
       get ["class"]() {
-        return getColumnsClass(props.builderBlock?.id) + " div-f2f53158";
+        return getColumnsClass(props.builderBlock?.id) + " div-5b8fb3ac";
       },
       get style() {
         return columnsCssVars();
@@ -1712,6 +1696,9 @@ function Columns(props) {
           id: "builderio-columns",
           get styles() {
             return columnsStyles();
+          },
+          get nonce() {
+            return props.builderContext.nonce;
           }
         });
       }
@@ -2515,9 +2502,6 @@ var componentInfo2 = {
   static: true,
   noWrap: true,
   shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
     builderLinkComponent: true
   }
 };
@@ -2750,12 +2734,6 @@ var componentInfo3 = {
 
 // src/blocks/fragment/component-info.ts
 var componentInfo4 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   name: "Fragment",
   static: true,
   hidden: true,
@@ -2890,21 +2868,12 @@ var componentInfo5 = {
     defaultValue: 0.7041
   }],
   shouldReceiveBuilderProps: {
-    builderBlock: true,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
+    builderBlock: true
   }
 };
 
 // src/blocks/section/component-info.ts
 var componentInfo6 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   name: "Core:Section",
   static: true,
   image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2F682efef23ace49afac61748dd305c70a",
@@ -2960,10 +2929,7 @@ var componentInfo7 = {
     defaultValue: "children"
   }],
   shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: true,
-    builderComponents: false,
-    builderLinkComponent: false
+    builderContext: true
   }
 };
 var _tmpl$8 = /* @__PURE__ */ template(`<div>`);
@@ -3282,10 +3248,7 @@ delegateEvents(["click"]);
 // src/blocks/text/component-info.ts
 var componentInfo10 = {
   shouldReceiveBuilderProps: {
-    builderBlock: TARGET === "reactNative" ? true : false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
+    builderBlock: TARGET === "reactNative" ? true : false
   },
   name: "Text",
   static: true,
@@ -3318,12 +3281,6 @@ var text_default = Text;
 
 // src/blocks/custom-code/component-info.ts
 var componentInfo11 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   name: "Custom Code",
   static: true,
   requiredPermissions: ["editCode"],
@@ -3400,12 +3357,6 @@ var custom_code_default = CustomCode;
 
 // src/blocks/embed/component-info.ts
 var componentInfo12 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   name: "Embed",
   static: true,
   inputs: [{
@@ -4031,12 +3982,6 @@ var form_default = FormComponent;
 
 // src/blocks/form/input/component-info.ts
 var componentInfo14 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   name: "Form:Input",
   image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2Fad6f37889d9e40bbbbc72cdb5875d6ca",
   inputs: [
@@ -4122,12 +4067,6 @@ var input_default = FormInputComponent;
 
 // src/blocks/form/select/component-info.ts
 var componentInfo15 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   name: "Form:Select",
   image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2F83acca093fb24aaf94dee136e9a4b045",
   defaultStyles: {
@@ -4214,12 +4153,6 @@ var select_default = SelectComponent;
 
 // src/blocks/form/submit-button/component-info.ts
 var componentInfo16 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   name: "Form:SubmitButton",
   image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2Fdf2820ffed1f4349a94c40b3221f5b98",
   defaultStyles: {
@@ -4258,12 +4191,6 @@ var submit_button_default = SubmitButton;
 
 // src/blocks/form/textarea/component-info.ts
 var componentInfo17 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   name: "Form:TextArea",
   image: "https://cdn.builder.io/api/v1/image/assets%2FIsxPKMo2gPRRKeakUztj1D6uqed2%2Ff74a2f3de58c4c3e939204e5b6b8f6c3",
   inputs: [{
@@ -4328,12 +4255,6 @@ var textarea_default = Textarea;
 
 // src/blocks/img/component-info.ts
 var componentInfo18 = {
-  shouldReceiveBuilderProps: {
-    builderBlock: false,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
-  },
   // friendlyName?
   name: "Raw:Img",
   hideFromInsertMenu: true,
@@ -4457,10 +4378,7 @@ var componentInfo19 = {
     advanced: true
   }],
   shouldReceiveBuilderProps: {
-    builderBlock: true,
-    builderContext: false,
-    builderComponents: false,
-    builderLinkComponent: false
+    builderBlock: true
   }
 };
 var _tmpl$19 = /* @__PURE__ */ template(`<source type=video/mp4>`);
@@ -4716,13 +4634,15 @@ function InlinedScript(props) {
   return (() => {
     const _el$ = _tmpl$20();
     effect((_p$) => {
-      const _v$ = props.scriptStr, _v$2 = props.id;
+      const _v$ = props.scriptStr, _v$2 = props.id, _v$3 = props.nonce || "";
       _v$ !== _p$._v$ && (_el$.innerHTML = _p$._v$ = _v$);
       _v$2 !== _p$._v$2 && setAttribute(_el$, "data-id", _p$._v$2 = _v$2);
+      _v$3 !== _p$._v$3 && setAttribute(_el$, "nonce", _p$._v$3 = _v$3);
       return _p$;
     }, {
       _v$: void 0,
-      _v$2: void 0
+      _v$2: void 0,
+      _v$3: void 0
     });
     return _el$;
   })();
@@ -5228,7 +5148,7 @@ function isFromTrustedHost(trustedHosts, e) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "1.1.2";
+var SDK_VERSION = "2.0.1";
 
 // src/functions/register.ts
 var registry = {};
@@ -5811,6 +5731,9 @@ ${getDefaultStyles(props.isNestedRender)}
     id: "builderio-content",
     get styles() {
       return injectedStyles();
+    },
+    get nonce() {
+      return props.nonce;
     }
   });
 }
@@ -5895,7 +5818,8 @@ function ContentComponent(props) {
     }), {}),
     inheritedStyles: {},
     BlocksWrapper: props.blocksWrapper || "div",
-    BlocksWrapperProps: props.blocksWrapperProps || {}
+    BlocksWrapperProps: props.blocksWrapperProps || {},
+    nonce: props.nonce || ""
   });
   function contentSetState(newRootState) {
     setBuilderContextSignal((PREVIOUS_VALUE) => ({
@@ -5911,6 +5835,9 @@ function ContentComponent(props) {
     },
     get children() {
       return createComponent(enable_editor_default, mergeProps({
+        get nonce() {
+          return props.nonce;
+        },
         get content() {
           return props.content;
         },
@@ -5963,6 +5890,9 @@ function ContentComponent(props) {
                 id: "builderio-variant-visibility",
                 get scriptStr() {
                   return scriptStr();
+                },
+                get nonce() {
+                  return props.nonce || "";
                 }
               });
             }
@@ -5970,6 +5900,9 @@ function ContentComponent(props) {
             when: TARGET !== "reactNative",
             get children() {
               return createComponent(styles_default, {
+                get nonce() {
+                  return props.nonce || "";
+                },
                 get isNestedRender() {
                   return props.isNestedRender;
                 },
@@ -6041,6 +5974,9 @@ function ContentVariants(props) {
         id: "builderio-init-variants-fns",
         get scriptStr() {
           return getInitVariantsFnsScriptString();
+        },
+        get nonce() {
+          return props.nonce || "";
         }
       });
     }
@@ -6053,11 +5989,17 @@ function ContentVariants(props) {
         id: "builderio-variants",
         get styles() {
           return hideVariantsStyleString();
+        },
+        get nonce() {
+          return props.nonce || "";
         }
       }), createComponent(inlined_script_default, {
         id: "builderio-variants-visibility",
         get scriptStr() {
           return updateCookieAndStylesScriptStr();
+        },
+        get nonce() {
+          return props.nonce || "";
         }
       }), createComponent(For, {
         get each() {
@@ -6072,6 +6014,9 @@ function ContentVariants(props) {
             get key() {
               return variant.testVariationId;
             },
+            get nonce() {
+              return props.nonce;
+            },
             content: variant,
             showContent: false,
             get model() {
@@ -6127,6 +6072,9 @@ function ContentVariants(props) {
       })];
     }
   }), createComponent(content_default, mergeProps({
+    get nonce() {
+      return props.nonce;
+    },
     get isNestedRender() {
       return props.isNestedRender;
     }
@@ -6251,6 +6199,9 @@ function Symbol(props) {
       }
     }, {}, () => props.attributes, {}), false, true);
     insert(_el$, createComponent(content_variants_default, {
+      get nonce() {
+        return props.builderContext.nonce;
+      },
       isNestedRender: true,
       get apiVersion() {
         return props.builderContext.apiVersion;