From b81e5db17aa8b3088d6034ddf86b79c69410f012 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Fri, 4 Oct 2019 20:28:51 -0400 Subject: [PATCH] Merge deno_cli_snapshots into deno_cli (#3064) --- .eslintignore | 1 - Cargo.lock | 9 -------- Cargo.toml | 1 - cli/Cargo.toml | 4 +++- {js => cli}/build.rs | 4 ++-- cli/file_fetcher.rs | 4 ---- js/lib.rs => cli/js.rs | 4 +++- {js => cli/js}/base64.ts | 0 {js => cli/js}/blob.ts | 0 {js => cli/js}/blob_test.ts | 0 {js => cli/js}/body.ts | 0 {js => cli/js}/body_test.ts | 0 {js => cli/js}/buffer.ts | 0 {js => cli/js}/buffer_test.ts | 0 {js => cli/js}/build.ts | 0 {js => cli/js}/build_test.ts | 0 {js => cli/js}/chmod.ts | 0 {js => cli/js}/chmod_test.ts | 0 {js => cli/js}/chown.ts | 0 {js => cli/js}/chown_test.ts | 0 {js => cli/js}/colors.ts | 0 {js => cli/js}/compiler.ts | 0 {js => cli/js}/console.ts | 0 {js => cli/js}/console_table.ts | 0 {js => cli/js}/console_test.ts | 0 {js => cli/js}/copy_file.ts | 0 {js => cli/js}/copy_file_test.ts | 0 {js => cli/js}/core.ts | 0 {js => cli/js}/custom_event.ts | 0 {js => cli/js}/custom_event_test.ts | 0 {js => cli/js}/deno.ts | 0 {js => cli/js}/diagnostics.ts | 0 {js => cli/js}/dir.ts | 0 {js => cli/js}/dir_test.ts | 0 {js => cli/js}/dispatch.ts | 0 {js => cli/js}/dispatch_json.ts | 0 {js => cli/js}/dispatch_json_test.ts | 0 {js => cli/js}/dispatch_minimal.ts | 0 {js => cli/js}/dom_file.ts | 0 {js => cli/js}/dom_types.ts | 0 {js => cli/js}/dom_util.ts | 0 {js => cli/js}/error_stack.ts | 0 {js => cli/js}/error_stack_test.ts | 0 {js => cli/js}/errors.ts | 0 {js => cli/js}/event.ts | 0 {js => cli/js}/event_target.ts | 0 {js => cli/js}/event_target_test.ts | 0 {js => cli/js}/event_test.ts | 0 {js => cli/js}/fetch.ts | 0 {js => cli/js}/fetch_test.ts | 0 {js => cli/js}/file_info.ts | 0 {js => cli/js}/file_test.ts | 0 {js => cli/js}/files.ts | 0 {js => cli/js}/files_test.ts | 0 {js => cli/js}/form_data.ts | 0 {js => cli/js}/form_data_test.ts | 0 {js => cli/js}/format_error.ts | 0 {js => cli/js}/get_random_values.ts | 0 {js => cli/js}/get_random_values_test.ts | 0 {js => cli/js}/globals.ts | 0 {js => cli/js}/globals_test.ts | 0 {js => cli/js}/headers.ts | 0 {js => cli/js}/headers_test.ts | 0 {js => cli/js}/io.ts | 0 {js => cli/js}/lib.deno_runtime.d.ts | 0 {js => cli/js}/lib.web_assembly.d.ts | 0 {js => cli/js}/link.ts | 0 {js => cli/js}/link_test.ts | 0 {js => cli/js}/location.ts | 0 {js => cli/js}/location_test.ts | 0 {js => cli/js}/main.ts | 0 {js => cli/js}/make_temp_dir.ts | 0 {js => cli/js}/make_temp_dir_test.ts | 0 {js => cli/js}/metrics.ts | 0 {js => cli/js}/metrics_test.ts | 0 {js => cli/js}/mixins/dom_iterable.ts | 0 {js => cli/js}/mixins/dom_iterable_test.ts | 0 {js => cli/js}/mkdir.ts | 0 {js => cli/js}/mkdir_test.ts | 0 {js => cli/js}/mock_builtin.js | 0 {js => cli/js}/net.ts | 0 {js => cli/js}/net_test.ts | 0 {js => cli/js}/os.ts | 0 {js => cli/js}/os_test.ts | 0 {js => cli/js}/performance.ts | 0 {js => cli/js}/performance_test.ts | 0 {js => cli/js}/permissions.ts | 0 {js => cli/js}/permissions_test.ts | 0 {js => cli/js}/process.ts | 0 {js => cli/js}/process_test.ts | 0 {js => cli/js}/read_dir.ts | 0 {js => cli/js}/read_dir_test.ts | 0 {js => cli/js}/read_file.ts | 0 {js => cli/js}/read_file_test.ts | 0 {js => cli/js}/read_link.ts | 0 {js => cli/js}/read_link_test.ts | 0 {js => cli/js}/remove.ts | 0 {js => cli/js}/remove_test.ts | 0 {js => cli/js}/rename.ts | 0 {js => cli/js}/rename_test.ts | 0 {js => cli/js}/repl.ts | 0 {js => cli/js}/request.ts | 0 {js => cli/js}/request_test.ts | 0 {js => cli/js}/resources.ts | 0 {js => cli/js}/resources_test.ts | 0 {js => cli/js}/stat.ts | 0 {js => cli/js}/stat_test.ts | 0 {js => cli/js}/symlink.ts | 0 {js => cli/js}/symlink_test.ts | 0 {js => cli/js}/test_util.ts | 6 +++--- {js => cli/js}/text_encoding.ts | 0 {js => cli/js}/text_encoding_test.ts | 0 {js => cli/js}/timers.ts | 0 {js => cli/js}/timers_test.ts | 0 {js => cli/js}/tls.ts | 0 {js => cli/js}/tls_test.ts | 0 {js => cli/js}/truncate.ts | 0 {js => cli/js}/truncate_test.ts | 0 {js => cli/js}/ts_global.d.ts | 0 {js => cli/js}/type_directives.ts | 0 {js => cli/js}/types.ts | 0 {js => cli/js}/unit_test_runner.ts | 4 ++-- {js => cli/js}/unit_tests.ts | 6 +++--- {js => cli/js}/url.ts | 0 {js => cli/js}/url_search_params.ts | 0 {js => cli/js}/url_search_params_test.ts | 0 {js => cli/js}/url_test.ts | 0 {js => cli/js}/util.ts | 0 {js => cli/js}/utime.ts | 0 {js => cli/js}/utime_test.ts | 0 {js => cli/js}/version.ts | 0 {js => cli/js}/version_test.ts | 0 {js => cli/js}/window.ts | 0 {js => cli/js}/workers.ts | 0 {js => cli/js}/write_file.ts | 0 {js => cli/js}/write_file_test.ts | 0 cli/lib.rs | 4 ++-- cli/ops/compiler.rs | 2 +- cli/source_maps.rs | 4 ++-- cli/startup_data.rs | 4 ++-- cli/tests/integration_tests.rs | 2 +- cli/version.rs | 2 +- js/Cargo.toml | 25 ---------------------- js/README.md | 10 --------- tools/cargo_publish_others.py | 4 ---- tools/complex_permissions_test.py | 11 +++++++--- tsconfig.json | 8 +++---- website/app_test.ts | 2 +- 148 files changed, 38 insertions(+), 83 deletions(-) rename {js => cli}/build.rs (89%) rename js/lib.rs => cli/js.rs (93%) rename {js => cli/js}/base64.ts (100%) rename {js => cli/js}/blob.ts (100%) rename {js => cli/js}/blob_test.ts (100%) rename {js => cli/js}/body.ts (100%) rename {js => cli/js}/body_test.ts (100%) rename {js => cli/js}/buffer.ts (100%) rename {js => cli/js}/buffer_test.ts (100%) rename {js => cli/js}/build.ts (100%) rename {js => cli/js}/build_test.ts (100%) rename {js => cli/js}/chmod.ts (100%) rename {js => cli/js}/chmod_test.ts (100%) rename {js => cli/js}/chown.ts (100%) rename {js => cli/js}/chown_test.ts (100%) rename {js => cli/js}/colors.ts (100%) rename {js => cli/js}/compiler.ts (100%) rename {js => cli/js}/console.ts (100%) rename {js => cli/js}/console_table.ts (100%) rename {js => cli/js}/console_test.ts (100%) rename {js => cli/js}/copy_file.ts (100%) rename {js => cli/js}/copy_file_test.ts (100%) rename {js => cli/js}/core.ts (100%) rename {js => cli/js}/custom_event.ts (100%) rename {js => cli/js}/custom_event_test.ts (100%) rename {js => cli/js}/deno.ts (100%) rename {js => cli/js}/diagnostics.ts (100%) rename {js => cli/js}/dir.ts (100%) rename {js => cli/js}/dir_test.ts (100%) rename {js => cli/js}/dispatch.ts (100%) rename {js => cli/js}/dispatch_json.ts (100%) rename {js => cli/js}/dispatch_json_test.ts (100%) rename {js => cli/js}/dispatch_minimal.ts (100%) rename {js => cli/js}/dom_file.ts (100%) rename {js => cli/js}/dom_types.ts (100%) rename {js => cli/js}/dom_util.ts (100%) rename {js => cli/js}/error_stack.ts (100%) rename {js => cli/js}/error_stack_test.ts (100%) rename {js => cli/js}/errors.ts (100%) rename {js => cli/js}/event.ts (100%) rename {js => cli/js}/event_target.ts (100%) rename {js => cli/js}/event_target_test.ts (100%) rename {js => cli/js}/event_test.ts (100%) rename {js => cli/js}/fetch.ts (100%) rename {js => cli/js}/fetch_test.ts (100%) rename {js => cli/js}/file_info.ts (100%) rename {js => cli/js}/file_test.ts (100%) rename {js => cli/js}/files.ts (100%) rename {js => cli/js}/files_test.ts (100%) rename {js => cli/js}/form_data.ts (100%) rename {js => cli/js}/form_data_test.ts (100%) rename {js => cli/js}/format_error.ts (100%) rename {js => cli/js}/get_random_values.ts (100%) rename {js => cli/js}/get_random_values_test.ts (100%) rename {js => cli/js}/globals.ts (100%) rename {js => cli/js}/globals_test.ts (100%) rename {js => cli/js}/headers.ts (100%) rename {js => cli/js}/headers_test.ts (100%) rename {js => cli/js}/io.ts (100%) rename {js => cli/js}/lib.deno_runtime.d.ts (100%) rename {js => cli/js}/lib.web_assembly.d.ts (100%) rename {js => cli/js}/link.ts (100%) rename {js => cli/js}/link_test.ts (100%) rename {js => cli/js}/location.ts (100%) rename {js => cli/js}/location_test.ts (100%) rename {js => cli/js}/main.ts (100%) rename {js => cli/js}/make_temp_dir.ts (100%) rename {js => cli/js}/make_temp_dir_test.ts (100%) rename {js => cli/js}/metrics.ts (100%) rename {js => cli/js}/metrics_test.ts (100%) rename {js => cli/js}/mixins/dom_iterable.ts (100%) rename {js => cli/js}/mixins/dom_iterable_test.ts (100%) rename {js => cli/js}/mkdir.ts (100%) rename {js => cli/js}/mkdir_test.ts (100%) rename {js => cli/js}/mock_builtin.js (100%) rename {js => cli/js}/net.ts (100%) rename {js => cli/js}/net_test.ts (100%) rename {js => cli/js}/os.ts (100%) rename {js => cli/js}/os_test.ts (100%) rename {js => cli/js}/performance.ts (100%) rename {js => cli/js}/performance_test.ts (100%) rename {js => cli/js}/permissions.ts (100%) rename {js => cli/js}/permissions_test.ts (100%) rename {js => cli/js}/process.ts (100%) rename {js => cli/js}/process_test.ts (100%) rename {js => cli/js}/read_dir.ts (100%) rename {js => cli/js}/read_dir_test.ts (100%) rename {js => cli/js}/read_file.ts (100%) rename {js => cli/js}/read_file_test.ts (100%) rename {js => cli/js}/read_link.ts (100%) rename {js => cli/js}/read_link_test.ts (100%) rename {js => cli/js}/remove.ts (100%) rename {js => cli/js}/remove_test.ts (100%) rename {js => cli/js}/rename.ts (100%) rename {js => cli/js}/rename_test.ts (100%) rename {js => cli/js}/repl.ts (100%) rename {js => cli/js}/request.ts (100%) rename {js => cli/js}/request_test.ts (100%) rename {js => cli/js}/resources.ts (100%) rename {js => cli/js}/resources_test.ts (100%) rename {js => cli/js}/stat.ts (100%) rename {js => cli/js}/stat_test.ts (100%) rename {js => cli/js}/symlink.ts (100%) rename {js => cli/js}/symlink_test.ts (100%) rename {js => cli/js}/test_util.ts (97%) rename {js => cli/js}/text_encoding.ts (100%) rename {js => cli/js}/text_encoding_test.ts (100%) rename {js => cli/js}/timers.ts (100%) rename {js => cli/js}/timers_test.ts (100%) rename {js => cli/js}/tls.ts (100%) rename {js => cli/js}/tls_test.ts (100%) rename {js => cli/js}/truncate.ts (100%) rename {js => cli/js}/truncate_test.ts (100%) rename {js => cli/js}/ts_global.d.ts (100%) rename {js => cli/js}/type_directives.ts (100%) rename {js => cli/js}/types.ts (100%) rename {js => cli/js}/unit_test_runner.ts (96%) rename {js => cli/js}/unit_tests.ts (90%) rename {js => cli/js}/url.ts (100%) rename {js => cli/js}/url_search_params.ts (100%) rename {js => cli/js}/url_search_params_test.ts (100%) rename {js => cli/js}/url_test.ts (100%) rename {js => cli/js}/util.ts (100%) rename {js => cli/js}/utime.ts (100%) rename {js => cli/js}/utime_test.ts (100%) rename {js => cli/js}/version.ts (100%) rename {js => cli/js}/version_test.ts (100%) rename {js => cli/js}/window.ts (100%) rename {js => cli/js}/workers.ts (100%) rename {js => cli/js}/write_file.ts (100%) rename {js => cli/js}/write_file_test.ts (100%) delete mode 100644 js/Cargo.toml delete mode 100644 js/README.md diff --git a/.eslintignore b/.eslintignore index 1b9e355376..30daa9c543 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1 @@ -/js/deps/ cli/tests/error_syntax.js diff --git a/Cargo.lock b/Cargo.lock index 20e94e0c9d..aed292e74f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -272,7 +272,6 @@ dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "deno 0.19.0", - "deno_cli_snapshots 0.19.0", "deno_typescript 0.19.0", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -313,14 +312,6 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "deno_cli_snapshots" -version = "0.19.0" -dependencies = [ - "deno 0.19.0", - "deno_typescript 0.19.0", -] - [[package]] name = "deno_typescript" version = "0.19.0" diff --git a/Cargo.toml b/Cargo.toml index 0f0b10de47..a54477a120 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,5 +4,4 @@ members = [ "core", "tools/hyper_hello", "deno_typescript", - "js", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 8894980d7b..56110b5e61 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -18,9 +18,11 @@ path = "lib.rs" name = "deno" path = "main.rs" +[build-dependencies] +deno_typescript = { path = "../deno_typescript", version = "0.19.0" } + [dependencies] deno = { path = "../core", version = "0.19.0" } -deno_cli_snapshots = { path = "../js", version = "0.19.0" } deno_typescript = { path = "../deno_typescript", version = "0.19.0" } ansi_term = "0.12.1" diff --git a/js/build.rs b/cli/build.rs similarity index 89% rename from js/build.rs rename to cli/build.rs index 1063fd8eb6..365e01aa8f 100644 --- a/js/build.rs +++ b/cli/build.rs @@ -14,13 +14,13 @@ fn main() { let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap()); let o = PathBuf::from(env::var_os("OUT_DIR").unwrap()); - let root_names = vec![c.join("main.ts")]; + let root_names = vec![c.join("js/main.ts")]; let bundle = o.join("CLI_SNAPSHOT.js"); let state = deno_typescript::compile_bundle(&bundle, root_names).unwrap(); assert!(bundle.exists()); deno_typescript::mksnapshot_bundle(&bundle, state).unwrap(); - let root_names = vec![c.join("compiler.ts")]; + let root_names = vec![c.join("js/compiler.ts")]; let bundle = o.join("COMPILER_SNAPSHOT.js"); let state = deno_typescript::compile_bundle(&bundle, root_names).unwrap(); assert!(bundle.exists()); diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs index 128bba2ef0..4ae48c4222 100644 --- a/cli/file_fetcher.rs +++ b/cli/file_fetcher.rs @@ -1284,8 +1284,6 @@ mod tests { assert!(r.is_err()); let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .parent() - .unwrap() .join("js/main.ts") .to_owned(); let specifier = @@ -1308,8 +1306,6 @@ mod tests { assert!(r.is_err()); let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .parent() - .unwrap() .join("js/main.ts") .to_owned(); let specifier = diff --git a/js/lib.rs b/cli/js.rs similarity index 93% rename from js/lib.rs rename to cli/js.rs index 89688b9a59..b76e493919 100644 --- a/js/lib.rs +++ b/cli/js.rs @@ -4,6 +4,7 @@ pub static CLI_SNAPSHOT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/CLI_SNAPSHOT.bin")); pub static CLI_SNAPSHOT_MAP: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/CLI_SNAPSHOT.js.map")); +#[allow(dead_code)] pub static CLI_SNAPSHOT_DTS: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/CLI_SNAPSHOT.d.ts")); @@ -11,10 +12,11 @@ pub static COMPILER_SNAPSHOT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/COMPILER_SNAPSHOT.bin")); pub static COMPILER_SNAPSHOT_MAP: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/COMPILER_SNAPSHOT.js.map")); +#[allow(dead_code)] pub static COMPILER_SNAPSHOT_DTS: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/COMPILER_SNAPSHOT.d.ts")); -static DENO_RUNTIME: &str = include_str!("lib.deno_runtime.d.ts"); +static DENO_RUNTIME: &str = include_str!("js/lib.deno_runtime.d.ts"); /// Same as deno_typescript::get_asset but also has lib.deno_runtime.d.ts pub fn get_asset(name: &str) -> Option<&'static str> { diff --git a/js/base64.ts b/cli/js/base64.ts similarity index 100% rename from js/base64.ts rename to cli/js/base64.ts diff --git a/js/blob.ts b/cli/js/blob.ts similarity index 100% rename from js/blob.ts rename to cli/js/blob.ts diff --git a/js/blob_test.ts b/cli/js/blob_test.ts similarity index 100% rename from js/blob_test.ts rename to cli/js/blob_test.ts diff --git a/js/body.ts b/cli/js/body.ts similarity index 100% rename from js/body.ts rename to cli/js/body.ts diff --git a/js/body_test.ts b/cli/js/body_test.ts similarity index 100% rename from js/body_test.ts rename to cli/js/body_test.ts diff --git a/js/buffer.ts b/cli/js/buffer.ts similarity index 100% rename from js/buffer.ts rename to cli/js/buffer.ts diff --git a/js/buffer_test.ts b/cli/js/buffer_test.ts similarity index 100% rename from js/buffer_test.ts rename to cli/js/buffer_test.ts diff --git a/js/build.ts b/cli/js/build.ts similarity index 100% rename from js/build.ts rename to cli/js/build.ts diff --git a/js/build_test.ts b/cli/js/build_test.ts similarity index 100% rename from js/build_test.ts rename to cli/js/build_test.ts diff --git a/js/chmod.ts b/cli/js/chmod.ts similarity index 100% rename from js/chmod.ts rename to cli/js/chmod.ts diff --git a/js/chmod_test.ts b/cli/js/chmod_test.ts similarity index 100% rename from js/chmod_test.ts rename to cli/js/chmod_test.ts diff --git a/js/chown.ts b/cli/js/chown.ts similarity index 100% rename from js/chown.ts rename to cli/js/chown.ts diff --git a/js/chown_test.ts b/cli/js/chown_test.ts similarity index 100% rename from js/chown_test.ts rename to cli/js/chown_test.ts diff --git a/js/colors.ts b/cli/js/colors.ts similarity index 100% rename from js/colors.ts rename to cli/js/colors.ts diff --git a/js/compiler.ts b/cli/js/compiler.ts similarity index 100% rename from js/compiler.ts rename to cli/js/compiler.ts diff --git a/js/console.ts b/cli/js/console.ts similarity index 100% rename from js/console.ts rename to cli/js/console.ts diff --git a/js/console_table.ts b/cli/js/console_table.ts similarity index 100% rename from js/console_table.ts rename to cli/js/console_table.ts diff --git a/js/console_test.ts b/cli/js/console_test.ts similarity index 100% rename from js/console_test.ts rename to cli/js/console_test.ts diff --git a/js/copy_file.ts b/cli/js/copy_file.ts similarity index 100% rename from js/copy_file.ts rename to cli/js/copy_file.ts diff --git a/js/copy_file_test.ts b/cli/js/copy_file_test.ts similarity index 100% rename from js/copy_file_test.ts rename to cli/js/copy_file_test.ts diff --git a/js/core.ts b/cli/js/core.ts similarity index 100% rename from js/core.ts rename to cli/js/core.ts diff --git a/js/custom_event.ts b/cli/js/custom_event.ts similarity index 100% rename from js/custom_event.ts rename to cli/js/custom_event.ts diff --git a/js/custom_event_test.ts b/cli/js/custom_event_test.ts similarity index 100% rename from js/custom_event_test.ts rename to cli/js/custom_event_test.ts diff --git a/js/deno.ts b/cli/js/deno.ts similarity index 100% rename from js/deno.ts rename to cli/js/deno.ts diff --git a/js/diagnostics.ts b/cli/js/diagnostics.ts similarity index 100% rename from js/diagnostics.ts rename to cli/js/diagnostics.ts diff --git a/js/dir.ts b/cli/js/dir.ts similarity index 100% rename from js/dir.ts rename to cli/js/dir.ts diff --git a/js/dir_test.ts b/cli/js/dir_test.ts similarity index 100% rename from js/dir_test.ts rename to cli/js/dir_test.ts diff --git a/js/dispatch.ts b/cli/js/dispatch.ts similarity index 100% rename from js/dispatch.ts rename to cli/js/dispatch.ts diff --git a/js/dispatch_json.ts b/cli/js/dispatch_json.ts similarity index 100% rename from js/dispatch_json.ts rename to cli/js/dispatch_json.ts diff --git a/js/dispatch_json_test.ts b/cli/js/dispatch_json_test.ts similarity index 100% rename from js/dispatch_json_test.ts rename to cli/js/dispatch_json_test.ts diff --git a/js/dispatch_minimal.ts b/cli/js/dispatch_minimal.ts similarity index 100% rename from js/dispatch_minimal.ts rename to cli/js/dispatch_minimal.ts diff --git a/js/dom_file.ts b/cli/js/dom_file.ts similarity index 100% rename from js/dom_file.ts rename to cli/js/dom_file.ts diff --git a/js/dom_types.ts b/cli/js/dom_types.ts similarity index 100% rename from js/dom_types.ts rename to cli/js/dom_types.ts diff --git a/js/dom_util.ts b/cli/js/dom_util.ts similarity index 100% rename from js/dom_util.ts rename to cli/js/dom_util.ts diff --git a/js/error_stack.ts b/cli/js/error_stack.ts similarity index 100% rename from js/error_stack.ts rename to cli/js/error_stack.ts diff --git a/js/error_stack_test.ts b/cli/js/error_stack_test.ts similarity index 100% rename from js/error_stack_test.ts rename to cli/js/error_stack_test.ts diff --git a/js/errors.ts b/cli/js/errors.ts similarity index 100% rename from js/errors.ts rename to cli/js/errors.ts diff --git a/js/event.ts b/cli/js/event.ts similarity index 100% rename from js/event.ts rename to cli/js/event.ts diff --git a/js/event_target.ts b/cli/js/event_target.ts similarity index 100% rename from js/event_target.ts rename to cli/js/event_target.ts diff --git a/js/event_target_test.ts b/cli/js/event_target_test.ts similarity index 100% rename from js/event_target_test.ts rename to cli/js/event_target_test.ts diff --git a/js/event_test.ts b/cli/js/event_test.ts similarity index 100% rename from js/event_test.ts rename to cli/js/event_test.ts diff --git a/js/fetch.ts b/cli/js/fetch.ts similarity index 100% rename from js/fetch.ts rename to cli/js/fetch.ts diff --git a/js/fetch_test.ts b/cli/js/fetch_test.ts similarity index 100% rename from js/fetch_test.ts rename to cli/js/fetch_test.ts diff --git a/js/file_info.ts b/cli/js/file_info.ts similarity index 100% rename from js/file_info.ts rename to cli/js/file_info.ts diff --git a/js/file_test.ts b/cli/js/file_test.ts similarity index 100% rename from js/file_test.ts rename to cli/js/file_test.ts diff --git a/js/files.ts b/cli/js/files.ts similarity index 100% rename from js/files.ts rename to cli/js/files.ts diff --git a/js/files_test.ts b/cli/js/files_test.ts similarity index 100% rename from js/files_test.ts rename to cli/js/files_test.ts diff --git a/js/form_data.ts b/cli/js/form_data.ts similarity index 100% rename from js/form_data.ts rename to cli/js/form_data.ts diff --git a/js/form_data_test.ts b/cli/js/form_data_test.ts similarity index 100% rename from js/form_data_test.ts rename to cli/js/form_data_test.ts diff --git a/js/format_error.ts b/cli/js/format_error.ts similarity index 100% rename from js/format_error.ts rename to cli/js/format_error.ts diff --git a/js/get_random_values.ts b/cli/js/get_random_values.ts similarity index 100% rename from js/get_random_values.ts rename to cli/js/get_random_values.ts diff --git a/js/get_random_values_test.ts b/cli/js/get_random_values_test.ts similarity index 100% rename from js/get_random_values_test.ts rename to cli/js/get_random_values_test.ts diff --git a/js/globals.ts b/cli/js/globals.ts similarity index 100% rename from js/globals.ts rename to cli/js/globals.ts diff --git a/js/globals_test.ts b/cli/js/globals_test.ts similarity index 100% rename from js/globals_test.ts rename to cli/js/globals_test.ts diff --git a/js/headers.ts b/cli/js/headers.ts similarity index 100% rename from js/headers.ts rename to cli/js/headers.ts diff --git a/js/headers_test.ts b/cli/js/headers_test.ts similarity index 100% rename from js/headers_test.ts rename to cli/js/headers_test.ts diff --git a/js/io.ts b/cli/js/io.ts similarity index 100% rename from js/io.ts rename to cli/js/io.ts diff --git a/js/lib.deno_runtime.d.ts b/cli/js/lib.deno_runtime.d.ts similarity index 100% rename from js/lib.deno_runtime.d.ts rename to cli/js/lib.deno_runtime.d.ts diff --git a/js/lib.web_assembly.d.ts b/cli/js/lib.web_assembly.d.ts similarity index 100% rename from js/lib.web_assembly.d.ts rename to cli/js/lib.web_assembly.d.ts diff --git a/js/link.ts b/cli/js/link.ts similarity index 100% rename from js/link.ts rename to cli/js/link.ts diff --git a/js/link_test.ts b/cli/js/link_test.ts similarity index 100% rename from js/link_test.ts rename to cli/js/link_test.ts diff --git a/js/location.ts b/cli/js/location.ts similarity index 100% rename from js/location.ts rename to cli/js/location.ts diff --git a/js/location_test.ts b/cli/js/location_test.ts similarity index 100% rename from js/location_test.ts rename to cli/js/location_test.ts diff --git a/js/main.ts b/cli/js/main.ts similarity index 100% rename from js/main.ts rename to cli/js/main.ts diff --git a/js/make_temp_dir.ts b/cli/js/make_temp_dir.ts similarity index 100% rename from js/make_temp_dir.ts rename to cli/js/make_temp_dir.ts diff --git a/js/make_temp_dir_test.ts b/cli/js/make_temp_dir_test.ts similarity index 100% rename from js/make_temp_dir_test.ts rename to cli/js/make_temp_dir_test.ts diff --git a/js/metrics.ts b/cli/js/metrics.ts similarity index 100% rename from js/metrics.ts rename to cli/js/metrics.ts diff --git a/js/metrics_test.ts b/cli/js/metrics_test.ts similarity index 100% rename from js/metrics_test.ts rename to cli/js/metrics_test.ts diff --git a/js/mixins/dom_iterable.ts b/cli/js/mixins/dom_iterable.ts similarity index 100% rename from js/mixins/dom_iterable.ts rename to cli/js/mixins/dom_iterable.ts diff --git a/js/mixins/dom_iterable_test.ts b/cli/js/mixins/dom_iterable_test.ts similarity index 100% rename from js/mixins/dom_iterable_test.ts rename to cli/js/mixins/dom_iterable_test.ts diff --git a/js/mkdir.ts b/cli/js/mkdir.ts similarity index 100% rename from js/mkdir.ts rename to cli/js/mkdir.ts diff --git a/js/mkdir_test.ts b/cli/js/mkdir_test.ts similarity index 100% rename from js/mkdir_test.ts rename to cli/js/mkdir_test.ts diff --git a/js/mock_builtin.js b/cli/js/mock_builtin.js similarity index 100% rename from js/mock_builtin.js rename to cli/js/mock_builtin.js diff --git a/js/net.ts b/cli/js/net.ts similarity index 100% rename from js/net.ts rename to cli/js/net.ts diff --git a/js/net_test.ts b/cli/js/net_test.ts similarity index 100% rename from js/net_test.ts rename to cli/js/net_test.ts diff --git a/js/os.ts b/cli/js/os.ts similarity index 100% rename from js/os.ts rename to cli/js/os.ts diff --git a/js/os_test.ts b/cli/js/os_test.ts similarity index 100% rename from js/os_test.ts rename to cli/js/os_test.ts diff --git a/js/performance.ts b/cli/js/performance.ts similarity index 100% rename from js/performance.ts rename to cli/js/performance.ts diff --git a/js/performance_test.ts b/cli/js/performance_test.ts similarity index 100% rename from js/performance_test.ts rename to cli/js/performance_test.ts diff --git a/js/permissions.ts b/cli/js/permissions.ts similarity index 100% rename from js/permissions.ts rename to cli/js/permissions.ts diff --git a/js/permissions_test.ts b/cli/js/permissions_test.ts similarity index 100% rename from js/permissions_test.ts rename to cli/js/permissions_test.ts diff --git a/js/process.ts b/cli/js/process.ts similarity index 100% rename from js/process.ts rename to cli/js/process.ts diff --git a/js/process_test.ts b/cli/js/process_test.ts similarity index 100% rename from js/process_test.ts rename to cli/js/process_test.ts diff --git a/js/read_dir.ts b/cli/js/read_dir.ts similarity index 100% rename from js/read_dir.ts rename to cli/js/read_dir.ts diff --git a/js/read_dir_test.ts b/cli/js/read_dir_test.ts similarity index 100% rename from js/read_dir_test.ts rename to cli/js/read_dir_test.ts diff --git a/js/read_file.ts b/cli/js/read_file.ts similarity index 100% rename from js/read_file.ts rename to cli/js/read_file.ts diff --git a/js/read_file_test.ts b/cli/js/read_file_test.ts similarity index 100% rename from js/read_file_test.ts rename to cli/js/read_file_test.ts diff --git a/js/read_link.ts b/cli/js/read_link.ts similarity index 100% rename from js/read_link.ts rename to cli/js/read_link.ts diff --git a/js/read_link_test.ts b/cli/js/read_link_test.ts similarity index 100% rename from js/read_link_test.ts rename to cli/js/read_link_test.ts diff --git a/js/remove.ts b/cli/js/remove.ts similarity index 100% rename from js/remove.ts rename to cli/js/remove.ts diff --git a/js/remove_test.ts b/cli/js/remove_test.ts similarity index 100% rename from js/remove_test.ts rename to cli/js/remove_test.ts diff --git a/js/rename.ts b/cli/js/rename.ts similarity index 100% rename from js/rename.ts rename to cli/js/rename.ts diff --git a/js/rename_test.ts b/cli/js/rename_test.ts similarity index 100% rename from js/rename_test.ts rename to cli/js/rename_test.ts diff --git a/js/repl.ts b/cli/js/repl.ts similarity index 100% rename from js/repl.ts rename to cli/js/repl.ts diff --git a/js/request.ts b/cli/js/request.ts similarity index 100% rename from js/request.ts rename to cli/js/request.ts diff --git a/js/request_test.ts b/cli/js/request_test.ts similarity index 100% rename from js/request_test.ts rename to cli/js/request_test.ts diff --git a/js/resources.ts b/cli/js/resources.ts similarity index 100% rename from js/resources.ts rename to cli/js/resources.ts diff --git a/js/resources_test.ts b/cli/js/resources_test.ts similarity index 100% rename from js/resources_test.ts rename to cli/js/resources_test.ts diff --git a/js/stat.ts b/cli/js/stat.ts similarity index 100% rename from js/stat.ts rename to cli/js/stat.ts diff --git a/js/stat_test.ts b/cli/js/stat_test.ts similarity index 100% rename from js/stat_test.ts rename to cli/js/stat_test.ts diff --git a/js/symlink.ts b/cli/js/symlink.ts similarity index 100% rename from js/symlink.ts rename to cli/js/symlink.ts diff --git a/js/symlink_test.ts b/cli/js/symlink_test.ts similarity index 100% rename from js/symlink_test.ts rename to cli/js/symlink_test.ts diff --git a/js/test_util.ts b/cli/js/test_util.ts similarity index 97% rename from js/test_util.ts rename to cli/js/test_util.ts index bb75082e6b..2f2916e11e 100644 --- a/js/test_util.ts +++ b/cli/js/test_util.ts @@ -7,8 +7,8 @@ // tests by the special string. permW1N0 means allow-write but not allow-net. // See tools/unit_tests.py for more details. -import * as testing from "../std/testing/mod.ts"; -import { assert, assertEquals } from "../std/testing/asserts.ts"; +import * as testing from "../../std/testing/mod.ts"; +import { assert, assertEquals } from "../../std/testing/asserts.ts"; export { assert, assertThrows, @@ -18,7 +18,7 @@ export { assertStrictEq, assertStrContains, unreachable -} from "../std/testing/asserts.ts"; +} from "../../std/testing/asserts.ts"; interface TestPermissions { read?: boolean; diff --git a/js/text_encoding.ts b/cli/js/text_encoding.ts similarity index 100% rename from js/text_encoding.ts rename to cli/js/text_encoding.ts diff --git a/js/text_encoding_test.ts b/cli/js/text_encoding_test.ts similarity index 100% rename from js/text_encoding_test.ts rename to cli/js/text_encoding_test.ts diff --git a/js/timers.ts b/cli/js/timers.ts similarity index 100% rename from js/timers.ts rename to cli/js/timers.ts diff --git a/js/timers_test.ts b/cli/js/timers_test.ts similarity index 100% rename from js/timers_test.ts rename to cli/js/timers_test.ts diff --git a/js/tls.ts b/cli/js/tls.ts similarity index 100% rename from js/tls.ts rename to cli/js/tls.ts diff --git a/js/tls_test.ts b/cli/js/tls_test.ts similarity index 100% rename from js/tls_test.ts rename to cli/js/tls_test.ts diff --git a/js/truncate.ts b/cli/js/truncate.ts similarity index 100% rename from js/truncate.ts rename to cli/js/truncate.ts diff --git a/js/truncate_test.ts b/cli/js/truncate_test.ts similarity index 100% rename from js/truncate_test.ts rename to cli/js/truncate_test.ts diff --git a/js/ts_global.d.ts b/cli/js/ts_global.d.ts similarity index 100% rename from js/ts_global.d.ts rename to cli/js/ts_global.d.ts diff --git a/js/type_directives.ts b/cli/js/type_directives.ts similarity index 100% rename from js/type_directives.ts rename to cli/js/type_directives.ts diff --git a/js/types.ts b/cli/js/types.ts similarity index 100% rename from js/types.ts rename to cli/js/types.ts diff --git a/js/unit_test_runner.ts b/cli/js/unit_test_runner.ts similarity index 96% rename from js/unit_test_runner.ts rename to cli/js/unit_test_runner.ts index 24dae7706e..d310f0a4e2 100755 --- a/js/unit_test_runner.ts +++ b/cli/js/unit_test_runner.ts @@ -57,7 +57,7 @@ async function main(): Promise { "run", "--no-prompt", ...cliPerms, - "js/unit_tests.ts" + "cli/js/unit_tests.ts" ]; const p = Deno.run({ @@ -73,7 +73,7 @@ async function main(): Promise { let result = 0; if (!actual && !expected) { - console.error("Bad js/unit_test.ts output"); + console.error("Bad cli/js/unit_test.ts output"); result = 1; } else if (expected !== actual) { result = 1; diff --git a/js/unit_tests.ts b/cli/js/unit_tests.ts similarity index 90% rename from js/unit_tests.ts rename to cli/js/unit_tests.ts index a83b57c15c..a3f150f4c4 100644 --- a/js/unit_tests.ts +++ b/cli/js/unit_tests.ts @@ -1,7 +1,7 @@ // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // This test is executed as part of tools/test.py -// But it can also be run manually: ./target/debug/deno js/unit_tests.ts +// But it can also be run manually: ./target/debug/deno cli/js/unit_tests.ts import "./blob_test.ts"; import "./body_test.ts"; @@ -53,9 +53,9 @@ import "./performance_test.ts"; import "./permissions_test.ts"; import "./version_test.ts"; -import "../website/app_test.ts"; +import "../../website/app_test.ts"; -import { runIfMain } from "../std/testing/mod.ts"; +import { runIfMain } from "../../std/testing/mod.ts"; async function main(): Promise { // Testing entire test suite serially diff --git a/js/url.ts b/cli/js/url.ts similarity index 100% rename from js/url.ts rename to cli/js/url.ts diff --git a/js/url_search_params.ts b/cli/js/url_search_params.ts similarity index 100% rename from js/url_search_params.ts rename to cli/js/url_search_params.ts diff --git a/js/url_search_params_test.ts b/cli/js/url_search_params_test.ts similarity index 100% rename from js/url_search_params_test.ts rename to cli/js/url_search_params_test.ts diff --git a/js/url_test.ts b/cli/js/url_test.ts similarity index 100% rename from js/url_test.ts rename to cli/js/url_test.ts diff --git a/js/util.ts b/cli/js/util.ts similarity index 100% rename from js/util.ts rename to cli/js/util.ts diff --git a/js/utime.ts b/cli/js/utime.ts similarity index 100% rename from js/utime.ts rename to cli/js/utime.ts diff --git a/js/utime_test.ts b/cli/js/utime_test.ts similarity index 100% rename from js/utime_test.ts rename to cli/js/utime_test.ts diff --git a/js/version.ts b/cli/js/version.ts similarity index 100% rename from js/version.ts rename to cli/js/version.ts diff --git a/js/version_test.ts b/cli/js/version_test.ts similarity index 100% rename from js/version_test.ts rename to cli/js/version_test.ts diff --git a/js/window.ts b/cli/js/window.ts similarity index 100% rename from js/window.ts rename to cli/js/window.ts diff --git a/js/workers.ts b/cli/js/workers.ts similarity index 100% rename from js/workers.ts rename to cli/js/workers.ts diff --git a/js/write_file.ts b/cli/js/write_file.ts similarity index 100% rename from js/write_file.ts rename to cli/js/write_file.ts diff --git a/js/write_file_test.ts b/cli/js/write_file_test.ts similarity index 100% rename from js/write_file_test.ts rename to cli/js/write_file_test.ts diff --git a/cli/lib.rs b/cli/lib.rs index 6584c0fa3d..8d0904ddb5 100644 --- a/cli/lib.rs +++ b/cli/lib.rs @@ -9,7 +9,6 @@ extern crate futures; extern crate serde_json; extern crate clap; extern crate deno; -extern crate deno_cli_snapshots; extern crate indexmap; #[cfg(unix)] extern crate nix; @@ -32,6 +31,7 @@ mod global_timer; mod http_body; mod http_util; mod import_map; +mod js; pub mod msg; pub mod ops; pub mod permissions; @@ -121,7 +121,7 @@ fn create_worker_and_state( } fn types_command() { - let content = deno_cli_snapshots::get_asset("lib.deno_runtime.d.ts").unwrap(); + let content = crate::js::get_asset("lib.deno_runtime.d.ts").unwrap(); println!("{}", content); } diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs index 8fb1ad9889..4228842dd8 100644 --- a/cli/ops/compiler.rs +++ b/cli/ops/compiler.rs @@ -91,7 +91,7 @@ pub fn op_fetch_asset( _zero_copy: Option, ) -> Result { let args: FetchAssetArgs = serde_json::from_value(args)?; - if let Some(source_code) = deno_cli_snapshots::get_asset(&args.name) { + if let Some(source_code) = crate::js::get_asset(&args.name) { Ok(JsonOp::Sync(json!(source_code))) } else { panic!("op_fetch_asset bad asset {}", args.name) diff --git a/cli/source_maps.rs b/cli/source_maps.rs index ec96ccf5b6..95df48a313 100644 --- a/cli/source_maps.rs +++ b/cli/source_maps.rs @@ -74,9 +74,9 @@ fn builtin_source_map(_: &str) -> Option> { #[cfg(not(feature = "check-only"))] fn builtin_source_map(script_name: &str) -> Option> { if script_name.ends_with("CLI_SNAPSHOT.js") { - Some(deno_cli_snapshots::CLI_SNAPSHOT_MAP.to_vec()) + Some(crate::js::CLI_SNAPSHOT_MAP.to_vec()) } else if script_name.ends_with("COMPILER_SNAPSHOT.js") { - Some(deno_cli_snapshots::COMPILER_SNAPSHOT_MAP.to_vec()) + Some(crate::js::COMPILER_SNAPSHOT_MAP.to_vec()) } else { None } diff --git a/cli/startup_data.rs b/cli/startup_data.rs index 593859be73..7dc2fdb60b 100644 --- a/cli/startup_data.rs +++ b/cli/startup_data.rs @@ -2,9 +2,9 @@ #[cfg(feature = "no-snapshot-init")] use deno::Script; +use crate::js::CLI_SNAPSHOT; +use crate::js::COMPILER_SNAPSHOT; use deno::StartupData; -use deno_cli_snapshots::CLI_SNAPSHOT; -use deno_cli_snapshots::COMPILER_SNAPSHOT; #[cfg(feature = "no-snapshot-init")] pub fn deno_isolate_init() -> StartupData<'static> { diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs index 0e30e05c79..4271036d1f 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -42,7 +42,7 @@ fn js_unit_tests() { .arg("--reload") .arg("--allow-run") .arg("--allow-env") - .arg("js/unit_test_runner.ts") + .arg("cli/js/unit_test_runner.ts") .spawn() .expect("failed to spawn script"); let status = deno.wait().expect("failed to wait for the child process"); diff --git a/cli/version.rs b/cli/version.rs index 44e394d184..a62d904f8c 100644 --- a/cli/version.rs +++ b/cli/version.rs @@ -1,6 +1,6 @@ // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. pub const DENO: &str = env!("CARGO_PKG_VERSION"); -pub const TYPESCRIPT: &str = deno_cli_snapshots::TS_VERSION; +pub const TYPESCRIPT: &str = crate::js::TS_VERSION; pub fn v8() -> &'static str { deno::v8_version() diff --git a/js/Cargo.toml b/js/Cargo.toml deleted file mode 100644 index 40cc43d939..0000000000 --- a/js/Cargo.toml +++ /dev/null @@ -1,25 +0,0 @@ -[package] -name = "deno_cli_snapshots" -version = "0.19.0" -license = "MIT" -authors = ["the Deno authors"] -edition = "2018" -description = "Provides snapshots for the deno CLI" -repository = "https://github.com/denoland/deno" -exclude = [ - "std/fs/testdata/0-link.ts", - "std/fs/testdata/copy_dir_link_file/0.txt", -] - -[lib] -path = "lib.rs" - -[dependencies] -deno_typescript = { path = "../deno_typescript", version = "0.19.0" } - -[dev-dependencies] -deno = { path = "../core", version = "0.19.0" } - -[build-dependencies] -deno_typescript = { path = "../deno_typescript", version = "0.19.0" } - diff --git a/js/README.md b/js/README.md deleted file mode 100644 index 850adb6eed..0000000000 --- a/js/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Crate: `deno_cli_snapshots` - -## AKA `cli_snapshots` AKA `//js` - -This is a small crate which exports just a few static blobs. It contains a -build.rs file which compiles Deno's internal JavaScript and TypeScript code -first into a single AMD bundle, and then into a binary V8 Snapshot. - -The main Deno executable crate ("cli") depends on this crate and has access to -all the runtime code. diff --git a/tools/cargo_publish_others.py b/tools/cargo_publish_others.py index 4b57c37c0a..83b9b50e2d 100755 --- a/tools/cargo_publish_others.py +++ b/tools/cargo_publish_others.py @@ -21,10 +21,6 @@ def main(): os.chdir(os.path.join(root_path, "deno_typescript")) run(cargo_publish) - # Publish the deno_cli_snapshots crate. - os.chdir(os.path.join(root_path, "js")) - run(cargo_publish) - # Publish the deno_cli crate. os.chdir(os.path.join(root_path, "cli")) run(cargo_publish) diff --git a/tools/complex_permissions_test.py b/tools/complex_permissions_test.py index 985f9a9721..9f0fcd7e7d 100755 --- a/tools/complex_permissions_test.py +++ b/tools/complex_permissions_test.py @@ -55,7 +55,8 @@ class BaseReadWritePermissionsTest(object): def test_outside_test_and_js_dir(self): code, _stdout, stderr = self._run_deno([ "--allow-" + self.test_type + "=" + os.path.join( - root_path, "cli/tests") + "," + os.path.join(root_path, "js") + root_path, "cli/tests") + "," + os.path.join( + root_path, "cli/js") ], [self.test_type, "package.json"]) assert code == 1 assert PROMPT_PATTERN not in stderr @@ -64,8 +65,12 @@ class BaseReadWritePermissionsTest(object): def test_inside_test_and_js_dir(self): code, _stdout, stderr = self._run_deno([ "--allow-" + self.test_type + "=" + os.path.join( - root_path, "cli/tests") + "," + os.path.join(root_path, "js") - ], [self.test_type, "js/dir_test.ts", "cli/tests/subdir/config.json"]) + root_path, "cli/tests") + "," + os.path.join( + root_path, "cli/js") + ], [ + self.test_type, "cli/js/dir_test.ts", + "cli/tests/subdir/config.json" + ]) assert code == 0 assert PROMPT_PATTERN not in stderr assert PERMISSION_DENIED_PATTERN not in stderr diff --git a/tsconfig.json b/tsconfig.json index cf252cfd79..6c9e7344d3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,9 +21,9 @@ "types": [] }, "files": [ - "js/lib.web_assembly.d.ts", - "js/lib.deno_runtime.d.ts", - "js/main.ts", - "js/compiler.ts" + "cli/js/lib.web_assembly.d.ts", + "cli/js/lib.deno_runtime.d.ts", + "cli/js/main.ts", + "cli/js/compiler.ts" ] } diff --git a/website/app_test.ts b/website/app_test.ts index 12ac92dd6d..ebc8699f63 100644 --- a/website/app_test.ts +++ b/website/app_test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. -import { test, assertEquals } from "../js/test_util.ts"; +import { test, assertEquals } from "../cli/js/test_util.ts"; import { runIfMain } from "../std/testing/mod.ts"; import { BenchmarkRun,