diff --git a/integration-tests/js-compute/fixtures/app/fastly.toml.in b/integration-tests/js-compute/fixtures/app/fastly.toml.in index 8affb592c2..79e9855af5 100644 --- a/integration-tests/js-compute/fixtures/app/fastly.toml.in +++ b/integration-tests/js-compute/fixtures/app/fastly.toml.in @@ -9,7 +9,7 @@ name = "js-test-app" service_id = "" [scripts] - build = "node ../../../../js-compute-runtime-cli.js --enable-pbl --enable-experimental-high-resolution-time-methods src/index.js" + build = "node ../../../../js-compute-runtime-cli.js --enable-experimental-high-resolution-time-methods src/index.js" [local_server] diff --git a/js-compute-runtime-cli.js b/js-compute-runtime-cli.js index 768e2f2dc1..aeda83628a 100755 --- a/js-compute-runtime-cli.js +++ b/js-compute-runtime-cli.js @@ -6,7 +6,6 @@ import { printHelp } from "./src/printHelp.js"; import { addSdkMetadataField } from "./src/addSdkMetadataField.js"; const { - enablePBL, enableAOT, aotCache, enableExperimentalHighResolutionTimeMethods, @@ -37,10 +36,9 @@ if (version) { output, wasmEngine, enableExperimentalHighResolutionTimeMethods, - enablePBL, enableExperimentalTopLevelAwait, enableAOT, aotCache, ); - await addSdkMetadataField(output, enablePBL); + await addSdkMetadataField(output, enableAOT); } diff --git a/src/addSdkMetadataField.js b/src/addSdkMetadataField.js index 4ccccaf0fe..0e6eef5115 100644 --- a/src/addSdkMetadataField.js +++ b/src/addSdkMetadataField.js @@ -4,15 +4,15 @@ import { dirname, join } from "node:path"; import { fileURLToPath } from "node:url"; const __dirname = dirname(fileURLToPath(import.meta.url)); -export async function addSdkMetadataField(wasmPath, usingPBL) { +export async function addSdkMetadataField(wasmPath, usingAOT) { const packageJson = await readFile(join(__dirname, "../package.json"), { encoding: "utf-8", }); let { name, version } = JSON.parse(packageJson); - if (usingPBL) { - name += ' (StarlingMonkey with PBL)' + if (usingAOT) { + name += ' (StarlingMonkey with Weval)' } else { name += ' (StarlingMonkey)' } diff --git a/src/compileApplicationToWasm.js b/src/compileApplicationToWasm.js index 423cfb331a..7b26d00f6a 100644 --- a/src/compileApplicationToWasm.js +++ b/src/compileApplicationToWasm.js @@ -19,7 +19,6 @@ export async function compileApplicationToWasm( output, wasmEngine, enableExperimentalHighResolutionTimeMethods = false, - enablePBL = false, enableExperimentalTopLevelAwait = false, enableAOT = false, aotCache = '', @@ -139,7 +138,6 @@ export async function compileApplicationToWasm( env: { ENABLE_EXPERIMENTAL_HIGH_RESOLUTION_TIME_METHODS: enableExperimentalHighResolutionTimeMethods ? "1" : "0", - ENABLE_PBL: enablePBL ? "1" : "0", ...process.env, }, } @@ -169,7 +167,6 @@ export async function compileApplicationToWasm( env: { ENABLE_EXPERIMENTAL_HIGH_RESOLUTION_TIME_METHODS: enableExperimentalHighResolutionTimeMethods ? "1" : "0", - ENABLE_PBL: enablePBL ? "1" : "0", ...process.env, }, } diff --git a/src/parseInputs.js b/src/parseInputs.js index db62e3af6b..1638b5fb19 100644 --- a/src/parseInputs.js +++ b/src/parseInputs.js @@ -8,7 +8,6 @@ export async function parseInputs(cliInputs) { let enableExperimentalHighResolutionTimeMethods = false; let enableExperimentalTopLevelAwait = false; - let enablePBL = false; let enableAOT = false; let customEngineSet = false; let wasmEngine = join(__dirname, "../fastly.wasm"); @@ -33,10 +32,6 @@ export async function parseInputs(cliInputs) { enableExperimentalTopLevelAwait = true; break; } - case "--enable-pbl": { - enablePBL = true; - break; - } case "--enable-experimental-aot": { enableAOT = true; break; @@ -132,7 +127,6 @@ export async function parseInputs(cliInputs) { return { enableExperimentalHighResolutionTimeMethods, enableExperimentalTopLevelAwait, - enablePBL, enableAOT, aotCache, input,