Cherry-pick version bump commit with conflicts

denoland · May 18, 2024 · 65e79fa · 65e79fa
1 parent 1a0fbc4
commit 65e79fa
Show file tree

Hide file tree

Showing 16 changed files with 483 additions and 0 deletions.
diff --git 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 = 91;
+=======
+const cacheVersion = 92;
+>>>>>>> a13c4531f (1.43.5 (#23876))
 
 const ubuntuX86Runner = "ubuntu-22.04";
 const ubuntuX86XlRunner = "ubuntu-22.04-xl";

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -367,8 +367,13 @@ jobs:
           path: |-
             ~/.cargo/registry/index
             ~/.cargo/registry/cache
+<<<<<<< HEAD
           key: '91-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
           restore-keys: '91-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
+=======
+          key: '92-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
+          restore-keys: '92-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
+>>>>>>> a13c4531f (1.43.5 (#23876))
         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: '91-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
+=======
+          restore-keys: '92-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
+>>>>>>> a13c4531f (1.43.5 (#23876))
       - 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: '91-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+=======
+          key: '92-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+>>>>>>> a13c4531f (1.43.5 (#23876))
   publish-canary:
     name: publish canary
     runs-on: ubuntu-22.04

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,7 +70,11 @@ 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" }
+<<<<<<< HEAD
 deno_http = { version = "0.150.0", path = "./ext/http" }
+=======
+deno_http = { version = "0.149.0", path = "./ext/http" }
+>>>>>>> a13c4531f (1.43.5 (#23876))
 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" }

diff --git a/Releases.md b/Releases.md
@@ -6,6 +6,13 @@ https://github.com/denoland/deno/releases
 We also have one-line install commands at:
 https://github.com/denoland/deno_install
 
+<<<<<<< HEAD
+=======
+### 1.43.5 / 2024.05.18
+
+- fix(npm): regression deserializing JSON for some npm packages (#23868)
+
+>>>>>>> a13c4531f (1.43.5 (#23876))
 ### 1.43.4 / 2024.05.16
 
 - fix(cli): panic with `deno coverage` (#23353)

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno"
+<<<<<<< HEAD
 version = "1.43.4"
+=======
+version = "1.43.5"
+>>>>>>> a13c4531f (1.43.5 (#23876))
 authors.workspace = true
 default-run = "deno"
 edition.workspace = true

diff --git a/cli/args/flags.rs b/cli/args/flags.rs
@@ -26,6 +26,10 @@ use serde::Serialize;
 use std::env;
 use std::ffi::OsString;
 use std::net::SocketAddr;
+<<<<<<< HEAD
+=======
+use std::num::NonZeroU16;
+>>>>>>> a13c4531f (1.43.5 (#23876))
 use std::num::NonZeroU32;
 use std::num::NonZeroU8;
 use std::num::NonZeroUsize;
@@ -282,7 +286,11 @@ impl RunFlags {
 pub struct ServeFlags {
   pub script: String,
   pub watch: Option<WatchFlagsWithPaths>,
+<<<<<<< HEAD
   pub port: u16,
+=======
+  pub port: NonZeroU16,
+>>>>>>> a13c4531f (1.43.5 (#23876))
   pub host: String,
 }
 
@@ -292,7 +300,11 @@ impl ServeFlags {
     Self {
       script,
       watch: None,
+<<<<<<< HEAD
       port,
+=======
+      port: NonZeroU16::new(port).unwrap(),
+>>>>>>> a13c4531f (1.43.5 (#23876))
       host: host.to_owned(),
     }
   }
@@ -2463,8 +2475,13 @@ fn serve_subcommand() -> Command {
     .arg(
       Arg::new("port")
         .long("port")
+<<<<<<< HEAD
         .help("The TCP port to serve on, defaulting to 8000. Pass 0 to pick a random free port.")
         .value_parser(value_parser!(u16)),
+=======
+        .help("The TCP port to serve on, defaulting to 8000.")
+        .value_parser(value_parser!(NonZeroU16)),
+>>>>>>> a13c4531f (1.43.5 (#23876))
     )
     .arg(
       Arg::new("host")
@@ -4126,7 +4143,13 @@ fn serve_parse(
   app: Command,
 ) -> clap::error::Result<()> {
   // deno serve implies --allow-net=host:port
+<<<<<<< HEAD
   let port = matches.remove_one::<u16>("port").unwrap_or(8000);
+=======
+  let port = matches
+    .remove_one::<NonZeroU16>("port")
+    .unwrap_or(NonZeroU16::new(8000).unwrap());
+>>>>>>> a13c4531f (1.43.5 (#23876))
   let host = matches
     .remove_one::<String>("host")
     .unwrap_or_else(|| "0.0.0.0".to_owned());
@@ -5319,6 +5342,7 @@ mod tests {
         ..Flags::default()
       }
     );
+<<<<<<< HEAD
 
     let r = flags_from_vec(svec![
       "deno",
@@ -5345,6 +5369,8 @@ mod tests {
         ..Flags::default()
       }
     );
+=======
+>>>>>>> a13c4531f (1.43.5 (#23876))
   }
 
   #[test]

diff --git a/cli/args/mod.rs b/cli/args/mod.rs
@@ -62,6 +62,10 @@ use std::env;
 use std::io::BufReader;
 use std::io::Cursor;
 use std::net::SocketAddr;
+<<<<<<< HEAD
+=======
+use std::num::NonZeroU16;
+>>>>>>> a13c4531f (1.43.5 (#23876))
 use std::num::NonZeroUsize;
 use std::path::Path;
 use std::path::PathBuf;
@@ -1035,7 +1039,11 @@ impl CliOptions {
     }
   }
 
+<<<<<<< HEAD
   pub fn serve_port(&self) -> Option<u16> {
+=======
+  pub fn serve_port(&self) -> Option<NonZeroU16> {
+>>>>>>> a13c4531f (1.43.5 (#23876))
     if let DenoSubcommand::Serve(flags) = self.sub_command() {
       Some(flags.port)
     } else {

diff --git a/cli/worker.rs b/cli/worker.rs
@@ -1,5 +1,9 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
+<<<<<<< HEAD
+=======
+use std::num::NonZeroU16;
+>>>>>>> a13c4531f (1.43.5 (#23876))
 use std::path::Path;
 use std::path::PathBuf;
 use std::rc::Rc;
@@ -147,7 +151,11 @@ struct SharedWorkerState {
   disable_deprecated_api_warning: bool,
   verbose_deprecated_api_warning: bool,
   code_cache: Option<Arc<dyn code_cache::CodeCache>>,
+<<<<<<< HEAD
   serve_port: Option<u16>,
+=======
+  serve_port: Option<NonZeroU16>,
+>>>>>>> a13c4531f (1.43.5 (#23876))
   serve_host: Option<String>,
 }
 
@@ -417,7 +425,11 @@ impl CliMainWorkerFactory {
     feature_checker: Arc<FeatureChecker>,
     options: CliMainWorkerOptions,
     node_ipc: Option<i64>,
+<<<<<<< HEAD
     serve_port: Option<u16>,
+=======
+    serve_port: Option<NonZeroU16>,
+>>>>>>> a13c4531f (1.43.5 (#23876))
     serve_host: Option<String>,
     enable_future_features: bool,
     disable_deprecated_api_warning: bool,

diff --git a/ext/http/00_serve.ts b/ext/http/00_serve.ts
@@ -793,9 +793,15 @@ internals.serveHttpOnConnection = serveHttpOnConnection;
 
 function registerDeclarativeServer(exports) {
   if (ObjectHasOwn(exports, "fetch")) {
+<<<<<<< HEAD
     if (typeof exports.fetch !== "function") {
       throw new TypeError(
         "Invalid type for fetch: must be a function with a single or no parameter",
+=======
+    if (typeof exports.fetch !== "function" || exports.fetch.length !== 1) {
+      throw new TypeError(
+        "Invalid type for fetch: must be a function with a single parameter",
+>>>>>>> a13c4531f (1.43.5 (#23876))
       );
     }
     return ({ servePort, serveHost }) => {

diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml
@@ -2,7 +2,11 @@
 
 [package]
 name = "deno_http"
+<<<<<<< HEAD
 version = "0.150.0"
+=======
+version = "0.149.0"
+>>>>>>> a13c4531f (1.43.5 (#23876))
 authors.workspace = true
 edition.workspace = true
 license.workspace = true