diff options
author | Divy Srivastava <dj.srivastava23@gmail.com> | 2023-12-08 13:03:25 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-08 08:33:25 +0100 |
commit | c5c5dea90debcc5ec53b4803ca530558df32e43f (patch) | |
tree | 2bd0483edd0a921802999429d6501ecb59bed3ef /runtime | |
parent | 2235a1a359ffabd72689db58b9af5873e0a9b38a (diff) |
chore: use primordials in 40_testing.js (#21422)
This commit brings back usage of primordials in "40_testing.js" by
turning it back into an ES module and using new "lazy loading" functionality
of ES modules coming from "deno_core".
The same approach was applied to "40_jupyter.js".
Co-authored-by: Bartek IwaĆczuk <biwanczuk@gmail.com>
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/js/10_permissions.js | 4 | ||||
-rw-r--r-- | runtime/js/30_os.js | 4 | ||||
-rw-r--r-- | runtime/web_worker.rs | 7 | ||||
-rw-r--r-- | runtime/worker.rs | 7 |
4 files changed, 2 insertions, 20 deletions
diff --git a/runtime/js/10_permissions.js b/runtime/js/10_permissions.js index 2d3295f85..4519f14a2 100644 --- a/runtime/js/10_permissions.js +++ b/runtime/js/10_permissions.js @@ -1,6 +1,6 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -import { core, internals, primordials } from "ext:core/mod.js"; +import { core, primordials } from "ext:core/mod.js"; const ops = core.ops; import { pathFromURL } from "ext:deno_web/00_infra.js"; import { Event, EventTarget } from "ext:deno_web/02_event.js"; @@ -290,6 +290,4 @@ function serializePermissions(permissions) { return permissions; } -internals.serializePermissions = serializePermissions; - export { Permissions, permissions, PermissionStatus, serializePermissions }; diff --git a/runtime/js/30_os.js b/runtime/js/30_os.js index 5bc96e54b..f6d655633 100644 --- a/runtime/js/30_os.js +++ b/runtime/js/30_os.js @@ -1,6 +1,6 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -import { core, internals, primordials } from "ext:core/mod.js"; +import { core, primordials } from "ext:core/mod.js"; const ops = core.ops; import { Event, EventTarget } from "ext:deno_web/02_event.js"; const { @@ -105,8 +105,6 @@ function execPath() { return ops.op_exec_path(); } -internals.setExitHandler = setExitHandler; - export { env, execPath, diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index 5b8c1944a..4244f1045 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -43,7 +43,6 @@ use deno_fs::FileSystem; use deno_http::DefaultHttpPropertyExtractor; use deno_io::Stdio; use deno_kv::dynamic::MultiBackendDbHandler; -use deno_node::SUPPORTED_BUILTIN_NODE_MODULES_WITH_PREFIX; use deno_tls::RootCertStoreProvider; use deno_web::create_entangled_message_port; use deno_web::BlobStore; @@ -523,11 +522,6 @@ impl WebWorker { (None, None) }; - // Clear extension modules from the module map, except preserve `node:*` - // modules as `node:` specifiers. - let preserve_snapshotted_modules = - Some(SUPPORTED_BUILTIN_NODE_MODULES_WITH_PREFIX); - let mut js_runtime = JsRuntime::new(RuntimeOptions { module_loader: Some(options.module_loader.clone()), startup_snapshot: options @@ -539,7 +533,6 @@ impl WebWorker { compiled_wasm_module_store: options.compiled_wasm_module_store.clone(), extensions, inspector: options.maybe_inspector_server.is_some(), - preserve_snapshotted_modules, feature_checker: Some(options.feature_checker.clone()), op_metrics_factory_fn, ..Default::default() diff --git a/runtime/worker.rs b/runtime/worker.rs index 3267bd78d..2a7e82c54 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -39,7 +39,6 @@ use deno_fs::FileSystem; use deno_http::DefaultHttpPropertyExtractor; use deno_io::Stdio; use deno_kv::dynamic::MultiBackendDbHandler; -use deno_node::SUPPORTED_BUILTIN_NODE_MODULES_WITH_PREFIX; use deno_tls::RootCertStoreProvider; use deno_web::BlobStore; use log::debug; @@ -420,11 +419,6 @@ impl MainWorker { #[cfg(all(feature = "include_js_files_for_snapshotting", feature = "dont_create_runtime_snapshot", not(feature = "__runtime_js_sources")))] options.startup_snapshot.as_ref().expect("Sources are not embedded, snapshotting was disabled and a user snapshot was not provided."); - // Clear extension modules from the module map, except preserve `node:*` - // modules. - let preserve_snapshotted_modules = - Some(SUPPORTED_BUILTIN_NODE_MODULES_WITH_PREFIX); - let mut js_runtime = JsRuntime::new(RuntimeOptions { module_loader: Some(options.module_loader.clone()), startup_snapshot: options @@ -437,7 +431,6 @@ impl MainWorker { shared_array_buffer_store: options.shared_array_buffer_store.clone(), compiled_wasm_module_store: options.compiled_wasm_module_store.clone(), extensions, - preserve_snapshotted_modules, inspector: options.maybe_inspector_server.is_some(), is_main: true, feature_checker: Some(options.feature_checker.clone()), |