diff options
| -rw-r--r-- | cli/build.rs | 9 | ||||
| -rw-r--r-- | runtime/build.rs | 103 |
2 files changed, 74 insertions, 38 deletions
diff --git a/cli/build.rs b/cli/build.rs index d54e22be8..752b80635 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -351,8 +351,13 @@ fn create_cli_snapshot(snapshot_path: PathBuf) { specifier: "runtime/js/99_main.js".to_string(), code: deno_runtime::js::SOURCE_CODE_FOR_99_MAIN_JS, }); - let extensions_with_js = - vec![Extension::builder("cli").esm(esm_files).build()]; + let extensions_with_js = vec![Extension::builder("cli") + // FIXME(bartlomieju): information about which extensions were + // already snapshotted is not preserved in the snapshot. This should be + // fixed, so we can reliably depend on that information. + // .dependencies(vec!["runtime"]) + .esm(esm_files) + .build()]; create_snapshot(CreateSnapshotOptions { cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"), diff --git a/runtime/build.rs b/runtime/build.rs index e892e7485..d3f92cf6a 100644 --- a/runtime/build.rs +++ b/runtime/build.rs @@ -155,9 +155,58 @@ mod not_docs { fn create_runtime_snapshot( snapshot_path: PathBuf, - additional_extension: Extension, + maybe_additional_extension: Option<Extension>, ) { - let extensions_with_js: Vec<Extension> = vec![ + let runtime_extension = Extension::builder("runtime") + .dependencies(vec![ + "deno_webidl", + "deno_console", + "deno_url", + "deno_tls", + "deno_web", + "deno_fetch", + "deno_cache", + "deno_websocket", + "deno_webstorage", + "deno_crypto", + "deno_webgpu", + "deno_broadcast_channel", + "deno_node", + "deno_ffi", + "deno_net", + "deno_napi", + "deno_http", + "deno_flash", + ]) + .esm(include_js_files_dir!( + dir "js", + "01_build.js", + "01_errors.js", + "01_version.ts", + "06_util.js", + "10_permissions.js", + "11_workers.js", + "12_io.js", + "13_buffer.js", + "30_fs.js", + "30_os.js", + "40_diagnostics.js", + "40_files.js", + "40_fs_events.js", + "40_http.js", + "40_process.js", + "40_read_file.js", + "40_signals.js", + "40_spawn.js", + "40_tty.js", + "40_write_file.js", + "41_prompt.js", + "90_deno_ns.js", + "98_global_scope.js", + )) + .build(); + + let mut extensions_with_js: Vec<Extension> = vec![ deno_webidl::init(), deno_console::init(), deno_url::init(), @@ -185,9 +234,13 @@ mod not_docs { deno_napi::init::<Permissions>(false), deno_http::init(), deno_flash::init::<Permissions>(false), // No --unstable - additional_extension, + runtime_extension, ]; + if let Some(additional_extension) = maybe_additional_extension { + extensions_with_js.push(additional_extension); + } + create_snapshot(CreateSnapshotOptions { cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"), snapshot_path, @@ -208,44 +261,22 @@ mod not_docs { pub fn build_snapshot(runtime_snapshot_path: PathBuf) { #[allow(unused_mut, unused_assignments)] - let mut esm_files = include_js_files_dir!( - dir "js", - "01_build.js", - "01_errors.js", - "01_version.ts", - "06_util.js", - "10_permissions.js", - "11_workers.js", - "12_io.js", - "13_buffer.js", - "30_fs.js", - "30_os.js", - "40_diagnostics.js", - "40_files.js", - "40_fs_events.js", - "40_http.js", - "40_process.js", - "40_read_file.js", - "40_signals.js", - "40_spawn.js", - "40_tty.js", - "40_write_file.js", - "41_prompt.js", - "90_deno_ns.js", - "98_global_scope.js", - ); + let mut maybe_additional_extension = None; #[cfg(not(feature = "snapshot_from_snapshot"))] { - esm_files.push(ExtensionFileSource { - specifier: "js/99_main.js".to_string(), - code: include_str!("js/99_main.js"), - }); + maybe_additional_extension = Some( + Extension::builder("runtime_main") + .dependencies(vec!["runtime"]) + .esm(vec![ExtensionFileSource { + specifier: "js/99_main.js".to_string(), + code: include_str!("js/99_main.js"), + }]) + .build(), + ); } - let additional_extension = - Extension::builder("runtime").esm(esm_files).build(); - create_runtime_snapshot(runtime_snapshot_path, additional_extension); + create_runtime_snapshot(runtime_snapshot_path, maybe_additional_extension); } } |