@builder.io/react 3.0.5 → 3.0.6-2

package/src/components/builder-component.component.tsx

@@ -49,6 +49,8 @@ function omit<T, K extends keyof T>(obj: T, ...keys: K[]): Omit<T, K> {
   return ret;
 }
 
+const instancesMap = new Map<string, Builder>();
+
 const wrapComponent = (info: any) => {
   return (props: any) => {
     // TODO: convention for all of this, like builderTagProps={{ style: {} foo: 'bar' }}
@@ -90,7 +92,7 @@ function debounce(func: Function, wait: number, immediate = false) {
 
 const fontsLoaded = new Set();
 
-let fetch: (typeof globalThis)['fetch'];
+let fetch: typeof globalThis['fetch'];
 if (globalThis.fetch) fetch = globalThis.fetch;
 fetch ??= require('node-fetch');
 
@@ -394,7 +396,7 @@ export class BuilderComponent extends React.Component<
       // TODO: should change if this prop changes
       context: {
         ...props.context,
-        apiKey: builder.apiKey || this.props.apiKey,
+        apiKey: this.props.apiKey || builder.apiKey,
       },
       state: Object.assign(this.rootState, {
         ...(this.inlinedContent && this.inlinedContent.data && this.inlinedContent.data.state),
@@ -416,7 +418,9 @@ export class BuilderComponent extends React.Component<
     if (Builder.isBrowser) {
       const key = this.props.apiKey;
       if (key && key !== this.builder.apiKey) {
-        this.builder.apiKey = key;
+        // hmm this could cause issues with global symbols
+        const instance = new Builder(key, undefined, undefined, true);
+        instancesMap.set(key, instance);
       }
 
       if (this.inlinedContent) {
@@ -428,7 +432,8 @@ export class BuilderComponent extends React.Component<
   }
 
   get builder() {
-    return this.props.builder || builder;
+    const instance = this.props.apiKey && instancesMap.get(this.props.apiKey);
+    return instance || this.props.builder || builder;
   }
 
   getHtmlData() {
@@ -1389,15 +1394,16 @@ export class BuilderComponent extends React.Component<
               error.stack
             );
           } else {
-            if (process?.env?.DEBUG) {
-              console.debug(
-                'Builder custom code error:',
-                error.message,
-                'in',
-                data.jsCode,
-                error.stack
-              );
-            }
+            // TODO(SK): test with replacing the below with typeof process !== undefined
+            // if (global?.process?.env?.DEBUG) {
+            console.debug(
+              'Builder custom code error:',
+              error.message,
+              'in',
+              data.jsCode,
+              error.stack
+            );
+            // }
             // Add to req.options.errors to return to client
           }
         }

package/src/components/builder-content.component.tsx

@@ -193,7 +193,7 @@ export class BuilderContent<ContentType extends object = any> extends React.Comp
     if (this.name !== '_inline') {
       // TODO:... using targeting...? express.request hmmm
       this.subscriptions.add(
-        builder.queueGetContent(this.name, this.options).subscribe(
+        this.builder.queueGetContent(this.name, this.options).subscribe(
           matches => {
             const match = matches && matches[0];
             this.setState({
@@ -204,7 +204,7 @@ export class BuilderContent<ContentType extends object = any> extends React.Comp
             // causing the sdk to resolve this call to the initialContent instead of the previewed/edited content
             // so we test here if the BuilderContent is being used directly ( not inlined ) and it has initial content ( content prop ), we let the first render go through to show the initial content
             // and we subscribe again to get the draft/editing content
-            const isPreviewing = (builder.editingModel || builder.previewingModel) === this.name;
+            const isPreviewing = (this.builder.editingModel || this.builder.previewingModel) === this.name;
             if (!this.props.inline && this.props.content && this.firstLoad && isPreviewing) {
               this.firstLoad = false;
               this.subscriptions.unsubscribe();

package/src/functions/string-to-function.ts

@@ -143,15 +143,16 @@ export function stringToFunction(
           error.stack || error
         );
       } else {
-        if (process?.env?.DEBUG) {
-          console.debug(
-            'Builder custom code error:',
-            error.message || error,
-            'in',
-            str,
-            error.stack || error
-          );
-        }
+        // TODO(SK): test with replacing the below with typeof process !== undefined
+        // if (process?.env?.DEBUG) {
+        console.debug(
+          'Builder custom code error:',
+          error.message || error,
+          'in',
+          str,
+          error.stack || error
+        );
+        // }
       }
       if (errors) {
         errors.push(error);

package/src/functions/try-eval.tsx

@@ -70,9 +70,10 @@ export const tryEval = (str?: string, data: any = {}, errors?: Error[]): any =>
     if (Builder.isBrowser) {
       console.warn('Builder custom code error:', error.message, 'in', str, error.stack);
     } else {
-      if (process?.env?.DEBUG) {
-        console.debug('Builder custom code error:', error.message, 'in', str, error.stack);
-      }
+      // TODO(SK): test with replacing the below with typeof process !== undefined
+      // if (process?.env?.DEBUG) {
+      console.debug('Builder custom code error:', error.message, 'in', str, error.stack);
+      // }
       // Add to req.options.errors to return to client
     }
   }

package/src/scripts/init-editing.ts

@@ -8,6 +8,7 @@ if (typeof window !== 'undefined') {
         value: true,
         supportsPatchUpdates: 'v4',
         supportsCustomBreakpoints: true,
+        supportsGlobalSymbols: true,
         priorVersion: version,
       },
     },

package/.npmrc

@@ -1 +0,0 @@
-git-tag-version=false