Commit dafed45
committed
src: clean up experimental flag variables
- `fetch` is no longer disable by a CLI flag
- `node:sqlite` requires SQLite, obviously
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #62759
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>1 parent a12dc44 commit dafed45
4 files changed
Lines changed: 5 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -269,13 +269,9 @@ void SetIsolateMiscHandlers(v8::Isolate* isolate, const IsolateSettings& s) { | |||
| 269 | 269 | isolate->SetModifyCodeGenerationFromStringsCallback( | |
| 270 | 270 | modify_code_generation_from_strings_callback); | |
| 271 | 271 | ||
| 272 | - Mutex::ScopedLock lock(node::per_process::cli_options_mutex); | ||
| 273 | - if (per_process::cli_options->get_per_isolate_options() | ||
| 274 | - ->get_per_env_options() | ||
| 275 | - ->experimental_fetch) { | ||
| 276 | - isolate->SetWasmStreamingCallback(wasm_web_api::StartStreamingCompilation); | ||
| 277 | - } | ||
| 272 | + isolate->SetWasmStreamingCallback(wasm_web_api::StartStreamingCompilation); | ||
| 278 | 273 | ||
| 274 | + Mutex::ScopedLock lock(node::per_process::cli_options_mutex); | ||
| 279 | 275 | if (per_process::cli_options->get_per_isolate_options() | |
| 280 | 276 | ->experimental_shadow_realm) { | |
| 281 | 277 | isolate->SetHostCreateShadowRealmContextCallback( | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -582,7 +582,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { | |||
| 582 | 582 | "experimental node:sqlite module", | |
| 583 | 583 | &EnvironmentOptions::experimental_sqlite, | |
| 584 | 584 | kAllowedInEnvvar, | |
| 585 | - true); | ||
| 585 | + HAVE_SQLITE); | ||
| 586 | 586 | AddOption("--experimental-quic", | |
| 587 | 587 | #ifndef OPENSSL_NO_QUIC | |
| 588 | 588 | "experimental QUIC support", | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -124,9 +124,8 @@ class EnvironmentOptions : public Options { | |||
| 124 | 124 | bool enable_source_maps = false; | |
| 125 | 125 | bool experimental_addon_modules = false; | |
| 126 | 126 | bool experimental_eventsource = false; | |
| 127 | - bool experimental_fetch = true; | ||
| 128 | 127 | bool experimental_websocket = true; | |
| 129 | - bool experimental_sqlite = true; | ||
| 128 | + bool experimental_sqlite = HAVE_SQLITE; | ||
| 130 | 129 | bool experimental_webstorage = false; | |
| 131 | 130 | #ifndef OPENSSL_NO_QUIC | |
| 132 | 131 | bool experimental_quic = false; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -62,6 +62,7 @@ require(fixtures.path('resolve-paths', 'default', 'verify-paths.js')); | |||
| 62 | 62 | builtinModules.forEach((mod) => { | |
| 63 | 63 | // TODO(@jasnell): Remove once node:quic is no longer flagged | |
| 64 | 64 | if (mod === 'node:quic') return; | |
| 65 | + if (mod === 'node:sqlite' && !common.hasSQLite) return; | ||
| 65 | 66 | assert.strictEqual(require.resolve.paths(mod), null); | |
| 66 | 67 | if (!mod.startsWith('node:')) { | |
| 67 | 68 | assert.strictEqual(require.resolve.paths(`node:${mod}`), null); | |
0 commit comments