@builder.io/sdk-solid 0.0.22 → 0.0.24-0

package/README.md

@@ -5,3 +5,7 @@ More info coming soon.
 ## Mitosis
 
 This SDK is generated by [Mitosis](https://github.com/BuilderIO/mitosis). To see the Mitosis source-code, go [here](../../).
+
+## Fetch
+
+This Package uses fetch. See [these docs](https://github.com/BuilderIO/this-package-uses-fetch/blob/main/README.md) for more information.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-solid",
-  "version": "0.0.22",
+  "version": "0.0.24-0",
   "description": "",
   "type": "module",
   "main": "./solid-index.jsx",
@@ -14,7 +14,6 @@
     "release:dev": "npm version prerelease --no-git-tag-version && npm publish --tag dev --access public"
   },
   "dependencies": {
-    "node-fetch": "^2.6.7",
     "solid-styled-components": "^0.27.6"
   },
   "peerDependencies": {

package/src/blocks/columns/columns.jsx

@@ -1,6 +1,10 @@
-import { For } from "solid-js";
+import { Show, For } from "solid-js";
 import { css } from "solid-styled-components";
 import RenderBlocks from "../../components/render-blocks.jsx";
+import { getSizesForBreakpoints } from "../../constants/device-sizes";
+import RenderInlinedStyles from "../../components/render-inlined-styles.jsx";
+import { TARGET } from "../../constants/target.js";
+import { convertStyleMapToCSS } from "../../helpers/css";
 function Columns(props) {
   function getGutterSize() {
     return typeof props.space === "number" ? props.space || 0 : 20;
@@ -39,35 +43,84 @@ function Columns(props) {
       "--column-margin-left-tablet": maybeApplyForTablet(marginLeft)
     };
   }
-  return <div class={"builder-columns " + css({
+  function getWidthForBreakpointSize(size) {
+    const breakpointSizes = getSizesForBreakpoints(props.customBreakpoints || {});
+    return breakpointSizes[size].max;
+  }
+  function columnStyleObjects() {
+    return {
+      columns: {
+        small: {
+          flexDirection: "var(--flex-dir)",
+          alignItems: "stretch"
+        },
+        medium: {
+          flexDirection: "var(--flex-dir-tablet)",
+          alignItems: "stretch"
+        }
+      },
+      column: {
+        small: {
+          width: "var(--column-width) !important",
+          marginLeft: "var(--column-margin-left) !important"
+        },
+        medium: {
+          width: "var(--column-width-tablet) !important",
+          marginLeft: "var(--column-margin-left-tablet) !important"
+        }
+      }
+    };
+  }
+  function columnsStyles() {
+    return `
+      @media (max-width: ${getWidthForBreakpointSize("medium")}px) {
+        .${props.builderBlock.id}-breakpoints {
+          ${convertStyleMapToCSS(columnStyleObjects().columns.medium)}
+        }
+
+        .${props.builderBlock.id}-breakpoints > .builder-column {
+          ${convertStyleMapToCSS(columnStyleObjects().column.medium)}
+        }
+      }
+
+      @media (max-width: ${getWidthForBreakpointSize("small")}px) {
+        .${props.builderBlock.id}-breakpoints {
+          ${convertStyleMapToCSS(columnStyleObjects().columns.small)}
+        }
+
+        .${props.builderBlock.id}-breakpoints > .builder-column {
+          ${convertStyleMapToCSS(columnStyleObjects().column.small)}
+        }
+      },
+    `;
+  }
+  function reactNativeColumnsStyles() {
+    return this.columnStyleObjects.columns.small;
+  }
+  function reactNativeColumnStyles() {
+    return this.columnStyleObjects.column.small;
+  }
+  return <div class={`builder-columns ${props.builderBlock.id}-breakpoints` + " " + css({
     display: "flex",
-    alignItems: "stretch",
-    lineHeight: "normal",
-    "@media (max-width: 991px)": {
-      flexDirection: "var(--flex-dir-tablet)"
-    },
-    "@media (max-width: 639px)": {
-      flexDirection: "var(--flex-dir)"
-    }
-  })} style={columnsCssVars()}>
+    lineHeight: "normal"
+  })} style={{
+    ...(TARGET === "reactNative" ? reactNativeColumnsStyles() : {}),
+    ...columnsCssVars()
+  }}>
+      <Show when={TARGET !== "reactNative"}>
+        <RenderInlinedStyles styles={columnsStyles()}></RenderInlinedStyles>
+      </Show>
       <For each={props.columns}>
         {(column, _index) => {
         const index = _index();
         return <div class={"builder-column " + css({
           display: "flex",
           flexDirection: "column",
-          alignItems: "stretch",
-          "@media (max-width: 991px)": {
-            width: "var(--column-width-tablet) !important",
-            marginLeft: "var(--column-margin-left-tablet) !important"
-          },
-          "@media (max-width: 639px)": {
-            width: "var(--column-width) !important",
-            marginLeft: "var(--column-margin-left) !important"
-          }
+          alignItems: "stretch"
         })} style={{
           width: getColumnCssWidth(index),
           "margin-left": `${index === 0 ? 0 : getGutterSize()}px`,
+          ...(TARGET === "reactNative" ? reactNativeColumnStyles() : {}),
           ...columnCssVars()
         }} key={index}>
               <RenderBlocks blocks={column.blocks} path={`component.options.columns.${index}.blocks`} parent={props.builderBlock.id} styleProp={{

package/src/blocks/section/section.jsx

@@ -1,7 +1,16 @@
 function SectionComponent(props) {
-  return <section {...props.attributes} style={props.maxWidth && typeof props.maxWidth === "number" ? {
-    "max-width": props.maxWidth
-  } : undefined}>
+  return <section {...props.attributes} style={{
+    width: "100%",
+    "align-self": "stretch",
+    "flex-grow": "1",
+    "box-sizing": "border-box",
+    "max-width": `${props.maxWidth && typeof props.maxWidth === "number" ? props.maxWidth : 1200}px`,
+    display: "flex",
+    "flex-direction": "column",
+    "align-items": "stretch",
+    "margin-left": "auto",
+    "margin-right": "auto"
+  }}>
       {props.children}
     </section>;
 }

package/src/blocks/symbol/symbol.jsx

@@ -2,9 +2,12 @@ import { useContext, on, createEffect, createSignal } from "solid-js";
 import RenderContent from "../../components/render-content/render-content.jsx";
 import BuilderContext from "../../context/builder.context.js";
 import { getContent } from "../../functions/get-content/index.js";
+import { TARGET } from "../../constants/target";
 function Symbol(props) {
-  const [className, setClassName] = createSignal("builder-symbol");
   const [fetchedContent, setFetchedContent] = createSignal(null);
+  function className() {
+    return [...(TARGET === "vue2" || TARGET === "vue3" ? Object.keys(props.attributes.class) : [props.attributes.class]), "builder-symbol", props.symbol?.inline ? "builder-inline-symbol" : undefined, props.symbol?.dynamic || props.dynamic ? "builder-dynamic-symbol" : undefined].filter(Boolean).join(" ");
+  }
   function contentToUse() {
     return props.symbol?.content || fetchedContent();
   }

package/src/components/render-block/render-block.jsx

@@ -55,12 +55,14 @@ function RenderBlock(props) {
     });
   }
   function attributes() {
+    const blockProperties = getBlockProperties(useBlock());
     return {
-      ...getBlockProperties(useBlock()),
+      ...blockProperties,
       ...(TARGET === "reactNative" ? {
         style: getReactNativeBlockStyles({
           block: useBlock(),
-          context: props.context
+          context: props.context,
+          blockStyles: blockProperties.style
         })
       } : {})
     };
@@ -83,7 +85,8 @@ function RenderBlock(props) {
             ...attributes(),
             ...actions()
           }
-        })
+        }),
+        customBreakpoints: childrenContext()?.content?.meta?.breakpoints
       },
       context: childrenContext()
     };
@@ -148,7 +151,8 @@ function RenderBlock(props) {
     }
     const styles = getReactNativeBlockStyles({
       block: useBlock(),
-      context: props.context
+      context: props.context,
+      blockStyles: attributes().style
     });
     return extractTextStyles(styles);
   }

package/src/components/render-content/render-content.jsx

@@ -5,7 +5,7 @@ import { getDefaultRegisteredComponents } from "../../constants/builder-register
 import { TARGET } from "../../constants/target.js";
 import { evaluate } from "../../functions/evaluate.js";
 import { getContent } from "../../functions/get-content/index.js";
-import { getFetch } from "../../functions/get-fetch.js";
+import { fetch } from "../../functions/get-fetch.js";
 import { isBrowser } from "../../functions/is-browser.js";
 import { isEditing } from "../../functions/is-editing.js";
 import { isPreviewing } from "../../functions/is-previewing.js";
@@ -19,6 +19,7 @@ function RenderContent(props) {
   const [forceReRenderCount, setForceReRenderCount] = createSignal(0);
   const [overrideContent, setOverrideContent] = createSignal(null);
   const [update, setUpdate] = createSignal(0);
+  const [useBreakpoints, setUseBreakpoints] = createSignal(null);
   const [overrideState, setOverrideState] = createSignal({});
   function canTrackToUse() {
     return props.canTrack || true;
@@ -56,6 +57,20 @@ function RenderContent(props) {
     } = event;
     if (data) {
       switch (data.type) {
+        case "builder.configureSdk":
+          {
+            const messageContent = data.data;
+            const {
+              breakpoints,
+              contentId
+            } = messageContent;
+            if (!contentId || contentId !== useContent?.id) {
+              return;
+            }
+            setUseBreakpoints(breakpoints);
+            setForceReRenderCount(forceReRenderCount() + 1); // This is a hack to force Qwik to re-render.
+            break;
+          }
         case "builder.contentUpdate":
           {
             const messageContent = data.data;
@@ -114,7 +129,7 @@ function RenderContent(props) {
     url,
     key
   }) {
-    getFetch().then(fetch => fetch(url)).then(response => response.json()).then(json => {
+    fetch(url).then(response => response.json()).then(json => {
       const newOverrideState = {
         ...overrideState(),
         [key]: json
@@ -162,12 +177,17 @@ function RenderContent(props) {
         ...props.content?.data,
         ...props.data,
         ...overrideContent()?.data
+      },
+      meta: {
+        ...props.content?.meta,
+        ...overrideContent()?.meta,
+        breakpoints: useBreakpoints() || overrideContent()?.meta?.breakpoints || props.content?.meta?.breakpoints
       }
     };
     return mergedContent;
   };
   const [useContent, setUseContent] = createStore(updateUseContent());
-  createEffect(on(() => [overrideContent(), props.content, props.data], () => setUseContent(reconcile(updateUseContent()))));
+  createEffect(on(() => [overrideContent(), useBreakpoints(), props.content, props.data], () => setUseContent(reconcile(updateUseContent()))));
   let elementRef;
   onMount(() => {
     if (!props.apiKey) {

package/src/functions/get-block-properties.js

@@ -17,12 +17,33 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { TARGET } from "../constants/target.js";
+import { convertStyleMapToCSSArray } from "../helpers/css.js";
+import { transformBlockProperties } from "./transform-block-properties.js";
 function getBlockProperties(block) {
   var _a;
-  return __spreadProps(__spreadValues({}, block.properties), {
+  const properties = __spreadProps(__spreadValues({}, block.properties), {
     "builder-id": block.id,
+    style: getStyleAttribute(block.style),
     class: [block.id, "builder-block", block.class, (_a = block.properties) == null ? void 0 : _a.class].filter(Boolean).join(" ")
   });
+  return transformBlockProperties(properties);
+}
+function getStyleAttribute(style) {
+  if (!style) {
+    return void 0;
+  }
+  switch (TARGET) {
+    case "svelte":
+    case "vue2":
+    case "vue3":
+    case "solid":
+      return convertStyleMapToCSSArray(style).join(" ");
+    case "qwik":
+    case "reactNative":
+    case "react":
+      return style;
+  }
 }
 export {
   getBlockProperties

package/src/functions/get-content/generate-content-url.js

@@ -0,0 +1,55 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+import { flatten } from "../../helpers/flatten.js";
+import {
+  getBuilderSearchParamsFromWindow,
+  normalizeSearchParams
+} from "../get-builder-search-params/index.js";
+const generateContentUrl = (options) => {
+  const {
+    limit = 30,
+    userAttributes,
+    query,
+    noTraverse = false,
+    model,
+    apiKey,
+    includeRefs = true,
+    locale
+  } = options;
+  if (!apiKey) {
+    throw new Error("Missing API key");
+  }
+  const url = new URL(`https://cdn.builder.io/api/v2/content/${model}?apiKey=${apiKey}&limit=${limit}&noTraverse=${noTraverse}&includeRefs=${includeRefs}${locale ? `&locale=${locale}` : ""}`);
+  const queryOptions = __spreadValues(__spreadValues({}, getBuilderSearchParamsFromWindow()), normalizeSearchParams(options.options || {}));
+  const flattened = flatten(queryOptions);
+  for (const key in flattened) {
+    url.searchParams.set(key, String(flattened[key]));
+  }
+  if (userAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  }
+  if (query) {
+    const flattened2 = flatten({ query });
+    for (const key in flattened2) {
+      url.searchParams.set(key, JSON.stringify(flattened2[key]));
+    }
+  }
+  return url;
+};
+export {
+  generateContentUrl
+};

package/src/functions/get-content/{fn.test.js → generate-content-url.test.js}

@@ -1,4 +1,4 @@
-import { generateContentUrl } from ".";
+import { generateContentUrl } from "./generate-content-url";
 const testKey = "YJIGb4i01jvw0SRdL5Bt";
 const testModel = "page";
 const testId = "c1b81bab59704599b997574eb0736def";

package/src/functions/get-content/index.js

@@ -37,54 +37,19 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { flatten } from "../../helpers/flatten.js";
-import {
-  getBuilderSearchParamsFromWindow,
-  normalizeSearchParams
-} from "../get-builder-search-params/index.js";
-import { getFetch } from "../get-fetch.js";
+import { fetch } from "../get-fetch.js";
 import { handleABTesting } from "./ab-testing.js";
+import { generateContentUrl } from "./generate-content-url.js";
 function getContent(options) {
   return __async(this, null, function* () {
     return (yield getAllContent(__spreadProps(__spreadValues({}, options), { limit: 1 }))).results[0] || null;
   });
 }
-const generateContentUrl = (options) => {
-  const {
-    limit = 30,
-    userAttributes,
-    query,
-    noTraverse = false,
-    model,
-    apiKey,
-    includeRefs = true,
-    locale
-  } = options;
-  if (!apiKey) {
-    throw new Error("Missing API key");
-  }
-  const url = new URL(`https://cdn.builder.io/api/v2/content/${model}?apiKey=${apiKey}&limit=${limit}&noTraverse=${noTraverse}&includeRefs=${includeRefs}${locale ? `&locale=${locale}` : ""}`);
-  const queryOptions = __spreadValues(__spreadValues({}, getBuilderSearchParamsFromWindow()), normalizeSearchParams(options.options || {}));
-  const flattened = flatten(queryOptions);
-  for (const key in flattened) {
-    url.searchParams.set(key, String(flattened[key]));
-  }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
-  }
-  if (query) {
-    const flattened2 = flatten({ query });
-    for (const key in flattened2) {
-      url.searchParams.set(key, JSON.stringify(flattened2[key]));
-    }
-  }
-  return url;
-};
 function getAllContent(options) {
   return __async(this, null, function* () {
     const url = generateContentUrl(options);
-    const fetch = yield getFetch();
-    const content = yield fetch(url.href).then((res) => res.json());
+    const res = yield fetch(url.href);
+    const content = yield res.json();
     const canTrack = options.canTrack !== false;
     if (canTrack && Array.isArray(content.results)) {
       for (const item of content.results) {
@@ -95,7 +60,6 @@ function getAllContent(options) {
   });
 }
 export {
-  generateContentUrl,
   getAllContent,
   getContent
 };

package/src/functions/get-fetch.js

@@ -1,34 +1,14 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import { getGlobalThis } from "./get-global-this.js";
 function getFetch() {
-  return __async(this, null, function* () {
-    const globalFetch = getGlobalThis().fetch;
-    if (typeof globalFetch === "undefined" && typeof global !== "undefined") {
-      const nodeFetch = import("node-fetch").then((d) => d.default);
-      return nodeFetch.default || nodeFetch;
-    }
-    return globalFetch.default || globalFetch;
-  });
+  const globalFetch = getGlobalThis().fetch;
+  if (typeof globalFetch === "undefined") {
+    console.warn(`Builder SDK could not find a global fetch function. Make sure you have a polyfill for fetch in your project. 
+      For more information, read https://github.com/BuilderIO/this-package-uses-fetch`);
+    throw new Error("Builder SDK could not find a global `fetch` function");
+  }
+  return globalFetch;
 }
+const fetch = getFetch();
 export {
-  getFetch
+  fetch
 };

package/src/functions/get-global-this.js

@@ -11,7 +11,7 @@ function getGlobalThis() {
   if (typeof self !== "undefined") {
     return self;
   }
-  return null;
+  return globalThis;
 }
 export {
   getGlobalThis

package/src/functions/get-react-native-block-styles.js

@@ -17,13 +17,14 @@ var __spreadValues = (a, b) => {
 import { sanitizeReactNativeBlockStyles } from "./sanitize-react-native-block-styles.js";
 function getReactNativeBlockStyles({
   block,
-  context
+  context,
+  blockStyles
 }) {
   const responsiveStyles = block.responsiveStyles;
   if (!responsiveStyles) {
     return {};
   }
-  const styles = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, context.inheritedStyles), responsiveStyles.large || {}), responsiveStyles.medium || {}), responsiveStyles.small || {});
+  const styles = __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, context.inheritedStyles), responsiveStyles.large || {}), responsiveStyles.medium || {}), responsiveStyles.small || {}), blockStyles);
   const newStyles = sanitizeReactNativeBlockStyles(styles);
   return newStyles;
 }

package/src/functions/transform-block-properties.js

@@ -0,0 +1,6 @@
+function transformBlockProperties(properties) {
+  return properties;
+}
+export {
+  transformBlockProperties
+};

package/src/helpers/css.js

@@ -1,19 +1,23 @@
 import { camelToKebabCase } from "../functions/camel-to-kebab-case.js";
-const convertStyleMaptoCSS = (style) => {
+import { checkIsDefined } from "./nullable.js";
+const convertStyleMapToCSSArray = (style) => {
   const cssProps = Object.entries(style).map(([key, value]) => {
     if (typeof value === "string") {
       return `${camelToKebabCase(key)}: ${value};`;
+    } else {
+      return void 0;
     }
   });
-  return cssProps.join("\n");
+  return cssProps.filter(checkIsDefined);
 };
+const convertStyleMapToCSS = (style) => convertStyleMapToCSSArray(style).join("\n");
 const createCssClass = ({
   mediaQuery,
   className,
   styles
 }) => {
   const cssClass = `.${className} {
-    ${convertStyleMaptoCSS(styles)}
+    ${convertStyleMapToCSS(styles)}
   }`;
   if (mediaQuery) {
     return `${mediaQuery} {
@@ -24,5 +28,7 @@ const createCssClass = ({
   }
 };
 export {
+  convertStyleMapToCSS,
+  convertStyleMapToCSSArray,
   createCssClass
 };