Merge deno_cli_snapshots into deno_cli (denoland#3064)

zenozeng · Oct 5, 2019 · b81e5db · b81e5db
1 parent 9049213
commit b81e5db
Show file tree

Hide file tree

Showing 148 changed files with 38 additions and 83 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1 @@
-/js/deps/
 cli/tests/error_syntax.js
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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 → cli/build.rs b/js/build.rs → 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
@@ -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 → cli/js.rs b/js/lib.rs → cli/js.rs
@@ -4,17 +4,19 @@ 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"));
 
 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 → cli/js/base64.ts b/js/base64.ts → cli/js/base64.ts
diff --git a/js/blob.ts → cli/js/blob.ts b/js/blob.ts → cli/js/blob.ts
diff --git a/js/blob_test.ts → cli/js/blob_test.ts b/js/blob_test.ts → cli/js/blob_test.ts
diff --git a/js/body.ts → cli/js/body.ts b/js/body.ts → cli/js/body.ts
diff --git a/js/body_test.ts → cli/js/body_test.ts b/js/body_test.ts → cli/js/body_test.ts
diff --git a/js/buffer.ts → cli/js/buffer.ts b/js/buffer.ts → cli/js/buffer.ts
diff --git a/js/buffer_test.ts → cli/js/buffer_test.ts b/js/buffer_test.ts → cli/js/buffer_test.ts
diff --git a/js/build.ts → cli/js/build.ts b/js/build.ts → cli/js/build.ts
diff --git a/js/build_test.ts → cli/js/build_test.ts b/js/build_test.ts → cli/js/build_test.ts
diff --git a/js/chmod.ts → cli/js/chmod.ts b/js/chmod.ts → cli/js/chmod.ts
diff --git a/js/chmod_test.ts → cli/js/chmod_test.ts b/js/chmod_test.ts → cli/js/chmod_test.ts
diff --git a/js/chown.ts → cli/js/chown.ts b/js/chown.ts → cli/js/chown.ts
diff --git a/js/chown_test.ts → cli/js/chown_test.ts b/js/chown_test.ts → cli/js/chown_test.ts
diff --git a/js/colors.ts → cli/js/colors.ts b/js/colors.ts → cli/js/colors.ts
diff --git a/js/compiler.ts → cli/js/compiler.ts b/js/compiler.ts → cli/js/compiler.ts
diff --git a/js/console.ts → cli/js/console.ts b/js/console.ts → cli/js/console.ts
diff --git a/js/console_table.ts → cli/js/console_table.ts b/js/console_table.ts → cli/js/console_table.ts
diff --git a/js/console_test.ts → cli/js/console_test.ts b/js/console_test.ts → cli/js/console_test.ts
diff --git a/js/copy_file.ts → cli/js/copy_file.ts b/js/copy_file.ts → cli/js/copy_file.ts
diff --git a/js/copy_file_test.ts → cli/js/copy_file_test.ts b/js/copy_file_test.ts → cli/js/copy_file_test.ts
diff --git a/js/core.ts → cli/js/core.ts b/js/core.ts → cli/js/core.ts
diff --git a/js/custom_event.ts → cli/js/custom_event.ts b/js/custom_event.ts → cli/js/custom_event.ts
diff --git a/js/custom_event_test.ts → cli/js/custom_event_test.ts b/js/custom_event_test.ts → cli/js/custom_event_test.ts
diff --git a/js/deno.ts → cli/js/deno.ts b/js/deno.ts → cli/js/deno.ts
diff --git a/js/diagnostics.ts → cli/js/diagnostics.ts b/js/diagnostics.ts → cli/js/diagnostics.ts
diff --git a/js/dir.ts → cli/js/dir.ts b/js/dir.ts → cli/js/dir.ts
diff --git a/js/dir_test.ts → cli/js/dir_test.ts b/js/dir_test.ts → cli/js/dir_test.ts
diff --git a/js/dispatch.ts → cli/js/dispatch.ts b/js/dispatch.ts → cli/js/dispatch.ts
diff --git a/js/dispatch_json.ts → cli/js/dispatch_json.ts b/js/dispatch_json.ts → cli/js/dispatch_json.ts
diff --git a/js/dispatch_json_test.ts → cli/js/dispatch_json_test.ts b/js/dispatch_json_test.ts → cli/js/dispatch_json_test.ts
diff --git a/js/dispatch_minimal.ts → cli/js/dispatch_minimal.ts b/js/dispatch_minimal.ts → cli/js/dispatch_minimal.ts
diff --git a/js/dom_file.ts → cli/js/dom_file.ts b/js/dom_file.ts → cli/js/dom_file.ts
diff --git a/js/dom_types.ts → cli/js/dom_types.ts b/js/dom_types.ts → cli/js/dom_types.ts
diff --git a/js/dom_util.ts → cli/js/dom_util.ts b/js/dom_util.ts → cli/js/dom_util.ts
diff --git a/js/error_stack.ts → cli/js/error_stack.ts b/js/error_stack.ts → cli/js/error_stack.ts
diff --git a/js/error_stack_test.ts → cli/js/error_stack_test.ts b/js/error_stack_test.ts → cli/js/error_stack_test.ts
diff --git a/js/errors.ts → cli/js/errors.ts b/js/errors.ts → cli/js/errors.ts
diff --git a/js/event.ts → cli/js/event.ts b/js/event.ts → cli/js/event.ts
diff --git a/js/event_target.ts → cli/js/event_target.ts b/js/event_target.ts → cli/js/event_target.ts
diff --git a/js/event_target_test.ts → cli/js/event_target_test.ts b/js/event_target_test.ts → cli/js/event_target_test.ts
diff --git a/js/event_test.ts → cli/js/event_test.ts b/js/event_test.ts → cli/js/event_test.ts
diff --git a/js/fetch.ts → cli/js/fetch.ts b/js/fetch.ts → cli/js/fetch.ts
diff --git a/js/fetch_test.ts → cli/js/fetch_test.ts b/js/fetch_test.ts → cli/js/fetch_test.ts
diff --git a/js/file_info.ts → cli/js/file_info.ts b/js/file_info.ts → cli/js/file_info.ts
diff --git a/js/file_test.ts → cli/js/file_test.ts b/js/file_test.ts → cli/js/file_test.ts
diff --git a/js/files.ts → cli/js/files.ts b/js/files.ts → cli/js/files.ts
diff --git a/js/files_test.ts → cli/js/files_test.ts b/js/files_test.ts → cli/js/files_test.ts
diff --git a/js/form_data.ts → cli/js/form_data.ts b/js/form_data.ts → cli/js/form_data.ts
diff --git a/js/form_data_test.ts → cli/js/form_data_test.ts b/js/form_data_test.ts → cli/js/form_data_test.ts
diff --git a/js/format_error.ts → cli/js/format_error.ts b/js/format_error.ts → cli/js/format_error.ts
diff --git a/js/get_random_values.ts → cli/js/get_random_values.ts b/js/get_random_values.ts → cli/js/get_random_values.ts
diff --git a/js/get_random_values_test.ts → cli/js/get_random_values_test.ts b/js/get_random_values_test.ts → cli/js/get_random_values_test.ts
diff --git a/js/globals.ts → cli/js/globals.ts b/js/globals.ts → cli/js/globals.ts
diff --git a/js/globals_test.ts → cli/js/globals_test.ts b/js/globals_test.ts → cli/js/globals_test.ts
diff --git a/js/headers.ts → cli/js/headers.ts b/js/headers.ts → cli/js/headers.ts
diff --git a/js/headers_test.ts → cli/js/headers_test.ts b/js/headers_test.ts → cli/js/headers_test.ts
diff --git a/js/io.ts → cli/js/io.ts b/js/io.ts → cli/js/io.ts
diff --git a/js/lib.deno_runtime.d.ts → cli/js/lib.deno_runtime.d.ts b/js/lib.deno_runtime.d.ts → cli/js/lib.deno_runtime.d.ts
diff --git a/js/lib.web_assembly.d.ts → cli/js/lib.web_assembly.d.ts b/js/lib.web_assembly.d.ts → cli/js/lib.web_assembly.d.ts
diff --git a/js/link.ts → cli/js/link.ts b/js/link.ts → cli/js/link.ts
diff --git a/js/link_test.ts → cli/js/link_test.ts b/js/link_test.ts → cli/js/link_test.ts
diff --git a/js/location.ts → cli/js/location.ts b/js/location.ts → cli/js/location.ts
diff --git a/js/location_test.ts → cli/js/location_test.ts b/js/location_test.ts → cli/js/location_test.ts
diff --git a/js/main.ts → cli/js/main.ts b/js/main.ts → cli/js/main.ts
diff --git a/js/make_temp_dir.ts → cli/js/make_temp_dir.ts b/js/make_temp_dir.ts → cli/js/make_temp_dir.ts
diff --git a/js/make_temp_dir_test.ts → cli/js/make_temp_dir_test.ts b/js/make_temp_dir_test.ts → cli/js/make_temp_dir_test.ts
diff --git a/js/metrics.ts → cli/js/metrics.ts b/js/metrics.ts → cli/js/metrics.ts
diff --git a/js/metrics_test.ts → cli/js/metrics_test.ts b/js/metrics_test.ts → cli/js/metrics_test.ts
diff --git a/js/mixins/dom_iterable.ts → cli/js/mixins/dom_iterable.ts b/js/mixins/dom_iterable.ts → cli/js/mixins/dom_iterable.ts
diff --git a/js/mixins/dom_iterable_test.ts → cli/js/mixins/dom_iterable_test.ts b/js/mixins/dom_iterable_test.ts → cli/js/mixins/dom_iterable_test.ts
diff --git a/js/mkdir.ts → cli/js/mkdir.ts b/js/mkdir.ts → cli/js/mkdir.ts
diff --git a/js/mkdir_test.ts → cli/js/mkdir_test.ts b/js/mkdir_test.ts → cli/js/mkdir_test.ts
diff --git a/js/mock_builtin.js → cli/js/mock_builtin.js b/js/mock_builtin.js → cli/js/mock_builtin.js
diff --git a/js/net.ts → cli/js/net.ts b/js/net.ts → cli/js/net.ts
diff --git a/js/net_test.ts → cli/js/net_test.ts b/js/net_test.ts → cli/js/net_test.ts
diff --git a/js/os.ts → cli/js/os.ts b/js/os.ts → cli/js/os.ts
diff --git a/js/os_test.ts → cli/js/os_test.ts b/js/os_test.ts → cli/js/os_test.ts
diff --git a/js/performance.ts → cli/js/performance.ts b/js/performance.ts → cli/js/performance.ts
diff --git a/js/performance_test.ts → cli/js/performance_test.ts b/js/performance_test.ts → cli/js/performance_test.ts
diff --git a/js/permissions.ts → cli/js/permissions.ts b/js/permissions.ts → cli/js/permissions.ts
diff --git a/js/permissions_test.ts → cli/js/permissions_test.ts b/js/permissions_test.ts → cli/js/permissions_test.ts
diff --git a/js/process.ts → cli/js/process.ts b/js/process.ts → cli/js/process.ts
diff --git a/js/process_test.ts → cli/js/process_test.ts b/js/process_test.ts → cli/js/process_test.ts
diff --git a/js/read_dir.ts → cli/js/read_dir.ts b/js/read_dir.ts → cli/js/read_dir.ts
diff --git a/js/read_dir_test.ts → cli/js/read_dir_test.ts b/js/read_dir_test.ts → cli/js/read_dir_test.ts
diff --git a/js/read_file.ts → cli/js/read_file.ts b/js/read_file.ts → cli/js/read_file.ts
diff --git a/js/read_file_test.ts → cli/js/read_file_test.ts b/js/read_file_test.ts → cli/js/read_file_test.ts
diff --git a/js/read_link.ts → cli/js/read_link.ts b/js/read_link.ts → cli/js/read_link.ts
diff --git a/js/read_link_test.ts → cli/js/read_link_test.ts b/js/read_link_test.ts → cli/js/read_link_test.ts
diff --git a/js/remove.ts → cli/js/remove.ts b/js/remove.ts → cli/js/remove.ts
diff --git a/js/remove_test.ts → cli/js/remove_test.ts b/js/remove_test.ts → cli/js/remove_test.ts
diff --git a/js/rename.ts → cli/js/rename.ts b/js/rename.ts → cli/js/rename.ts
diff --git a/js/rename_test.ts → cli/js/rename_test.ts b/js/rename_test.ts → cli/js/rename_test.ts
diff --git a/js/repl.ts → cli/js/repl.ts b/js/repl.ts → cli/js/repl.ts
diff --git a/js/request.ts → cli/js/request.ts b/js/request.ts → cli/js/request.ts
diff --git a/js/request_test.ts → cli/js/request_test.ts b/js/request_test.ts → cli/js/request_test.ts
diff --git a/js/resources.ts → cli/js/resources.ts b/js/resources.ts → cli/js/resources.ts
diff --git a/js/resources_test.ts → cli/js/resources_test.ts b/js/resources_test.ts → cli/js/resources_test.ts
diff --git a/js/stat.ts → cli/js/stat.ts b/js/stat.ts → cli/js/stat.ts
diff --git a/js/stat_test.ts → cli/js/stat_test.ts b/js/stat_test.ts → cli/js/stat_test.ts
diff --git a/js/symlink.ts → cli/js/symlink.ts b/js/symlink.ts → cli/js/symlink.ts
diff --git a/js/symlink_test.ts → cli/js/symlink_test.ts b/js/symlink_test.ts → cli/js/symlink_test.ts
diff --git a/js/test_util.ts → cli/js/test_util.ts b/js/test_util.ts → 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 → cli/js/text_encoding.ts b/js/text_encoding.ts → cli/js/text_encoding.ts
diff --git a/js/text_encoding_test.ts → cli/js/text_encoding_test.ts b/js/text_encoding_test.ts → cli/js/text_encoding_test.ts
diff --git a/js/timers.ts → cli/js/timers.ts b/js/timers.ts → cli/js/timers.ts
diff --git a/js/timers_test.ts → cli/js/timers_test.ts b/js/timers_test.ts → cli/js/timers_test.ts
diff --git a/js/tls.ts → cli/js/tls.ts b/js/tls.ts → cli/js/tls.ts
diff --git a/js/tls_test.ts → cli/js/tls_test.ts b/js/tls_test.ts → cli/js/tls_test.ts
diff --git a/js/truncate.ts → cli/js/truncate.ts b/js/truncate.ts → cli/js/truncate.ts
diff --git a/js/truncate_test.ts → cli/js/truncate_test.ts b/js/truncate_test.ts → cli/js/truncate_test.ts
diff --git a/js/ts_global.d.ts → cli/js/ts_global.d.ts b/js/ts_global.d.ts → cli/js/ts_global.d.ts
diff --git a/js/type_directives.ts → cli/js/type_directives.ts b/js/type_directives.ts → cli/js/type_directives.ts
diff --git a/js/types.ts → cli/js/types.ts b/js/types.ts → cli/js/types.ts
diff --git a/js/unit_test_runner.ts → cli/js/unit_test_runner.ts b/js/unit_test_runner.ts → cli/js/unit_test_runner.ts
@@ -57,7 +57,7 @@ async function main(): Promise<void> {
  "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<void> {
  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 → cli/js/unit_tests.ts b/js/unit_tests.ts → 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<void> {
  // Testing entire test suite serially

diff --git a/js/url.ts → cli/js/url.ts b/js/url.ts → cli/js/url.ts
diff --git a/js/url_search_params.ts → cli/js/url_search_params.ts b/js/url_search_params.ts → cli/js/url_search_params.ts
diff --git a/js/url_search_params_test.ts → cli/js/url_search_params_test.ts b/js/url_search_params_test.ts → cli/js/url_search_params_test.ts
diff --git a/js/url_test.ts → cli/js/url_test.ts b/js/url_test.ts → cli/js/url_test.ts
diff --git a/js/util.ts → cli/js/util.ts b/js/util.ts → cli/js/util.ts
diff --git a/js/utime.ts → cli/js/utime.ts b/js/utime.ts → cli/js/utime.ts
diff --git a/js/utime_test.ts → cli/js/utime_test.ts b/js/utime_test.ts → cli/js/utime_test.ts
diff --git a/js/version.ts → cli/js/version.ts b/js/version.ts → cli/js/version.ts
diff --git a/js/version_test.ts → cli/js/version_test.ts b/js/version_test.ts → cli/js/version_test.ts
diff --git a/js/window.ts → cli/js/window.ts b/js/window.ts → cli/js/window.ts
diff --git a/js/workers.ts → cli/js/workers.ts b/js/workers.ts → cli/js/workers.ts
diff --git a/js/write_file.ts → cli/js/write_file.ts b/js/write_file.ts → cli/js/write_file.ts
diff --git a/js/write_file_test.ts → cli/js/write_file_test.ts b/js/write_file_test.ts → cli/js/write_file_test.ts
diff --git 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
@@ -91,7 +91,7 @@ pub fn op_fetch_asset(
  _zero_copy: Option<PinnedBuf>,
 ) -> Result<JsonOp, ErrBox> {
  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
@@ -74,9 +74,9 @@ fn builtin_source_map(_: &str) -> Option<Vec<u8>> {
 #[cfg(not(feature = "check-only"))]
 fn builtin_source_map(script_name: &str) -> Option<Vec<u8>> {
  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
@@ -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
@@ -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
@@ -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
diff --git a/js/README.md b/js/README.md
diff --git 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
@@ -55,7 +55,8 @@ def test_inside_test_dir(self):
  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 @@ def test_outside_test_and_js_dir(self):
  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
@@ -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
@@ -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,