From 221021ae9b8051e3ca3a9257ef00c8bf33a0e08e Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 21 Jan 2025 17:00:40 +0000
Subject: [PATCH] Support for our own vm-browserify implementation which
 re-uses the iframe for running JS in the frontend, to improve performance.

---
 packages/string-templates/package.json |  1 +
 packages/string-templates/src/index.ts |  6 +++---
 yarn.lock                              | 18 +++++++++++++++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 1d7a4507ab..74d9aaa85a 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@budibase/handlebars-helpers": "^0.13.2",
+    "@budibase/vm-browserify": "^1.1.3",
     "dayjs": "^1.10.8",
     "handlebars": "^4.7.8",
     "lodash.clonedeep": "^4.5.0"
diff --git a/packages/string-templates/src/index.ts b/packages/string-templates/src/index.ts
index 8dda8b71ab..bd008dd4d2 100644
--- a/packages/string-templates/src/index.ts
+++ b/packages/string-templates/src/index.ts
@@ -1,4 +1,4 @@
-import { createContext, runInNewContext } from "vm"
+import vm from "@budibase/vm-browserify"
 import { create, TemplateDelegate } from "handlebars"
 import { registerAll, registerMinimum } from "./helpers/index"
 import { postprocess, postprocessWithLogs, preprocess } from "./processors"
@@ -511,11 +511,11 @@ export function browserJSSetup() {
    * Use polyfilled vm to run JS scripts in a browser Env
    */
   setJSRunner((js: string, context: Record<string, any>) => {
-    createContext(context)
+    vm.createContext(context)
 
     const wrappedJs = frontendWrapJS(js)
 
-    const result = runInNewContext(wrappedJs, context, { timeout: 1000 })
+    const result = vm.runInNewContext(wrappedJs, context)
     if (result.error) {
       throw new UserScriptError(result.error)
     }
diff --git a/yarn.lock b/yarn.lock
index 453dc45128..e25ff97747 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2131,9 +2131,9 @@
     through2 "^2.0.0"
 
 "@budibase/pro@npm:@budibase/pro@latest":
-  version "3.2.44"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-3.2.44.tgz#90367bb2167aafd8c809e000a57d349e5dc4bb78"
-  integrity sha512-Zv2PBVUZUS6/psOpIRIDlW3jrOHWWPhpQXzCk00kIQJaqjkdcvuTXSedQ70u537sQmLu8JsSWbui9MdfF8ksVw==
+  version "3.2.47"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-3.2.47.tgz#150d7b16b14932d03c84bdb0e6d570d490c28a5c"
+  integrity sha512-UeTIq7yzMUK6w/akUsRafoD/Kif6PXv4d7K1arn8GTMjwFm9QYu2hg1YkQ+duNdwyZ/GEPlEAV5SYK+NDgtpdA==
   dependencies:
     "@anthropic-ai/sdk" "^0.27.3"
     "@budibase/backend-core" "*"
@@ -2152,6 +2152,13 @@
     scim-patch "^0.8.1"
     scim2-parse-filter "^0.2.8"
 
+"@budibase/vm-browserify@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@budibase/vm-browserify/-/vm-browserify-1.1.3.tgz#63f7917671a0f0cb760e3aa37cfd5dfa32e997ed"
+  integrity sha512-CuoNb2xwS8TT2ZfG9YqC8QCTcG3ZPLwH4m00sfPDluwmdp3U3HGg/UKWRIqKC6Wv8Mywy1q6bxmSx6Vf40V52w==
+  dependencies:
+    indexof "^0.0.1"
+
 "@bull-board/api@5.10.2":
   version "5.10.2"
   resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-5.10.2.tgz#ae8ff6918b23897bf879a6ead3683f964374c4b3"
@@ -11925,6 +11932,11 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==
 
+indexof@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==
+
 infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"