diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 32374ae9bf..6230f89521 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -5,7 +5,11 @@ import * as yaml from "https://deno.land/std@0.173.0/encoding/yaml.ts"; // Bump this number when you want to purge the cache. // Note: the tools/release/01_bump_crate_versions.ts script will update this version // automatically via regex, so ensure that this line maintains this format. +<<<<<<< HEAD const cacheVersion = 78; +======= +const cacheVersion = 79; +>>>>>>> 0d7662e15 (1.41.3 (#22925)) const ubuntuX86Runner = "ubuntu-22.04"; const ubuntuX86XlRunner = "ubuntu-22.04-xl"; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 531a9875fe..2976e5a356 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -356,8 +356,13 @@ jobs: path: |- ~/.cargo/registry/index ~/.cargo/registry/cache +<<<<<<< HEAD key: '78-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}' restore-keys: '78-cargo-home-${{ matrix.os }}-${{ matrix.arch }}' +======= + key: '79-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}' + restore-keys: '79-cargo-home-${{ matrix.os }}-${{ matrix.arch }}' +>>>>>>> 0d7662e15 (1.41.3 (#22925)) if: '!(matrix.skip)' - name: Restore cache build output (PR) uses: actions/cache/restore@v4 @@ -369,7 +374,11 @@ jobs: !./target/*/*.zip !./target/*/*.tar.gz key: never_saved +<<<<<<< HEAD restore-keys: '78-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-' +======= + restore-keys: '79-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-' +>>>>>>> 0d7662e15 (1.41.3 (#22925)) - name: Apply and update mtime cache if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))' uses: ./.github/mtime_cache @@ -663,7 +672,11 @@ jobs: !./target/*/gn_out !./target/*/*.zip !./target/*/*.tar.gz +<<<<<<< HEAD key: '78-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' +======= + key: '79-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' +>>>>>>> 0d7662e15 (1.41.3 (#22925)) publish-canary: name: publish canary runs-on: ubuntu-22.04 diff --git a/Cargo.lock b/Cargo.lock index 50005a04b4..221e21fd75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1025,7 +1025,11 @@ dependencies = [ [[package]] name = "deno" +<<<<<<< HEAD version = "1.41.2" +======= +version = "1.41.3" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "async-trait", "base32", @@ -1171,7 +1175,11 @@ dependencies = [ [[package]] name = "deno_bench_util" +<<<<<<< HEAD version = "0.135.0" +======= +version = "0.136.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "bencher", "deno_core", @@ -1181,7 +1189,11 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" +<<<<<<< HEAD version = "0.135.0" +======= +version = "0.136.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "async-trait", "deno_core", @@ -1191,7 +1203,11 @@ dependencies = [ [[package]] name = "deno_cache" +<<<<<<< HEAD version = "0.73.0" +======= +version = "0.74.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "async-trait", "deno_core", @@ -1222,7 +1238,11 @@ dependencies = [ [[package]] name = "deno_canvas" +<<<<<<< HEAD version = "0.10.0" +======= +version = "0.11.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_core", "deno_webgpu", @@ -1251,7 +1271,11 @@ dependencies = [ [[package]] name = "deno_console" +<<<<<<< HEAD version = "0.141.0" +======= +version = "0.142.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_core", ] @@ -1296,7 +1320,11 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" [[package]] name = "deno_cron" +<<<<<<< HEAD version = "0.21.0" +======= +version = "0.22.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "anyhow", "async-trait", @@ -1309,7 +1337,11 @@ dependencies = [ [[package]] name = "deno_crypto" +<<<<<<< HEAD version = "0.155.0" +======= +version = "0.156.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "aes", "aes-gcm", @@ -1384,7 +1416,11 @@ dependencies = [ [[package]] name = "deno_fetch" +<<<<<<< HEAD version = "0.165.0" +======= +version = "0.166.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "bytes", "data-url", @@ -1402,7 +1438,11 @@ dependencies = [ [[package]] name = "deno_ffi" +<<<<<<< HEAD version = "0.128.0" +======= +version = "0.129.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_core", "dlopen2", @@ -1418,7 +1458,11 @@ dependencies = [ [[package]] name = "deno_fs" +<<<<<<< HEAD version = "0.51.0" +======= +version = "0.52.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "async-trait", "base32", @@ -1468,7 +1512,11 @@ dependencies = [ [[package]] name = "deno_http" +<<<<<<< HEAD version = "0.138.0" +======= +version = "0.139.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "async-compression", "async-trait", @@ -1507,7 +1555,11 @@ dependencies = [ [[package]] name = "deno_io" +<<<<<<< HEAD version = "0.51.0" +======= +version = "0.52.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "async-trait", "deno_core", @@ -1522,7 +1574,11 @@ dependencies = [ [[package]] name = "deno_kv" +<<<<<<< HEAD version = "0.49.0" +======= +version = "0.50.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "anyhow", "async-trait", @@ -1594,7 +1650,11 @@ dependencies = [ [[package]] name = "deno_napi" +<<<<<<< HEAD version = "0.71.0" +======= +version = "0.72.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_core", "libloading 0.7.4", @@ -1615,7 +1675,11 @@ dependencies = [ [[package]] name = "deno_net" +<<<<<<< HEAD version = "0.133.0" +======= +version = "0.134.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_core", "deno_tls", @@ -1632,7 +1696,11 @@ dependencies = [ [[package]] name = "deno_node" +<<<<<<< HEAD version = "0.78.0" +======= +version = "0.79.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "aead-gcm-stream", "aes", @@ -1733,7 +1801,11 @@ dependencies = [ [[package]] name = "deno_permissions" +<<<<<<< HEAD version = "0.1.0" +======= +version = "0.2.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "console_static_text", "deno_core", @@ -1749,7 +1821,11 @@ dependencies = [ [[package]] name = "deno_runtime" +<<<<<<< HEAD version = "0.149.0" +======= +version = "0.150.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "console_static_text", "deno_ast", @@ -1854,7 +1930,11 @@ dependencies = [ [[package]] name = "deno_tls" +<<<<<<< HEAD version = "0.128.0" +======= +version = "0.129.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_core", "deno_native_certs", @@ -1887,7 +1967,11 @@ dependencies = [ [[package]] name = "deno_url" +<<<<<<< HEAD version = "0.141.0" +======= +version = "0.142.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_bench_util", "deno_console", @@ -1899,7 +1983,11 @@ dependencies = [ [[package]] name = "deno_web" +<<<<<<< HEAD version = "0.172.0" +======= +version = "0.173.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "async-trait", "base64-simd", @@ -1920,7 +2008,11 @@ dependencies = [ [[package]] name = "deno_webgpu" +<<<<<<< HEAD version = "0.108.0" +======= +version = "0.109.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_core", "raw-window-handle", @@ -1933,7 +2025,11 @@ dependencies = [ [[package]] name = "deno_webidl" +<<<<<<< HEAD version = "0.141.0" +======= +version = "0.142.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_bench_util", "deno_core", @@ -1941,7 +2037,11 @@ dependencies = [ [[package]] name = "deno_websocket" +<<<<<<< HEAD version = "0.146.0" +======= +version = "0.147.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "bytes", "deno_core", @@ -1961,7 +2061,11 @@ dependencies = [ [[package]] name = "deno_webstorage" +<<<<<<< HEAD version = "0.136.0" +======= +version = "0.137.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "deno_core", "deno_web", @@ -4074,7 +4178,11 @@ dependencies = [ [[package]] name = "napi_sym" +<<<<<<< HEAD version = "0.71.0" +======= +version = "0.72.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 261a6b84f3..df96b72e00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,6 +46,7 @@ repository = "https://github.com/denoland/deno" deno_ast = { version = "0.34.1", features = ["transpiling"] } deno_core = { version = "0.270.0", features = ["lazy_eval_snapshot"] } +<<<<<<< HEAD deno_bench_util = { version = "0.135.0", path = "./bench_util" } deno_lockfile = "0.19.0" deno_media_type = { version = "0.1.1", features = ["module_specifier"] } @@ -53,6 +54,15 @@ deno_permissions = { version = "0.1.0", path = "./runtime/permissions" } deno_runtime = { version = "0.149.0", path = "./runtime" } deno_terminal = "0.1.1" napi_sym = { version = "0.71.0", path = "./cli/napi/sym" } +======= +deno_bench_util = { version = "0.136.0", path = "./bench_util" } +deno_lockfile = "0.19.0" +deno_media_type = { version = "0.1.1", features = ["module_specifier"] } +deno_permissions = { version = "0.2.0", path = "./runtime/permissions" } +deno_runtime = { version = "0.150.0", path = "./runtime" } +deno_terminal = "0.1.1" +napi_sym = { version = "0.72.0", path = "./cli/napi/sym" } +>>>>>>> 0d7662e15 (1.41.3 (#22925)) test_util = { package = "test_server", path = "./tests/util/server" } denokv_proto = "0.5.0" @@ -61,6 +71,7 @@ denokv_remote = "0.5.0" denokv_sqlite = { default-features = false, version = "0.5.0" } # exts +<<<<<<< HEAD deno_broadcast_channel = { version = "0.135.0", path = "./ext/broadcast_channel" } deno_cache = { version = "0.73.0", path = "./ext/cache" } deno_canvas = { version = "0.10.0", path = "./ext/canvas" } @@ -83,6 +94,30 @@ deno_webgpu = { version = "0.108.0", path = "./ext/webgpu" } deno_webidl = { version = "0.141.0", path = "./ext/webidl" } deno_websocket = { version = "0.146.0", path = "./ext/websocket" } deno_webstorage = { version = "0.136.0", path = "./ext/webstorage" } +======= +deno_broadcast_channel = { version = "0.136.0", path = "./ext/broadcast_channel" } +deno_cache = { version = "0.74.0", path = "./ext/cache" } +deno_canvas = { version = "0.11.0", path = "./ext/canvas" } +deno_console = { version = "0.142.0", path = "./ext/console" } +deno_cron = { version = "0.22.0", path = "./ext/cron" } +deno_crypto = { version = "0.156.0", path = "./ext/crypto" } +deno_fetch = { version = "0.166.0", path = "./ext/fetch" } +deno_ffi = { version = "0.129.0", path = "./ext/ffi" } +deno_fs = { version = "0.52.0", path = "./ext/fs" } +deno_http = { version = "0.139.0", path = "./ext/http" } +deno_io = { version = "0.52.0", path = "./ext/io" } +deno_kv = { version = "0.50.0", path = "./ext/kv" } +deno_napi = { version = "0.72.0", path = "./ext/napi" } +deno_net = { version = "0.134.0", path = "./ext/net" } +deno_node = { version = "0.79.0", path = "./ext/node" } +deno_tls = { version = "0.129.0", path = "./ext/tls" } +deno_url = { version = "0.142.0", path = "./ext/url" } +deno_web = { version = "0.173.0", path = "./ext/web" } +deno_webgpu = { version = "0.109.0", path = "./ext/webgpu" } +deno_webidl = { version = "0.142.0", path = "./ext/webidl" } +deno_websocket = { version = "0.147.0", path = "./ext/websocket" } +deno_webstorage = { version = "0.137.0", path = "./ext/webstorage" } +>>>>>>> 0d7662e15 (1.41.3 (#22925)) aes = "=0.8.3" anyhow = "1.0.57" diff --git a/Releases.md b/Releases.md index acabb21713..87253fe9e6 100644 --- a/Releases.md +++ b/Releases.md @@ -6,6 +6,59 @@ https://github.com/denoland/deno/releases We also have one-line install commands at: https://github.com/denoland/deno_install +<<<<<<< HEAD +======= +### 1.41.3 / 2024.03.14 + +- fix(cli): occasional panics on progress bar (#22809) +- fix(cli): show asserts before leaks (#22904) +- fix(cli): unbreak extension example and fix __runtime_js_sources (#22906) +- fix(cli): use Instant for test times (#22853) +- fix(config): add unstable features as examples to config schema (#22814) +- fix(config): remove pkg name example and add pattern to schema (#22813) +- fix(ext/node): add more named curves in `crypto.generateKeyPair[Sync]()` + (#22882) +- fix(ext/node) implement receiveMessageOnPort for node:worker_threads (#22766) +- fix(ext/node): DH (`dhKeyAgreement`) support for `createPrivateKey` (#22891) +- fix(ext/node): Add Immediate class to mirror NodeJS.Immediate (#22808) +- fix(ext/node): Implement `isBuiltin` in `node:module` (#22817) +- fix(ext/node): Match punycode module behavior to node (#22847) +- fix(ext/node): Support private EC key signing (#22914) +- fix(ext/node): allow automatic worker_thread termination (#22647) +- fix(ext/node): crypto.getCipherInfo() (#22916) +- fix(ext/node): flush brotli decompression stream (#22856) +- fix(ext/node): initial `crypto.createPublicKey()` support (#22509) +- fix(ext/node): make worker ids sequential (#22884) +- fix(ext/node): make worker setup synchronous (#22815) +- fix(ext/node): support `spki` format in createPublicKey (#22918) +- fix(ext/node): support junction symlinks on Windows (#22762) +- fix(ext/node): worker_threads.parentPort is updated on startup (#20794) +- fix(ext/websocket): do not continue reading if socket rid closes (#21849) +- fix(node): add nul byte to statfs path on windows (#22905) +- fix(node): implement fs.statfs() (#22862) +- fix(node): require of pkg json imports was broken (#22821) +- fix(node): resolve .css files in npm packages when type checking (#22804) +- fix(node): resolve types via package.json for directory import (#22878) +- fix(node:http) Export `validateHeaderName` and `validateHeaderValue` functions + (#22616) +- fix(publish): ability to un-exclude when .gitignore ignores everything + (#22805) +- fix(publish): regression - publishing with vendor folder (#22830) +- fix(publish): suggest using `--allow-dirty` on uncommitted changes (#22810) +- fix(publish): typo in `--allow-dirty` help text (#22799) +- fix(runtime): Restore default signal handler after user handlers are + unregistered (#22757) +- fix(runtime): negate partial condition for deny flags (#22866) +- fix(slow-types): improved exports tracing and infer type literals in as exprs + (#22849) +- fix: fix crate vulnerabilities (#22825) +- fix: stop type checking during runtime (#22854) +- fix: support sloppy resolution to file where directory exists (#22800) +- fix: typo in error from GPUBuffer.prototype.mapAsync (#22913) +- perf(permissions): Fast exit from checks when permission is in "fully-granted" + state (#22894) + +>>>>>>> 0d7662e15 (1.41.3 (#22925)) ### 1.41.2 / 2024.03.08 - fix(ext/node): ref/unref on workers (#22778) diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml index 77e0a67392..c9cb27b3ea 100644 --- a/bench_util/Cargo.toml +++ b/bench_util/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_bench_util" +<<<<<<< HEAD version = "0.135.0" +======= +version = "0.136.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 86511465c8..ca8d2c9d94 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno" +<<<<<<< HEAD version = "1.41.2" +======= +version = "1.41.3" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true default-run = "deno" edition.workspace = true diff --git a/cli/deno_std.rs b/cli/deno_std.rs index 43133acbc5..436e88ccb4 100644 --- a/cli/deno_std.rs +++ b/cli/deno_std.rs @@ -2,4 +2,8 @@ // WARNING: Ensure this is the only deno_std version reference as this // is automatically updated by the version bump workflow. +<<<<<<< HEAD pub const CURRENT_STD_URL_STR: &str = "https://deno.land/std@0.219.0/"; +======= +pub const CURRENT_STD_URL_STR: &str = "https://deno.land/std@0.220.0/"; +>>>>>>> 0d7662e15 (1.41.3 (#22925)) diff --git a/cli/napi/sym/Cargo.toml b/cli/napi/sym/Cargo.toml index 88c99c5996..d617943067 100644 --- a/cli/napi/sym/Cargo.toml +++ b/cli/napi/sym/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "napi_sym" +<<<<<<< HEAD version = "0.71.0" +======= +version = "0.72.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml index cf3d48841d..819421f462 100644 --- a/ext/broadcast_channel/Cargo.toml +++ b/ext/broadcast_channel/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_broadcast_channel" +<<<<<<< HEAD version = "0.135.0" +======= +version = "0.136.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/cache/Cargo.toml b/ext/cache/Cargo.toml index 66af345044..f4af728d00 100644 --- a/ext/cache/Cargo.toml +++ b/ext/cache/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_cache" +<<<<<<< HEAD version = "0.73.0" +======= +version = "0.74.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/canvas/Cargo.toml b/ext/canvas/Cargo.toml index 163f6b2eab..0381d9eb91 100644 --- a/ext/canvas/Cargo.toml +++ b/ext/canvas/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_canvas" +<<<<<<< HEAD version = "0.10.0" +======= +version = "0.11.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/console/Cargo.toml b/ext/console/Cargo.toml index 513cb1496d..74092a2457 100644 --- a/ext/console/Cargo.toml +++ b/ext/console/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_console" +<<<<<<< HEAD version = "0.141.0" +======= +version = "0.142.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/cron/Cargo.toml b/ext/cron/Cargo.toml index 4fbe6ccc94..ca5528ca97 100644 --- a/ext/cron/Cargo.toml +++ b/ext/cron/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_cron" +<<<<<<< HEAD version = "0.21.0" +======= +version = "0.22.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml index 7369e0a845..a143722c16 100644 --- a/ext/crypto/Cargo.toml +++ b/ext/crypto/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_crypto" +<<<<<<< HEAD version = "0.155.0" +======= +version = "0.156.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml index 963bd8ab8c..e026f6b2a0 100644 --- a/ext/fetch/Cargo.toml +++ b/ext/fetch/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_fetch" +<<<<<<< HEAD version = "0.165.0" +======= +version = "0.166.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml index 9190283cb0..bd728eaa29 100644 --- a/ext/ffi/Cargo.toml +++ b/ext/ffi/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_ffi" +<<<<<<< HEAD version = "0.128.0" +======= +version = "0.129.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml index b8cccde286..0b3af827ca 100644 --- a/ext/fs/Cargo.toml +++ b/ext/fs/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_fs" +<<<<<<< HEAD version = "0.51.0" +======= +version = "0.52.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml index 0e8a0c7019..eb8c1d51e9 100644 --- a/ext/http/Cargo.toml +++ b/ext/http/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_http" +<<<<<<< HEAD version = "0.138.0" +======= +version = "0.139.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/io/Cargo.toml b/ext/io/Cargo.toml index 566e0ed2c5..40364a7a23 100644 --- a/ext/io/Cargo.toml +++ b/ext/io/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_io" +<<<<<<< HEAD version = "0.51.0" +======= +version = "0.52.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/kv/Cargo.toml b/ext/kv/Cargo.toml index 51848b5a42..f784099d34 100644 --- a/ext/kv/Cargo.toml +++ b/ext/kv/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_kv" +<<<<<<< HEAD version = "0.49.0" +======= +version = "0.50.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/napi/Cargo.toml b/ext/napi/Cargo.toml index 1343635db1..ab969eab2e 100644 --- a/ext/napi/Cargo.toml +++ b/ext/napi/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_napi" +<<<<<<< HEAD version = "0.71.0" +======= +version = "0.72.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml index 964e2940f8..646bf32b12 100644 --- a/ext/net/Cargo.toml +++ b/ext/net/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_net" +<<<<<<< HEAD version = "0.133.0" +======= +version = "0.134.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml index 8569a0491a..873de54cb2 100644 --- a/ext/node/Cargo.toml +++ b/ext/node/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_node" +<<<<<<< HEAD version = "0.78.0" +======= +version = "0.79.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml index bf34ff600a..2487a841ee 100644 --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_tls" +<<<<<<< HEAD version = "0.128.0" +======= +version = "0.129.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml index 1b88eb07f9..76b164d7fb 100644 --- a/ext/url/Cargo.toml +++ b/ext/url/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_url" +<<<<<<< HEAD version = "0.141.0" +======= +version = "0.142.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml index b707d979d1..d7f1f22a48 100644 --- a/ext/web/Cargo.toml +++ b/ext/web/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_web" +<<<<<<< HEAD version = "0.172.0" +======= +version = "0.173.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml index 66cdcc3389..58b820b7bc 100644 --- a/ext/webgpu/Cargo.toml +++ b/ext/webgpu/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webgpu" +<<<<<<< HEAD version = "0.108.0" +======= +version = "0.109.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors = ["the Deno authors"] edition.workspace = true license = "MIT" diff --git a/ext/webidl/Cargo.toml b/ext/webidl/Cargo.toml index 014d5b46c5..1c99043b60 100644 --- a/ext/webidl/Cargo.toml +++ b/ext/webidl/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webidl" +<<<<<<< HEAD version = "0.141.0" +======= +version = "0.142.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml index 0d6f4eb96a..9e82ec5c57 100644 --- a/ext/websocket/Cargo.toml +++ b/ext/websocket/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_websocket" +<<<<<<< HEAD version = "0.146.0" +======= +version = "0.147.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml index 3107051622..28803bf518 100644 --- a/ext/webstorage/Cargo.toml +++ b/ext/webstorage/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webstorage" +<<<<<<< HEAD version = "0.136.0" +======= +version = "0.137.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 484266888c..b92f698c98 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_runtime" +<<<<<<< HEAD version = "0.149.0" +======= +version = "0.150.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/runtime/permissions/Cargo.toml b/runtime/permissions/Cargo.toml index 8a0904bea1..27dae28422 100644 --- a/runtime/permissions/Cargo.toml +++ b/runtime/permissions/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_permissions" +<<<<<<< HEAD version = "0.1.0" +======= +version = "0.2.0" +>>>>>>> 0d7662e15 (1.41.3 (#22925)) authors.workspace = true edition.workspace = true license.workspace = true