Cherry-pick version bump commit with conflicts

.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 = 47;
+=======
+const cacheVersion = 46;
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 
 const Runners = (() => {
   const ubuntuRunner = "ubuntu-22.04";

.github/workflows/ci.yml

@@ -304,8 +304,13 @@ jobs:
           path: |-
             ~/.cargo/registry/index
             ~/.cargo/registry/cache
+<<<<<<< HEAD
           key: '47-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}'
           restore-keys: '47-cargo-home-${{ matrix.os }}'
+=======
+          key: '46-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}'
+          restore-keys: '46-cargo-home-${{ matrix.os }}'
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
         if: '!(github.event_name == ''pull_request'' && matrix.skip_pr)'
       - name: Restore cache build output (PR)
         uses: actions/cache/restore@v3
@@ -317,7 +322,11 @@ jobs:
             !./target/*/*.zip
             !./target/*/*.tar.gz
           key: never_saved
+<<<<<<< HEAD
           restore-keys: '47-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-'
+=======
+          restore-keys: '46-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-'
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
       - name: Apply and update mtime cache
         if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (!startsWith(github.ref, ''refs/tags/''))'
         uses: ./.github/mtime_cache
@@ -605,7 +614,11 @@ jobs:
             !./target/*/gn_out
             !./target/*/*.zip
             !./target/*/*.tar.gz
+<<<<<<< HEAD
           key: '47-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+=======
+          key: '46-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
   publish-canary:
     name: publish canary
     runs-on: ubuntu-22.04

Cargo.lock

@@ -788,7 +788,11 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
 
 [[package]]
 name = "deno"
+<<<<<<< HEAD
 version = "1.35.3"
+=======
+version = "1.35.2"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "async-trait",
  "atty",
@@ -935,7 +939,11 @@ dependencies = [
 
 [[package]]
 name = "deno_bench_util"
+<<<<<<< HEAD
 version = "0.107.0"
+=======
+version = "0.106.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "bencher",
  "deno_core",
@@ -945,7 +953,11 @@ dependencies = [
 
 [[package]]
 name = "deno_broadcast_channel"
+<<<<<<< HEAD
 version = "0.107.0"
+=======
+version = "0.106.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "async-trait",
  "deno_core",
@@ -955,7 +967,11 @@ dependencies = [
 
 [[package]]
 name = "deno_cache"
+<<<<<<< HEAD
 version = "0.45.0"
+=======
+version = "0.44.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "async-trait",
  "deno_core",
@@ -967,7 +983,11 @@ dependencies = [
 
 [[package]]
 name = "deno_console"
+<<<<<<< HEAD
 version = "0.113.0"
+=======
+version = "0.112.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "deno_core",
 ]
@@ -1000,7 +1020,11 @@ dependencies = [
 
 [[package]]
 name = "deno_crypto"
+<<<<<<< HEAD
 version = "0.127.0"
+=======
+version = "0.126.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "aes",
  "aes-gcm",
@@ -1070,7 +1094,11 @@ dependencies = [
 
 [[package]]
 name = "deno_fetch"
+<<<<<<< HEAD
 version = "0.137.0"
+=======
+version = "0.136.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "bytes",
  "data-url",
@@ -1087,7 +1115,11 @@ dependencies = [
 
 [[package]]
 name = "deno_ffi"
+<<<<<<< HEAD
 version = "0.100.0"
+=======
+version = "0.99.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "deno_core",
  "dlopen",
@@ -1103,7 +1135,11 @@ dependencies = [
 
 [[package]]
 name = "deno_fs"
+<<<<<<< HEAD
 version = "0.23.0"
+=======
+version = "0.22.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "async-trait",
  "deno_core",
@@ -1143,7 +1179,11 @@ dependencies = [
 
 [[package]]
 name = "deno_http"
+<<<<<<< HEAD
 version = "0.108.0"
+=======
+version = "0.107.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "async-compression 0.3.15",
  "async-trait",
@@ -1179,7 +1219,11 @@ dependencies = [
 
 [[package]]
 name = "deno_io"
+<<<<<<< HEAD
 version = "0.23.0"
+=======
+version = "0.22.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "async-trait",
  "deno_core",
@@ -1193,7 +1237,11 @@ dependencies = [
 
 [[package]]
 name = "deno_kv"
+<<<<<<< HEAD
 version = "0.21.0"
+=======
+version = "0.20.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1251,7 +1299,11 @@ dependencies = [
 
 [[package]]
 name = "deno_napi"
+<<<<<<< HEAD
 version = "0.43.0"
+=======
+version = "0.42.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "deno_core",
  "libloading",
@@ -1259,7 +1311,11 @@ dependencies = [
 
 [[package]]
 name = "deno_net"
+<<<<<<< HEAD
 version = "0.105.0"
+=======
+version = "0.104.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "deno_core",
  "deno_tls",
@@ -1275,7 +1331,11 @@ dependencies = [
 
 [[package]]
 name = "deno_node"
+<<<<<<< HEAD
 version = "0.50.0"
+=======
+version = "0.49.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "aes",
  "brotli",
@@ -1369,7 +1429,11 @@ dependencies = [
 
 [[package]]
 name = "deno_runtime"
+<<<<<<< HEAD
 version = "0.121.0"
+=======
+version = "0.120.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "atty",
  "console_static_text",
@@ -1452,7 +1516,11 @@ dependencies = [
 
 [[package]]
 name = "deno_tls"
+<<<<<<< HEAD
 version = "0.100.0"
+=======
+version = "0.99.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "deno_core",
  "once_cell",
@@ -1466,7 +1534,11 @@ dependencies = [
 
 [[package]]
 name = "deno_url"
+<<<<<<< HEAD
 version = "0.113.0"
+=======
+version = "0.112.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "deno_bench_util",
  "deno_core",
@@ -1478,7 +1550,11 @@ dependencies = [
 
 [[package]]
 name = "deno_web"
+<<<<<<< HEAD
 version = "0.144.0"
+=======
+version = "0.143.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "async-trait",
  "base64-simd",
@@ -1497,7 +1573,11 @@ dependencies = [
 
 [[package]]
 name = "deno_webidl"
+<<<<<<< HEAD
 version = "0.113.0"
+=======
+version = "0.112.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "deno_bench_util",
  "deno_core",
@@ -1505,7 +1585,11 @@ dependencies = [
 
 [[package]]
 name = "deno_websocket"
+<<<<<<< HEAD
 version = "0.118.0"
+=======
+version = "0.117.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "bytes",
  "deno_core",
@@ -1522,7 +1606,11 @@ dependencies = [
 
 [[package]]
 name = "deno_webstorage"
+<<<<<<< HEAD
 version = "0.108.0"
+=======
+version = "0.107.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "deno_core",
  "deno_web",
@@ -3118,7 +3206,11 @@ dependencies = [
 
 [[package]]
 name = "napi_sym"
+<<<<<<< HEAD
 version = "0.43.0"
+=======
+version = "0.42.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 dependencies = [
  "proc-macro2 1.0.66",
  "quote 1.0.28",

Cargo.toml

@@ -45,9 +45,15 @@ deno_core = "0.197.0"
 deno_ops = "0.75.0"
 serde_v8 = "0.108.0"
 
+<<<<<<< HEAD
 deno_runtime = { version = "0.121.0", path = "./runtime" }
 napi_sym = { version = "0.43.0", path = "./cli/napi/sym" }
 deno_bench_util = { version = "0.107.0", path = "./bench_util" }
+=======
+deno_runtime = { version = "0.120.0", path = "./runtime" }
+napi_sym = { version = "0.42.0", path = "./cli/napi/sym" }
+deno_bench_util = { version = "0.106.0", path = "./bench_util" }
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 test_util = { path = "./test_util" }
 deno_lockfile = "0.14.1"
 deno_media_type = { version = "0.1.0", features = ["module_specifier"] }
@@ -55,6 +61,7 @@ deno_npm = "0.9.1"
 deno_semver = "0.2.2"
 
 # exts
+<<<<<<< HEAD
 deno_broadcast_channel = { version = "0.107.0", path = "./ext/broadcast_channel" }
 deno_cache = { version = "0.45.0", path = "./ext/cache" }
 deno_console = { version = "0.113.0", path = "./ext/console" }
@@ -74,6 +81,27 @@ deno_webidl = { version = "0.113.0", path = "./ext/webidl" }
 deno_websocket = { version = "0.118.0", path = "./ext/websocket" }
 deno_webstorage = { version = "0.108.0", path = "./ext/webstorage" }
 deno_napi = { version = "0.43.0", path = "./ext/napi" }
+=======
+deno_broadcast_channel = { version = "0.106.0", path = "./ext/broadcast_channel" }
+deno_cache = { version = "0.44.0", path = "./ext/cache" }
+deno_console = { version = "0.112.0", path = "./ext/console" }
+deno_crypto = { version = "0.126.0", path = "./ext/crypto" }
+deno_fetch = { version = "0.136.0", path = "./ext/fetch" }
+deno_ffi = { version = "0.99.0", path = "./ext/ffi" }
+deno_fs = { version = "0.22.0", path = "./ext/fs" }
+deno_http = { version = "0.107.0", path = "./ext/http" }
+deno_io = { version = "0.22.0", path = "./ext/io" }
+deno_net = { version = "0.104.0", path = "./ext/net" }
+deno_node = { version = "0.49.0", path = "./ext/node" }
+deno_kv = { version = "0.20.0", path = "./ext/kv" }
+deno_tls = { version = "0.99.0", path = "./ext/tls" }
+deno_url = { version = "0.112.0", path = "./ext/url" }
+deno_web = { version = "0.143.0", path = "./ext/web" }
+deno_webidl = { version = "0.112.0", path = "./ext/webidl" }
+deno_websocket = { version = "0.117.0", path = "./ext/websocket" }
+deno_webstorage = { version = "0.107.0", path = "./ext/webstorage" }
+deno_napi = { version = "0.42.0", path = "./ext/napi" }
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 
 aes = "=0.8.2"
 anyhow = "1.0.57"

Releases.md

@@ -6,6 +6,7 @@ https://github.com/denoland/deno/releases
 We also have one-line install commands at:
 https://github.com/denoland/deno_install
 
+<<<<<<< HEAD
 ### 1.35.3 / 2023.07.26
 
 - feat(runtime): sys_info.rs - Use KERN_OSRELEASE on {Free,Open}BSD (#19849)
@@ -28,6 +29,8 @@ https://github.com/denoland/deno_install
 - perf(lsp): format in a blocking task (#19883)
 - perf: cache node resolution when accesing a global (#19930)
 
+=======
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 ### 1.35.2 / 2023.07.20
 
 - fix(bench): run warmup benchmark to break JIT bias (#19844)

bench_util/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_bench_util"
+<<<<<<< HEAD
 version = "0.107.0"
+=======
+version = "0.106.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

cli/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno"
+<<<<<<< HEAD
 version = "1.35.3"
+=======
+version = "1.35.2"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 default-run = "deno"
 edition.workspace = true

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.196.0/";
+=======
+pub const CURRENT_STD_URL_STR: &str = "https://deno.land/std@0.195.0/";
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))

cli/napi/sym/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "napi_sym"
+<<<<<<< HEAD
 version = "0.43.0"
+=======
+version = "0.42.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/broadcast_channel/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_broadcast_channel"
+<<<<<<< HEAD
 version = "0.107.0"
+=======
+version = "0.106.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/cache/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_cache"
+<<<<<<< HEAD
 version = "0.45.0"
+=======
+version = "0.44.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/console/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_console"
+<<<<<<< HEAD
 version = "0.113.0"
+=======
+version = "0.112.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/crypto/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_crypto"
+<<<<<<< HEAD
 version = "0.127.0"
+=======
+version = "0.126.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/fetch/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_fetch"
+<<<<<<< HEAD
 version = "0.137.0"
+=======
+version = "0.136.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/ffi/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_ffi"
+<<<<<<< HEAD
 version = "0.100.0"
+=======
+version = "0.99.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/fs/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_fs"
+<<<<<<< HEAD
 version = "0.23.0"
+=======
+version = "0.22.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/http/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_http"
+<<<<<<< HEAD
 version = "0.108.0"
+=======
+version = "0.107.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/io/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_io"
+<<<<<<< HEAD
 version = "0.23.0"
+=======
+version = "0.22.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/kv/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_kv"
+<<<<<<< HEAD
 version = "0.21.0"
+=======
+version = "0.20.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/napi/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_napi"
+<<<<<<< HEAD
 version = "0.43.0"
+=======
+version = "0.42.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/net/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_net"
+<<<<<<< HEAD
 version = "0.105.0"
+=======
+version = "0.104.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/node/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_node"
+<<<<<<< HEAD
 version = "0.50.0"
+=======
+version = "0.49.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/tls/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_tls"
+<<<<<<< HEAD
 version = "0.100.0"
+=======
+version = "0.99.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/url/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_url"
+<<<<<<< HEAD
 version = "0.113.0"
+=======
+version = "0.112.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/web/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_web"
+<<<<<<< HEAD
 version = "0.144.0"
+=======
+version = "0.143.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/webidl/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_webidl"
+<<<<<<< HEAD
 version = "0.113.0"
+=======
+version = "0.112.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/websocket/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_websocket"
+<<<<<<< HEAD
 version = "0.118.0"
+=======
+version = "0.117.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ext/webstorage/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_webstorage"
+<<<<<<< HEAD
 version = "0.108.0"
+=======
+version = "0.107.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

runtime/Cargo.toml

@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_runtime"
+<<<<<<< HEAD
 version = "0.121.0"
+=======
+version = "0.120.0"
+>>>>>>> b0a4536de (fix(task): ensure quoted strings are maintained mid-word (#19944))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true