Merge branch 'main' into node-crypto-setAutoPadding

iuioiua · Feb 15, 2024 · 9979f2e · 9979f2e
2 parents 7e77b7b + 1ad754b
commit 9979f2e
Show file tree

Hide file tree

Showing 271 changed files with 1,589 additions and 768 deletions.
diff --git a/.dprint.json b/.dprint.json
@@ -45,8 +45,8 @@
     "cli/tsc/*typescript.js",
     "gh-pages",
     "target",
-    "test_ffi/tests/test.js",
-    "test_util/std",
+    "tests/ffi/tests/test.js",
+    "tests/util/std",
     "test_util/wpt",
     "third_party",
     "tools/node_compat/TODO.md",

diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
@@ -445,7 +445,7 @@ const ci = {
       },
       steps: skipJobsIfPrAndMarkedSkip([
         ...cloneRepoStep,
-        submoduleStep("./test_util/std"),
+        submoduleStep("./tests/util/std"),
         {
           ...submoduleStep("./test_util/wpt"),
           if: "matrix.wpt",
@@ -704,6 +704,7 @@ const ci = {
           run: [
             "cd target/release",
             "zip -r deno-${{ matrix.arch }}-unknown-linux-gnu.zip deno",
+            "zip -r denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort",
             "./deno types > lib.deno.d.ts",
           ].join("\n"),
         },
@@ -728,6 +729,7 @@ const ci = {
             "--entitlements-xml-file=cli/entitlements.plist",
             "cd target/release",
             "zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno",
+            "zip -r denort-${{ matrix.arch }}-apple-darwin.zip denort",
           ]
             .join("\n"),
         },
@@ -740,8 +742,10 @@ const ci = {
             "github.repository == 'denoland/deno'",
           ].join("\n"),
           shell: "pwsh",
-          run:
+          run: [
             "Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip",
+            "Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip",
+          ].join("\n"),
         },
         {
           name: "Upload canary to dl.deno.land",
@@ -942,6 +946,7 @@ const ci = {
           run: [
             'du -hd1 "./target/${{ matrix.profile }}"',
             'du -ha  "./target/${{ matrix.profile }}/deno"',
+            'du -ha  "./target/${{ matrix.profile }}/denort"',
           ].join("\n"),
         },
         {
@@ -1007,10 +1012,15 @@ const ci = {
           with: {
             files: [
               "target/release/deno-x86_64-pc-windows-msvc.zip",
+              "target/release/denort-x86_64-pc-windows-msvc.zip",
               "target/release/deno-x86_64-unknown-linux-gnu.zip",
+              "target/release/denort-x86_64-unknown-linux-gnu.zip",
               "target/release/deno-x86_64-apple-darwin.zip",
+              "target/release/denort-x86_64-apple-darwin.zip",
               "target/release/deno-aarch64-unknown-linux-gnu.zip",
+              "target/release/denort-aarch64-unknown-linux-gnu.zip",
               "target/release/deno-aarch64-apple-darwin.zip",
+              "target/release/denort-aarch64-apple-darwin.zip",
               "target/release/deno_src.tar.gz",
               "target/release/lib.deno.d.ts",
             ].join("\n"),

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -149,8 +149,8 @@ jobs:
           fetch-depth: 5
           submodules: false
         if: '!(matrix.skip)'
-      - name: Clone submodule ./test_util/std
-        run: git submodule update --init --recursive --depth=1 -- ./test_util/std
+      - name: Clone submodule ./tests/util/std
+        run: git submodule update --init --recursive --depth=1 -- ./tests/util/std
         if: '!(matrix.skip)'
       - name: Clone submodule ./test_util/wpt
         run: git submodule update --init --recursive --depth=1 -- ./test_util/wpt
@@ -424,6 +424,7 @@ jobs:
         run: |-
           cd target/release
           zip -r deno-${{ matrix.arch }}-unknown-linux-gnu.zip deno
+          zip -r denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort
           ./deno types > lib.deno.d.ts
       - name: Pre-release (mac)
         if: |-
@@ -439,14 +440,17 @@ jobs:
           rcodesign sign target/release/deno --code-signature-flags=runtime --p12-password="$APPLE_CODESIGN_PASSWORD" --p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) --entitlements-xml-file=cli/entitlements.plist
           cd target/release
           zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno
+          zip -r denort-${{ matrix.arch }}-apple-darwin.zip denort
       - name: Pre-release (windows)
         if: |-
           !(matrix.skip) && (matrix.os == 'windows' &&
           matrix.job == 'test' &&
           matrix.profile == 'release' &&
           github.repository == 'denoland/deno')
         shell: pwsh
-        run: 'Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip'
+        run: |-
+          Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip
+          Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip
       - name: Upload canary to dl.deno.land
         if: |-
           !(matrix.skip) && (matrix.job == 'test' &&
@@ -588,6 +592,7 @@ jobs:
         run: |-
           du -hd1 "./target/${{ matrix.profile }}"
           du -ha  "./target/${{ matrix.profile }}/deno"
+          du -ha  "./target/${{ matrix.profile }}/denort"
       - name: Worker info
         if: '!(matrix.skip) && (matrix.job == ''bench'')'
         run: |-
@@ -632,10 +637,15 @@ jobs:
         with:
           files: |-
             target/release/deno-x86_64-pc-windows-msvc.zip
+            target/release/denort-x86_64-pc-windows-msvc.zip
             target/release/deno-x86_64-unknown-linux-gnu.zip
+            target/release/denort-x86_64-unknown-linux-gnu.zip
             target/release/deno-x86_64-apple-darwin.zip
+            target/release/denort-x86_64-apple-darwin.zip
             target/release/deno-aarch64-unknown-linux-gnu.zip
+            target/release/denort-aarch64-unknown-linux-gnu.zip
             target/release/deno-aarch64-apple-darwin.zip
+            target/release/denort-aarch64-apple-darwin.zip
             target/release/deno_src.tar.gz
             target/release/lib.deno.d.ts
           body_path: target/release/release-notes.md

diff --git a/.gitignore b/.gitignore
@@ -12,9 +12,9 @@ gclient_config.py_entries
 /std/hash/_wasm/target
 /tools/wpt/manifest.json
 /third_party/
-/test_napi/node_modules
-/test_napi/build
-/test_napi/third_party_tests/node_modules
+/tests/napi/node_modules
+/tests/napi/build
+/tests/napi/third_party_tests/node_modules
 
 # MacOS generated files
 .DS_Store

diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
-[submodule "test_util/std"]
-	path = test_util/std
+[submodule "tests/util/std"]
+	path = tests/util/std
 	url = https://github.com/denoland/deno_std
 	shallow = true
 [submodule "test_util/wpt"]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,12 +28,12 @@ members = [
   "ext/websocket",
   "ext/webstorage",
   "runtime",
-  "test_ffi",
-  "test_napi",
   "test_util",
   "tests",
+  "tests/ffi",
+  "tests/napi",
 ]
-exclude = ["test_util/std/hash/_wasm"]
+exclude = ["tests/util/std/hash/_wasm"]
 
 [workspace.package]
 authors = ["the Deno authors"]
@@ -43,7 +43,7 @@ repository = "https://github.com/denoland/deno"
 
 [workspace.dependencies]
 deno_ast = { version = "0.33.2", features = ["transpiling"] }
-deno_core = { version = "0.261.0" }
+deno_core = { version = "0.262.0" }
 
 deno_bench_util = { version = "0.131.0", path = "./bench_util" }
 deno_lockfile = "0.18.2"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -4,10 +4,8 @@
 name = "deno"
 version = "1.40.4"
 authors.workspace = true
-autotests = false
 default-run = "deno"
 edition.workspace = true
-exclude = ["tests/testdata/npm/registry/*"]
 license.workspace = true
 repository.workspace = true
 description = "Provides the deno executable"
@@ -17,9 +15,14 @@ name = "deno"
 path = "main.rs"
 doc = false
 
+[[bin]]
+name = "denort"
+path = "mainrt.rs"
+doc = false
+
 [[test]]
 name = "integration"
-path = "../tests/integration_tests_runner.rs"
+path = "integration_tests_runner.rs"
 harness = false
 
 [[bench]]
@@ -65,7 +68,7 @@ deno_config = "=0.9.2"
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_doc = { version = "=0.103.0", features = ["html"] }
 deno_emit = "=0.36.0"
-deno_graph = "=0.65.1"
+deno_graph = "=0.65.3"
 deno_lint = { version = "=0.56.0", features = ["docs"] }
 deno_lockfile.workspace = true
 deno_npm = "=0.16.0"

diff --git a/cli/args/flags.rs b/cli/args/flags.rs
@@ -2379,6 +2379,8 @@ fn publish_subcommand() -> Command {
           .long("token")
           .help("The API token to use when publishing. If unset, interactive authentication is be used")
       )
+      .arg(config_arg())
+      .arg(no_config_arg())
       .arg(
         Arg::new("dry-run")
           .long("dry-run")
@@ -3821,6 +3823,8 @@ fn vendor_parse(flags: &mut Flags, matches: &mut ArgMatches) {
 }
 
 fn publish_parse(flags: &mut Flags, matches: &mut ArgMatches) {
+  config_args_parse(flags, matches);
+
   flags.subcommand = DenoSubcommand::Publish(PublishFlags {
     token: matches.remove_one("token"),
     dry_run: matches.get_flag("dry-run"),

diff --git a/cli/args/mod.rs b/cli/args/mod.rs
@@ -102,9 +102,9 @@ pub fn npm_registry_default_url() -> &'static Url {
   &NPM_REGISTRY_DEFAULT_URL
 }
 
-pub fn deno_registry_url() -> &'static Url {
-  static DENO_REGISTRY_URL: Lazy<Url> = Lazy::new(|| {
-    let env_var_name = "DENO_REGISTRY_URL";
+pub fn jsr_url() -> &'static Url {
+  static JSR_URL: Lazy<Url> = Lazy::new(|| {
+    let env_var_name = "JSR_URL";
     if let Ok(registry_url) = std::env::var(env_var_name) {
       // ensure there is a trailing slash for the directory
       let registry_url = format!("{}/", registry_url.trim_end_matches('/'));
@@ -125,17 +125,17 @@ pub fn deno_registry_url() -> &'static Url {
     Url::parse("https://jsr.io/").unwrap()
   });
 
-  &DENO_REGISTRY_URL
+  &JSR_URL
 }
 
-pub fn deno_registry_api_url() -> &'static Url {
-  static DENO_REGISTRY_API_URL: Lazy<Url> = Lazy::new(|| {
-    let mut deno_registry_api_url = deno_registry_url().clone();
-    deno_registry_api_url.set_path("api/");
-    deno_registry_api_url
+pub fn jsr_api_url() -> &'static Url {
+  static JSR_API_URL: Lazy<Url> = Lazy::new(|| {
+    let mut jsr_api_url = jsr_url().clone();
+    jsr_api_url.set_path("api/");
+    jsr_api_url
   });
 
-  &DENO_REGISTRY_API_URL
+  &JSR_API_URL
 }
 
 pub fn ts_config_to_emit_options(
@@ -2018,10 +2018,10 @@ mod test {
   }
 
   #[test]
-  fn deno_registry_urls() {
-    let reg_url = deno_registry_url();
+  fn jsr_urls() {
+    let reg_url = jsr_url();
     assert!(reg_url.as_str().ends_with('/'));
-    let reg_api_url = deno_registry_api_url();
+    let reg_api_url = jsr_api_url();
     assert!(reg_api_url.as_str().ends_with('/'));
   }
 }
diff --git a/cli/bench/main.rs b/cli/bench/main.rs
@@ -123,7 +123,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[
       "check",
       "--reload",
       "--unstable",
-      "test_util/std/http/file_server_test.ts",
+      "tests/util/std/http/file_server_test.ts",
     ],
     None,
   ),
@@ -134,7 +134,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[
       "--reload",
       "--no-check",
       "--unstable",
-      "test_util/std/http/file_server_test.ts",
+      "tests/util/std/http/file_server_test.ts",
     ],
     None,
   ),
@@ -143,7 +143,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[
     &[
       "bundle",
       "--unstable",
-      "test_util/std/http/file_server_test.ts",
+      "tests/util/std/http/file_server_test.ts",
     ],
     None,
   ),
@@ -153,7 +153,7 @@ const EXEC_TIME_BENCHMARKS: &[(&str, &[&str], Option<i32>)] = &[
       "bundle",
       "--no-check",
       "--unstable",
-      "test_util/std/http/file_server_test.ts",
+      "tests/util/std/http/file_server_test.ts",
     ],
     None,
   ),
@@ -306,7 +306,7 @@ fn get_binary_sizes(target_dir: &Path) -> Result<HashMap<String, i64>> {
 }
 
 const BUNDLES: &[(&str, &str)] = &[
-  ("file_server", "./test_util/std/http/file_server.ts"),
+  ("file_server", "./tests/util/std/http/file_server.ts"),
   ("welcome", "./tests/testdata/welcome.ts"),
 ];
 fn bundle_benchmark(deno_exe: &Path) -> Result<HashMap<String, i64>> {

diff --git a/cli/bench/napi/bench.js b/cli/bench/napi/bench.js
@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-import { loadTestLibrary } from "../../../test_napi/common.js";
+import { loadTestLibrary } from "../../../tests/napi/common.js";
 
 const lib = loadTestLibrary();
 

diff --git a/cli/bench/napi/bench_node.mjs b/cli/bench/napi/bench_node.mjs
@@ -2,7 +2,7 @@ import { bench, run } from "mitata";
 import { createRequire } from "module";
 
 const require = createRequire(import.meta.url);
-const lib = require("../../../test_napi.node");
+const lib = require("../../../tests/napi.node");
 
 bench("warmup", () => {});
 bench("napi_get_undefined", () => lib.test_get_undefined(0));