From 43a83916843d7c26db861cf5e6d01de0fb78bd6c Mon Sep 17 00:00:00 2001 From: denobot <33910674+denobot@users.noreply.github.com> Date: Fri, 17 May 2024 08:28:38 +0900 Subject: [PATCH] Cherry-pick version bump commit with conflicts --- .github/workflows/ci.generate.ts | 4 ++ .github/workflows/ci.yml | 13 ++++ Cargo.lock | 108 +++++++++++++++++++++++++++++++ Cargo.toml | 35 ++++++++++ Releases.md | 38 +++++++++++ bench_util/Cargo.toml | 4 ++ cli/Cargo.toml | 4 ++ cli/napi/sym/Cargo.toml | 4 ++ ext/broadcast_channel/Cargo.toml | 4 ++ ext/cache/Cargo.toml | 4 ++ ext/canvas/Cargo.toml | 4 ++ ext/console/Cargo.toml | 4 ++ ext/cron/Cargo.toml | 4 ++ ext/crypto/Cargo.toml | 4 ++ ext/fetch/Cargo.toml | 4 ++ ext/ffi/Cargo.toml | 4 ++ ext/fs/Cargo.toml | 4 ++ ext/http/Cargo.toml | 4 ++ ext/io/Cargo.toml | 4 ++ ext/kv/Cargo.toml | 4 ++ ext/napi/Cargo.toml | 4 ++ ext/net/Cargo.toml | 4 ++ ext/node/Cargo.toml | 4 ++ ext/tls/Cargo.toml | 4 ++ ext/url/Cargo.toml | 4 ++ ext/web/Cargo.toml | 4 ++ ext/webgpu/Cargo.toml | 4 ++ ext/webidl/Cargo.toml | 4 ++ ext/websocket/Cargo.toml | 4 ++ ext/webstorage/Cargo.toml | 4 ++ runtime/Cargo.toml | 4 ++ runtime/permissions/Cargo.toml | 4 ++ 32 files changed, 306 insertions(+) diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 478a6bde80..b75a3934eb 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -5,7 +5,11 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify"; // 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 = 90; +======= +const cacheVersion = 91; +>>>>>>> d64921c19 (1.43.4 (#23853)) const ubuntuX86Runner = "ubuntu-22.04"; const ubuntuX86XlRunner = "ubuntu-22.04-xl"; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36f6adea60..cb5e56e516 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -367,8 +367,13 @@ jobs: path: |- ~/.cargo/registry/index ~/.cargo/registry/cache +<<<<<<< HEAD key: '90-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}' restore-keys: '90-cargo-home-${{ matrix.os }}-${{ matrix.arch }}' +======= + key: '91-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}' + restore-keys: '91-cargo-home-${{ matrix.os }}-${{ matrix.arch }}' +>>>>>>> d64921c19 (1.43.4 (#23853)) if: '!(matrix.skip)' - name: Restore cache build output (PR) uses: actions/cache/restore@v4 @@ -380,7 +385,11 @@ jobs: !./target/*/*.zip !./target/*/*.tar.gz key: never_saved +<<<<<<< HEAD restore-keys: '90-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-' +======= + restore-keys: '91-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-' +>>>>>>> d64921c19 (1.43.4 (#23853)) - name: Apply and update mtime cache if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))' uses: ./.github/mtime_cache @@ -669,7 +678,11 @@ jobs: !./target/*/gn_out !./target/*/*.zip !./target/*/*.tar.gz +<<<<<<< HEAD key: '90-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' +======= + key: '91-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' +>>>>>>> d64921c19 (1.43.4 (#23853)) publish-canary: name: publish canary runs-on: ubuntu-22.04 diff --git a/Cargo.lock b/Cargo.lock index 2dd72b3534..4340f9f6e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1066,7 +1066,11 @@ dependencies = [ [[package]] name = "deno" +<<<<<<< HEAD version = "1.43.3" +======= +version = "1.43.4" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "async-trait", "base32", @@ -1210,7 +1214,11 @@ dependencies = [ [[package]] name = "deno_bench_util" +<<<<<<< HEAD version = "0.145.0" +======= +version = "0.146.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "bencher", "deno_core", @@ -1219,7 +1227,11 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" +<<<<<<< HEAD version = "0.145.0" +======= +version = "0.146.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "async-trait", "deno_core", @@ -1229,7 +1241,11 @@ dependencies = [ [[package]] name = "deno_cache" +<<<<<<< HEAD version = "0.83.0" +======= +version = "0.84.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "async-trait", "deno_core", @@ -1260,7 +1276,11 @@ dependencies = [ [[package]] name = "deno_canvas" +<<<<<<< HEAD version = "0.20.0" +======= +version = "0.21.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", "deno_webgpu", @@ -1288,7 +1308,11 @@ dependencies = [ [[package]] name = "deno_console" +<<<<<<< HEAD version = "0.151.0" +======= +version = "0.152.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", ] @@ -1332,7 +1356,11 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" [[package]] name = "deno_cron" +<<<<<<< HEAD version = "0.31.0" +======= +version = "0.32.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "anyhow", "async-trait", @@ -1344,7 +1372,11 @@ dependencies = [ [[package]] name = "deno_crypto" +<<<<<<< HEAD version = "0.165.0" +======= +version = "0.166.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "aes", "aes-gcm", @@ -1419,7 +1451,11 @@ dependencies = [ [[package]] name = "deno_fetch" +<<<<<<< HEAD version = "0.175.0" +======= +version = "0.176.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "bytes", "data-url", @@ -1436,7 +1472,11 @@ dependencies = [ [[package]] name = "deno_ffi" +<<<<<<< HEAD version = "0.138.0" +======= +version = "0.139.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", "dlopen2", @@ -1452,7 +1492,11 @@ dependencies = [ [[package]] name = "deno_fs" +<<<<<<< HEAD version = "0.61.0" +======= +version = "0.62.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "async-trait", "base32", @@ -1499,7 +1543,11 @@ dependencies = [ [[package]] name = "deno_http" +<<<<<<< HEAD version = "0.148.0" +======= +version = "0.149.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "async-compression", "async-trait", @@ -1538,7 +1586,11 @@ dependencies = [ [[package]] name = "deno_io" +<<<<<<< HEAD version = "0.61.0" +======= +version = "0.62.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "async-trait", "deno_core", @@ -1554,7 +1606,11 @@ dependencies = [ [[package]] name = "deno_kv" +<<<<<<< HEAD version = "0.59.0" +======= +version = "0.60.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "anyhow", "async-trait", @@ -1620,7 +1676,11 @@ dependencies = [ [[package]] name = "deno_napi" +<<<<<<< HEAD version = "0.81.0" +======= +version = "0.82.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", "libloading 0.7.4", @@ -1641,7 +1701,11 @@ dependencies = [ [[package]] name = "deno_net" +<<<<<<< HEAD version = "0.143.0" +======= +version = "0.144.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", "deno_tls", @@ -1656,7 +1720,11 @@ dependencies = [ [[package]] name = "deno_node" +<<<<<<< HEAD version = "0.88.0" +======= +version = "0.89.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "aead-gcm-stream", "aes", @@ -1758,7 +1826,11 @@ dependencies = [ [[package]] name = "deno_permissions" +<<<<<<< HEAD version = "0.11.0" +======= +version = "0.12.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", "deno_terminal", @@ -1773,7 +1845,11 @@ dependencies = [ [[package]] name = "deno_runtime" +<<<<<<< HEAD version = "0.159.0" +======= +version = "0.160.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_ast", "deno_broadcast_channel", @@ -1874,7 +1950,11 @@ dependencies = [ [[package]] name = "deno_tls" +<<<<<<< HEAD version = "0.138.0" +======= +version = "0.139.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", "deno_native_certs", @@ -1898,7 +1978,11 @@ dependencies = [ [[package]] name = "deno_url" +<<<<<<< HEAD version = "0.151.0" +======= +version = "0.152.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_bench_util", "deno_console", @@ -1909,7 +1993,11 @@ dependencies = [ [[package]] name = "deno_web" +<<<<<<< HEAD version = "0.182.0" +======= +version = "0.183.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "async-trait", "base64-simd 0.8.0", @@ -1929,7 +2017,11 @@ dependencies = [ [[package]] name = "deno_webgpu" +<<<<<<< HEAD version = "0.118.0" +======= +version = "0.119.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", "raw-window-handle", @@ -1941,7 +2033,11 @@ dependencies = [ [[package]] name = "deno_webidl" +<<<<<<< HEAD version = "0.151.0" +======= +version = "0.152.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_bench_util", "deno_core", @@ -1949,7 +2045,11 @@ dependencies = [ [[package]] name = "deno_websocket" +<<<<<<< HEAD version = "0.156.0" +======= +version = "0.157.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "bytes", "deno_core", @@ -1969,7 +2069,11 @@ dependencies = [ [[package]] name = "deno_webstorage" +<<<<<<< HEAD version = "0.146.0" +======= +version = "0.147.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "deno_core", "deno_web", @@ -4110,7 +4214,11 @@ dependencies = [ [[package]] name = "napi_sym" +<<<<<<< HEAD version = "0.81.0" +======= +version = "0.82.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) dependencies = [ "quote", "serde", diff --git a/Cargo.toml b/Cargo.toml index 321fc61bbc..fa95e70515 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,6 +46,7 @@ repository = "https://github.com/denoland/deno" deno_ast = { version = "=0.38.2", features = ["transpiling"] } deno_core = { version = "0.280.0" } +<<<<<<< HEAD deno_bench_util = { version = "0.145.0", path = "./bench_util" } deno_lockfile = "0.19.0" deno_media_type = { version = "0.1.4", features = ["module_specifier"] } @@ -53,6 +54,15 @@ deno_permissions = { version = "0.11.0", path = "./runtime/permissions" } deno_runtime = { version = "0.159.0", path = "./runtime" } deno_terminal = "0.1.1" napi_sym = { version = "0.81.0", path = "./cli/napi/sym" } +======= +deno_bench_util = { version = "0.146.0", path = "./bench_util" } +deno_lockfile = "0.19.0" +deno_media_type = { version = "0.1.4", features = ["module_specifier"] } +deno_permissions = { version = "0.12.0", path = "./runtime/permissions" } +deno_runtime = { version = "0.160.0", path = "./runtime" } +deno_terminal = "0.1.1" +napi_sym = { version = "0.82.0", path = "./cli/napi/sym" } +>>>>>>> d64921c19 (1.43.4 (#23853)) 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.145.0", path = "./ext/broadcast_channel" } deno_cache = { version = "0.83.0", path = "./ext/cache" } deno_canvas = { version = "0.20.0", path = "./ext/canvas" } @@ -83,6 +94,30 @@ deno_webgpu = { version = "0.118.0", path = "./ext/webgpu" } deno_webidl = { version = "0.151.0", path = "./ext/webidl" } deno_websocket = { version = "0.156.0", path = "./ext/websocket" } deno_webstorage = { version = "0.146.0", path = "./ext/webstorage" } +======= +deno_broadcast_channel = { version = "0.146.0", path = "./ext/broadcast_channel" } +deno_cache = { version = "0.84.0", path = "./ext/cache" } +deno_canvas = { version = "0.21.0", path = "./ext/canvas" } +deno_console = { version = "0.152.0", path = "./ext/console" } +deno_cron = { version = "0.32.0", path = "./ext/cron" } +deno_crypto = { version = "0.166.0", path = "./ext/crypto" } +deno_fetch = { version = "0.176.0", path = "./ext/fetch" } +deno_ffi = { version = "0.139.0", path = "./ext/ffi" } +deno_fs = { version = "0.62.0", path = "./ext/fs" } +deno_http = { version = "0.149.0", path = "./ext/http" } +deno_io = { version = "0.62.0", path = "./ext/io" } +deno_kv = { version = "0.60.0", path = "./ext/kv" } +deno_napi = { version = "0.82.0", path = "./ext/napi" } +deno_net = { version = "0.144.0", path = "./ext/net" } +deno_node = { version = "0.89.0", path = "./ext/node" } +deno_tls = { version = "0.139.0", path = "./ext/tls" } +deno_url = { version = "0.152.0", path = "./ext/url" } +deno_web = { version = "0.183.0", path = "./ext/web" } +deno_webgpu = { version = "0.119.0", path = "./ext/webgpu" } +deno_webidl = { version = "0.152.0", path = "./ext/webidl" } +deno_websocket = { version = "0.157.0", path = "./ext/websocket" } +deno_webstorage = { version = "0.147.0", path = "./ext/webstorage" } +>>>>>>> d64921c19 (1.43.4 (#23853)) aes = "=0.8.3" anyhow = "1.0.57" diff --git a/Releases.md b/Releases.md index 87050babcd..13b498d46f 100644 --- a/Releases.md +++ b/Releases.md @@ -6,6 +6,44 @@ https://github.com/denoland/deno/releases We also have one-line install commands at: https://github.com/denoland/deno_install +<<<<<<< HEAD +======= +### 1.43.4 / 2024.05.16 + +- fix(cli): panic with `deno coverage` (#23353) +- fix(doc): --lint - private ref diagnostic was displaying incorrect information + (#23834) +- fix(doc/publish): support expando properties (#23795) +- fix(emit): regression - keep comments in emit (#23815) +- fix(ext/node): export geteuid from node:process (#23840) +- fix(ext/node): fix grpc error_handling example (#23755) +- fix(ext/node): homedir() `getpwuid`/`SHGetKnownFolderPath` fallback (#23841) +- fix(ext/node): process.uptime works without this (#23786) +- fix(ext/web): update ongoing promise in async iterator `return()` method + (#23642) +- fix(lsp): respect types dependencies for tsc roots (#23825) +- fix(lsp): show reference code lens on methods (#23804) +- fix(node): error when throwing `FS_EISDIR` (#23829) +- fix(node): seperate worker module cache (#23634) +- fix(node): stub `AsyncResource.emitDestroy()` (#23802) +- fix(node): wrong `worker_threads.terminate()` return value (#23803) +- fix(npm): handle null fields in npm registry JSON (#23785) +- fix(npm): make tarball extraction more reliable (#23759) +- fix(publish): always include config file when publishing (#23797) +- fix(publish): error for missing version constraints on dry-publish instead of + just publish (#23798) +- fix(runtime): output to stderr with colors if a tty and stdout is piped + (#23813) +- fix: Add missing `"junction"` type for `SymlinkOptions.types` (#23756) +- fix: update swc_ecma_parser to 0.114.1 (#23816) +- fix: widen aarch64 linux minimum GLIBC version by improving sysroot build + (#23791) +- perf(compile): Do not checksum eszip content (#23839) +- perf(jsr): download metadata files as soon as possible and in parallel + (#23836) +- perf(lsp): Cache semantic tokens for open documents (#23799) + +>>>>>>> d64921c19 (1.43.4 (#23853)) ### 1.43.3 / 2024.05.10 - fix(ext/webgpu): invalidate GPUAdapter when a device is created (#23752) diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml index 47365460d1..65b48ee0bf 100644 --- a/bench_util/Cargo.toml +++ b/bench_util/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_bench_util" +<<<<<<< HEAD version = "0.145.0" +======= +version = "0.146.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 6478ee245f..19924a7efb 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno" +<<<<<<< HEAD version = "1.43.3" +======= +version = "1.43.4" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true default-run = "deno" edition.workspace = true diff --git a/cli/napi/sym/Cargo.toml b/cli/napi/sym/Cargo.toml index c711bbbef2..99d1462a9b 100644 --- a/cli/napi/sym/Cargo.toml +++ b/cli/napi/sym/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "napi_sym" +<<<<<<< HEAD version = "0.81.0" +======= +version = "0.82.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml index e821d1cdec..ebcfb5adbf 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.145.0" +======= +version = "0.146.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/cache/Cargo.toml b/ext/cache/Cargo.toml index 04baa2e131..bfbad05453 100644 --- a/ext/cache/Cargo.toml +++ b/ext/cache/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_cache" +<<<<<<< HEAD version = "0.83.0" +======= +version = "0.84.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/canvas/Cargo.toml b/ext/canvas/Cargo.toml index aa5d5703d6..c22f764cd8 100644 --- a/ext/canvas/Cargo.toml +++ b/ext/canvas/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_canvas" +<<<<<<< HEAD version = "0.20.0" +======= +version = "0.21.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/console/Cargo.toml b/ext/console/Cargo.toml index 82a8e525d4..002d6d541e 100644 --- a/ext/console/Cargo.toml +++ b/ext/console/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_console" +<<<<<<< HEAD version = "0.151.0" +======= +version = "0.152.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/cron/Cargo.toml b/ext/cron/Cargo.toml index b0f76f69c4..08f2397606 100644 --- a/ext/cron/Cargo.toml +++ b/ext/cron/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_cron" +<<<<<<< HEAD version = "0.31.0" +======= +version = "0.32.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml index faeb684fb6..94a794b354 100644 --- a/ext/crypto/Cargo.toml +++ b/ext/crypto/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_crypto" +<<<<<<< HEAD version = "0.165.0" +======= +version = "0.166.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml index f28e203004..d4709125df 100644 --- a/ext/fetch/Cargo.toml +++ b/ext/fetch/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_fetch" +<<<<<<< HEAD version = "0.175.0" +======= +version = "0.176.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml index ae090a0975..065b4f260a 100644 --- a/ext/ffi/Cargo.toml +++ b/ext/ffi/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_ffi" +<<<<<<< HEAD version = "0.138.0" +======= +version = "0.139.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml index f5fd753d10..0dc5ef9025 100644 --- a/ext/fs/Cargo.toml +++ b/ext/fs/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_fs" +<<<<<<< HEAD version = "0.61.0" +======= +version = "0.62.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml index fdeec59d21..9d9a602ec9 100644 --- a/ext/http/Cargo.toml +++ b/ext/http/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_http" +<<<<<<< HEAD version = "0.148.0" +======= +version = "0.149.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/io/Cargo.toml b/ext/io/Cargo.toml index 16ec986bf3..8c6d8b1a7b 100644 --- a/ext/io/Cargo.toml +++ b/ext/io/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_io" +<<<<<<< HEAD version = "0.61.0" +======= +version = "0.62.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/kv/Cargo.toml b/ext/kv/Cargo.toml index a974f026e4..07e02a90dd 100644 --- a/ext/kv/Cargo.toml +++ b/ext/kv/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_kv" +<<<<<<< HEAD version = "0.59.0" +======= +version = "0.60.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/napi/Cargo.toml b/ext/napi/Cargo.toml index dcfc320829..3cf7780c7c 100644 --- a/ext/napi/Cargo.toml +++ b/ext/napi/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_napi" +<<<<<<< HEAD version = "0.81.0" +======= +version = "0.82.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml index ab7a6b79cd..d639c32105 100644 --- a/ext/net/Cargo.toml +++ b/ext/net/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_net" +<<<<<<< HEAD version = "0.143.0" +======= +version = "0.144.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml index f930f3f3ae..2970e419d6 100644 --- a/ext/node/Cargo.toml +++ b/ext/node/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_node" +<<<<<<< HEAD version = "0.88.0" +======= +version = "0.89.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml index 274f51fa7f..85cae1a3cc 100644 --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_tls" +<<<<<<< HEAD version = "0.138.0" +======= +version = "0.139.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml index 7430af45d0..12495c272f 100644 --- a/ext/url/Cargo.toml +++ b/ext/url/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_url" +<<<<<<< HEAD version = "0.151.0" +======= +version = "0.152.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml index fdd49b74cf..6faa5b9389 100644 --- a/ext/web/Cargo.toml +++ b/ext/web/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_web" +<<<<<<< HEAD version = "0.182.0" +======= +version = "0.183.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml index 16acb24a9a..822a36b1b4 100644 --- a/ext/webgpu/Cargo.toml +++ b/ext/webgpu/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webgpu" +<<<<<<< HEAD version = "0.118.0" +======= +version = "0.119.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors = ["the Deno authors"] edition.workspace = true license = "MIT" diff --git a/ext/webidl/Cargo.toml b/ext/webidl/Cargo.toml index aeb2617883..0cee800312 100644 --- a/ext/webidl/Cargo.toml +++ b/ext/webidl/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webidl" +<<<<<<< HEAD version = "0.151.0" +======= +version = "0.152.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml index 1a8896466a..cfa6959ee5 100644 --- a/ext/websocket/Cargo.toml +++ b/ext/websocket/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_websocket" +<<<<<<< HEAD version = "0.156.0" +======= +version = "0.157.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml index 63ebf15fdd..bb44c8f4c6 100644 --- a/ext/webstorage/Cargo.toml +++ b/ext/webstorage/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webstorage" +<<<<<<< HEAD version = "0.146.0" +======= +version = "0.147.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 283345886a..6ea2c1acad 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_runtime" +<<<<<<< HEAD version = "0.159.0" +======= +version = "0.160.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/runtime/permissions/Cargo.toml b/runtime/permissions/Cargo.toml index dc64b5e397..23774e048a 100644 --- a/runtime/permissions/Cargo.toml +++ b/runtime/permissions/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_permissions" +<<<<<<< HEAD version = "0.11.0" +======= +version = "0.12.0" +>>>>>>> d64921c19 (1.43.4 (#23853)) authors.workspace = true edition.workspace = true license.workspace = true