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
2 changes: 1 addition & 1 deletion deno
Submodule deno updated 72 files
+47 −22 Cargo.lock
+7 −7 Cargo.toml
+16 −11 cli/args/flags.rs
+6 −0 cli/args/mod.rs
+4 −0 cli/cdp.rs
+22 −1 cli/factory.rs
+9 −1 cli/graph_util.rs
+36 −39 cli/jsr.rs
+1 −1 cli/lsp/completions.rs
+6 −4 cli/lsp/config.rs
+12 −2 cli/lsp/jsr.rs
+21 −4 cli/lsp/language_server.rs
+12 −2 cli/lsp/npm.rs
+12 −7 cli/lsp/resolver.rs
+2 −0 cli/lsp/tsc.rs
+27 −5 cli/main.rs
+37 −24 cli/npm.rs
+6 −0 cli/rt/file_system.rs
+42 −0 cli/schemas/permission-broker-request.v1.json
+20 −0 cli/schemas/permission-broker-response.v1.json
+2 −2 cli/tools/bundle/esbuild.rs
+6 −0 cli/tools/bundle/mod.rs
+7 −2 cli/tools/compile.rs
+2 −1 cli/tools/doc.rs
+16 −6 cli/tools/installer/bin_name_resolver.rs
+26 −5 cli/tools/installer/mod.rs
+17 −6 cli/tools/pm/cache_deps.rs
+45 −31 cli/tools/pm/deps.rs
+82 −59 cli/tools/pm/mod.rs
+6 −2 cli/tools/pm/outdated/mod.rs
+1 −1 cli/tools/task.rs
+2 −0 cli/tools/test/mod.rs
+1 −1 cli/tools/test/reporters/dot.rs
+7 −0 cli/util/file_watcher.rs
+1 −1 ext/crypto/generate_key.rs
+0 −21 ext/crypto/key.rs
+3 −3 ext/crypto/lib.rs
+4 −4 ext/fs/lib.rs
+32 −4 ext/fs/ops.rs
+8 −2 ext/fs/std_fs.rs
+5 −0 ext/io/fs.rs
+22 −6 ext/io/lib.rs
+2 −0 ext/net/tunnel.rs
+10 −10 ext/node/ops/crypto/cipher.rs
+11 −8 ext/node/ops/zlib/mod.rs
+6 −15 ext/node/polyfills/internal/validators.mjs
+84 −8 ext/node/polyfills/timers.ts
+6 −0 libs/maybe_sync/lib.rs
+1 −0 libs/npm_installer/Cargo.toml
+3 −3 libs/npm_installer/extra_info.rs
+3 −6 libs/npm_installer/factory.rs
+5 −6 libs/npm_installer/initializer.rs
+2 −2 libs/npm_installer/lib.rs
+9 −18 libs/npm_installer/resolution.rs
+12 −5 libs/package_json/lib.rs
+1 −0 libs/resolver/Cargo.toml
+52 −4 libs/resolver/factory.rs
+27 −8 libs/resolver/workspace.rs
+130 −0 runtime/permissions/broker.rs
+55 −1 runtime/permissions/lib.rs
+1 −1 rust-toolchain.toml
+79 −0 tests/integration/run_tests.rs
+1 −1 tests/specs/compile/ffi/__test__.jsonc
+3 −28 tests/specs/compile/ffi/main.ts
+81 −0 tests/testdata/run/permission_broker/broker.ts
+1 −0 tests/testdata/run/permission_broker/log.txt
+1 −0 tests/testdata/run/permission_broker/scratch.txt
+8 −0 tests/testdata/run/permission_broker/test1.ts
+68 −1 tests/unit/process_test.ts
+24 −0 tests/unit/stat_test.ts
+44 −0 tests/unit/utime_test.ts
+21 −1 tests/unit_node/timers_test.ts
2 changes: 2 additions & 0 deletions src/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ export interface WorkspaceOptions {
configPath?: string;
/** Node resolution conditions to use for resolving package.json exports. */
nodeConditions?: string[];
/** Date for the newest allowed dependency. */
newestDependencyDate?: Date;
/**
* Platform to bundle for.
* @default "node"
Expand Down
17 changes: 11 additions & 6 deletions src/rs_lib/Cargo.lock

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

3 changes: 2 additions & 1 deletion src/rs_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ deno_error = "=0.7.0"
deno_path_util = "=0.6.1"
deno_semver = "=0.9.0"
url = "2.5"
chrono = { version = "0.4.42", default-features = false }

[dependencies.flate2]
version = "1.0.30"
Expand All @@ -41,7 +42,7 @@ path = "../../deno/libs/config"
features = ["workspace","sync"]

[dependencies.deno_graph]
version = "=0.100.1"
version = "=0.101.0"
features = ["swc"]
default-features = false

Expand Down
9 changes: 9 additions & 0 deletions src/rs_lib/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ pub struct DenoWorkspaceOptions {
#[serde(default)]
pub node_conditions: Option<Vec<String>>,
#[serde(default)]
pub newest_dependency_date: Option<chrono::DateTime<chrono::Utc>>,
#[serde(default)]
pub cached_only: Option<bool>,
#[serde(default)]
pub preserve_jsx: Option<bool>,
Expand Down Expand Up @@ -303,8 +305,10 @@ impl DenoWorkspace {
package_json_dep_resolution: None,
specified_import_map: None,
bare_node_builtins: true,
newest_dependency_date: options.newest_dependency_date,
// todo: report these
on_mapped_resolution_diagnostic: None,
types_node_version_req: None,
},
));
let http_client = WasmHttpClient::default();
Expand Down Expand Up @@ -510,6 +514,8 @@ impl DenoLoader {
{
lockfile.fill_graph(&mut graph);
}
let jsr_version_resolver =
self.resolver_factory.jsr_version_resolver()?;
graph
.build(
entrypoints,
Expand All @@ -523,6 +529,9 @@ impl DenoLoader {
locker: locker.as_mut().map(|l| l as _),
file_system: self.workspace_factory.sys(),
jsr_url_provider: Default::default(),
jsr_version_resolver: Cow::Borrowed(
jsr_version_resolver.as_ref(),
),
passthrough_jsr_specifiers: false,
module_analyzer: &module_analyzer,
npm_resolver: Some(npm_resolver.as_ref()),
Expand Down