MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-pro-ref

This commit is contained in:
Adria Navarro 2024-02-20 12:14:25 +01:00 committed by GitHub
parent 2d019ccb65 904476de5c
commit 9ad90c5c95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.20.0", "version": "2.20.1",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

7
packages/server/src/jsRunner/index.ts
View File

@ -21,9 +21,9 @@ export function init() {
} }
try { try {
const bbCtx = context.getCurrentContext()! const bbCtx = context.getCurrentContext()
let { vm } = bbCtx let vm = bbCtx?.vm
if (!vm) { if (!vm) {
// Can't copy the native helpers into the isolate. We just ignore them as they are handled properly from the helpersSource // Can't copy the native helpers into the isolate. We just ignore them as they are handled properly from the helpersSource
const { helpers, ...ctxToPass } = ctx const { helpers, ...ctxToPass } = ctx
@ -36,8 +36,11 @@ export function init() {
.withContext(ctxToPass) .withContext(ctxToPass)
.withHelpers() .withHelpers()
if (bbCtx) {
// If we have a context, we want to persist it to reuse the isolate
bbCtx.vm = vm bbCtx.vm = vm
} }
}
return vm.execute(js) return vm.execute(js)
} catch (error: any) { } catch (error: any) {
if (error.message === "Script execution timed out.") { if (error.message === "Script execution timed out.") {