Merge pull request #1020 from nodejs/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/ISSUE_TEMPLATE/1-bug-report.yml

@@ -13,7 +13,9 @@ body:
   - type: input
     attributes:
       label: Version
-      description: Output of `node -v`
+      description: |
+        Output of `node -v`.
+        Please verify that you are reproducing the issue in a [currently-supported version](https://github.com/nodejs/Release/blob/HEAD/README.md#release-schedule) of Node.js.
   - type: textarea
     attributes:
       label: Platform

BUILDING.md

@@ -226,7 +226,7 @@ Consult previous versions of this document for older versions of Node.js:
 
 ### Prerequisites
 
-* Python support: the Node.js project supports Python >= 3.6 for building and testing.
+* [A supported version of Python][Python versions] for building and testing.
 * Memory: at least 8GB of RAM is typically required when compiling with 4 parallel jobs (e.g: `make -j4`)
 
 ### Unix and macOS

Makefile

@@ -241,8 +241,10 @@ coverage-clean:
 	$(RM) -r node_modules
 	$(RM) -r gcovr
 	$(RM) -r coverage/tmp
-	$(FIND) out/$(BUILDTYPE)/obj.target \( -name "*.gcda" -o -name "*.gcno" \) \
-		-type f -exec $(RM) {} \;
+	@if [ -d "out/Release/obj.target" ]; then \
+		$(FIND) out/$(BUILDTYPE)/obj.target \( -name "*.gcda" -o -name "*.gcno" \) \
+			-type f -exec $(RM) {};\
+	fi
 
 .PHONY: coverage
 # Build and test with code coverage reporting. HTML coverage reports will be
@@ -266,7 +268,9 @@ coverage-build-js:
 
 .PHONY: coverage-test
 coverage-test: coverage-build
-	$(FIND) out/$(BUILDTYPE)/obj.target -name "*.gcda" -type f -exec $(RM) {} \;
+	@if [ -d "out/Release/obj.target" ]; then \
+		$(FIND) out/$(BUILDTYPE)/obj.target -name "*.gcda" -type f -exec $(RM) {}; \
+	fi
 	-NODE_V8_COVERAGE=coverage/tmp \
 		TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
 	$(MAKE) coverage-report-js

android-configure

@@ -8,8 +8,6 @@ command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
 command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
 command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
 command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
-command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
-command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
 command -v python3 >/dev/null && exec python3 "$0" "$@"
 exec python "$0" "$@"
 ''' "$0" "$@"
@@ -23,7 +21,7 @@ except ImportError:
   from distutils.spawn import find_executable as which
 
 print('Node.js android configure: Found Python {}.{}.{}...'.format(*sys.version_info))
-acceptable_pythons = ((3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6))
+acceptable_pythons = ((3, 11), (3, 10), (3, 9), (3, 8))
 if sys.version_info[:2] in acceptable_pythons:
   import android_configure
 else:

benchmark/url/whatwg-url-to-and-from-path.js

@@ -3,28 +3,46 @@ const common = require('../common.js');
 const { fileURLToPath, pathToFileURL } = require('node:url');
 const isWindows = process.platform === 'win32';
 
-const bench = common.createBenchmark(main, {
-  input: isWindows ? [
-    'file:///c/',
-  ] : [
-    'file:///dev/null',
-    'file:///dev/null?key=param&bool',
-    'file:///dev/null?key=param&bool#hash',
-  ],
-  method: isWindows ? [
-    'fileURLToPath',
-  ] : [
-    'fileURLToPath',
-    'pathToFileURL',
-  ],
-  n: [5e6],
-});
+const inputs = isWindows ? [
+  'C:\\foo',
+  'C:\\Program Files\\Music\\Web Sys\\main.html?REQUEST=RADIO',
+  '\\\\nas\\My Docs\\File.doc',
+  '\\\\?\\UNC\\server\\share\\folder\\file.txt',
+  'file:///C:/foo',
+  'file:///C:/dir/foo?query=1',
+  'file:///C:/dir/foo#fragment',
+] : [
+  '/dev/null',
+  '/dev/null?key=param&bool',
+  '/dev/null?key=param&bool#hash',
+  'file:///dev/null',
+  'file:///dev/null?key=param&bool',
+  'file:///dev/null?key=param&bool#hash',
+];
 
-function main({ n, input, method }) {
-  method = method === 'fileURLOrPath' ? fileURLToPath : pathToFileURL;
+const bench = common.createBenchmark(
+  main,
+  {
+    method: ['pathToFileURL', 'fileURLToPath'],
+    input: Object.values(inputs),
+    n: [5e6],
+  },
+  {
+    combinationFilter: (p) => (
+      (isWindows ?
+        (!p.input.startsWith('file://') && p.method === 'pathToFileURL') :
+        p.method === 'pathToFileURL'
+      ) ||
+      (p.input.startsWith('file://') && p.method === 'fileURLToPath')
+    ),
+  },
+);
+
+function main({ method, input, n }) {
+  const methodFunc = method === 'fileURLToPath' ? fileURLToPath : pathToFileURL;
   bench.start();
   for (let i = 0; i < n; i++) {
-    method(input);
+    methodFunc(input);
   }
   bench.end(n);
 }

configure

@@ -10,8 +10,6 @@ command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
 command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
 command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
 command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
-command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
-command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
 command -v python3 >/dev/null && exec python3 "$0" "$@"
 exec python "$0" "$@"
 ''' "$0" "$@"
@@ -25,7 +23,7 @@ except ImportError:
   from distutils.spawn import find_executable as which
 
 print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
-acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6))
+acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8))
 if sys.version_info[:2] in acceptable_pythons:
   import configure
 else:

configure.py

@@ -2126,7 +2126,7 @@ def make_bin_override():
   if sys.platform == 'win32':
     raise Exception('make_bin_override should not be called on win32.')
   # If the system python is not the python we are running (which should be
-  # python 3), then create a directory with a symlink called `python` to our
+  # python 3.8+), then create a directory with a symlink called `python` to our
   # sys.executable. This directory will be prefixed to the PATH, so that
   # other tools that shell out to `python` will use the appropriate python
 

deps/amaro/dist/index.js

@@ -1,6 +1,6 @@
 {
 	"name": "amaro",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"description": "Node.js TypeScript wrapper",
 	"license": "MIT",
 	"type": "commonjs",

deps/amaro/package.json

@@ -1653,7 +1653,7 @@ Use this flag to disable top-level await in REPL.
 added: v22.0.0
 -->
 
-Use this flag to disable experimental [`WebSocket`][] support.
+Disable exposition of [`WebSocket`][] on the global scope.
 
 ### `--no-extra-info-on-fatal-exception`
 
@@ -2218,6 +2218,17 @@ concurrently. If `--experimental-test-isolation` is set to `'none'`, this flag
 is ignored and concurrency is one. Otherwise, concurrency defaults to
 `os.availableParallelism() - 1`.
 
+### `--test-coverage-branches=threshold`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+Require a minimum percent of covered branches. If code coverage does not reach
+the threshold specified, the process will exit with code `1`.
+
 ### `--test-coverage-exclude`
 
 <!-- YAML
@@ -2235,6 +2246,17 @@ This option may be specified multiple times to exclude multiple glob patterns.
 If both `--test-coverage-exclude` and `--test-coverage-include` are provided,
 files must meet **both** criteria to be included in the coverage report.
 
+### `--test-coverage-functions=threshold`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+Require a minimum percent of covered functions. If code coverage does not reach
+the threshold specified, the process will exit with code `1`.
+
 ### `--test-coverage-include`
 
 <!-- YAML
@@ -2252,6 +2274,17 @@ This option may be specified multiple times to include multiple glob patterns.
 If both `--test-coverage-exclude` and `--test-coverage-include` are provided,
 files must meet **both** criteria to be included in the coverage report.
 
+### `--test-coverage-lines=threshold`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+Require a minimum percent of covered lines. If code coverage does not reach
+the threshold specified, the process will exit with code `1`.
+
 ### `--test-force-exit`
 
 <!-- YAML
@@ -3017,8 +3050,11 @@ one is included in the list below.
 * `--secure-heap-min`
 * `--secure-heap`
 * `--snapshot-blob`
+* `--test-coverage-branches`
 * `--test-coverage-exclude`
+* `--test-coverage-functions`
 * `--test-coverage-include`
+* `--test-coverage-lines`
 * `--test-name-pattern`
 * `--test-only`
 * `--test-reporter-destination`