From ffb5f7a4e1d5d4ac488058ca3ec3c0805587fe44 Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Thu, 17 Dec 2020 16:37:57 +0000 Subject: [PATCH] refactor: Rename runtime/rt to runtime/js (#8806) --- cli/fmt_errors.rs | 4 ++-- cli/tsc/README.md | 11 ++--------- runtime/build.rs | 2 +- runtime/{rt => js}/00_bootstrap_namespace.js | 0 runtime/{rt => js}/01_build.js | 0 runtime/{rt => js}/01_colors.js | 0 runtime/{rt => js}/01_errors.js | 0 runtime/{rt => js}/01_internals.js | 0 runtime/{rt => js}/01_version.js | 0 runtime/{rt => js}/01_web_util.js | 0 runtime/{rt => js}/02_console.js | 0 runtime/{rt => js}/06_util.js | 0 runtime/{rt => js}/10_dispatch_minimal.js | 0 runtime/{rt => js}/11_timers.js | 0 runtime/{rt => js}/11_workers.js | 0 runtime/{rt => js}/12_io.js | 0 runtime/{rt => js}/13_buffer.js | 0 runtime/{rt => js}/27_websocket.js | 0 runtime/{rt => js}/30_files.js | 0 runtime/{rt => js}/30_fs.js | 0 runtime/{rt => js}/30_metrics.js | 0 runtime/{rt => js}/30_net.js | 0 runtime/{rt => js}/30_os.js | 0 runtime/{rt => js}/40_compiler_api.js | 0 runtime/{rt => js}/40_diagnostics.js | 0 runtime/{rt => js}/40_error_stack.js | 0 runtime/{rt => js}/40_fs_events.js | 0 runtime/{rt => js}/40_net_unstable.js | 0 runtime/{rt => js}/40_performance.js | 0 runtime/{rt => js}/40_permissions.js | 0 runtime/{rt => js}/40_plugins.js | 0 runtime/{rt => js}/40_process.js | 0 runtime/{rt => js}/40_read_file.js | 0 runtime/{rt => js}/40_signals.js | 0 runtime/{rt => js}/40_testing.js | 0 runtime/{rt => js}/40_tls.js | 0 runtime/{rt => js}/40_tty.js | 0 runtime/{rt => js}/40_write_file.js | 0 runtime/{rt => js}/41_prompt.js | 0 runtime/{rt => js}/90_deno_ns.js | 0 runtime/{rt => js}/99_main.js | 0 runtime/{rt => js}/README.md | 0 42 files changed, 5 insertions(+), 12 deletions(-) rename runtime/{rt => js}/00_bootstrap_namespace.js (100%) rename runtime/{rt => js}/01_build.js (100%) rename runtime/{rt => js}/01_colors.js (100%) rename runtime/{rt => js}/01_errors.js (100%) rename runtime/{rt => js}/01_internals.js (100%) rename runtime/{rt => js}/01_version.js (100%) rename runtime/{rt => js}/01_web_util.js (100%) rename runtime/{rt => js}/02_console.js (100%) rename runtime/{rt => js}/06_util.js (100%) rename runtime/{rt => js}/10_dispatch_minimal.js (100%) rename runtime/{rt => js}/11_timers.js (100%) rename runtime/{rt => js}/11_workers.js (100%) rename runtime/{rt => js}/12_io.js (100%) rename runtime/{rt => js}/13_buffer.js (100%) rename runtime/{rt => js}/27_websocket.js (100%) rename runtime/{rt => js}/30_files.js (100%) rename runtime/{rt => js}/30_fs.js (100%) rename runtime/{rt => js}/30_metrics.js (100%) rename runtime/{rt => js}/30_net.js (100%) rename runtime/{rt => js}/30_os.js (100%) rename runtime/{rt => js}/40_compiler_api.js (100%) rename runtime/{rt => js}/40_diagnostics.js (100%) rename runtime/{rt => js}/40_error_stack.js (100%) rename runtime/{rt => js}/40_fs_events.js (100%) rename runtime/{rt => js}/40_net_unstable.js (100%) rename runtime/{rt => js}/40_performance.js (100%) rename runtime/{rt => js}/40_permissions.js (100%) rename runtime/{rt => js}/40_plugins.js (100%) rename runtime/{rt => js}/40_process.js (100%) rename runtime/{rt => js}/40_read_file.js (100%) rename runtime/{rt => js}/40_signals.js (100%) rename runtime/{rt => js}/40_testing.js (100%) rename runtime/{rt => js}/40_tls.js (100%) rename runtime/{rt => js}/40_tty.js (100%) rename runtime/{rt => js}/40_write_file.js (100%) rename runtime/{rt => js}/41_prompt.js (100%) rename runtime/{rt => js}/90_deno_ns.js (100%) rename runtime/{rt => js}/99_main.js (100%) rename runtime/{rt => js}/README.md (100%) diff --git a/cli/fmt_errors.rs b/cli/fmt_errors.rs index b3c855db94..3e871e6f30 100644 --- a/cli/fmt_errors.rs +++ b/cli/fmt_errors.rs @@ -40,7 +40,7 @@ fn italic_bold(s: &str, internal: bool) -> String { } } -// Keep in sync with `cli/rt/40_error_stack.js`. +// Keep in sync with `runtime/js/40_error_stack.js`. pub fn format_location(frame: &JsStackFrame) -> String { let internal = frame .file_name @@ -75,7 +75,7 @@ pub fn format_location(frame: &JsStackFrame) -> String { result } -// Keep in sync with `cli/rt/40_error_stack.js`. +// Keep in sync with `runtime/js/40_error_stack.js`. fn format_frame(frame: &JsStackFrame) -> String { let internal = frame .file_name diff --git a/cli/tsc/README.md b/cli/tsc/README.md index e680138857..e8287f3c09 100644 --- a/cli/tsc/README.md +++ b/cli/tsc/README.md @@ -1,11 +1,4 @@ # tsc -This directory contains the code for the typescript compiler snapshot - -There is currently A LOT of overlap between this code and the runtime snapshot -code in cli/rt. - -This is intentionally ugly because there should be no overlap. - -This directory ultimately should contain just typescript.js and a smallish -CompilerHost. +This directory contains the typescript compiler and a small compiler host for +the runtime snapshot. diff --git a/runtime/build.rs b/runtime/build.rs index 78f17f61fc..ca4a77c314 100644 --- a/runtime/build.rs +++ b/runtime/build.rs @@ -62,7 +62,7 @@ fn main() { // Main snapshot let runtime_snapshot_path = o.join("CLI_SNAPSHOT.bin"); - let js_files = get_js_files("rt"); + let js_files = get_js_files("js"); create_runtime_snapshot(&runtime_snapshot_path, js_files); } diff --git a/runtime/rt/00_bootstrap_namespace.js b/runtime/js/00_bootstrap_namespace.js similarity index 100% rename from runtime/rt/00_bootstrap_namespace.js rename to runtime/js/00_bootstrap_namespace.js diff --git a/runtime/rt/01_build.js b/runtime/js/01_build.js similarity index 100% rename from runtime/rt/01_build.js rename to runtime/js/01_build.js diff --git a/runtime/rt/01_colors.js b/runtime/js/01_colors.js similarity index 100% rename from runtime/rt/01_colors.js rename to runtime/js/01_colors.js diff --git a/runtime/rt/01_errors.js b/runtime/js/01_errors.js similarity index 100% rename from runtime/rt/01_errors.js rename to runtime/js/01_errors.js diff --git a/runtime/rt/01_internals.js b/runtime/js/01_internals.js similarity index 100% rename from runtime/rt/01_internals.js rename to runtime/js/01_internals.js diff --git a/runtime/rt/01_version.js b/runtime/js/01_version.js similarity index 100% rename from runtime/rt/01_version.js rename to runtime/js/01_version.js diff --git a/runtime/rt/01_web_util.js b/runtime/js/01_web_util.js similarity index 100% rename from runtime/rt/01_web_util.js rename to runtime/js/01_web_util.js diff --git a/runtime/rt/02_console.js b/runtime/js/02_console.js similarity index 100% rename from runtime/rt/02_console.js rename to runtime/js/02_console.js diff --git a/runtime/rt/06_util.js b/runtime/js/06_util.js similarity index 100% rename from runtime/rt/06_util.js rename to runtime/js/06_util.js diff --git a/runtime/rt/10_dispatch_minimal.js b/runtime/js/10_dispatch_minimal.js similarity index 100% rename from runtime/rt/10_dispatch_minimal.js rename to runtime/js/10_dispatch_minimal.js diff --git a/runtime/rt/11_timers.js b/runtime/js/11_timers.js similarity index 100% rename from runtime/rt/11_timers.js rename to runtime/js/11_timers.js diff --git a/runtime/rt/11_workers.js b/runtime/js/11_workers.js similarity index 100% rename from runtime/rt/11_workers.js rename to runtime/js/11_workers.js diff --git a/runtime/rt/12_io.js b/runtime/js/12_io.js similarity index 100% rename from runtime/rt/12_io.js rename to runtime/js/12_io.js diff --git a/runtime/rt/13_buffer.js b/runtime/js/13_buffer.js similarity index 100% rename from runtime/rt/13_buffer.js rename to runtime/js/13_buffer.js diff --git a/runtime/rt/27_websocket.js b/runtime/js/27_websocket.js similarity index 100% rename from runtime/rt/27_websocket.js rename to runtime/js/27_websocket.js diff --git a/runtime/rt/30_files.js b/runtime/js/30_files.js similarity index 100% rename from runtime/rt/30_files.js rename to runtime/js/30_files.js diff --git a/runtime/rt/30_fs.js b/runtime/js/30_fs.js similarity index 100% rename from runtime/rt/30_fs.js rename to runtime/js/30_fs.js diff --git a/runtime/rt/30_metrics.js b/runtime/js/30_metrics.js similarity index 100% rename from runtime/rt/30_metrics.js rename to runtime/js/30_metrics.js diff --git a/runtime/rt/30_net.js b/runtime/js/30_net.js similarity index 100% rename from runtime/rt/30_net.js rename to runtime/js/30_net.js diff --git a/runtime/rt/30_os.js b/runtime/js/30_os.js similarity index 100% rename from runtime/rt/30_os.js rename to runtime/js/30_os.js diff --git a/runtime/rt/40_compiler_api.js b/runtime/js/40_compiler_api.js similarity index 100% rename from runtime/rt/40_compiler_api.js rename to runtime/js/40_compiler_api.js diff --git a/runtime/rt/40_diagnostics.js b/runtime/js/40_diagnostics.js similarity index 100% rename from runtime/rt/40_diagnostics.js rename to runtime/js/40_diagnostics.js diff --git a/runtime/rt/40_error_stack.js b/runtime/js/40_error_stack.js similarity index 100% rename from runtime/rt/40_error_stack.js rename to runtime/js/40_error_stack.js diff --git a/runtime/rt/40_fs_events.js b/runtime/js/40_fs_events.js similarity index 100% rename from runtime/rt/40_fs_events.js rename to runtime/js/40_fs_events.js diff --git a/runtime/rt/40_net_unstable.js b/runtime/js/40_net_unstable.js similarity index 100% rename from runtime/rt/40_net_unstable.js rename to runtime/js/40_net_unstable.js diff --git a/runtime/rt/40_performance.js b/runtime/js/40_performance.js similarity index 100% rename from runtime/rt/40_performance.js rename to runtime/js/40_performance.js diff --git a/runtime/rt/40_permissions.js b/runtime/js/40_permissions.js similarity index 100% rename from runtime/rt/40_permissions.js rename to runtime/js/40_permissions.js diff --git a/runtime/rt/40_plugins.js b/runtime/js/40_plugins.js similarity index 100% rename from runtime/rt/40_plugins.js rename to runtime/js/40_plugins.js diff --git a/runtime/rt/40_process.js b/runtime/js/40_process.js similarity index 100% rename from runtime/rt/40_process.js rename to runtime/js/40_process.js diff --git a/runtime/rt/40_read_file.js b/runtime/js/40_read_file.js similarity index 100% rename from runtime/rt/40_read_file.js rename to runtime/js/40_read_file.js diff --git a/runtime/rt/40_signals.js b/runtime/js/40_signals.js similarity index 100% rename from runtime/rt/40_signals.js rename to runtime/js/40_signals.js diff --git a/runtime/rt/40_testing.js b/runtime/js/40_testing.js similarity index 100% rename from runtime/rt/40_testing.js rename to runtime/js/40_testing.js diff --git a/runtime/rt/40_tls.js b/runtime/js/40_tls.js similarity index 100% rename from runtime/rt/40_tls.js rename to runtime/js/40_tls.js diff --git a/runtime/rt/40_tty.js b/runtime/js/40_tty.js similarity index 100% rename from runtime/rt/40_tty.js rename to runtime/js/40_tty.js diff --git a/runtime/rt/40_write_file.js b/runtime/js/40_write_file.js similarity index 100% rename from runtime/rt/40_write_file.js rename to runtime/js/40_write_file.js diff --git a/runtime/rt/41_prompt.js b/runtime/js/41_prompt.js similarity index 100% rename from runtime/rt/41_prompt.js rename to runtime/js/41_prompt.js diff --git a/runtime/rt/90_deno_ns.js b/runtime/js/90_deno_ns.js similarity index 100% rename from runtime/rt/90_deno_ns.js rename to runtime/js/90_deno_ns.js diff --git a/runtime/rt/99_main.js b/runtime/js/99_main.js similarity index 100% rename from runtime/rt/99_main.js rename to runtime/js/99_main.js diff --git a/runtime/rt/README.md b/runtime/js/README.md similarity index 100% rename from runtime/rt/README.md rename to runtime/js/README.md