summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/cache/mod.rs4
-rw-r--r--cli/cache/node.rs1
-rw-r--r--cli/cache/parsed_source.rs8
-rw-r--r--cli/graph_util.rs8
-rw-r--r--cli/module_loader.rs1
-rw-r--r--cli/proc_state.rs52
-rw-r--r--cli/tests/watcher_tests.rs40
-rw-r--r--cli/tools/bench.rs12
-rw-r--r--cli/tools/run.rs16
-rw-r--r--cli/tools/test.rs13
-rw-r--r--cli/util/file_watcher.rs2
-rw-r--r--test_util/src/lib.rs11
12 files changed, 126 insertions, 42 deletions
diff --git a/cli/cache/mod.rs b/cli/cache/mod.rs
index d2ad1b20a..4d255b014 100644
--- a/cli/cache/mod.rs
+++ b/cli/cache/mod.rs
@@ -50,12 +50,10 @@ pub struct FetchCacher {
impl FetchCacher {
pub fn new(
emit_cache: EmitCache,
- file_fetcher: FileFetcher,
+ file_fetcher: Arc<FileFetcher>,
root_permissions: PermissionsContainer,
dynamic_permissions: PermissionsContainer,
) -> Self {
- let file_fetcher = Arc::new(file_fetcher);
-
Self {
emit_cache,
dynamic_permissions,
diff --git a/cli/cache/node.rs b/cli/cache/node.rs
index cc93f36e1..24341e1c1 100644
--- a/cli/cache/node.rs
+++ b/cli/cache/node.rs
@@ -24,6 +24,7 @@ struct CjsAnalysisData {
pub reexports: Vec<String>,
}
+#[derive(Clone)]
pub struct NodeAnalysisCache {
db_file_path: Option<PathBuf>,
inner: Arc<Mutex<Option<Option<NodeAnalysisCacheInner>>>>,
diff --git a/cli/cache/parsed_source.rs b/cli/cache/parsed_source.rs
index 9ab926874..28547dcf6 100644
--- a/cli/cache/parsed_source.rs
+++ b/cli/cache/parsed_source.rs
@@ -65,6 +65,14 @@ impl ParsedSourceCache {
}
}
+ pub fn reset_for_file_watcher(&self) -> Self {
+ Self {
+ db_cache_path: self.db_cache_path.clone(),
+ cli_version: self.cli_version.clone(),
+ sources: Default::default(),
+ }
+ }
+
pub fn get_parsed_source_from_module(
&self,
module: &deno_graph::Module,
diff --git a/cli/graph_util.rs b/cli/graph_util.rs
index 812701892..35eaae127 100644
--- a/cli/graph_util.rs
+++ b/cli/graph_util.rs
@@ -72,7 +72,7 @@ pub struct GraphData {
impl GraphData {
/// Store data from `graph` into `self`.
- pub fn add_graph(&mut self, graph: &ModuleGraph, reload: bool) {
+ pub fn add_graph(&mut self, graph: &ModuleGraph) {
for graph_import in &graph.imports {
for dep in graph_import.dependencies.values() {
for resolved in [&dep.maybe_code, &dep.maybe_type] {
@@ -96,7 +96,7 @@ impl GraphData {
continue;
}
- if !reload && self.modules.contains_key(specifier) {
+ if self.modules.contains_key(specifier) {
continue;
}
@@ -470,7 +470,7 @@ impl GraphData {
impl From<&ModuleGraph> for GraphData {
fn from(graph: &ModuleGraph) -> Self {
let mut graph_data = GraphData::default();
- graph_data.add_graph(graph, false);
+ graph_data.add_graph(graph);
graph_data
}
}
@@ -542,7 +542,7 @@ pub async fn create_graph_and_maybe_check(
let check_js = ps.options.check_js();
let mut graph_data = GraphData::default();
- graph_data.add_graph(&graph, false);
+ graph_data.add_graph(&graph);
graph_data
.check(
&graph.roots,
diff --git a/cli/module_loader.rs b/cli/module_loader.rs
index d507a5b15..c0f9e43d0 100644
--- a/cli/module_loader.rs
+++ b/cli/module_loader.rs
@@ -277,7 +277,6 @@ impl ModuleLoader for CliModuleLoader {
lib,
root_permissions,
dynamic_permissions,
- false,
)
.await
}
diff --git a/cli/proc_state.rs b/cli/proc_state.rs
index bbfc3cbad..ac06e6c72 100644
--- a/cli/proc_state.rs
+++ b/cli/proc_state.rs
@@ -77,7 +77,7 @@ pub struct ProcState(Arc<Inner>);
pub struct Inner {
pub dir: DenoDir,
- pub file_fetcher: FileFetcher,
+ pub file_fetcher: Arc<FileFetcher>,
pub http_client: HttpClient,
pub options: Arc<CliOptions>,
pub emit_cache: EmitCache,
@@ -147,6 +147,38 @@ impl ProcState {
Ok(ps)
}
+ /// Reset all runtime state to its default. This should be used on file
+ /// watcher restarts.
+ pub fn reset_for_file_watcher(&mut self) {
+ self.0 = Arc::new(Inner {
+ dir: self.dir.clone(),
+ options: self.options.clone(),
+ emit_cache: self.emit_cache.clone(),
+ emit_options_hash: self.emit_options_hash,
+ emit_options: self.emit_options.clone(),
+ file_fetcher: self.file_fetcher.clone(),
+ http_client: self.http_client.clone(),
+ graph_data: Default::default(),
+ lockfile: self.lockfile.clone(),
+ maybe_import_map: self.maybe_import_map.clone(),
+ maybe_inspector_server: self.maybe_inspector_server.clone(),
+ root_cert_store: self.root_cert_store.clone(),
+ blob_store: Default::default(),
+ broadcast_channel: Default::default(),
+ shared_array_buffer_store: Default::default(),
+ compiled_wasm_module_store: Default::default(),
+ parsed_source_cache: self.parsed_source_cache.reset_for_file_watcher(),
+ maybe_resolver: self.maybe_resolver.clone(),
+ maybe_file_watcher_reporter: self.maybe_file_watcher_reporter.clone(),
+ node_analysis_cache: self.node_analysis_cache.clone(),
+ npm_cache: self.npm_cache.clone(),
+ npm_resolver: self.npm_resolver.clone(),
+ cjs_resolutions: Default::default(),
+ progress_bar: self.progress_bar.clone(),
+ node_std_graph_prepared: AtomicBool::new(false),
+ });
+ }
+
async fn build_with_sender(
cli_options: Arc<CliOptions>,
maybe_sender: Option<tokio::sync::mpsc::UnboundedSender<Vec<PathBuf>>>,
@@ -256,7 +288,7 @@ impl ProcState {
.write_hashable(&emit_options)
.finish(),
emit_options,
- file_fetcher,
+ file_fetcher: Arc::new(file_fetcher),
http_client,
graph_data: Default::default(),
lockfile,
@@ -291,7 +323,6 @@ impl ProcState {
lib: TsTypeLib,
root_permissions: PermissionsContainer,
dynamic_permissions: PermissionsContainer,
- reload_on_watch: bool,
) -> Result<(), AnyError> {
log::debug!("Preparing module load.");
let _pb_clear_guard = self.progress_bar.clear_guard();
@@ -304,7 +335,7 @@ impl ProcState {
.map(|s| (s, ModuleKind::Esm))
.collect::<Vec<_>>();
- if !reload_on_watch && !has_root_npm_specifier {
+ if !has_root_npm_specifier {
let graph_data = self.graph_data.read();
if self.options.type_check_mode() == TypeCheckMode::None
|| graph_data.is_type_checked(&roots, &lib)
@@ -338,7 +369,6 @@ impl ProcState {
struct ProcStateLoader<'a> {
inner: &'a mut cache::FetchCacher,
graph_data: Arc<RwLock<GraphData>>,
- reload: bool,
}
impl Loader for ProcStateLoader<'_> {
fn get_cache_info(
@@ -355,9 +385,7 @@ impl ProcState {
let graph_data = self.graph_data.read();
let found_specifier = graph_data.follow_redirect(specifier);
match graph_data.get(&found_specifier) {
- Some(_) if !self.reload => {
- Box::pin(futures::future::ready(Err(anyhow!(""))))
- }
+ Some(_) => Box::pin(futures::future::ready(Err(anyhow!("")))),
_ => self.inner.load(specifier, is_dynamic),
}
}
@@ -365,7 +393,6 @@ impl ProcState {
let mut loader = ProcStateLoader {
inner: &mut cache,
graph_data: self.graph_data.clone(),
- reload: reload_on_watch,
};
let maybe_file_watcher_reporter: Option<&dyn deno_graph::source::Reporter> =
@@ -404,7 +431,7 @@ impl ProcState {
let npm_package_reqs = {
let mut graph_data = self.graph_data.write();
- graph_data.add_graph(&graph, reload_on_watch);
+ graph_data.add_graph(&graph);
let check_js = self.options.check_js();
graph_data
.check(
@@ -492,7 +519,6 @@ impl ProcState {
lib,
PermissionsContainer::allow_all(),
PermissionsContainer::allow_all(),
- false,
)
.await
}
@@ -506,7 +532,7 @@ impl ProcState {
let node_std_graph = self
.create_graph(vec![(node::MODULE_ALL_URL.clone(), ModuleKind::Esm)])
.await?;
- self.graph_data.write().add_graph(&node_std_graph, false);
+ self.graph_data.write().add_graph(&node_std_graph);
self.node_std_graph_prepared.store(true, Ordering::Relaxed);
Ok(())
}
@@ -747,7 +773,7 @@ pub fn import_map_from_text(
Ok(result.import_map)
}
-#[derive(Debug)]
+#[derive(Clone, Debug)]
struct FileWatcherReporter {
sender: tokio::sync::mpsc::UnboundedSender<Vec<PathBuf>>,
file_paths: Arc<Mutex<Vec<PathBuf>>>,
diff --git a/cli/tests/watcher_tests.rs b/cli/tests/watcher_tests.rs
index 0b9749e48..a300f3953 100644
--- a/cli/tests/watcher_tests.rs
+++ b/cli/tests/watcher_tests.rs
@@ -1098,6 +1098,44 @@ mod watcher {
check_alive_then_kill(child);
}
+ // Regression test for https://github.com/denoland/deno/issues/15465.
+ #[test]
+ fn run_watch_reload_once() {
+ let _g = util::http_server();
+ let t = TempDir::new();
+ let file_to_watch = t.path().join("file_to_watch.js");
+ let file_content = r#"
+ import { time } from "http://localhost:4545/dynamic_module.ts";
+ console.log(time);
+ "#;
+ write(&file_to_watch, file_content).unwrap();
+
+ let mut child = util::deno_cmd()
+ .current_dir(util::testdata_path())
+ .arg("run")
+ .arg("--watch")
+ .arg("--reload")
+ .arg(&file_to_watch)
+ .env("NO_COLOR", "1")
+ .stdout(std::process::Stdio::piped())
+ .stderr(std::process::Stdio::piped())
+ .spawn()
+ .unwrap();
+ let (mut stdout_lines, mut stderr_lines) = child_lines(&mut child);
+
+ wait_contains("finished", &mut stderr_lines);
+ let first_output = stdout_lines.next().unwrap();
+
+ write(&file_to_watch, file_content).unwrap();
+ // The remote dynamic module should not have been reloaded again.
+
+ wait_contains("finished", &mut stderr_lines);
+ let second_output = stdout_lines.next().unwrap();
+ assert_eq!(second_output, first_output);
+
+ check_alive_then_kill(child);
+ }
+
#[test]
fn run_watch_dynamic_imports() {
let t = TempDir::new();
@@ -1159,11 +1197,11 @@ mod watcher {
&mut stdout_lines,
);
- wait_contains("finished", &mut stderr_lines);
wait_for(
|m| m.contains("Watching paths") && m.contains("imported2.js"),
&mut stderr_lines,
);
+ wait_contains("finished", &mut stderr_lines);
write(
&file_to_watch3,
diff --git a/cli/tools/bench.rs b/cli/tools/bench.rs
index ed788fa7f..ad5841e39 100644
--- a/cli/tools/bench.rs
+++ b/cli/tools/bench.rs
@@ -32,6 +32,7 @@ use indexmap::IndexMap;
use log::Level;
use serde::Deserialize;
use serde::Serialize;
+use std::cell::RefCell;
use std::collections::HashSet;
use std::path::Path;
use std::path::PathBuf;
@@ -339,7 +340,6 @@ async fn check_specifiers(
lib,
PermissionsContainer::allow_all(),
PermissionsContainer::new(permissions),
- true,
)
.await?;
@@ -538,13 +538,15 @@ pub async fn run_benchmarks_with_watch(
.collect();
let no_check = ps.options.type_check_mode() == TypeCheckMode::None;
+ let ps = RefCell::new(ps);
+
let resolver = |changed: Option<Vec<PathBuf>>| {
let paths_to_watch = paths_to_watch.clone();
let paths_to_watch_clone = paths_to_watch.clone();
let files_changed = changed.is_some();
let files = bench_options.files.clone();
- let ps = ps.clone();
+ let ps = ps.borrow().clone();
async move {
let bench_modules = collect_specifiers(&files, is_supported_bench_path)?;
@@ -656,7 +658,8 @@ pub async fn run_benchmarks_with_watch(
let operation = |modules_to_reload: Vec<(ModuleSpecifier, ModuleKind)>| {
let permissions = permissions.clone();
- let ps = ps.clone();
+ ps.borrow_mut().reset_for_file_watcher();
+ let ps = ps.borrow().clone();
let filter = bench_options.filter.clone();
let files = bench_options.files.clone();
@@ -681,12 +684,13 @@ pub async fn run_benchmarks_with_watch(
}
};
+ let clear_screen = !ps.borrow().options.no_clear_screen();
file_watcher::watch_func(
resolver,
operation,
file_watcher::PrintConfig {
job_name: "Bench".to_string(),
- clear_screen: !ps.options.no_clear_screen(),
+ clear_screen,
},
)
.await?;
diff --git a/cli/tools/run.rs b/cli/tools/run.rs
index 3830affed..a022a5059 100644
--- a/cli/tools/run.rs
+++ b/cli/tools/run.rs
@@ -1,7 +1,6 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
use std::io::Read;
-use std::path::PathBuf;
use std::sync::Arc;
use deno_ast::MediaType;
@@ -104,16 +103,13 @@ async fn run_with_watch(flags: Flags, script: String) -> Result<i32, AnyError> {
let flags = Arc::new(flags);
let main_module = resolve_url_or_path(&script)?;
let (sender, receiver) = tokio::sync::mpsc::unbounded_channel();
+ let mut ps =
+ ProcState::build_for_file_watcher((*flags).clone(), sender.clone()).await?;
- let operation = |(sender, main_module): (
- tokio::sync::mpsc::UnboundedSender<Vec<PathBuf>>,
- ModuleSpecifier,
- )| {
- let flags = flags.clone();
+ let operation = |main_module: ModuleSpecifier| {
+ ps.reset_for_file_watcher();
+ let ps = ps.clone();
Ok(async move {
- let ps =
- ProcState::build_for_file_watcher((*flags).clone(), sender.clone())
- .await?;
let permissions = PermissionsContainer::new(Permissions::from_options(
&ps.options.permissions_options(),
)?);
@@ -128,7 +124,7 @@ async fn run_with_watch(flags: Flags, script: String) -> Result<i32, AnyError> {
util::file_watcher::watch_func2(
receiver,
operation,
- (sender, main_module),
+ main_module,
util::file_watcher::PrintConfig {
job_name: "Process".to_string(),
clear_screen: !flags.no_clear_screen,
diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index 4cac8a404..548ae2801 100644
--- a/cli/tools/test.rs
+++ b/cli/tools/test.rs
@@ -46,6 +46,7 @@ use rand::seq::SliceRandom;
use rand::SeedableRng;
use regex::Regex;
use serde::Deserialize;
+use std::cell::RefCell;
use std::collections::BTreeMap;
use std::collections::HashSet;
use std::fmt::Write as _;
@@ -957,7 +958,6 @@ pub async fn check_specifiers(
lib,
PermissionsContainer::new(Permissions::allow_all()),
PermissionsContainer::new(permissions.clone()),
- false,
)
.await?;
}
@@ -979,7 +979,6 @@ pub async fn check_specifiers(
lib,
PermissionsContainer::allow_all(),
PermissionsContainer::new(permissions),
- true,
)
.await?;
@@ -1355,12 +1354,14 @@ pub async fn run_tests_with_watch(
let no_check = ps.options.type_check_mode() == TypeCheckMode::None;
let test_options = &test_options;
+ let ps = RefCell::new(ps);
+
let resolver = |changed: Option<Vec<PathBuf>>| {
let paths_to_watch = paths_to_watch.clone();
let paths_to_watch_clone = paths_to_watch.clone();
let files_changed = changed.is_some();
- let ps = ps.clone();
+ let ps = ps.borrow().clone();
async move {
let test_modules = if test_options.doc {
@@ -1477,7 +1478,8 @@ pub async fn run_tests_with_watch(
let operation = |modules_to_reload: Vec<(ModuleSpecifier, ModuleKind)>| {
let permissions = permissions.clone();
- let ps = ps.clone();
+ ps.borrow_mut().reset_for_file_watcher();
+ let ps = ps.borrow().clone();
let test_options = test_options.clone();
async move {
@@ -1517,12 +1519,13 @@ pub async fn run_tests_with_watch(
}
};
+ let clear_screen = !ps.borrow().options.no_clear_screen();
file_watcher::watch_func(
resolver,
operation,
file_watcher::PrintConfig {
job_name: "Test".to_string(),
- clear_screen: !ps.options.no_clear_screen(),
+ clear_screen,
},
)
.await?;
diff --git a/cli/util/file_watcher.rs b/cli/util/file_watcher.rs
index b87782d6b..29213f0c9 100644
--- a/cli/util/file_watcher.rs
+++ b/cli/util/file_watcher.rs
@@ -322,13 +322,13 @@ where
continue;
},
_ = operation_future => {
+ consume_paths_to_watch(&mut watcher, &mut paths_to_watch_receiver);
// TODO(bartlomieju): print exit code here?
info!(
"{} {} finished. Restarting on file change...",
colors::intense_blue("Watcher"),
job_name,
);
- consume_paths_to_watch(&mut watcher, &mut paths_to_watch_receiver);
},
};
diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs
index 99927de10..ce1d15d4b 100644
--- a/test_util/src/lib.rs
+++ b/test_util/src/lib.rs
@@ -971,6 +971,17 @@ async fn main_server(
);
Ok(res)
}
+ (_, "/dynamic_module.ts") => {
+ let mut res = Response::new(Body::from(format!(
+ r#"export const time = {};"#,
+ std::time::SystemTime::now().elapsed().unwrap().as_nanos()
+ )));
+ res.headers_mut().insert(
+ "Content-type",
+ HeaderValue::from_static("application/typescript"),
+ );
+ Ok(res)
+ }
(_, "/echo_accept") => {
let accept = req.headers().get("accept").map(|v| v.to_str().unwrap());
let res = Response::new(Body::from(
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 00:23:59 +0000