@builder.io/react 2.0.10-7 → 2.0.10-9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/dist/builder-react-lite.cjs.js +1 -1
- package/dist/builder-react-lite.cjs.js.map +1 -1
- package/dist/builder-react-lite.esm.js +1 -1
- package/dist/builder-react-lite.esm.js.map +1 -1
- package/dist/builder-react.browser.js +1 -1
- package/dist/builder-react.browser.js.map +1 -1
- package/dist/builder-react.cjs.js +1 -1
- package/dist/builder-react.cjs.js.map +1 -1
- package/dist/builder-react.es5.js +1 -1
- package/dist/builder-react.es5.js.map +1 -1
- package/dist/builder-react.unpkg.js +1 -1
- package/dist/builder-react.unpkg.js.map +1 -1
- package/dist/lib/package.json +1 -1
- package/dist/lib/src/functions/safe-dynamic-require.js +1 -1
- package/dist/lib/src/functions/safe-dynamic-require.js.map +1 -1
- package/dist/lib/src/functions/string-to-function.js +2 -3
- package/dist/lib/src/functions/string-to-function.js.map +1 -1
- package/dist/lib/src/functions/try-eval.js +1 -3
- package/dist/lib/src/functions/try-eval.js.map +1 -1
- package/package.json +1 -1
- package/src/functions/safe-dynamic-require.ts +1 -1
- package/src/functions/string-to-function.ts +3 -3
- package/src/functions/try-eval.tsx +1 -4
package/dist/lib/package.json
CHANGED
|
@@ -24,7 +24,7 @@ var noop = function () { return null; };
|
|
|
24
24
|
* 1. Node -> globalThis.require does not work
|
|
25
25
|
* 2. Cloudflare edge -> only globalThis.require works
|
|
26
26
|
*/
|
|
27
|
-
if (typeof globalThis.require === 'function' ||
|
|
27
|
+
if (typeof (globalThis === null || globalThis === void 0 ? void 0 : globalThis.require) === 'function' ||
|
|
28
28
|
(sdk_1.Builder.isServer && typeof require === 'function')) {
|
|
29
29
|
exports.safeDynamicRequire = eval('require');
|
|
30
30
|
}
|
|
@@ -1 +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;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,IACE,OAAO,UAAU,
|
|
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;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,IACE,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAA,KAAK,UAAU;IACzC,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"}
|
|
@@ -79,12 +79,10 @@ function stringToFunction(str, expression, errors, logs) {
|
|
|
79
79
|
// tslint:disable:comment-format
|
|
80
80
|
var VM = (0, safe_dynamic_require_1.safeDynamicRequire)('vm2').VM;
|
|
81
81
|
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];
|
|
82
|
-
|
|
82
|
+
return new VM({
|
|
83
83
|
timeout: 100,
|
|
84
84
|
sandbox: __assign(__assign(__assign(__assign(__assign({}, state), { state: state }), { context: context }), { builder: exports.api }), { event: event_1 }),
|
|
85
85
|
}).run(str.replace(/(^|;)return /, '$1'));
|
|
86
|
-
console.log(' evaluating ', str, ' result is ', result, state);
|
|
87
|
-
return result;
|
|
88
86
|
// tslint:enable:comment-format
|
|
89
87
|
}
|
|
90
88
|
}
|
|
@@ -100,6 +98,7 @@ function stringToFunction(str, expression, errors, logs) {
|
|
|
100
98
|
if (errors) {
|
|
101
99
|
errors.push(error);
|
|
102
100
|
}
|
|
101
|
+
return null;
|
|
103
102
|
}
|
|
104
103
|
};
|
|
105
104
|
if (sdk_1.Builder.isBrowser) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string-to-function.js","sourceRoot":"","sources":["../../../../src/functions/string-to-function.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"string-to-function.js","sourceRoot":"","sources":["../../../../src/functions/string-to-function.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,12 +51,10 @@ var tryEval = function (str, data, errors) {
|
|
|
51
51
|
// for the server build
|
|
52
52
|
// tslint:disable:comment-format
|
|
53
53
|
var VM = (0, safe_dynamic_require_1.safeDynamicRequire)('vm2').VM;
|
|
54
|
-
|
|
54
|
+
return new VM({
|
|
55
55
|
sandbox: __assign(__assign({}, data), { state: data }),
|
|
56
56
|
// TODO: convert reutrn to module.exports on server
|
|
57
57
|
}).run(value.replace(/(^|;)return /, '$1'));
|
|
58
|
-
console.log(' tryEval, ', value, ' result is ', result);
|
|
59
|
-
return result;
|
|
60
58
|
// tslint:enable:comment-format
|
|
61
59
|
}
|
|
62
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"try-eval.js","sourceRoot":"","sources":["../../../../src/functions/try-eval.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uCAA0C;AAC1C,+DAA4D;AAErD,IAAM,OAAO,GAAG,UAAC,GAAY,EAAE,IAAc,EAAE,MAAgB;IAAhC,qBAAA,EAAA,SAAc;IAClD,IAAM,KAAK,GAAG,GAAG,CAAC;IAClB,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE;QAChD,OAAO;KACR;IACD,IAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IACvE,IAAI,EAAE,GAAa;QACjB,yBAAyB;IAC3B,CAAC,CAAC;IACF,IAAI;QACF,IAAI,aAAO,CAAC,SAAS,EAAE;YACrB,oEAAoE;YACpE,yBAAyB;YACzB,EAAE,GAAG,IAAI,QAAQ,CACf,OAAO;YACP,qEAAqE;YACrE,4bAeI,SAAS,CAAC,CAAC,CAAC,kBAAW,GAAG,OAAI,CAAC,CAAC,CAAC,GAAG,iBACtC,CACH,CAAC;SACH;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,aAAO,CAAC,SAAS,EAAE;YACrB,OAAO,CAAC,IAAI,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;SACrD;aAAM;YACL,gDAAgD;SACjD;KACF;IACD,IAAI;QACF,IAAI,aAAO,CAAC,SAAS,EAAE;YACrB,OAAO,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;SACvB;aAAM;YACL,4FAA4F;YAC5F,0FAA0F;YAC1F,uBAAuB;YACvB,gCAAgC;YACxB,IAAA,EAAE,GAAK,IAAA,yCAAkB,EAAC,KAAK,CAAC,GAA9B,CAA+B;YACzC,
|
|
1
|
+
{"version":3,"file":"try-eval.js","sourceRoot":"","sources":["../../../../src/functions/try-eval.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uCAA0C;AAC1C,+DAA4D;AAErD,IAAM,OAAO,GAAG,UAAC,GAAY,EAAE,IAAc,EAAE,MAAgB;IAAhC,qBAAA,EAAA,SAAc;IAClD,IAAM,KAAK,GAAG,GAAG,CAAC;IAClB,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE;QAChD,OAAO;KACR;IACD,IAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IACvE,IAAI,EAAE,GAAa;QACjB,yBAAyB;IAC3B,CAAC,CAAC;IACF,IAAI;QACF,IAAI,aAAO,CAAC,SAAS,EAAE;YACrB,oEAAoE;YACpE,yBAAyB;YACzB,EAAE,GAAG,IAAI,QAAQ,CACf,OAAO;YACP,qEAAqE;YACrE,4bAeI,SAAS,CAAC,CAAC,CAAC,kBAAW,GAAG,OAAI,CAAC,CAAC,CAAC,GAAG,iBACtC,CACH,CAAC;SACH;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,aAAO,CAAC,SAAS,EAAE;YACrB,OAAO,CAAC,IAAI,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;SACrD;aAAM;YACL,gDAAgD;SACjD;KACF;IACD,IAAI;QACF,IAAI,aAAO,CAAC,SAAS,EAAE;YACrB,OAAO,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;SACvB;aAAM;YACL,4FAA4F;YAC5F,0FAA0F;YAC1F,uBAAuB;YACvB,gCAAgC;YACxB,IAAA,EAAE,GAAK,IAAA,yCAAkB,EAAC,KAAK,CAAC,GAA9B,CAA+B;YACzC,OAAO,IAAI,EAAE,CAAC;gBACZ,OAAO,wBACF,IAAI,GACJ,EAAE,KAAK,EAAE,IAAI,EAAE,CACnB;gBACD,mDAAmD;aACpD,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5C,+BAA+B;SAChC;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACpB;QAED,IAAI,aAAO,CAAC,SAAS,EAAE;YACrB,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;SACnF;aAAM;YACL,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;gBACrB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;aACpF;YACD,gDAAgD;SACjD;KACF;IAED,OAAO;AACT,CAAC,CAAC;AA5EW,QAAA,OAAO,WA4ElB"}
|
package/package.json
CHANGED
|
@@ -29,7 +29,7 @@ export let safeDynamicRequire: typeof require;
|
|
|
29
29
|
* 2. Cloudflare edge -> only globalThis.require works
|
|
30
30
|
*/
|
|
31
31
|
if (
|
|
32
|
-
typeof globalThis
|
|
32
|
+
typeof globalThis?.require === 'function' ||
|
|
33
33
|
(Builder.isServer && typeof require === 'function')
|
|
34
34
|
) {
|
|
35
35
|
safeDynamicRequire = eval('require');
|
|
@@ -120,7 +120,8 @@ export function stringToFunction(
|
|
|
120
120
|
// tslint:disable:comment-format
|
|
121
121
|
const { VM } = safeDynamicRequire('vm2');
|
|
122
122
|
const [state, event, _block, _builder, _Device, _update, _Builder, context] = args;
|
|
123
|
-
|
|
123
|
+
|
|
124
|
+
return new VM({
|
|
124
125
|
timeout: 100,
|
|
125
126
|
sandbox: {
|
|
126
127
|
...state,
|
|
@@ -130,8 +131,6 @@ export function stringToFunction(
|
|
|
130
131
|
event,
|
|
131
132
|
},
|
|
132
133
|
}).run(str.replace(/(^|;)return /, '$1'));
|
|
133
|
-
console.log(' evaluating ', str, ' result is ', result, state)
|
|
134
|
-
return result;
|
|
135
134
|
// tslint:enable:comment-format
|
|
136
135
|
}
|
|
137
136
|
} catch (error: any) {
|
|
@@ -157,6 +156,7 @@ export function stringToFunction(
|
|
|
157
156
|
if (errors) {
|
|
158
157
|
errors.push(error);
|
|
159
158
|
}
|
|
159
|
+
return null;
|
|
160
160
|
}
|
|
161
161
|
};
|
|
162
162
|
|
|
@@ -52,16 +52,13 @@ export const tryEval = (str?: string, data: any = {}, errors?: Error[]): any =>
|
|
|
52
52
|
// for the server build
|
|
53
53
|
// tslint:disable:comment-format
|
|
54
54
|
const { VM } = safeDynamicRequire('vm2');
|
|
55
|
-
|
|
55
|
+
return new VM({
|
|
56
56
|
sandbox: {
|
|
57
57
|
...data,
|
|
58
58
|
...{ state: data },
|
|
59
59
|
},
|
|
60
60
|
// TODO: convert reutrn to module.exports on server
|
|
61
61
|
}).run(value.replace(/(^|;)return /, '$1'));
|
|
62
|
-
|
|
63
|
-
console.log( ' tryEval, ', value, ' result is ', result);
|
|
64
|
-
return result;
|
|
65
62
|
// tslint:enable:comment-format
|
|
66
63
|
}
|
|
67
64
|
} catch (error: any) {
|