@builder.io/sdk-solid 0.1.15 → 0.2.0

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+### 0.2.0
+- Sets the default `apiVersion` to `v3`.
+
+In case you feel the need to use our older API Version `v2`, reach out to us at support@builder.io first. But you can override the default by setting `apiVersion` explicitly to `v2` as follows:
+
+```jsx
+<RenderContent apiVersion="v2" />
+```
+
+```js
+getContent({ apiVersion: "v2" })
+```
+More details on the Builder API Versions visit [this link](https://www.builder.io/c/docs/content-api-versions).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-solid",
-  "version": "0.1.15",
+  "version": "0.2.0",
   "description": "",
   "type": "module",
   "main": "./solid-index.jsx",

package/src/blocks/button/button.jsx

@@ -7,9 +7,16 @@ function Button(props) {
     <Show
       fallback={
         <button
-          class={css({
-            all: "unset",
-          })}
+          class={
+            /**
+             * We have to explicitly provide `class` so that Mitosis knows to merge it with `css`.
+             */
+            props.attributes.class +
+            " " +
+            css({
+              all: "unset",
+            })
+          }
           {...props.attributes}
         >
           {props.text}

package/src/blocks/image/image.jsx

@@ -92,9 +92,7 @@ function Image(props) {
             })
           }
           style={{
-            "padding-top":
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              props.aspectRatio * 100 + "%",
+            "padding-top": props.aspectRatio * 100 + "%",
           }}
         ></div>
       </Show>

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

@@ -153,6 +153,7 @@ function RenderBlock(props) {
     };
     return {
       apiKey: props.context.apiKey,
+      apiVersion: props.context.apiVersion,
       state: props.context.state,
       content: props.context.content,
       context: props.context.context,

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

@@ -193,7 +193,7 @@ function RenderContent(props) {
         setContextState(newState);
       })
       .catch((err) => {
-        console.log("error fetching dynamic data", url, err);
+        console.error("error fetching dynamic data", url, err);
       });
   }
 

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

@@ -19,6 +19,7 @@ import {
   getBuilderSearchParamsFromWindow,
   normalizeSearchParams
 } from "../get-builder-search-params/index.js";
+import { DEFAULT_API_VERSION } from "../../types/api-version";
 const generateContentUrl = (options) => {
   const {
     limit = 30,
@@ -29,7 +30,7 @@ const generateContentUrl = (options) => {
     apiKey,
     includeRefs = true,
     locale,
-    apiVersion = "v2"
+    apiVersion = DEFAULT_API_VERSION
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");

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

@@ -28,6 +28,15 @@ describe("Generate Content URL", () => {
     });
     expect(output).toMatchSnapshot();
   });
+  test("generate content url with apiVersion as default", () => {
+    const output = generateContentUrl({
+      apiKey: testKey,
+      model: testModel,
+      query: { id: testId },
+      options
+    });
+    expect(output).toMatchSnapshot();
+  });
   test("generate content url with apiVersion as v2", () => {
     const output = generateContentUrl({
       apiKey: testKey,

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

@@ -42,7 +42,11 @@ 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 allContent = yield getAllContent(__spreadProps(__spreadValues({}, options), { limit: 1 }));
+    if ("results" in allContent) {
+      return (allContent == null ? void 0 : allContent.results[0]) || null;
+    }
+    return null;
   });
 }
 function getAllContent(options) {
@@ -50,11 +54,19 @@ function getAllContent(options) {
     const url = generateContentUrl(options);
     const res = yield fetch(url.href);
     const content = yield res.json();
+    if ("status" in content && !("results" in content)) {
+      console.error("[Builder.io]: Error fetching data. ", content, options);
+      return content;
+    }
     const canTrack = options.canTrack !== false;
-    if (canTrack && Array.isArray(content.results)) {
-      for (const item of content.results) {
-        yield handleABTesting({ item, canTrack });
+    try {
+      if (canTrack && Array.isArray(content.results)) {
+        for (const item of content.results) {
+          yield handleABTesting({ item, canTrack });
+        }
       }
+    } catch (e) {
+      console.error("[Builder.io]: Could not setup A/B testing. ", e);
     }
     return content;
   });

package/src/types/api-version.js

@@ -0,0 +1,4 @@
+const DEFAULT_API_VERSION = "v3";
+export {
+  DEFAULT_API_VERSION
+};