use latest sdk and update interface, server context new api (BuilderI…

…O#47)
vishwamartur · Dec 4, 2023 · a5218a6 · a5218a6
1 parent 0cd8ff2
commit a5218a6
Show file tree

Hide file tree

Showing 10 changed files with 4,577 additions and 4,564 deletions.
diff --git a/components/cart/CartSidebarView/CartSidebarView.tsx b/components/cart/CartSidebarView/CartSidebarView.tsx
@@ -12,7 +12,7 @@ import env from '@config/env'
 const CartSidebarView: FC = () => {
   const checkoutUrl = useCheckoutUrl()
   const cart = useCart()
-  const subTotal = cart?.subtotalPrice
+  const subTotal = (cart?.subtotalPrice as any)?.amount || cart?.subtotalPrice || '-';
   const total = ' - '
 
   const items = cart?.lineItems ?? []

diff --git a/components/common/Layout.tsx b/components/common/Layout.tsx
@@ -28,7 +28,7 @@ const Layout: React.FC<{ pageProps: any; children: React.ReactNode }> = ({
   const builderTheme = pageProps.theme
   return (
     <CommerceProvider {...shopifyConfig}>
-      <BuilderContent isStatic content={builderTheme} modelName="theme">
+      <BuilderContent content={builderTheme} modelName="theme">
         {(data, loading) => {
           if (loading && !builderTheme) {
             return 'loading ...'

diff --git a/lib/resolve-builder-content.ts b/lib/resolve-builder-content.ts
@@ -15,9 +15,9 @@ export async function resolveBuilderContent(
   let page = await builder
     .get(modelName, {
       apiKey: builderConfig.apiKey,
+      enrich: true,
       options: {
         locale,
-        includeRefs: true,
         // only cachebust if you're statically generating the page
         cachebust: true,
       },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     ]
   },
   "dependencies": {
-    "@builder.io/react": "^3.0.14",
+    "@builder.io/react": "^3.1.1",
     "@builder.io/utils": "1.1.10",
     "@builder.io/widgets": "1.2.24",
     "@emotion/react": "^11.10.6",

diff --git a/pages/[[...path]].tsx b/pages/[[...path]].tsx
@@ -105,7 +105,7 @@ export default function Path({
         />
       )}
       <BuilderComponent
-        options={{ includeRefs: true }}
+        options={{ enrich: true }}
         model="page"
         data={{ theme }}
         context={{

diff --git a/pages/_document.tsx b/pages/_document.tsx
@@ -7,6 +7,16 @@ import Document, {
 } from 'next/document'
 import cheerio from 'cheerio'
 
+import { Builder } from '@builder.io/react';
+import ivm from 'isolated-vm'
+
+/**
+ * Run content code bindings in SSR context
+ */
+const isolate = new ivm.Isolate({ memoryLimit: 128 });
+const context = isolate.createContextSync();
+Builder.setServerContext(context);
+
 /**
  * See this issue for more details https://github.com/emotion-js/emotion/issues/2040
  * Theme-ui using emotion which render styles inside template tags causing it not to apply when rendering

diff --git a/pages/collection/[handle].tsx b/pages/collection/[handle].tsx
@@ -75,9 +75,8 @@ export default function Handle({
     <h1>Loading...</h1>
   ) : (
     <BuilderComponent
-      isStatic
       key={collection.id}
-      options={{ includeRefs: true }}
+      options={{ enrich: true }}
       model={builderModel}
       data={{ collection, theme }}
       content={page}

diff --git a/pages/product/[handle].tsx b/pages/product/[handle].tsx
@@ -76,10 +76,9 @@ export default function Handle({
     <h1>Loading...</h1>
   ) : (
     <BuilderComponent
-      isStatic
       key={product!.id}
       model={builderModel}
-      options={{ includeRefs: true }}
+      options={{ enrich: true }}
       data={{ product, theme }}
       content={page}
     />