summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/Cargo.toml18
-rw-r--r--cli/lockfile.rs7
-rw-r--r--cli/main.rs14
-rw-r--r--cli/proc_state.rs28
-rw-r--r--cli/tests/testdata/coverage/complex_expected.lcov7
-rw-r--r--cli/tests/testdata/coverage/complex_expected.out6
-rw-r--r--cli/tools/doc.rs14
-rw-r--r--cli/tools/vendor/test.rs14
-rw-r--r--cli/tsc.rs28
9 files changed, 73 insertions, 63 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index d1a7ab318..79f9b8876 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -50,31 +50,31 @@ winapi = "=0.3.9"
winres = "=0.1.12"
[dependencies]
-deno_ast = { version = "0.19.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] }
+deno_ast = { version = "0.20.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] }
deno_core = { version = "0.155.0", path = "../core" }
-deno_doc = "0.46.0"
-deno_emit = "0.9.0"
-deno_graph = "0.34.0"
-deno_lint = { version = "0.33.0", features = ["docs"] }
+deno_doc = "0.47.0"
+deno_emit = "0.10.0"
+deno_graph = "0.37.1"
+deno_lint = { version = "0.34.0", features = ["docs"] }
deno_runtime = { version = "0.81.0", path = "../runtime" }
deno_task_shell = "0.6.0"
napi_sym = { path = "./napi_sym", version = "0.3.0" }
atty = "=0.2.14"
-base64 = "=0.13.0"
+base64 = "=0.13.1"
cache_control = "=0.2.0"
chrono = { version = "=0.4.22", default-features = false, features = ["clock"] }
clap = "=3.1.12"
clap_complete = "=3.1.2"
clap_complete_fig = "=3.1.5"
-data-url = "=0.1.1"
+data-url = "=0.2.0"
dissimilar = "=1.0.4"
dprint-plugin-json = "=0.15.6"
dprint-plugin-markdown = "=0.14.1"
-dprint-plugin-typescript = "=0.74.0"
+dprint-plugin-typescript = "=0.76.0"
encoding_rs = "=0.8.31"
env_logger = "=0.9.0"
-eszip = "=0.28.0"
+eszip = "=0.29.0"
fancy-regex = "=0.10.0"
flate2 = "=1.0.24"
http = "=0.2.8"
diff --git a/cli/lockfile.rs b/cli/lockfile.rs
index 067a0adf9..b572b9d93 100644
--- a/cli/lockfile.rs
+++ b/cli/lockfile.rs
@@ -154,11 +154,10 @@ impl deno_graph::source::Locker for Locker {
pub fn as_maybe_locker(
lockfile: Option<Arc<Mutex<Lockfile>>>,
-) -> Option<Rc<RefCell<Box<dyn deno_graph::source::Locker>>>> {
+) -> Option<Rc<RefCell<dyn deno_graph::source::Locker>>> {
lockfile.as_ref().map(|lf| {
- Rc::new(RefCell::new(
- Box::new(Locker(Some(lf.clone()))) as Box<dyn deno_graph::source::Locker>
- ))
+ Rc::new(RefCell::new(Locker(Some(lf.clone()))))
+ as Rc<RefCell<dyn deno_graph::source::Locker>>
})
}
diff --git a/cli/main.rs b/cli/main.rs
index 3a4cc3c37..23f073a7d 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -492,13 +492,15 @@ async fn create_graph_and_maybe_check(
let graph = Arc::new(
deno_graph::create_graph(
vec![(root, deno_graph::ModuleKind::Esm)],
- false,
- maybe_imports,
&mut cache,
- maybe_resolver,
- maybe_locker,
- Some(&*analyzer),
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: maybe_imports,
+ resolver: maybe_resolver,
+ locker: maybe_locker,
+ module_analyzer: Some(&*analyzer),
+ reporter: None,
+ },
)
.await,
);
diff --git a/cli/proc_state.rs b/cli/proc_state.rs
index 49ee5d8f4..ac83e9459 100644
--- a/cli/proc_state.rs
+++ b/cli/proc_state.rs
@@ -370,13 +370,15 @@ impl ProcState {
let analyzer = self.parsed_source_cache.as_analyzer();
let graph = create_graph(
roots.clone(),
- is_dynamic,
- maybe_imports,
&mut loader,
- maybe_resolver,
- maybe_locker,
- Some(&*analyzer),
- maybe_file_watcher_reporter,
+ deno_graph::GraphOptions {
+ is_dynamic,
+ imports: maybe_imports,
+ resolver: maybe_resolver,
+ locker: maybe_locker,
+ module_analyzer: Some(&*analyzer),
+ reporter: maybe_file_watcher_reporter,
+ },
)
.await;
@@ -639,13 +641,15 @@ impl ProcState {
let graph = create_graph(
roots,
- false,
- maybe_imports,
loader,
- maybe_resolver,
- maybe_locker,
- Some(&*analyzer),
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: maybe_imports,
+ resolver: maybe_resolver,
+ locker: maybe_locker,
+ module_analyzer: Some(&*analyzer),
+ reporter: None,
+ },
)
.await;
diff --git a/cli/tests/testdata/coverage/complex_expected.lcov b/cli/tests/testdata/coverage/complex_expected.lcov
index 188ebe542..cfa40b232 100644
--- a/cli/tests/testdata/coverage/complex_expected.lcov
+++ b/cli/tests/testdata/coverage/complex_expected.lcov
@@ -39,7 +39,6 @@ DA:37,2
DA:38,2
DA:39,2
DA:40,2
-DA:41,2
DA:42,2
DA:44,1
DA:45,1
@@ -52,7 +51,6 @@ DA:51,0
DA:52,0
DA:53,0
DA:54,0
-DA:55,0
DA:56,0
DA:58,1
DA:59,1
@@ -62,12 +60,11 @@ DA:63,1
DA:64,0
DA:65,0
DA:66,0
-DA:67,0
DA:68,0
DA:70,1
DA:71,0
DA:73,1
DA:74,1
-LH:40
-LF:57
+LH:39
+LF:54
end_of_record
diff --git a/cli/tests/testdata/coverage/complex_expected.out b/cli/tests/testdata/coverage/complex_expected.out
index f2f9468f5..b1910af60 100644
--- a/cli/tests/testdata/coverage/complex_expected.out
+++ b/cli/tests/testdata/coverage/complex_expected.out
@@ -1,4 +1,4 @@
-cover [WILDCARD]/coverage/complex.ts ... 70.175% (40/57)
+cover [WILDCARD]/coverage/complex.ts ... 72.222% (39/54)
46 | export function unused(
47 | foo: string,
48 | bar: string,
@@ -8,13 +8,13 @@ cover [WILDCARD]/coverage/complex.ts ... 70.175% (40/57)
52 | foo,
53 | bar,
54 | baz,
- 55 | );
+-----|-----
56 | }
-----|-----
64 | export function ƒ(): number {
65 | return (
66 | 0
- 67 | );
+-----|-----
68 | }
-----|-----
71 | console.log("%s", () => 1);
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs
index 452425451..b02a188b0 100644
--- a/cli/tools/doc.rs
+++ b/cli/tools/doc.rs
@@ -44,13 +44,15 @@ pub async fn print_docs(
let analyzer = deno_graph::CapturingModuleAnalyzer::default();
let graph = deno_graph::create_graph(
vec![(source_file_specifier.clone(), ModuleKind::Esm)],
- false,
- None,
&mut loader,
- None,
- None,
- Some(&analyzer),
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: None,
+ resolver: None,
+ locker: None,
+ module_analyzer: Some(&analyzer),
+ reporter: None,
+ },
)
.await;
let doc_parser = doc::DocParser::new(
diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs
index 036dd6663..451b4b614 100644
--- a/cli/tools/vendor/test.rs
+++ b/cli/tools/vendor/test.rs
@@ -268,13 +268,15 @@ async fn build_test_graph(
original_import_map.map(|m| ImportMapResolver::new(Arc::new(m)));
deno_graph::create_graph(
roots,
- false,
- None,
&mut loader,
- resolver.as_ref().map(|im| im.as_resolver()),
- None,
- Some(analyzer),
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: None,
+ resolver: resolver.as_ref().map(|im| im.as_resolver()),
+ locker: None,
+ module_analyzer: Some(analyzer),
+ reporter: None,
+ },
)
.await
}
diff --git a/cli/tsc.rs b/cli/tsc.rs
index 90ae7334c..c81ff9335 100644
--- a/cli/tsc.rs
+++ b/cli/tsc.rs
@@ -848,13 +848,15 @@ mod tests {
let mut loader = MockLoader { fixtures };
let graph = deno_graph::create_graph(
vec![(specifier, ModuleKind::Esm)],
- false,
- None,
&mut loader,
- None,
- None,
- None,
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: None,
+ resolver: None,
+ locker: None,
+ module_analyzer: None,
+ reporter: None,
+ },
)
.await;
let state = State::new(
@@ -879,13 +881,15 @@ mod tests {
let mut loader = MockLoader { fixtures };
let graph = deno_graph::create_graph(
vec![(specifier.clone(), ModuleKind::Esm)],
- false,
- None,
&mut loader,
- None,
- None,
- None,
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: None,
+ resolver: None,
+ locker: None,
+ module_analyzer: None,
+ reporter: None,
+ },
)
.await;
let config = TsConfig::new(json!({
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 19:12:18 +0000