summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/Cargo.toml1
-rw-r--r--cli/build.rs5
-rw-r--r--cli/dts/lib.deno.shared_globals.d.ts1
-rw-r--r--cli/file_fetcher.rs4
-rw-r--r--cli/lsp/registries.rs2
-rw-r--r--cli/main.rs3
-rw-r--r--cli/program_state.rs2
-rw-r--r--cli/specifier_handler.rs2
-rw-r--r--cli/standalone.rs2
-rw-r--r--cli/tsc.rs1
10 files changed, 7 insertions, 16 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 305b19c9b..64f261c7b 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -25,7 +25,6 @@ deno_console = { version = "0.8.0", path = "../extensions/console" }
deno_core = { version = "0.89.0", path = "../core" }
deno_crypto = { version = "0.22.0", path = "../extensions/crypto" }
deno_fetch = { version = "0.30.0", path = "../extensions/fetch" }
-deno_file = { version = "0.7.0", path = "../extensions/file" }
deno_timers = { version = "0.6.0", path = "../extensions/timers" }
deno_url = { version = "0.8.0", path = "../extensions/url" }
deno_web = { version = "0.39.0", path = "../extensions/web" }
diff --git a/cli/build.rs b/cli/build.rs
index 053d05395..c88c00376 100644
--- a/cli/build.rs
+++ b/cli/build.rs
@@ -59,7 +59,6 @@ fn create_compiler_snapshot(
op_crate_libs.insert("deno.console", deno_console::get_declaration());
op_crate_libs.insert("deno.url", deno_url::get_declaration());
op_crate_libs.insert("deno.web", deno_web::get_declaration());
- op_crate_libs.insert("deno.file", deno_file::get_declaration());
op_crate_libs.insert("deno.fetch", deno_fetch::get_declaration());
op_crate_libs.insert("deno.webgpu", deno_webgpu::get_declaration());
op_crate_libs.insert("deno.websocket", deno_websocket::get_declaration());
@@ -276,10 +275,6 @@ fn main() {
deno_web::get_declaration().display()
);
println!(
- "cargo:rustc-env=DENO_FILE_LIB_PATH={}",
- deno_file::get_declaration().display()
- );
- println!(
"cargo:rustc-env=DENO_FETCH_LIB_PATH={}",
deno_fetch::get_declaration().display()
);
diff --git a/cli/dts/lib.deno.shared_globals.d.ts b/cli/dts/lib.deno.shared_globals.d.ts
index e35de2e77..a59a7af36 100644
--- a/cli/dts/lib.deno.shared_globals.d.ts
+++ b/cli/dts/lib.deno.shared_globals.d.ts
@@ -6,7 +6,6 @@
/// <reference no-default-lib="true" />
/// <reference lib="esnext" />
/// <reference lib="deno.console" />
-/// <reference lib="deno.file" />
/// <reference lib="deno.url" />
/// <reference lib="deno.web" />
/// <reference lib="deno.fetch" />
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index 8403c660d..bd16cb1e1 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -19,7 +19,7 @@ use deno_core::futures;
use deno_core::futures::future::FutureExt;
use deno_core::ModuleSpecifier;
use deno_runtime::deno_fetch::reqwest;
-use deno_runtime::deno_file::BlobUrlStore;
+use deno_runtime::deno_web::BlobUrlStore;
use deno_runtime::permissions::Permissions;
use log::debug;
use log::info;
@@ -579,7 +579,7 @@ mod tests {
use deno_core::error::get_custom_error_class;
use deno_core::resolve_url;
use deno_core::resolve_url_or_path;
- use deno_runtime::deno_file::Blob;
+ use deno_runtime::deno_web::Blob;
use std::rc::Rc;
use tempfile::TempDir;
diff --git a/cli/lsp/registries.rs b/cli/lsp/registries.rs
index 29ec3258b..83b322eab 100644
--- a/cli/lsp/registries.rs
+++ b/cli/lsp/registries.rs
@@ -26,7 +26,7 @@ use deno_core::serde_json::json;
use deno_core::url::Position;
use deno_core::url::Url;
use deno_core::ModuleSpecifier;
-use deno_runtime::deno_file::BlobUrlStore;
+use deno_runtime::deno_web::BlobUrlStore;
use deno_runtime::permissions::Permissions;
use log::error;
use lspower::lsp;
diff --git a/cli/main.rs b/cli/main.rs
index 23b51219f..5827203ce 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -330,12 +330,11 @@ fn print_cache_info(
pub fn get_types(unstable: bool) -> String {
let mut types = format!(
- "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}",
+ "{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}",
crate::tsc::DENO_NS_LIB,
crate::tsc::DENO_CONSOLE_LIB,
crate::tsc::DENO_URL_LIB,
crate::tsc::DENO_WEB_LIB,
- crate::tsc::DENO_FILE_LIB,
crate::tsc::DENO_FETCH_LIB,
crate::tsc::DENO_WEBGPU_LIB,
crate::tsc::DENO_WEBSOCKET_LIB,
diff --git a/cli/program_state.rs b/cli/program_state.rs
index c3c399b69..95362165f 100644
--- a/cli/program_state.rs
+++ b/cli/program_state.rs
@@ -16,7 +16,7 @@ use crate::source_maps::SourceMapGetter;
use crate::specifier_handler::FetchHandler;
use crate::version;
use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
-use deno_runtime::deno_file::BlobUrlStore;
+use deno_runtime::deno_web::BlobUrlStore;
use deno_runtime::inspector_server::InspectorServer;
use deno_runtime::permissions::Permissions;
diff --git a/cli/specifier_handler.rs b/cli/specifier_handler.rs
index 900b918ab..cd27e45cc 100644
--- a/cli/specifier_handler.rs
+++ b/cli/specifier_handler.rs
@@ -574,7 +574,7 @@ pub mod tests {
use crate::file_fetcher::CacheSetting;
use crate::http_cache::HttpCache;
use deno_core::resolve_url_or_path;
- use deno_runtime::deno_file::BlobUrlStore;
+ use deno_runtime::deno_web::BlobUrlStore;
use tempfile::TempDir;
macro_rules! map (
diff --git a/cli/standalone.rs b/cli/standalone.rs
index 7216a5fd6..8cb21f710 100644
--- a/cli/standalone.rs
+++ b/cli/standalone.rs
@@ -23,7 +23,7 @@ use deno_core::ModuleLoader;
use deno_core::ModuleSpecifier;
use deno_core::OpState;
use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
-use deno_runtime::deno_file::BlobUrlStore;
+use deno_runtime::deno_web::BlobUrlStore;
use deno_runtime::permissions::Permissions;
use deno_runtime::permissions::PermissionsOptions;
use deno_runtime::worker::MainWorker;
diff --git a/cli/tsc.rs b/cli/tsc.rs
index 9d7b2a5ff..f87682fca 100644
--- a/cli/tsc.rs
+++ b/cli/tsc.rs
@@ -33,7 +33,6 @@ pub static DENO_NS_LIB: &str = include_str!("dts/lib.deno.ns.d.ts");
pub static DENO_CONSOLE_LIB: &str = include_str!(env!("DENO_CONSOLE_LIB_PATH"));
pub static DENO_URL_LIB: &str = include_str!(env!("DENO_URL_LIB_PATH"));
pub static DENO_WEB_LIB: &str = include_str!(env!("DENO_WEB_LIB_PATH"));
-pub static DENO_FILE_LIB: &str = include_str!(env!("DENO_FILE_LIB_PATH"));
pub static DENO_FETCH_LIB: &str = include_str!(env!("DENO_FETCH_LIB_PATH"));
pub static DENO_WEBGPU_LIB: &str = include_str!(env!("DENO_WEBGPU_LIB_PATH"));
pub static DENO_WEBSOCKET_LIB: &str =