@builder.io/react 3.0.7-0 → 3.0.7-1

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

@@ -49,8 +49,6 @@ 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' }}
@@ -92,7 +90,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');
 
@@ -396,7 +394,7 @@ export class BuilderComponent extends React.Component<
       // TODO: should change if this prop changes
       context: {
         ...props.context,
-        apiKey: this.props.apiKey || builder.apiKey,
+        apiKey: builder.apiKey || this.props.apiKey,
       },
       state: Object.assign(this.rootState, {
         ...(this.inlinedContent && this.inlinedContent.data && this.inlinedContent.data.state),
@@ -418,9 +416,7 @@ export class BuilderComponent extends React.Component<
     if (Builder.isBrowser) {
       const key = this.props.apiKey;
       if (key && key !== this.builder.apiKey) {
-        // hmm this could cause issues with global symbols
-        const instance = new Builder(key, undefined, undefined, true);
-        instancesMap.set(key, instance);
+        this.builder.apiKey = key;
       }
 
       if (this.inlinedContent) {
@@ -432,8 +428,7 @@ export class BuilderComponent extends React.Component<
   }
 
   get builder() {
-    const instance = this.props.apiKey && instancesMap.get(this.props.apiKey);
-    return instance || this.props.builder || builder;
+    return this.props.builder || builder;
   }
 
   getHtmlData() {
@@ -1394,16 +1389,19 @@ export class BuilderComponent extends React.Component<
               error.stack
             );
           } else {
-            // 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
-            );
-            // }
+            if (
+              typeof process !== 'undefined' &&
+              typeof process.env !== 'undefined' &&
+              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(
-        this.builder.queueGetContent(this.name, this.options).subscribe(
+        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 = (this.builder.editingModel || this.builder.previewingModel) === this.name;
+            const isPreviewing = (builder.editingModel || 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,16 +143,19 @@ export function stringToFunction(
           error.stack || error
         );
       } else {
-        // 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 (
+          typeof process !== 'undefined' &&
+          typeof process.env !== 'undefined' &&
+          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,10 +70,13 @@ 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 {
-      // 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);
-      // }
+      if (
+        typeof process !== 'undefined' &&
+        typeof process.env !== 'undefined' &&
+        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,7 +8,6 @@ if (typeof window !== 'undefined') {
         value: true,
         supportsPatchUpdates: 'v4',
         supportsCustomBreakpoints: true,
-        supportsGlobalSymbols: true,
         priorVersion: version,
       },
     },