diff options
33 files changed, 535 insertions, 547 deletions
diff --git a/Cargo.lock b/Cargo.lock index d724d9577..e791eb6ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -779,7 +779,7 @@ dependencies = [ "clap_complete", "clap_complete_fig", "data-url", - "deno_ast 0.21.0", + "deno_ast", "deno_bench_util", "deno_core", "deno_doc", @@ -852,36 +852,6 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f52615649f4f096eed78ec8e2a7eb68ff0bf5f330d59302c5479c7a8fa158" -dependencies = [ - "anyhow", - "base64", - "data-url", - "dprint-swc-ext", - "serde", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_codegen_macros", - "swc_ecma_loader", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_classes", - "swc_ecma_transforms_macros", - "swc_ecma_transforms_proposal", - "swc_ecma_transforms_react", - "swc_ecma_transforms_typescript", - "swc_ecma_utils", - "swc_ecma_visit", - "text_lines", - "url", -] - -[[package]] -name = "deno_ast" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e95105b29938cac5c987017a3c3d245776d71de77838658e5abe917ad75b1929" @@ -957,7 +927,7 @@ version = "0.160.0" dependencies = [ "anyhow", "bytes", - "deno_ast 0.20.0", + "deno_ast", "deno_ops", "futures", "indexmap", @@ -1017,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa3bb0abda350b6523cfc96e0b14c55037fd7b5a901fcc40cb87ef9a1abb6d92" dependencies = [ "cfg-if", - "deno_ast 0.21.0", + "deno_ast", "deno_graph", "futures", "import_map", @@ -1036,7 +1006,7 @@ checksum = "7be76420d8eaac9d82295eb51cb2c0aebd326d305a2ecbeab6582343fb1b743c" dependencies = [ "anyhow", "base64", - "deno_ast 0.21.0", + "deno_ast", "deno_graph", "futures", "parking_lot 0.11.2", @@ -1100,7 +1070,7 @@ dependencies = [ "anyhow", "cfg-if", "data-url", - "deno_ast 0.21.0", + "deno_ast", "futures", "lazy_static", "parking_lot 0.12.1", @@ -1143,7 +1113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d2c4e416322d10531eb0ebc6f3fa355380e4d25bbcd4109e3edd0b0aa71ed77" dependencies = [ "anyhow", - "deno_ast 0.21.0", + "deno_ast", "derive_more", "if_chain", "log", @@ -1494,7 +1464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f864163f7cff21d4ff2385d36d441ff30af73d77530d87c6c90510e39a69a4f5" dependencies = [ "anyhow", - "deno_ast 0.21.0", + "deno_ast", "dprint-core", "rustc-hash", "serde", @@ -1696,7 +1666,7 @@ checksum = "1fdf9b31295c768c806cbc0d08d98868b4382684b002d216a16eb661bb8e8575" dependencies = [ "anyhow", "base64", - "deno_ast 0.21.0", + "deno_ast", "deno_graph", "futures", "serde", @@ -5186,9 +5156,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.64" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f408301c7480f9e6294eb779cfc907f54bd901a9660ef24d7f233ed5376485" +checksum = "ea496675d71016e9bc76aa42d87f16aefd95447cc5818e671e12b2d7e269075d" dependencies = [ "glob", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index 9b8f767dd..f34f92f53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,6 +33,105 @@ members = [ ] exclude = ["test_util/std/hash/_wasm"] +[workspace.package] +authors = ["the Deno authors"] +edition = "2021" +license = "MIT" +repository = "https://github.com/denoland/deno" + +[workspace.dependencies] +v8 = { version = "0.55.0", default-features = false } +deno_ast = { version = "0.21.0", features = ["transpiling"] } + +deno_core = { version = "0.160.0", path = "./core" } +deno_ops = { version = "0.38.0", path = "./ops" } +serde_v8 = { version = "0.71.0", path = "./serde_v8" } +deno_runtime = { version = "0.86.0", path = "./runtime" } +napi_sym = { version = "0.8.0", path = "./cli/napi_sym" } +deno_bench_util = { version = "0.72.0", path = "./bench_util" } +test_util = { path = "./test_util" } + +# exts +deno_broadcast_channel = { version = "0.72.0", path = "./ext/broadcast_channel" } +deno_cache = { version = "0.10.0", path = "./ext/cache" } +deno_console = { version = "0.78.0", path = "./ext/console" } +deno_crypto = { version = "0.92.0", path = "./ext/crypto" } +deno_fetch = { version = "0.101.0", path = "./ext/fetch" } +deno_ffi = { version = "0.65.0", path = "./ext/ffi" } +deno_flash = { version = "0.14.0", path = "./ext/flash" } +deno_http = { version = "0.72.0", path = "./ext/http" } +deno_net = { version = "0.70.0", path = "./ext/net" } +deno_node = { version = "0.15.0", path = "./ext/node" } +deno_tls = { version = "0.65.0", path = "./ext/tls" } +deno_url = { version = "0.78.0", path = "./ext/url" } +deno_web = { version = "0.109.0", path = "./ext/web" } +deno_webgpu = { version = "0.79.0", path = "./ext/webgpu" } +deno_webidl = { version = "0.78.0", path = "./ext/webidl" } +deno_websocket = { version = "0.83.0", path = "./ext/websocket" } +deno_webstorage = { version = "0.73.0", path = "./ext/webstorage" } +deno_napi = { version = "0.8.0", path = "./ext/napi" } + +anyhow = "1.0.57" +async-trait = "0.1.51" +atty = "=0.2.14" +base64 = "=0.13.1" +bencher = "0.1" +bytes = "=1.2.1" +cache_control = "=0.2.0" +data-url = "=0.2.0" +dlopen = "0.1.8" +encoding_rs = "=0.8.31" +flate2 = "=1.0.24" +futures = "0.3.21" +http = "=0.2.8" +hyper = "0.14.18" +libc = "=0.2.126" +log = "=0.4.17" +lzzzz = "1.0" +notify = "=5.0.0" +once_cell = "=1.14.0" +os_pipe = "=1.0.1" +parking_lot = "0.12.0" +percent-encoding = "=2.2.0" +pin-project = "1.0.11" # don't pin because they yank crates from cargo +pretty_assertions = "=1.3.0" +rand = "=0.8.5" +regex = "=1.6.0" +reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks"] } +ring = "=0.16.20" +rusqlite = { version = "=0.28.0", features = ["unlock_notify", "bundled"] } +rustls = "0.20.5" +rustls-pemfile = "1.0.0" +semver = "=1.0.14" +serde = { version = "=1.0.144", features = ["derive"] } +serde_bytes = "0.11" +serde_json = "=1.0.85" +serde_repr = "=0.1.9" +sha2 = "0.10.2" +smallvec = "1.8" +socket2 = "0.4.7" +tar = "=0.4.38" +tokio = { version = "=1.21.1", features = ["full"] } +tokio-rustls = "0.23.3" +tokio-tungstenite = "0.16.1" +tokio-util = "=0.7.4" +url = { version = "2.3.1", features = ["serde", "expose_internals"] } +uuid = { version = "=1.1.2", features = ["v4"] } +zstd = "=0.11.2" + +# macros +proc-macro2 = "1" +quote = "1" +syn = { version = "1", features = ["full", "extra-traits"] } + +# unix +nix = "=0.24.2" + +# windows deps +fwdansi = "=1.1.0" +winres = "=0.1.12" +winapi = "=0.3.9" + # NB: the `bench` and `release` profiles must remain EXACTLY the same. [profile.release] codegen-units = 1 diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml index 9e48afb65..930c7b447 100644 --- a/bench_util/Cargo.toml +++ b/bench_util/Cargo.toml @@ -1,23 +1,24 @@ # Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. + [package] name = "deno_bench_util" version = "0.72.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true publish = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Bench and profiling utilities for deno crates" [lib] path = "lib.rs" [dependencies] -bencher = "0.1" -deno_core = { version = "0.160.0", path = "../core" } -once_cell = "1.10.0" -tokio = { version = "1.21", features = ["full"] } +bencher.workspace = true +deno_core.workspace = true +once_cell.workspace = true +tokio.workspace = true [[bench]] name = "op_baseline" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 24d37ec81..a260ef09d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -3,12 +3,12 @@ [package] name = "deno" version = "1.28.1" -authors = ["the Deno authors"] +authors.workspace = true default-run = "deno" -edition = "2021" +edition.workspace = true exclude = ["tests/testdata/npm/registry/*"] -license = "MIT" -repository = "https://github.com/denoland/deno" +license.workspace = true +repository.workspace = true description = "Provides the deno executable" [[bin]] @@ -26,103 +26,103 @@ harness = false path = "./bench/lsp_bench_standalone.rs" [build-dependencies] -deno_runtime = { version = "0.86.0", path = "../runtime" } -deno_core = { version = "0.160.0", path = "../core" } -regex = "=1.6.0" -serde = { version = "=1.0.144", features = ["derive"] } -serde_json = "1.0.64" -zstd = '=0.11.2' +deno_runtime.workspace = true +deno_core.workspace = true +regex.workspace = true +serde.workspace = true +serde_json.workspace = true +zstd.workspace = true glibc_version = "0.1.2" lzzzz = '1.0' [target.'cfg(windows)'.build-dependencies] -winapi = "=0.3.9" -winres = "=0.1.12" +winapi.workspace = true +winres.workspace = true [dependencies] -deno_ast = { version = "0.21.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] } -deno_core = { version = "0.160.0", path = "../core" } +deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] } +deno_core.workspace = true deno_doc = "0.49.1" deno_emit = "0.11.0" deno_graph = "0.38.0" deno_lint = { version = "0.35.0", features = ["docs"] } -deno_runtime = { version = "0.86.0", path = "../runtime" } +deno_runtime.workspace = true deno_task_shell = "0.7.2" -napi_sym = { path = "./napi_sym", version = "0.8.0" } +napi_sym.workspace = true -atty = "=0.2.14" +atty.workspace = true base32 = "=0.4.0" -base64 = "=0.13.1" -cache_control = "=0.2.0" +base64.workspace = true +cache_control.workspace = true 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.2.0" +data-url.workspace = true dissimilar = "=1.0.4" dprint-plugin-json = "=0.15.6" dprint-plugin-markdown = "=0.14.1" dprint-plugin-typescript = "=0.78.0" -encoding_rs = "=0.8.31" +encoding_rs.workspace = true env_logger = "=0.9.0" eszip = "=0.30.0" fancy-regex = "=0.10.0" -flate2 = "=1.0.24" -http = "=0.2.8" +flate2.workspace = true +http.workspace = true import_map = "=0.13.0" indexmap = "=1.9.1" indicatif = "=0.17.1" jsonc-parser = { version = "=0.21.0", features = ["serde"] } -libc = "=0.2.126" -log = { version = "=0.4.17", features = ["serde"] } +libc.workspace = true +log = { workspace = true, features = ["serde"] } lsp-types = "=0.93.2" # used by tower-lsp and "proposed" feature is unstable in patch releases lzzzz = '1.0' mitata = "=0.0.7" monch = "=0.4.0" -notify = "=5.0.0" -once_cell = "=1.14.0" -os_pipe = "=1.0.1" -percent-encoding = "=2.2.0" -pin-project = "1.0.11" # don't pin because they yank crates from cargo -rand = { version = "=0.8.5", features = ["small_rng"] } -regex = "=1.6.0" -ring = "=0.16.20" +notify.workspace = true +once_cell.workspace = true +os_pipe.workspace = true +percent-encoding.workspace = true +pin-project.workspace = true +rand = { workspace = true, features = ["small_rng"] } +regex.workspace = true +ring.workspace = true rustyline = { version = "=10.0.0", default-features = false, features = ["custom-bindings"] } rustyline-derive = "=0.7.0" secure_tempfile = { version = "=3.3.0", package = "tempfile" } # different name to discourage use in tests -semver = "=1.0.14" -serde = { version = "=1.0.144", features = ["derive"] } -serde_repr = "=0.1.9" +semver.workspace = true +serde.workspace = true +serde_repr.workspace = true shell-escape = "=0.1.5" -tar = "=0.4.38" +tar.workspace = true text-size = "=1.1.0" text_lines = "=0.6.0" -tokio = { version = "=1.21.1", features = ["full"] } -tokio-util = "=0.7.4" +tokio.workspace = true +tokio-util.workspace = true tower-lsp = { version = "=0.17.0", features = ["proposed"] } twox-hash = "=1.6.3" typed-arena = "=2.0.1" -uuid = { version = "=1.1.2", features = ["v4", "serde"] } +uuid = { workspace = true, features = ["serde"] } walkdir = "=2.3.2" -zstd = '=0.11.2' +zstd.workspace = true [target.'cfg(windows)'.dependencies] -fwdansi = "=1.1.0" +fwdansi.workspace = true junction = "=0.2.0" -winapi = { version = "=0.3.9", features = ["knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] } +winapi = { workspace = true, features = ["knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] } [target.'cfg(unix)'.dependencies] -nix = "=0.24.2" +nix.workspace = true [dev-dependencies] -deno_bench_util = { version = "0.72.0", path = "../bench_util" } +deno_bench_util.workspace = true dotenv = "=0.15.0" flaky_test = "=0.1.0" -once_cell = "=1.14.0" -os_pipe = "=1.0.1" -pretty_assertions = "=1.3.0" -test_util = { path = "../test_util" } +once_cell.workspace = true +os_pipe.workspace = true +pretty_assertions.workspace = true +test_util.workspace = true trust-dns-client = "=0.22.0" trust-dns-server = "=0.22.0" diff --git a/cli/napi_sym/Cargo.toml b/cli/napi_sym/Cargo.toml index b2472f024..e521cca76 100644 --- a/cli/napi_sym/Cargo.toml +++ b/cli/napi_sym/Cargo.toml @@ -1,9 +1,13 @@ +# Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. + [package] name = "napi_sym" version = "0.8.0" -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" +repository.workspace = true description = "proc macro for writing N-API symbols" [lib] @@ -11,8 +15,8 @@ path = "./lib.rs" proc-macro = true [dependencies] -proc-macro2 = "1" -quote = "1" -serde = { version = "1", features = ["derive"] } -serde_json = "1" -syn = { version = "1", features = ["full", "extra-traits"] } +proc-macro2.workspace = true +quote.workspace = true +serde.workspace = true +serde_json.workspace = true +syn.workspace = true diff --git a/core/Cargo.toml b/core/Cargo.toml index e61d88048..a1095c35b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,12 +1,13 @@ # Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. + [package] name = "deno_core" version = "0.160.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "A modern JavaScript/TypeScript runtime built with V8, Rust, and Tokio" [lib] @@ -17,25 +18,25 @@ default = ["v8_use_custom_libcxx"] v8_use_custom_libcxx = ["v8/use_custom_libcxx"] [dependencies] -anyhow = "1.0.57" -bytes = "1" -deno_ops = { path = "../ops", version = "0.38.0" } -futures = "0.3.21" +anyhow.workspace = true +bytes.workspace = true +deno_ops.workspace = true +futures.workspace = true # Stay on 1.6 to avoid a dependency cycle in ahash https://github.com/tkaitchuck/aHash/issues/95 # Projects not depending on ahash are unafected as cargo will pull any 1.X that is >= 1.6. indexmap = "1.6" -libc = "0.2.126" -log = "0.4.16" -once_cell = "1.10.0" -parking_lot = "0.12.0" -pin-project = "1.0.11" -serde = { version = "1.0.136", features = ["derive"] } -serde_json = { version = "1.0.79", features = ["preserve_order"] } -serde_v8 = { version = "0.71.0", path = "../serde_v8" } -smallvec = "1.8" +libc.workspace = true +log.workspace = true +once_cell.workspace = true +parking_lot.workspace = true +pin-project.workspace = true +serde.workspace = true +serde_json = { workspace = true, features = ["preserve_order"] } +serde_v8.workspace = true +smallvec.workspace = true sourcemap = "6.1" -url = { version = "2.3.1", features = ["serde", "expose_internals"] } -v8 = { version = "0.55.0", default-features = false } +url.workspace = true +v8.workspace = true [[example]] name = "http_bench_json_ops" @@ -43,5 +44,5 @@ path = "examples/http_bench_json_ops.rs" # These dependencies are only used for the 'http_bench_*_ops' examples. [dev-dependencies] -deno_ast = { version = "0.20.0", features = ["transpiling"] } -tokio = { version = "1.21", features = ["full"] } +deno_ast.workspace = true +tokio.workspace = true diff --git a/ext/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml index d3468c901..9e130b0af 100644 --- a/ext/broadcast_channel/Cargo.toml +++ b/ext/broadcast_channel/Cargo.toml @@ -3,18 +3,18 @@ [package] name = "deno_broadcast_channel" version = "0.72.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Implementation of BroadcastChannel API for Deno" [lib] path = "lib.rs" [dependencies] -async-trait = "0.1" -deno_core = { version = "0.160.0", path = "../../core" } -tokio = { version = "1.21", features = ["full"] } -uuid = { version = "1.0.0", features = ["v4"] } +async-trait.workspace = true +deno_core.workspace = true +tokio.workspace = true +uuid.workspace = true diff --git a/ext/cache/Cargo.toml b/ext/cache/Cargo.toml index dd0b8c87c..54302fb37 100644 --- a/ext/cache/Cargo.toml +++ b/ext/cache/Cargo.toml @@ -3,20 +3,20 @@ [package] name = "deno_cache" version = "0.10.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Implementation of Cache API for Deno" [lib] path = "lib.rs" [dependencies] -async-trait = "0.1" -deno_core = { version = "0.160.0", path = "../../core" } -rusqlite = { version = "0.28.0", features = ["unlock_notify", "bundled"] } -serde = { version = "1.0.129", features = ["derive"] } -sha2 = "0.10.2" -tokio = { version = "1.19", features = ["full"] } +async-trait.workspace = true +deno_core.workspace = true +rusqlite.workspace = true +serde.workspace = true +sha2.workspace = true +tokio.workspace = true diff --git a/ext/console/Cargo.toml b/ext/console/Cargo.toml index ecc728635..cafb79eeb 100644 --- a/ext/console/Cargo.toml +++ b/ext/console/Cargo.toml @@ -3,15 +3,15 @@ [package] name = "deno_console" version = "0.78.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Implementation of Console API for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } +deno_core.workspace = true diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml index de324e22a..ba4e628a1 100644 --- a/ext/crypto/Cargo.toml +++ b/ext/crypto/Cargo.toml @@ -3,11 +3,11 @@ [package] name = "deno_crypto" version = "0.92.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Web Cryptography API implementation for Deno" [lib] @@ -17,30 +17,30 @@ path = "lib.rs" aes = "0.8.1" aes-gcm = "0.10" aes-kw = { version = "0.2.1", features = ["alloc"] } -base64 = "0.13.0" +base64.workspace = true block-modes = "0.9.1" cbc = { version = "0.1.2", features = ["alloc"] } const-oid = "0.9.0" ctr = "0.9.1" # https://github.com/dalek-cryptography/curve25519-dalek/pull/397 curve25519-dalek = "2.1.3" -deno_core = { version = "0.160.0", path = "../../core" } -deno_web = { version = "0.109.0", path = "../web" } +deno_core.workspace = true +deno_web.workspace = true elliptic-curve = { version = "0.12.1", features = ["std", "pem"] } num-traits = "0.2.14" -once_cell = "1.10.0" +once_cell.workspace = true p256 = { version = "0.11.1", features = ["ecdh"] } p384 = "0.11.1" -rand = "0.8.4" -ring = { version = "0.16.20", features = ["std"] } +rand.workspace = true +ring = { workspace = true, features = ["std"] } rsa = { version = "=0.7.0-pre", default-features = false, features = ["std"] } sec1 = "0.3.0" -serde = { version = "1.0.129", features = ["derive"] } -serde_bytes = "0.11" +serde.workspace = true +serde_bytes.workspace = true sha-1 = "0.10.0" -sha2 = "0.10.2" +sha2.workspace = true spki = "0.6.0" -tokio = { version = "1.21", features = ["full"] } -uuid = { version = "1.0.0", features = ["v4"] } +tokio.workspace = true +uuid.workspace = true # https://github.com/dalek-cryptography/x25519-dalek/pull/89 x25519-dalek = "2.0.0-pre.1" diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml index ed5b54d85..c68a011e2 100644 --- a/ext/fetch/Cargo.toml +++ b/ext/fetch/Cargo.toml @@ -3,25 +3,25 @@ [package] name = "deno_fetch" version = "0.101.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Fetch API implementation for Deno" [lib] path = "lib.rs" [dependencies] -bytes = "1.1.0" -data-url = "0.2.0" -deno_core = { version = "0.160.0", path = "../../core" } -deno_tls = { version = "0.65.0", path = "../tls" } +bytes.workspace = true +data-url.workspace = true +deno_core.workspace = true +deno_tls.workspace = true dyn-clone = "1" -http = "0.2.6" -reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks"] } -serde = { version = "1.0.136", features = ["derive"] } -tokio = { version = "1.21", features = ["full"] } +http.workspace = true +reqwest.workspace = true +serde.workspace = true +tokio.workspace = true tokio-stream = "0.1.8" -tokio-util = { version = "0.7", features = ["io"] } +tokio-util = { workspace = true, features = ["io"] } diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml index 7ad922576..3da3881c3 100644 --- a/ext/ffi/Cargo.toml +++ b/ext/ffi/Cargo.toml @@ -3,23 +3,23 @@ [package] name = "deno_ffi" version = "0.65.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Dynamic library ffi for deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } -dlopen = "0.1.8" +deno_core.workspace = true +dlopen.workspace = true dynasmrt = "1.2.3" libffi = "3.0.0" -serde = { version = "1.0.129", features = ["derive"] } -tokio = { version = "1.21", features = ["full"] } +serde.workspace = true +tokio.workspace = true [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3.9", features = ["errhandlingapi", "minwindef", "ntdef", "winbase", "winnt"] } +winapi = { workspace = true, features = ["errhandlingapi", "minwindef", "ntdef", "winbase", "winnt"] } diff --git a/ext/flash/Cargo.toml b/ext/flash/Cargo.toml index 72355f730..9ef179488 100644 --- a/ext/flash/Cargo.toml +++ b/ext/flash/Cargo.toml @@ -3,28 +3,28 @@ [package] name = "deno_flash" version = "0.14.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Fast HTTP/1 server implementation for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { path = "../../core", version = "0.160.0" } -deno_tls = { version = "0.65.0", path = "../tls" } +deno_core.workspace = true +deno_tls.workspace = true # For HTTP/2 and websocket upgrades -deno_websocket = { version = "0.83.0", path = "../websocket" } -http = "0.2.6" +deno_websocket.workspace = true +http.workspace = true httparse = "1.8" -libc = "0.2" -log = "0.4.17" +libc.workspace = true +log.workspace = true mio = { version = "0.8.1", features = ["os-poll", "net"] } -rustls = { version = "0.20" } -rustls-pemfile = "1.0" -serde = { version = "1.0.136", features = ["derive"] } -socket2 = "0.4.7" -tokio = { version = "1.21", features = ["full"] } +rustls.workspace = true +rustls-pemfile.workspace = true +serde.workspace = true +socket2.workspace = true +tokio.workspace = true diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml index 243a75a2f..6f66b8474 100644 --- a/ext/http/Cargo.toml +++ b/ext/http/Cargo.toml @@ -3,11 +3,11 @@ [package] name = "deno_http" version = "0.72.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "HTTP server implementation for Deno" [lib] @@ -19,22 +19,22 @@ harness = false [dependencies] async-compression = { version = "0.3.12", features = ["tokio", "brotli", "gzip"] } -base64 = "0.13.0" +base64.workspace = true brotli = "3.3.4" -bytes = "1" -cache_control = "0.2.0" -deno_core = { version = "0.160.0", path = "../../core" } -deno_websocket = { version = "0.83.0", path = "../websocket" } -flate2 = "1.0.23" +bytes.workspace = true +cache_control.workspace = true +deno_core.workspace = true +deno_websocket.workspace = true +flate2.workspace = true fly-accept-encoding = "0.2.0" -hyper = { version = "0.14.18", features = ["server", "stream", "http1", "http2", "runtime"] } +hyper = { workspace = true, features = ["server", "stream", "http1", "http2", "runtime"] } mime = "0.3.16" -percent-encoding = "2.2.0" +percent-encoding.workspace = true phf = { version = "0.10", features = ["macros"] } -ring = "0.16.20" -serde = { version = "1.0.136", features = ["derive"] } -tokio = { version = "1.21", features = ["full"] } -tokio-util = { version = "0.7", features = ["io"] } +ring.workspace = true +serde.workspace = true +tokio.workspace = true +tokio-util = { workspace = true, features = ["io"] } [dev-dependencies] -bencher = "0.1" +bencher.workspace = true diff --git a/ext/napi/Cargo.toml b/ext/napi/Cargo.toml index 2909b2e38..378dba0f3 100644 --- a/ext/napi/Cargo.toml +++ b/ext/napi/Cargo.toml @@ -3,16 +3,16 @@ [package] name = "deno_napi" version = "0.8.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "NAPI implementation for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } +deno_core.workspace = true libloading = { version = "0.7" } diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml index 01997a064..31821dd1d 100644 --- a/ext/net/Cargo.toml +++ b/ext/net/Cargo.toml @@ -3,22 +3,22 @@ [package] name = "deno_net" version = "0.70.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Networking for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } -deno_tls = { version = "0.65.0", path = "../tls" } -log = "0.4.16" -serde = { version = "1.0.136", features = ["derive"] } -socket2 = "0.4.4" -tokio = { version = "1.21", features = ["full"] } +deno_core.workspace = true +deno_tls.workspace = true +log.workspace = true +serde.workspace = true +socket2.workspace = true +tokio.workspace = true trust-dns-proto = "0.22" trust-dns-resolver = { version = "0.22", features = ["tokio-runtime", "serde-config"] } diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml index b72e54130..edacfd832 100644 --- a/ext/node/Cargo.toml +++ b/ext/node/Cargo.toml @@ -3,19 +3,19 @@ [package] name = "deno_node" version = "0.15.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Node compatibility for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } -once_cell = "1.12.0" +deno_core.workspace = true +once_cell.workspace = true path-clean = "=0.1.0" -regex = "1" -serde = "1.0.136" +regex.workspace = true +serde = "1.0.144" diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml index 1071a89a4..599d056f6 100644 --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml @@ -3,22 +3,22 @@ [package] name = "deno_tls" version = "0.65.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "TLS for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } -once_cell = "1.10.0" -rustls = { version = "0.20.5", features = ["dangerous_configuration"] } +deno_core.workspace = true +once_cell.workspace = true +rustls = { workspace = true, features = ["dangerous_configuration"] } rustls-native-certs = "0.6.2" -rustls-pemfile = "1.0.0" -serde = { version = "1.0.136", features = ["derive"] } +rustls-pemfile.workspace = true +serde.workspace = true webpki = "0.22" webpki-roots = "0.22" diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml index eaa092900..d27b0cb30 100644 --- a/ext/url/Cargo.toml +++ b/ext/url/Cargo.toml @@ -3,25 +3,25 @@ [package] name = "deno_url" version = "0.78.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "URL API implementation for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } -serde = { version = "1.0.136", features = ["derive"] } -serde_repr = "0.1.7" +deno_core.workspace = true +serde.workspace = true +serde_repr.workspace = true urlpattern = "0.2.0" [dev-dependencies] -deno_bench_util = { version = "0.72.0", path = "../../bench_util" } -deno_webidl = { version = "0.78.0", path = "../webidl" } +deno_bench_util.workspace = true +deno_webidl.workspace = true [[bench]] name = "url_ops" diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml index 3bb02df6b..56e8bcbaf 100644 --- a/ext/web/Cargo.toml +++ b/ext/web/Cargo.toml @@ -3,30 +3,30 @@ [package] name = "deno_web" version = "0.109.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Collection of Web APIs" [lib] path = "lib.rs" [dependencies] -async-trait = "0.1.51" +async-trait.workspace = true base64-simd = "0.7" -deno_core = { version = "0.160.0", path = "../../core" } -encoding_rs = "0.8.31" -flate2 = "1" -serde = "1.0.136" -tokio = { version = "1.21", features = ["full"] } -uuid = { version = "1.0.0", features = ["v4", "serde"] } +deno_core.workspace = true +encoding_rs.workspace = true +flate2.workspace = true +serde = "1.0.144" +tokio.workspace = true +uuid = { workspace = true, features = ["serde"] } [dev-dependencies] -deno_bench_util = { version = "0.72.0", path = "../../bench_util" } -deno_url = { version = "0.78.0", path = "../url" } -deno_webidl = { version = "0.78.0", path = "../webidl" } +deno_bench_util.workspace = true +deno_url.workspace = true +deno_webidl.workspace = true [[bench]] name = "encoding" diff --git a/ext/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml index d952bc603..438f99289 100644 --- a/ext/webgpu/Cargo.toml +++ b/ext/webgpu/Cargo.toml @@ -3,16 +3,16 @@ [package] name = "deno_webgpu" version = "0.79.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" repository = "https://github.com/gfx-rs/wgpu" description = "WebGPU implementation for Deno" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } -serde = { version = "1.0", features = ["derive"] } -tokio = { version = "1.21", features = ["full"] } +deno_core.workspace = true +serde.workspace = true +tokio.workspace = true wgpu-core = { version = "0.13", features = ["trace", "replay", "serde"] } wgpu-types = { version = "0.13", features = ["trace", "replay", "serde"] } diff --git a/ext/webidl/Cargo.toml b/ext/webidl/Cargo.toml index 906846393..09228c9d5 100644 --- a/ext/webidl/Cargo.toml +++ b/ext/webidl/Cargo.toml @@ -3,15 +3,15 @@ [package] name = "deno_webidl" version = "0.78.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "WebIDL implementation for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } +deno_core.workspace = true diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml index 91823de7a..876b8f6ea 100644 --- a/ext/websocket/Cargo.toml +++ b/ext/websocket/Cargo.toml @@ -3,22 +3,22 @@ [package] name = "deno_websocket" version = "0.83.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Implementation of WebSocket API for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } -deno_tls = { version = "0.65.0", path = "../tls" } -http = "0.2.6" -hyper = { version = "0.14.18" } -serde = { version = "1.0.136", features = ["derive"] } -tokio = { version = "1.21", features = ["full"] } -tokio-rustls = "0.23.3" -tokio-tungstenite = { version = "0.16.1", features = ["rustls-tls-webpki-roots"] } +deno_core.workspace = true +deno_tls.workspace = true +http.workspace = true +hyper.workspace = true +serde.workspace = true +tokio.workspace = true +tokio-rustls.workspace = true +tokio-tungstenite = { workspace = true, features = ["rustls-tls-webpki-roots"] } diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml index 768485ce6..de3a3bc85 100644 --- a/ext/webstorage/Cargo.toml +++ b/ext/webstorage/Cargo.toml @@ -3,18 +3,18 @@ [package] name = "deno_webstorage" version = "0.73.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Implementation of WebStorage API for Deno" [lib] path = "lib.rs" [dependencies] -deno_core = { version = "0.160.0", path = "../../core" } -deno_web = { version = "0.109.0", path = "../web" } -rusqlite = { version = "0.28.0", features = ["unlock_notify", "bundled"] } -serde = { version = "1.0.136", features = ["derive"] } +deno_core.workspace = true +deno_web.workspace = true +rusqlite.workspace = true +serde.workspace = true diff --git a/ops/Cargo.toml b/ops/Cargo.toml index 19caa4d56..f0e7b8b0c 100644 --- a/ops/Cargo.toml +++ b/ops/Cargo.toml @@ -1,9 +1,13 @@ +# Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. + [package] name = "deno_ops" version = "0.38.0" -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" +repository.workspace = true description = "Proc macro for writing Deno Ops" [lib] @@ -11,16 +15,16 @@ path = "./lib.rs" proc-macro = true [dependencies] -once_cell = "1.10.0" +once_cell.workspace = true pmutil = "0.5.3" proc-macro-crate = "1.1.3" -proc-macro2 = "1" -quote = "1" -regex = "1.6.0" -syn = { version = "1", features = ["full", "extra-traits"] } +proc-macro2.workspace = true +quote.workspace = true +regex.workspace = true +syn.workspace = true [dev-dependencies] -deno_core = { path = "../core" } +deno_core.workspace = true prettyplease = "0.1.21" testing_macros = "0.2.7" -trybuild = "1.0.61" +trybuild = "1.0.71" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 05ea797ff..8613c14bd 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -3,10 +3,10 @@ [package] name = "deno_runtime" version = "0.86.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" -repository = "https://github.com/denoland/deno" +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Provides the deno runtime library" [features] @@ -22,85 +22,85 @@ name = "hello_runtime" path = "examples/hello_runtime.rs" [build-dependencies] -deno_broadcast_channel = { version = "0.72.0", path = "../ext/broadcast_channel" } -deno_cache = { version = "0.10.0", path = "../ext/cache" } -deno_console = { version = "0.78.0", path = "../ext/console" } -deno_core = { version = "0.160.0", path = "../core" } -deno_crypto = { version = "0.92.0", path = "../ext/crypto" } -deno_fetch = { version = "0.101.0", path = "../ext/fetch" } -deno_ffi = { version = "0.65.0", path = "../ext/ffi" } -deno_flash = { version = "0.14.0", path = "../ext/flash" } -deno_http = { version = "0.72.0", path = "../ext/http" } -deno_net = { version = "0.70.0", path = "../ext/net" } -deno_node = { version = "0.15.0", path = "../ext/node" } -deno_tls = { version = "0.65.0", path = "../ext/tls" } -deno_url = { version = "0.78.0", path = "../ext/url" } -deno_web = { version = "0.109.0", path = "../ext/web" } -deno_webgpu = { version = "0.79.0", path = "../ext/webgpu" } -deno_webidl = { version = "0.78.0", path = "../ext/webidl" } -deno_websocket = { version = "0.83.0", path = "../ext/websocket" } -deno_webstorage = { version = "0.73.0", path = "../ext/webstorage" } -deno_napi = { version = "0.8.0", path = "../ext/napi" } +deno_broadcast_channel.workspace = true +deno_cache.workspace = true +deno_console.workspace = true +deno_core.workspace = true +deno_crypto.workspace = true +deno_fetch.workspace = true +deno_ffi.workspace = true +deno_flash.workspace = true +deno_http.workspace = true +deno_net.workspace = true +deno_node.workspace = true +deno_tls.workspace = true +deno_url.workspace = true +deno_web.workspace = true +deno_webgpu.workspace = true +deno_webidl.workspace = true +deno_websocket.workspace = true +deno_webstorage.workspace = true +deno_napi.workspace = true -lzzzz = '1.0' +lzzzz.workspace = true [target.'cfg(windows)'.build-dependencies] -winres = "0.1.11" -winapi = "0.3.9" +winres.workspace = true +winapi.workspace = true [dependencies] -deno_broadcast_channel = { version = "0.72.0", path = "../ext/broadcast_channel" } -deno_cache = { version = "0.10.0", path = "../ext/cache" } -deno_console = { version = "0.78.0", path = "../ext/console" } -deno_core = { version = "0.160.0", path = "../core" } -deno_crypto = { version = "0.92.0", path = "../ext/crypto" } -deno_fetch = { version = "0.101.0", path = "../ext/fetch" } -deno_ffi = { version = "0.65.0", path = "../ext/ffi" } -deno_flash = { version = "0.14.0", path = "../ext/flash" } -deno_http = { version = "0.72.0", path = "../ext/http" } -deno_napi = { version = "0.8.0", path = "../ext/napi" } -deno_net = { version = "0.70.0", path = "../ext/net" } -deno_node = { version = "0.15.0", path = "../ext/node" } -deno_tls = { version = "0.65.0", path = "../ext/tls" } -deno_url = { version = "0.78.0", path = "../ext/url" } -deno_web = { version = "0.109.0", path = "../ext/web" } -deno_webgpu = { version = "0.79.0", path = "../ext/webgpu" } -deno_webidl = { version = "0.78.0", path = "../ext/webidl" } -deno_websocket = { version = "0.83.0", path = "../ext/websocket" } -deno_webstorage = { version = "0.73.0", path = "../ext/webstorage" } +deno_broadcast_channel.workspace = true +deno_cache.workspace = true +deno_console.workspace = true +deno_core.workspace = true +deno_crypto.workspace = true +deno_fetch.workspace = true +deno_ffi.workspace = true +deno_flash.workspace = true +deno_http.workspace = true +deno_napi.workspace = true +deno_net.workspace = true +deno_node.workspace = true +deno_tls.workspace = true +deno_url.workspace = true +deno_web.workspace = true +deno_webgpu.workspace = true +deno_webidl.workspace = true +deno_websocket.workspace = true +deno_webstorage.workspace = true -atty = "0.2.14" -dlopen = "0.1.8" -encoding_rs = "0.8.31" +atty.workspace = true +dlopen.workspace = true +encoding_rs.workspace = true filetime = "0.2.16" fs3 = "0.5.0" -http = "0.2.6" -hyper = { version = "0.14.18", features = ["server", "stream", "http1", "http2", "runtime"] } -libc = "0.2.126" -log = "0.4.16" -lzzzz = '1.0' +http.workspace = true +hyper = { workspace = true, features = ["server", "stream", "http1", "http2", "runtime"] } +libc.workspace = true +log.workspace = true +lzzzz.workspace = true netif = "0.1.6" -notify = "5.0" -once_cell = "1.10.0" -regex = "1.6.0" -ring = "0.16.20" -serde = { version = "1.0.136", features = ["derive"] } +notify.workspace = true +once_cell.workspace = true +regex.workspace = true +ring.workspace = true +serde.workspace = true signal-hook-registry = "1.4.0" termcolor = "1.1.3" -tokio = { version = "1.21", features = ["full"] } -uuid = { version = "1.0.0", features = ["v4"] } +tokio.workspace = true +uuid.workspace = true [target.'cfg(windows)'.dependencies] -fwdansi = "1.1.0" -winapi = { version = "0.3.9", features = ["commapi", "knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] } +fwdansi.workspace = true +winapi = { workspace = true, features = ["commapi", "knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] } ntapi = "0.4.0" [target.'cfg(unix)'.dependencies] -nix = "=0.24.2" +nix.workspace = true [dev-dependencies] # Used in benchmark -test_util = { path = "../test_util" } +test_util.workspace = true [package.metadata.docs.rs] features = ["docsrs"] diff --git a/serde_v8/Cargo.toml b/serde_v8/Cargo.toml index 228f0dc19..670025c9a 100644 --- a/serde_v8/Cargo.toml +++ b/serde_v8/Cargo.toml @@ -1,28 +1,29 @@ # Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. + [package] name = "serde_v8" version = "0.71.0" -authors = ["the Deno authors"] -edition = "2021" -license = "MIT" +authors.workspace = true +edition.workspace = true +license.workspace = true readme = "README.md" -repository = "https://github.com/denoland/deno" +repository.workspace = true description = "Rust to V8 serialization and deserialization" [lib] path = "lib.rs" [dependencies] -bytes = "=1.2.1" +bytes.workspace = true derive_more = "0.99.17" -serde = { version = "1.0.136", features = ["derive"] } -serde_bytes = "0.11" -smallvec = { version = "1.8", features = ["union"] } -v8 = { version = "0.55.0", default-features = false } +serde.workspace = true +serde_bytes.workspace = true +smallvec = { workspace = true, features = ["union"] } +v8.workspace = true [dev-dependencies] -bencher = "0.1" -serde_json = "1.0.64" +bencher.workspace = true +serde_json.workspace = true [[example]] name = "basic" diff --git a/test_ffi/Cargo.toml b/test_ffi/Cargo.toml index 38dd86b3e..3c588dbe8 100644 --- a/test_ffi/Cargo.toml +++ b/test_ffi/Cargo.toml @@ -3,13 +3,15 @@ [package] name = "test_ffi" version = "0.1.0" -authors = ["the deno authors"] -edition = "2021" +authors.workspace = true +edition.workspace = true +license.workspace = true publish = false +repository.workspace = true [lib] crate-type = ["cdylib"] [dev-dependencies] -pretty_assertions = "1.2.1" -test_util = { path = "../test_util" } +pretty_assertions.workspace = true +test_util.workspace = true diff --git a/test_napi/Cargo.toml b/test_napi/Cargo.toml index 407275563..5a81f1ea1 100644 --- a/test_napi/Cargo.toml +++ b/test_napi/Cargo.toml @@ -3,9 +3,11 @@ [package] name = "test_napi" version = "0.1.0" -authors = ["the deno authors"] -edition = "2021" +authors.workspace = true +edition.workspace = true +license.workspace = true publish = false +repository.workspace = true [lib] crate-type = ["cdylib"] @@ -14,7 +16,7 @@ crate-type = ["cdylib"] napi-sys = { version = "2.2.2", default-features = false, features = ["napi7"] } [dev-dependencies] -test_util = { path = "../test_util" } +test_util.workspace = true [build-dependencies] napi-build = "1" diff --git a/test_util/Cargo.toml b/test_util/Cargo.toml index ac3858499..45fa76881 100644 --- a/test_util/Cargo.toml +++ b/test_util/Cargo.toml @@ -3,42 +3,44 @@ [package] name = "test_util" version = "0.1.0" -authors = ["the Deno authors"] -edition = "2021" +authors.workspace = true +edition.workspace = true +license.workspace = true publish = false +repository.workspace = true [[bin]] name = "test_server" path = "src/test_server.rs" [dependencies] -anyhow = "1.0.57" +anyhow.workspace = true async-stream = "0.3.3" -atty = "0.2.14" -base64 = "0.13.0" -flate2 = "1.0.24" -futures = "0.3.21" -hyper = { version = "0.14.18", features = ["server", "http1", "http2", "runtime"] } +atty.workspace = true +base64.workspace = true +flate2.workspace = true +futures.workspace = true +hyper = { workspace = true, features = ["server", "http1", "http2", "runtime"] } lazy_static = "1.4.0" -once_cell = "1.10.0" -os_pipe = "1.0.1" -parking_lot = "0.12.0" -pretty_assertions = "1.3" -regex = "1.6.0" -reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks"] } -ring = "0.16.20" -rustls-pemfile = "1.0.0" -semver = "1.0" -serde = { version = "1.0.136", features = ["derive"] } -serde_json = "1.0.79" -tar = "0.4.38" -tokio = { version = "1.21", features = ["full"] } -tokio-rustls = "0.23" -tokio-tungstenite = "0.16" -url = { version = "2.3.1", features = ["serde", "expose_internals"] } +once_cell.workspace = true +os_pipe.workspace = true +parking_lot.workspace = true +pretty_assertions.workspace = true +regex.workspace = true +reqwest.workspace = true +ring.workspace = true +rustls-pemfile.workspace = true +semver.workspace = true +serde.workspace = true +serde_json.workspace = true +tar.workspace = true +tokio.workspace = true +tokio-rustls.workspace = true +tokio-tungstenite.workspace = true +url.workspace = true [target.'cfg(unix)'.dependencies] pty = "0.2.2" [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3.9", features = ["consoleapi", "synchapi", "handleapi", "namedpipeapi", "winbase", "winerror"] } +winapi = { workspace = true, features = ["consoleapi", "synchapi", "handleapi", "namedpipeapi", "winbase", "winerror"] } diff --git a/tools/deno.lock.json b/tools/deno.lock.json index 06d62b2e7..94fbf22c8 100644 --- a/tools/deno.lock.json +++ b/tools/deno.lock.json @@ -66,46 +66,6 @@ "https://cdn.skypack.dev/-/universal-user-agent@v6.0.0-fUAPE3UH5QP7qG0fd0dH/dist=es2019,mode=imports/optimized/universal-user-agent.js": "24df9219684b303ca065c02733e601d11b3ed63a35ec8e473094006d65f6ded9", "https://cdn.skypack.dev/-/wrappy@v1.0.2-e8nLh7Qms0NRhbAbUpJP/dist=es2019,mode=imports/optimized/wrappy.js": "01dc1f36207f5400dad37bac2acddb2de0466953f289b8c84b7100e8b160fbb2", "https://cdn.skypack.dev/@octokit/core@3?dts": "7a987f1931a3102f29bb54a0ee09a9d4c99555e6a4cae98dd1e0127c9929dd36", - "https://deno.land/std@0.108.0/_util/assert.ts": "2f868145a042a11d5ad0a3c748dcf580add8a0dbc0e876eaa0026303a5488f58", - "https://deno.land/std@0.108.0/_util/os.ts": "dfb186cc4e968c770ab6cc3288bd65f4871be03b93beecae57d657232ecffcac", - "https://deno.land/std@0.108.0/archive/tar.ts": "ec86fe4a11478616c50d1f9bd5f322fde5fe56a17f95fc9d76c126df3b6a03ac", - "https://deno.land/std@0.108.0/async/deadline.ts": "1d6ac7aeaee22f75eb86e4e105d6161118aad7b41ae2dd14f4cfd3bf97472b93", - "https://deno.land/std@0.108.0/async/debounce.ts": "b2f693e4baa16b62793fd618de6c003b63228db50ecfe3bd51fc5f6dc0bc264b", - "https://deno.land/std@0.108.0/async/deferred.ts": "ab60d46ba561abb3b13c0c8085d05797a384b9f182935f051dc67136817acdee", - "https://deno.land/std@0.108.0/async/delay.ts": "db68b7c22518ea9805be110cdc914017d741894d2bececf4d78607fd2f0548e7", - "https://deno.land/std@0.108.0/async/mod.ts": "78425176fabea7bd1046ce3819fd69ce40da85c83e0f174d17e8e224a91f7d10", - "https://deno.land/std@0.108.0/async/mux_async_iterator.ts": "62abff3af9ff619e8f2adc96fc70d4ca020fa48a50c23c13f12d02ed2b760dbe", - "https://deno.land/std@0.108.0/async/pool.ts": "353ce4f91865da203a097aa6f33de8966340c91b6f4a055611c8c5d534afd12f", - "https://deno.land/std@0.108.0/async/tee.ts": "63811ea47268825db2b15e973dc5c37bab37b749ffa00d2b7bbb6c6f568412cb", - "https://deno.land/std@0.108.0/bytes/bytes_list.ts": "3bff6a09c72b2e0b1e92e29bd3b135053894196cca07a2bba842901073efe5cb", - "https://deno.land/std@0.108.0/bytes/mod.ts": "440684e07e8f57a19a43b34d57eb63af0b36fc92b6657b6dcdbf9d5612d62e29", - "https://deno.land/std@0.108.0/fmt/colors.ts": "8368ddf2d48dfe413ffd04cdbb7ae6a1009cf0dccc9c7ff1d76259d9c61a0621", - "https://deno.land/std@0.108.0/fs/_util.ts": "f2ce811350236ea8c28450ed822a5f42a0892316515b1cd61321dec13569c56b", - "https://deno.land/std@0.108.0/fs/ensure_dir.ts": "b7c103dc41a3d1dbbb522bf183c519c37065fdc234831a4a0f7d671b1ed5fea7", - "https://deno.land/std@0.108.0/fs/ensure_file.ts": "c06031af24368e80c330897e4b8e9109efc8602ffabc8f3e2306be07529e1d13", - "https://deno.land/std@0.108.0/io/buffer.ts": "3ead6bb11276ebcf093c403f74f67fd2205a515dbbb9061862c468ca56f37cd8", - "https://deno.land/std@0.108.0/io/bufio.ts": "988237679157f1331a1e81afeac42f8364ab8dc583380d67db7e4cbad3e22e81", - "https://deno.land/std@0.108.0/io/readers.ts": "17403919724fef2f343c88555606368868a5c752a1099ad801f6a381c170f62d", - "https://deno.land/std@0.108.0/io/types.d.ts": "89a27569399d380246ca7cdd9e14d5e68459f11fb6110790cc5ecbd4ee7f3215", - "https://deno.land/std@0.108.0/io/util.ts": "85c33d61b20fd706acc094fe80d4c8ae618b04abcf3a96ca2b47071842c1c8ac", - "https://deno.land/std@0.108.0/node/_errors.ts": "74d1e7c7aad0f4a04df20be1f25f8a0a1d39483a75daabefa2cb285b0090e6e5", - "https://deno.land/std@0.108.0/node/_util/_util_callbackify.ts": "f2ac50a47572dde37612a52c7b337afeefb6faafdb849184487e06436334a5ab", - "https://deno.land/std@0.108.0/node/_util/_util_promisify.ts": "2ad6efe685f73443d5ed6ae009999789a8de4a0f01e6d2afdf242b4515477ee2", - "https://deno.land/std@0.108.0/node/_util/_util_types.ts": "ae3d21e07c975f06590ab80bbde8173670d70ff40546267c0c1df869fc2ff00c", - "https://deno.land/std@0.108.0/node/_utils.ts": "c32d3491e380488728d65ad471698ed0aadff7fe35bde0a26ba4dd8f434ed0e7", - "https://deno.land/std@0.108.0/node/events.ts": "d99b2b5fdce543b537ff5f2204067fe545c556f7d391063c6187bcdcf8145513", - "https://deno.land/std@0.108.0/node/util.ts": "23878bd3ee67a52e67cfe5acb78c7ccce9c54735c6d280b069577605e8679935", - "https://deno.land/std@0.108.0/path/_constants.ts": "1247fee4a79b70c89f23499691ef169b41b6ccf01887a0abd131009c5581b853", - "https://deno.land/std@0.108.0/path/_interface.ts": "1fa73b02aaa24867e481a48492b44f2598cd9dfa513c7b34001437007d3642e4", - "https://deno.land/std@0.108.0/path/_util.ts": "2e06a3b9e79beaf62687196bd4b60a4c391d862cfa007a20fc3a39f778ba073b", - "https://deno.land/std@0.108.0/path/common.ts": "f41a38a0719a1e85aa11c6ba3bea5e37c15dd009d705bd8873f94c833568cbc4", - "https://deno.land/std@0.108.0/path/glob.ts": "46708a3249cb5dc4a116cae3055114d6339bd5f0c1f412db6a4e0cb44c828a7d", - "https://deno.land/std@0.108.0/path/mod.ts": "4465dc494f271b02569edbb4a18d727063b5dbd6ed84283ff906260970a15d12", - "https://deno.land/std@0.108.0/path/posix.ts": "34349174b9cd121625a2810837a82dd8b986bbaaad5ade690d1de75bbb4555b2", - "https://deno.land/std@0.108.0/path/separator.ts": "8fdcf289b1b76fd726a508f57d3370ca029ae6976fcde5044007f062e643ff1c", - "https://deno.land/std@0.108.0/path/win32.ts": "2edb2f71f10578ee1168de01a8cbd3c65483e45a46bc2fa3156a0c6bfbd2720d", - "https://deno.land/std@0.108.0/testing/_diff.ts": "ccd6c3af6e44c74bf1591acb1361995f5f50df64323a6e7fb3f16c8ea792c940", - "https://deno.land/std@0.108.0/testing/asserts.ts": "6b0d6ba564bdff807bd0f0e93e02c48aa3177acf19416bf84a7f420191ef74cd", "https://deno.land/std@0.147.0/_deno_unstable.ts": "be3276fd42cffb49f51b705c4b0aa8656aaf2a34be22d769455c8e50ea38e51a", "https://deno.land/std@0.147.0/_util/assert.ts": "e94f2eb37cebd7f199952e242c77654e43333c1ac4c5c700e929ea3aa5489f74", "https://deno.land/std@0.147.0/_util/os.ts": "3b4c6e27febd119d36a416d7a97bd3b0251b77c88942c8f16ee5953ea13e2e49", @@ -138,65 +98,31 @@ "https://deno.land/std@0.147.0/path/separator.ts": "fe1816cb765a8068afb3e8f13ad272351c85cbc739af56dacfc7d93d710fe0f9", "https://deno.land/std@0.147.0/path/win32.ts": "bd7549042e37879c68ff2f8576a25950abbfca1d696d41d82c7bca0b7e6f452c", "https://deno.land/std@0.147.0/streams/conversion.ts": "fc3db02026183da795fa32ac7549868e9f19c75ba029d4b4c3739af62b48517a", - "https://deno.land/x/compress@v0.4.1/deps.ts": "b23619920334f637497a5a236e40ec259707463fdc3692fdb375b6399fc0280a", - "https://deno.land/x/compress@v0.4.1/gzip/gzip.ts": "4bf22e9cd3368332928324dd9443ef72cabd05e9234e5a37dd7b3517d50e945e", - "https://deno.land/x/compress@v0.4.1/gzip/gzip_file.ts": "b044ec0df4266c084baa033a4ab5394882e44a86d09d5616636467dcb39c671d", - "https://deno.land/x/compress@v0.4.1/gzip/gzip_stream.ts": "6781cf0e47648e3e5631cba4cc2cd018a24935ce09fdaa86e0cabcf78b5012df", - "https://deno.land/x/compress@v0.4.1/gzip/mod.ts": "4ade8edbe01b54a84f289351e137ebdfc040a74cd616636770cf1724fbf522d1", - "https://deno.land/x/compress@v0.4.1/gzip/writer_gunzip.ts": "5aba34394820b835c414048ac2e15f52d443f1f773ebe61fd2517c938572d616", - "https://deno.land/x/compress@v0.4.1/gzip/writer_gzip.ts": "c7aad0c51ab4f5952c068088186339cfc79a2ee1e057d6e16731b1175f342645", - "https://deno.land/x/compress@v0.4.1/utils/uint8.ts": "9c82e09c065f1f4bc648e3b14df441b43a7960fc7bdb29e9fb8d3a69c7e9d425", - "https://deno.land/x/compress@v0.4.1/zlib/deflate.ts": "e1e3b406dcc3e20021e53cde427b4b9ced752b72df820de73fec17c6e5ba999e", - "https://deno.land/x/compress@v0.4.1/zlib/inflate.ts": "618cc3dd25d202bf6b89d92f3ab2865e7495884cafce950638c77cbc1537aeb1", - "https://deno.land/x/compress@v0.4.1/zlib/mod.ts": "4dca9c1e934b7ab27f31c318abd7bfd39b09be96fd76ba27bd46f3a4e73b4ad0", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/adler32.ts": "e34c7596d63a655755c4b0a44a40d4f9c1d1c4d3b891e5c1f3f840f8939e1940", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/crc32.ts": "b9bc4adaf327d32585205d1176bd52f6453c06dd1040544611d4c869e638119c", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/deflate.ts": "8d1dd88630279313e50deed4fe5feefe8128307cc48fa560e659b5234ab09d83", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/gzheader.ts": "11e6da7383447aae9791308dc2350a809fa341a876a2da396b03a2a31408c20c", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/inffast.ts": "282daf5ea16bb876d26e342f3c24fe1a8ec84640e713a970b02232955a853f86", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/inflate.ts": "76751c1a5b18d70a929fa31ce4959db0bde1b9097bfa1b5ea3b4d1fba2ab92fa", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/inftrees.ts": "8a6d765a5c42bf3b6990060cabbe52e88493f8ce6d082e6e35d97756914cfb8e", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/messages.ts": "c82229bd67ccc3b6162f3aca1c5e7f936e546aa91ac9a9ac4fcfefc3a9dc5ac8", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/status.ts": "5987864d2d43d59bbbfa2e6ef4d5a07284c1d10489cc5843ddf41ac547957ac3", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/trees.ts": "6b65a767646e031e87e7b725ffad0c511fe701f393a01652e1e7ee8884f60fee", - "https://deno.land/x/compress@v0.4.1/zlib/zlib/zstream.ts": "c110fd5919235e317d64933852e24a1bba0126202be592e90e58f7b19315ad93", - "https://deno.land/x/crc32@v0.2.0/mod.ts": "de7a3fa2d4ef24b96fc21e1cc4d2d65d1d2b1dcea92f63960e3e11bfa82df0fa", - "https://deno.land/x/dax@0.7.1/lib/rs_lib.generated.js": "c4d29beff18383609dd91f23f2bf39617f4d3f350aabf4499f43fd95448fb651", - "https://deno.land/x/dax@0.7.1/mod.ts": "a738ad8a6910edab7c334b32cf03679cd2594bfa405debf8af03df82c6ab3e81", - "https://deno.land/x/dax@0.7.1/src/command.ts": "a62691337a0d9aff3eeb7d4ff688d0e0e56750fca9b1372aa875d007067ca08c", - "https://deno.land/x/dax@0.7.1/src/commands/cd.ts": "cb3c00decd8037ff9505bfb19f0dabfa8f151ad22efdfa9a27618c5733deb0da", - "https://deno.land/x/dax@0.7.1/src/commands/echo.ts": "9803a078dca3b65b08b892e35d885468f3a3569be38c84e39758256811d0d756", - "https://deno.land/x/dax@0.7.1/src/commands/export.ts": "754a1600a441e18545a7d5a239437f8e823bfd7079cc637989d2473507f3a62b", - "https://deno.land/x/dax@0.7.1/src/commands/sleep.ts": "8b5dffa3742a3f8ad2a93e81120e56857814be3d9d41e3ee2dd8d616ff121c8a", - "https://deno.land/x/dax@0.7.1/src/common.ts": "c43b15084a6c6b8675f012eb48daabf3f7dc89e76b2160eb559e762d65d4f643", - "https://deno.land/x/dax@0.7.1/src/deps.ts": "a6ad51c3ca8d4411e5768ce4e943349d272c43a1e943fdb46f2f62dc59a91155", - "https://deno.land/x/dax@0.7.1/src/pipes.ts": "84eda4be883b90fc950e54770e1c809a68d395790da3e4064c6f7b28702bf354", - "https://deno.land/x/dax@0.7.1/src/request.ts": "aa25ac908adb33d8e8ec45cfded9387959667c1b565da75a5df93f357d9c1080", - "https://deno.land/x/dax@0.7.1/src/result.ts": "c0cd24e377548990f3de240606bd1a205c0428c0252bd7c5ef9be92a93d54ffc", - "https://deno.land/x/dax@0.7.1/src/shell.ts": "cdab0db18654d2bf5058e8d220cdbefc308c6b2549bb56e8d01aea5ce5a7b60a", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/build/deno-wasm/deno-wasm.js": "82c270a48886f86e0e9ea6e5e70a6e37836181466cb9a41942420c884e0d3db9", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/deno-dom-wasm.ts": "097cb6382dd8a335f9409e899873a103d7fbe7cbe06b32fd11b5bbc58305f6dc", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/api.ts": "fe91e8c83ce491d0bd5fe5d0ae4c7c99754b88cb6e69e818683e10e43e01bf10", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/constructor-lock.ts": "4c07b7d2b102c1d71a57b404176b55e8680c99d6880acd210f9afe8b8fced441", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/deserialize.ts": "4fe99c4f11255e4868a865ed0c63aad3ca38e6356168e481cf195eda77dbdc44", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/dom/document.ts": "56fd98bdf465d54061b58c2879d43b6ee1b9f3f8026817678e1592e544556596", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/dom/dom-parser.ts": "312469f5d46c830fa8f506e3a2336d4d6f311f9a838d10670c5d05346273560f", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/dom/element.ts": "16f73441fc08514118fa80a7058a0f9d25e0f0de646ae3e550622d81f4035e50", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/dom/html-collection.ts": "f1aa6f452489557c0f1622e3415eaae15ad70bcee29c7305d29b91693e185837", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/dom/node-list.ts": "ba890ee68928c5b91c38bdf5c114f5b414e1ff20781e544b1b1f98feeec6ca36", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/dom/node.ts": "565e2382e4f0ed4ec2416e71280516103f90f43f6fa0d72ae3b270e39a588327", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/dom/nwsapi-types.ts": "54601c41f8ab524b565550cd764864d9cf109010619b8ce769cfa59cc3be4ed1", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/dom/nwsapi.js": "8a52f4d0b8d0371bfeefed5314f90b5623fcdfc2e4450b0ae54eb137f778a634", - "https://deno.land/x/deno_dom@v0.1.3-alpha2/src/parser.ts": "bda4ab4a1c9a2e156877f33ee4e60caac935a7c995a86bbe026bdc0f0d31b8c1", + "https://deno.land/x/dax@0.11.0/lib/rs_lib.generated.js": "c4d29beff18383609dd91f23f2bf39617f4d3f350aabf4499f43fd95448fb651", + "https://deno.land/x/dax@0.11.0/mod.ts": "e30eadd6dd8a886432b664d6cc0cf96a6e35957c288ca76bcbd21c0bbb614d36", + "https://deno.land/x/dax@0.11.0/src/command.ts": "efb6fc33fd1c271f18f735f3ff0ee81e33c134f78bca119362273d60b094b558", + "https://deno.land/x/dax@0.11.0/src/command_handler.ts": "b4e9ad8a95015a926c93e467a074574b2f98e7209e4d48439cfb4bfd9be4946e", + "https://deno.land/x/dax@0.11.0/src/commands/cd.ts": "15a75fb42646445fb6a061af1f52c63253c7c45accdbc801a92a5b00f1cf212c", + "https://deno.land/x/dax@0.11.0/src/commands/echo.ts": "2af0b8f33a688a972540848487cb6a045debe504edcc5eb40bd9eb4aad6058c4", + "https://deno.land/x/dax@0.11.0/src/commands/exit.ts": "36759cba6494062891216794bffa61803a6d547fe05a5a5da76a7daa31b8968a", + "https://deno.land/x/dax@0.11.0/src/commands/export.ts": "b7fd3e55e744d83735013c8c35e629ff4533b0d5929cc1d0d60af68718ff902d", + "https://deno.land/x/dax@0.11.0/src/commands/sleep.ts": "63805137d7113314e4c104d87a102ca50b55642d6cf450cba1533f973c81123a", + "https://deno.land/x/dax@0.11.0/src/commands/test.ts": "50ccc3fc02a6d3c01700f93a70b42594e2e6bc41955ed0f5b06eb6da8eb8335b", + "https://deno.land/x/dax@0.11.0/src/common.ts": "cb00a20e264e4a48d3e8261617c270677a62fbdf082358aaca9c907073e58d03", + "https://deno.land/x/dax@0.11.0/src/deps.ts": "a6ad51c3ca8d4411e5768ce4e943349d272c43a1e943fdb46f2f62dc59a91155", + "https://deno.land/x/dax@0.11.0/src/pipes.ts": "ee0e31f99bd0ddb33173196a7a0af1156ae7a43f83ac1a4f405e2e5653d97685", + "https://deno.land/x/dax@0.11.0/src/request.ts": "aa25ac908adb33d8e8ec45cfded9387959667c1b565da75a5df93f357d9c1080", + "https://deno.land/x/dax@0.11.0/src/result.ts": "c0cd24e377548990f3de240606bd1a205c0428c0252bd7c5ef9be92a93d54ffc", + "https://deno.land/x/dax@0.11.0/src/shell.ts": "39b51f147f082a8a44e55b595d434374585f25a504d92805595cd852d9f5bab8", "https://deno.land/x/semver@v1.4.0/mod.ts": "c3e08f7f0a3e625015ecc9a46cf79a9dc3f081f3c5b3037d3c49c0773e58d265", "https://deno.land/x/which@0.2.1/mod.ts": "2e076cb85aea9798662b355fb613d27eebcc78dfc8934ece4ae932f6303f6ca8", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/cargo.ts": "9410b216fa45a203cec84a518672650a1605abf508f006d65b8f733b318b2000", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/crate.ts": "11d61f61d85943c1243b5c2e4694506883366e40599fe9fc2c64c43fce8760e7", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/crates_io.ts": "3ff42c79874ab1a422849381d8e8bd2397aeda206aef34e0022f691d1b2090e0", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/deps.ts": "4cdcd195ea494d3d5dce08e561f8bb12e63486402f742b00e168645add84de17", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/github_actions.ts": "3c4b334a94cfb0f6838d9cf30041ad3316c744ffc75cae7b5aad54b61b6c15de", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/helpers.ts": "5e6f51b15b94db597162f4bcea7e275ef0e0eccbaec940393d8dbabf44c195d7", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/mod.ts": "a5a905605448b872bb5671a3c36f6f022a32509f9bff8a932c68b7db9e1d5cd5", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/releases_md.ts": "b30eb02a3ea3da70807c491dc4fe5b8185b91b84fc33bb27a6f2cd8a2aa09c7c", - "https://raw.githubusercontent.com/denoland/automation/0.12.2/repo.ts": "5185c18effbddda1caa21e1353ab57e56a2bf03a918769b98202da8ef9a25811" + "https://raw.githubusercontent.com/denoland/automation/0.16.0/cargo.ts": "9410b216fa45a203cec84a518672650a1605abf508f006d65b8f733b318b2000", + "https://raw.githubusercontent.com/denoland/automation/0.16.0/crate.ts": "acb84ac48b4e769437def38f683ab2f1bcefe92a4a6d307b8c897db5f4969caa", + "https://raw.githubusercontent.com/denoland/automation/0.16.0/crates_io.ts": "22fe929e7d58a2a23b4c9bf4b11979144efb31f77791b1f0dfc969777c489bf3", + "https://raw.githubusercontent.com/denoland/automation/0.16.0/deps.ts": "b216c87ccf427d8043d8d5cf0221838d444b72c03a057b8c4214e1571a42a8f1", + "https://raw.githubusercontent.com/denoland/automation/0.16.0/github_actions.ts": "3c4b334a94cfb0f6838d9cf30041ad3316c744ffc75cae7b5aad54b61b6c15de", + "https://raw.githubusercontent.com/denoland/automation/0.16.0/helpers.ts": "5e6f51b15b94db597162f4bcea7e275ef0e0eccbaec940393d8dbabf44c195d7", + "https://raw.githubusercontent.com/denoland/automation/0.16.0/mod.ts": "a5a905605448b872bb5671a3c36f6f022a32509f9bff8a932c68b7db9e1d5cd5", + "https://raw.githubusercontent.com/denoland/automation/0.16.0/releases_md.ts": "b30eb02a3ea3da70807c491dc4fe5b8185b91b84fc33bb27a6f2cd8a2aa09c7c", + "https://raw.githubusercontent.com/denoland/automation/0.16.0/repo.ts": "5185c18effbddda1caa21e1353ab57e56a2bf03a918769b98202da8ef9a25811" } diff --git a/tools/release/deps.ts b/tools/release/deps.ts index 63215247f..976a83733 100644 --- a/tools/release/deps.ts +++ b/tools/release/deps.ts @@ -1,4 +1,4 @@ // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. -export * from "https://raw.githubusercontent.com/denoland/automation/0.12.2/mod.ts"; -export * from "https://raw.githubusercontent.com/denoland/automation/0.12.2/github_actions.ts"; +export * from "https://raw.githubusercontent.com/denoland/automation/0.16.0/mod.ts"; +export * from "https://raw.githubusercontent.com/denoland/automation/0.16.0/github_actions.ts"; diff --git a/tools/wgpu_sync.js b/tools/wgpu_sync.js index 06dbe7381..4d343878b 100755 --- a/tools/wgpu_sync.js +++ b/tools/wgpu_sync.js @@ -1,7 +1,7 @@ #!/usr/bin/env -S deno run --unstable --allow-read --allow-write --allow-run // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. -import { join, ROOT_PATH, walk } from "./util.js"; +import { join, ROOT_PATH } from "./util.js"; const COMMIT = "076df1a56812eee01614b7a3a4c88798012e79ab"; const REPO = "gfx-rs/wgpu"; @@ -37,17 +37,11 @@ async function checkoutUpstream() { await bash(cmd); } -async function denoCoreVersion() { - const coreCargo = join(ROOT_PATH, "core", "Cargo.toml"); - const contents = await Deno.readTextFile(coreCargo); - return contents.match(/^version = "(\d+\.\d+\.\d+)"$/m)[1]; -} - async function denoWebgpuVersion() { - const coreCargo = join(ROOT_PATH, "runtime", "Cargo.toml"); + const coreCargo = join(ROOT_PATH, "Cargo.toml"); const contents = await Deno.readTextFile(coreCargo); return contents.match( - /^deno_webgpu = { version = "(\d+\.\d+\.\d+)", path = "..\/ext\/webgpu" }$/m, + /^deno_webgpu = { version = "(\d+\.\d+\.\d+)", path = ".\/ext\/webgpu" }$/m, )[1]; } @@ -58,18 +52,12 @@ async function patchFile(path, patcher) { } async function patchCargo() { - const vDenoCore = await denoCoreVersion(); const vDenoWebgpu = await denoWebgpuVersion(); await patchFile( join(TARGET_DIR, "Cargo.toml"), (data) => data .replace(/^version = .*/m, `version = "${vDenoWebgpu}"`) - .replace(`edition = "2018"`, `edition = "2021"`) - .replace( - /^deno_core \= .*$/gm, - `deno_core = { version = "${vDenoCore}", path = "../../core" }`, - ) .replace( /^wgpu-core \= .*$/gm, `wgpu-core = { version = "${V_WGPU}", features = ["trace", "replay", "serde"] }`, @@ -97,23 +85,11 @@ async function patchSrcLib() { ); } -async function patchCopyrights() { - const walker = walk(TARGET_DIR, { includeDirs: false }); - for await (const entry of walker) { - await patchFile( - entry.path, - (data) => - data.replace(/^\/\/ Copyright 2018-2021/, "// Copyright 2018-2022"), - ); - } -} - async function main() { await clearTargetDir(); await checkoutUpstream(); await patchCargo(); await patchSrcLib(); - await patchCopyrights(); await bash(join(ROOT_PATH, "tools", "format.js")); } |