@builder.io/react 2.0.10-4 → 2.0.10-6

package/dist/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@builder.io/react",
-    "version": "2.0.10-3",
+    "version": "2.0.10-5",
     "description": "",
     "keywords": [],
     "main": "dist/builder-react.cjs.js",

package/dist/lib/src/functions/safe-dynamic-require.js

@@ -22,16 +22,11 @@ var noop = function () { return null; };
  * In Summary:
  *
  * 1. Node -> globalThis.require does not work
- * 2. Client -> typeof require === 'function' does not work because of overoptimization by the compiler
- * 3. Cloudflare edge -> only globalThis.require works
+ * 2. Cloudflare edge -> only globalThis.require works
  */
-if (typeof globalThis.require === 'function' || sdk_1.Builder.isServer && (typeof require === 'function')) {
-    console.log(' eval require aobut to happen ');
-    exports.safeDynamicRequire = function (str) {
-        var t = eval;
-        console.log(' requireing eval ', str);
-        return t('require')(str);
-    };
+if (typeof globalThis.require === 'function' ||
+    (sdk_1.Builder.isServer && typeof require === 'function')) {
+    exports.safeDynamicRequire = eval('require');
 }
 exports.safeDynamicRequire !== null && exports.safeDynamicRequire !== void 0 ? exports.safeDynamicRequire : (exports.safeDynamicRequire = noop);
 //# sourceMappingURL=safe-dynamic-require.js.map

package/dist/lib/src/functions/safe-dynamic-require.js.map

@@ -1 +1 @@
-{"version":3,"file":"safe-dynamic-require.js","sourceRoot":"","sources":["../../../../src/functions/safe-dynamic-require.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,uCAA0C;AAE1C,IAAM,IAAI,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC;AAKxB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,UAAU,IAAI,aAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,OAAO,KAAK,UAAU,CAAC,EAAE;IACnG,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;IAC7C,0BAAkB,GAAG,UAAC,GAAW;QAC/B,IAAM,CAAC,GAAG,IAAI,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QACtC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC,CAAC;CACH;AAED,0BAAkB,aAAlB,0BAAkB,cAAlB,0BAAkB,IAAlB,0BAAkB,GAAK,IAAW,EAAC"}
+{"version":3,"file":"safe-dynamic-require.js","sourceRoot":"","sources":["../../../../src/functions/safe-dynamic-require.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,uCAA0C;AAE1C,IAAM,IAAI,GAAG,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC;AAKxB;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,IACE,OAAO,UAAU,CAAC,OAAO,KAAK,UAAU;IACxC,CAAC,aAAO,CAAC,QAAQ,IAAI,OAAO,OAAO,KAAK,UAAU,CAAC,EACnD;IACA,0BAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;CACtC;AAED,0BAAkB,aAAlB,0BAAkB,cAAlB,0BAAkB,IAAlB,0BAAkB,GAAK,IAAW,EAAC"}

package/dist/lib/src/functions/string-to-function.js

@@ -79,10 +79,12 @@ function stringToFunction(str, expression, errors, logs) {
                 // tslint:disable:comment-format
                 var VM = (0, safe_dynamic_require_1.safeDynamicRequire)('vm2').VM;
                 var state = args[0], event_1 = args[1], _block = args[2], _builder = args[3], _Device = args[4], _update = args[5], _Builder = args[6], context = args[7];
-                return new VM({
+                var result = new VM({
                     timeout: 100,
                     sandbox: __assign(__assign(__assign(__assign(__assign({}, state), { state: state }), { context: context }), { builder: exports.api }), { event: event_1 }),
                 }).run(str.replace(/(^|;)return /, '$1'));
+                console.log(' evaluating ', str, ' result is ', result, state);
+                return result;
                 // tslint:enable:comment-format
             }
         }

package/dist/lib/src/functions/string-to-function.js.map

@@ -1 +1 @@
-{"version":3,"file":"string-to-function.js","sourceRoot":"","sources":["../../../../src/functions/string-to-function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"string-to-function.js","sourceRoot":"","sources":["../../../../src/functions/string-to-function.ts"],"names":[],"mappings":"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"}

package/dist/types/src/functions/safe-dynamic-require.d.ts

@@ -1 +1,2 @@
-export declare let safeDynamicRequire: (id: string) => any;
+/// <reference types="@types/node" />
+export declare let safeDynamicRequire: typeof require;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/react",
-  "version": "2.0.10-4",
+  "version": "2.0.10-6",
   "description": "",
   "keywords": [],
   "main": "dist/builder-react.cjs.js",

package/src/functions/safe-dynamic-require.ts

@@ -5,7 +5,7 @@ import { Builder } from '@builder.io/sdk';
 const noop = () => null;
 // Allow us to require things dynamically safe from webpack bundling
 
-export let safeDynamicRequire: (id: string) => any;
+export let safeDynamicRequire: typeof require;
 
 /*
  * The if condition below used to be
@@ -26,16 +26,13 @@ export let safeDynamicRequire: (id: string) => any;
  * In Summary:
  *
  * 1. Node -> globalThis.require does not work
- * 2. Client -> typeof require === 'function' does not work because of overoptimization by the compiler
- * 3. Cloudflare edge -> only globalThis.require works
+ * 2. Cloudflare edge -> only globalThis.require works
  */
-if (typeof globalThis.require === 'function' || Builder.isServer && (typeof require === 'function')) {
-  console.log(' eval require aobut to happen ')
-  safeDynamicRequire = (str: string) => {
-    const t = eval;
-    console.log(' requireing eval ', str);
-    return t('require')(str)
-  };
+if (
+  typeof globalThis.require === 'function' ||
+  (Builder.isServer && typeof require === 'function')
+) {
+  safeDynamicRequire = eval('require');
 }
 
 safeDynamicRequire ??= noop as any;

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

@@ -120,8 +120,7 @@ export function stringToFunction(
         // tslint:disable:comment-format
         const { VM } = safeDynamicRequire('vm2');
         const [state, event, _block, _builder, _Device, _update, _Builder, context] = args;
-
-        return new VM({
+        const result = new VM({
           timeout: 100,
           sandbox: {
             ...state,
@@ -131,6 +130,8 @@ export function stringToFunction(
             event,
           },
         }).run(str.replace(/(^|;)return /, '$1'));
+        console.log(' evaluating ', str, ' result is ', result, state)
+        return result;
         // tslint:enable:comment-format
       }
     } catch (error: any) {