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

Fix ts-node and other runners

This commit is contained in:
Adria Navarro 2024-02-13 17:43:42 +01:00
parent 0bf94bcd7b
commit 9ed6502681
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/server/src/environment.ts
View File

@ -98,6 +98,7 @@ const environment = {
JS_RUNNER_MEMORY_LIMIT: JS_RUNNER_MEMORY_LIMIT:
parseIntSafe(process.env.JS_RUNNER_MEMORY_LIMIT) || 64, parseIntSafe(process.env.JS_RUNNER_MEMORY_LIMIT) || 64,
LOG_JS_ERRORS: process.env.LOG_JS_ERRORS, LOG_JS_ERRORS: process.env.LOG_JS_ERRORS,
isBundled: process.env.BUNDLED,
} }
// clean up any environment variable edge cases // clean up any environment variable edge cases

11
packages/server/src/jsRunner/bundles/index.ts
View File

@ -8,20 +8,21 @@ export const enum BundleType {
} }
const bundleSourceCode = { const bundleSourceCode = {
[BundleType.HELPERS]: "../bundles/index-helpers.ivm.bundle.js", [BundleType.HELPERS]: "./index-helpers.ivm.bundle.js",
[BundleType.BSON]: "../bundles/bson.ivm.bundle.js", [BundleType.BSON]: "./bson.ivm.bundle.js",
} }
export function loadBundle(type: BundleType) { export function loadBundle(type: BundleType) {
if (environment.isJest()) { if (!environment.isBundled) {
return fs.readFileSync(require.resolve(bundleSourceCode[type]), "utf-8") return fs.readFileSync(require.resolve(bundleSourceCode[type]), "utf-8")
} }
// If we are running from a built version, esbuild is configured to inject .ivm.bundle.js files as text
switch (type) { switch (type) {
case BundleType.HELPERS: case BundleType.HELPERS:
return require("../bundles/index-helpers.ivm.bundle.js") return require("./index-helpers.ivm.bundle.js")
case BundleType.BSON: case BundleType.BSON:
return require("../bundles/bson.ivm.bundle.js") return require("./bson.ivm.bundle.js")
default: default:
utils.unreachable(type) utils.unreachable(type)
} }

3
scripts/build.js
View File

@ -63,6 +63,9 @@ function runBuild(entry, outfile) {
"graphql/*", "graphql/*",
"bson", "bson",
], ],
define: {
"process.env.BUNDLED": '"true"',
},
} }
build({ build({