Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
641 changes: 28 additions & 613 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ members = [

[workspace.dependencies]
async-trait = "0.1.88"
deno_cache_dir = "0.23.0"
deno_config = "0.61.0"
deno_error = { version = "0.6.1", features = ["serde", "serde_json", "url"] }
deno_graph = { version = "0.96.2", features = ["swc"], default-features = false }
deno_path_util = "0.4.0"
deno_resolver = { version = "0.42.0", features = ["graph"] }
serde_json = { version = "1.0.140", features = ["preserve_order"] }
Expand Down
5 changes: 2 additions & 3 deletions deno.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,12 @@
"tests/web_socket_project/npm"
],
"imports": {
"@deno/cache-dir": "jsr:@deno/cache-dir@^0.20",
"@std/assert": "jsr:@std/assert@1",
"@std/fmt": "jsr:@std/fmt@1",
"@std/fs": "jsr:@std/fs@1",
"@std/path": "jsr:@std/path@1",
"@ts-morph/bootstrap": "jsr:@ts-morph/bootstrap@^0.25.0",
"code-block-writer": "jsr:@david/code-block-writer@^13.0.2"
"@ts-morph/bootstrap": "jsr:@ts-morph/bootstrap@^0.27.0",
"code-block-writer": "jsr:@david/code-block-writer@^13.0.3"
},
"exports": {
".": "./mod.ts",
Expand Down
95 changes: 31 additions & 64 deletions deno.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,9 @@ export async function build(options: BuildOptions): Promise<void> {
outputFile.filePath,
);
const outputFileText = binaryEntryPointPaths.has(outputFile.filePath)
? `#!/usr/bin/env node\n${outputFile.fileText}`
? `#!/usr/bin/env node\n${
outputFile.fileText.replace(/^#![^\n\r]*\r?\n?/, "")
}`
: outputFile.fileText;
const sourceFile = project.createSourceFile(
outputFilePath,
Expand Down
9 changes: 4 additions & 5 deletions rs-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ repository = "https://github.com/denoland/dnt"
description = "Deno to Node/canonical TypeScript transform."

[features]
default = ["tokio-loader", "serialization"]
tokio-loader = ["tokio", "reqwest"]
default = ["serialization"]
serialization = ["serde"]

[dependencies]
anyhow = "1.0.70"
async-trait.workspace = true
base64 = "0.13.1"
deno_ast = { version = "0.48.1", features = ["transforms", "view", "visit", "utils"] }
deno_cache_dir.workspace = true
deno_config.workspace = true
deno_error.workspace = true
deno_graph = { version = "0.96.2", features = ["swc"], default-features = false }
deno_graph.workspace = true
deno_path_util.workspace = true
deno_resolver.workspace = true
deno_semver = "0.7.1"
Expand All @@ -30,13 +30,12 @@ jsonc-parser = { version = "0.26.2", features = ["serde"] }
once_cell = "1.17.1"
pathdiff = "0.2.1"
regex = "1.7"
reqwest = { version = "0.11", features = ["rustls"], optional = true }
serde = { version = "1.0.159", features = ["derive"], optional = true }
serde_json.workspace = true
sys_traits.workspace = true
tokio = { version = "1", features = ["full"], optional = true }
url.workspace = true

[dev-dependencies]
pretty_assertions = "1.3.0"
sys_traits = { workspace = true, features = ["memory"] }
tokio = { version = "1", features = ["full"] }
3 changes: 1 addition & 2 deletions rs-lib/src/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use std::fmt::Write;
use std::rc::Rc;

use crate::loader::get_all_specifier_mappers;
use crate::loader::Loader;
use crate::loader::SourceLoader;
use crate::parser::ScopeAnalysisParser;
use crate::specifiers::get_specifiers;
Expand Down Expand Up @@ -35,7 +34,7 @@ use sys_traits::impls::RealSys;
pub struct ModuleGraphOptions<'a, TSys: WorkspaceFactorySys> {
pub entry_points: Vec<ModuleSpecifier>,
pub test_entry_points: Vec<ModuleSpecifier>,
pub loader: Rc<dyn Loader>,
pub loader: Rc<dyn deno_graph::source::Loader>,
pub resolver: DefaultDenoResolverRc<TSys>,
pub specifier_mappings: &'a HashMap<ModuleSpecifier, MappedSpecifier>,
pub compiler_options_resolver: Rc<CompilerOptionsResolver>,
Expand Down
Loading
Loading