DatabaseHandler for SqliteDbHandler {
(Some(path), _) => {
let flags =
OpenFlags::default().difference(OpenFlags::SQLITE_OPEN_URI);
+<<<<<<< HEAD
let resolved_path = canonicalize_path(&PathBuf::from(path))
.map_err(|_| SqliteBackendError::DatabaseClosed)?;
+=======
+ let resolved_path = canonicalize_path(&PathBuf::from(path))?;
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
(
rusqlite::Connection::open_with_flags(path, flags)?,
Some(resolved_path),
)
}
(None, Some(path)) => {
+<<<<<<< HEAD
std::fs::create_dir_all(path)
.map_err(|_| SqliteBackendError::DatabaseClosed)?;
+=======
+ std::fs::create_dir_all(path)?;
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
let path = path.join("kv.sqlite3");
(rusqlite::Connection::open(path.clone())?, Some(path))
}
@@ -112,7 +124,11 @@ impl DatabaseHandler for SqliteDbHandler {
conn.pragma_update(None, "journal_mode", "wal")?;
+<<<<<<< HEAD
Ok::<_, SqliteBackendError>((conn, queue_waker_key))
+=======
+ Ok::<_, AnyError>((conn, queue_waker_key))
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
})
})
.await
diff --git a/ext/napi/Cargo.toml b/ext/napi/Cargo.toml
index 97bc002625..5a1151e367 100644
--- a/ext/napi/Cargo.toml
+++ b/ext/napi/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_napi"
+<<<<<<< HEAD
version = "0.55.0"
+=======
+version = "0.56.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml
index 91f2a527ff..ac217cef92 100644
--- a/ext/net/Cargo.toml
+++ b/ext/net/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_net"
+<<<<<<< HEAD
version = "0.117.0"
+=======
+version = "0.118.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml
index 03ccc5562e..0661e1dc87 100644
--- a/ext/node/Cargo.toml
+++ b/ext/node/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_node"
+<<<<<<< HEAD
version = "0.62.0"
+=======
+version = "0.63.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/node/lib.rs b/ext/node/lib.rs
index af8aabd1f0..a63372112b 100644
--- a/ext/node/lib.rs
+++ b/ext/node/lib.rs
@@ -463,8 +463,11 @@ deno_core::extension!(deno_node,
"internal/util/comparisons.ts",
"internal/util/debuglog.ts",
"internal/util/inspect.mjs",
+<<<<<<< HEAD
"internal/util/parse_args/parse_args.js",
"internal/util/parse_args/utils.js",
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
"internal/util/types.ts",
"internal/validators.mjs",
"path/_constants.ts",
diff --git a/ext/node/polyfills/_stream.mjs b/ext/node/polyfills/_stream.mjs
index d6db3020b5..9cb424edc1 100644
--- a/ext/node/polyfills/_stream.mjs
+++ b/ext/node/polyfills/_stream.mjs
@@ -4474,7 +4474,10 @@ var require_duplexify = __commonJS({
readable: false,
});
}
+<<<<<<< HEAD
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
if (typeof body === "function") {
const { value, write, final, destroy } = fromAsyncGen(body);
if (isIterable(value)) {
@@ -4670,6 +4673,11 @@ var require_duplexify = __commonJS({
cb(err);
} else if (err) {
d.destroy(err);
+<<<<<<< HEAD
+=======
+ } else if (!readable && !writable) {
+ d.destroy();
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
}
d = new Duplexify({
diff --git a/ext/node/polyfills/internal/buffer.mjs b/ext/node/polyfills/internal/buffer.mjs
index 4d50fe80f9..8d48c574d1 100644
--- a/ext/node/polyfills/internal/buffer.mjs
+++ b/ext/node/polyfills/internal/buffer.mjs
@@ -1536,12 +1536,17 @@ Buffer.prototype.copy = function copy(
sourceStart = 0;
} else {
sourceStart = toInteger(sourceStart, 0);
+<<<<<<< HEAD
if (sourceStart < 0 || sourceStart > this.length) {
throw new codes.ERR_OUT_OF_RANGE(
"sourceStart",
`>= 0 && <= ${this.length}`,
sourceStart,
);
+=======
+ if (sourceStart < 0) {
+ throw new codes.ERR_OUT_OF_RANGE("sourceStart", ">= 0", sourceStart);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
if (sourceStart >= MAX_UINT32) {
throw new codes.ERR_OUT_OF_RANGE(
diff --git a/ext/node/polyfills/internal/console/constructor.mjs b/ext/node/polyfills/internal/console/constructor.mjs
index afa18bb97e..7d32ba9828 100644
--- a/ext/node/polyfills/internal/console/constructor.mjs
+++ b/ext/node/polyfills/internal/console/constructor.mjs
@@ -17,7 +17,21 @@ import {
validateInteger,
validateObject,
} from "ext:deno_node/internal/validators.mjs";
+<<<<<<< HEAD
import { previewEntries } from "ext:deno_node/internal_binding/util.ts";
+=======
+const previewEntries = (iter, isKeyValue) => {
+ if (isKeyValue) {
+ const arr = [...iter];
+ if (Array.isArray(arr[0]) && arr[0].length === 2) {
+ return [[].concat(...arr), true];
+ }
+ return [arr, false];
+ } else {
+ return [...iter];
+ }
+};
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
import { Buffer } from "node:buffer";
const { isBuffer } = Buffer;
import {
@@ -465,6 +479,10 @@ const consoleMethods = {
// https://console.spec.whatwg.org/#table
table(tabularData, properties) {
+<<<<<<< HEAD
+=======
+ console.log("tabularData", tabularData);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
if (properties !== undefined) {
validateArray(properties, "properties");
}
diff --git a/ext/node/polyfills/internal/errors.ts b/ext/node/polyfills/internal/errors.ts
index 8d10e18573..afdf5468f2 100644
--- a/ext/node/polyfills/internal/errors.ts
+++ b/ext/node/polyfills/internal/errors.ts
@@ -2472,6 +2472,7 @@ export class ERR_PACKAGE_PATH_NOT_EXPORTED extends NodeError {
}
}
+<<<<<<< HEAD
export class ERR_PARSE_ARGS_INVALID_OPTION_VALUE extends NodeTypeError {
constructor(x: string) {
super("ERR_PARSE_ARGS_INVALID_OPTION_VALUE", x);
@@ -2502,6 +2503,8 @@ export class ERR_PARSE_ARGS_UNKNOWN_OPTION extends NodeTypeError {
}
}
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
export class ERR_INTERNAL_ASSERTION extends NodeError {
constructor(message?: string) {
const suffix = "This is caused by either a bug in Node.js " +
diff --git a/ext/node/polyfills/internal/validators.mjs b/ext/node/polyfills/internal/validators.mjs
index b5b539088a..fbf95a2b0b 100644
--- a/ext/node/polyfills/internal/validators.mjs
+++ b/ext/node/polyfills/internal/validators.mjs
@@ -9,12 +9,15 @@ import { hideStackFrames } from "ext:deno_node/internal/hide_stack_frames.ts";
import { isArrayBufferView } from "ext:deno_node/internal/util/types.ts";
import { normalizeEncoding } from "ext:deno_node/internal/normalize_encoding.mjs";
+<<<<<<< HEAD
const primordials = globalThis.__bootstrap.primordials;
const {
ArrayPrototypeIncludes,
ArrayPrototypeJoin,
} = primordials;
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
/**
* @param {number} value
* @returns {boolean}
@@ -288,6 +291,7 @@ const validateArray = hideStackFrames(
},
);
+<<<<<<< HEAD
function validateUnion(value, name, union) {
if (!ArrayPrototypeIncludes(union, value)) {
throw new ERR_INVALID_ARG_TYPE(
@@ -298,6 +302,8 @@ function validateUnion(value, name, union) {
}
}
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
export default {
isInt32,
isUint32,
@@ -315,7 +321,10 @@ export default {
validatePort,
validateString,
validateUint32,
+<<<<<<< HEAD
validateUnion,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
};
export {
isInt32,
@@ -334,5 +343,8 @@ export {
validatePort,
validateString,
validateUint32,
+<<<<<<< HEAD
validateUnion,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
};
diff --git a/ext/node/polyfills/internal_binding/util.ts b/ext/node/polyfills/internal_binding/util.ts
index 59f1246fc4..82a22d4a31 100644
--- a/ext/node/polyfills/internal_binding/util.ts
+++ b/ext/node/polyfills/internal_binding/util.ts
@@ -129,5 +129,8 @@ export function getOwnNonIndexProperties(
}
return result;
}
+<<<<<<< HEAD
export { previewEntries } from "ext:deno_console/01_console.js";
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
diff --git a/ext/node/polyfills/os.ts b/ext/node/polyfills/os.ts
index d1f5e7bfae..e77bb873ab 100644
--- a/ext/node/polyfills/os.ts
+++ b/ext/node/polyfills/os.ts
@@ -159,6 +159,7 @@ export function endianness(): "BE" | "LE" {
/** Return free memory amount */
export function freemem(): number {
+<<<<<<< HEAD
if (Deno.build.os === "linux") {
// On linux, use 'available' memory
// https://github.com/libuv/libuv/blob/a5c01d4de3695e9d9da34cfd643b5ff0ba582ea7/src/unix/linux.c#L2064
@@ -167,6 +168,9 @@ export function freemem(): number {
// Use 'free' memory on other platforms
return Deno.systemMemoryInfo().free;
}
+=======
+ return Deno.systemMemoryInfo().free;
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
/** Not yet implemented */
diff --git a/ext/node/polyfills/util.ts b/ext/node/polyfills/util.ts
index 68c9626c9c..be7e704c5f 100644
--- a/ext/node/polyfills/util.ts
+++ b/ext/node/polyfills/util.ts
@@ -15,7 +15,10 @@ import { Buffer } from "node:buffer";
import { isDeepStrictEqual } from "ext:deno_node/internal/util/comparisons.ts";
import process from "node:process";
import { validateString } from "ext:deno_node/internal/validators.mjs";
+<<<<<<< HEAD
import { parseArgs } from "ext:deno_node/internal/util/parse_args/parse_args.js";
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
const primordials = globalThis.__bootstrap.primordials;
const {
ArrayIsArray,
@@ -49,7 +52,10 @@ export {
format,
formatWithOptions,
inspect,
+<<<<<<< HEAD
parseArgs,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
promisify,
stripVTControlCharacters,
types,
@@ -314,7 +320,10 @@ export default {
getSystemErrorName,
deprecate,
callbackify,
+<<<<<<< HEAD
parseArgs,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
promisify,
inherits,
types,
diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml
index 96fba5e3a3..ac0926bf35 100644
--- a/ext/tls/Cargo.toml
+++ b/ext/tls/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_tls"
+<<<<<<< HEAD
version = "0.112.0"
+=======
+version = "0.113.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml
index 44c995fd36..187b93eabc 100644
--- a/ext/url/Cargo.toml
+++ b/ext/url/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_url"
+<<<<<<< HEAD
version = "0.125.0"
+=======
+version = "0.126.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/web/06_streams.js b/ext/web/06_streams.js
index 4f472984d6..e0cec8579c 100644
--- a/ext/web/06_streams.js
+++ b/ext/web/06_streams.js
@@ -79,7 +79,10 @@ const {
TypedArrayPrototypeGetBuffer,
TypedArrayPrototypeGetByteLength,
TypedArrayPrototypeGetByteOffset,
+<<<<<<< HEAD
TypedArrayPrototypeGetLength,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
TypedArrayPrototypeGetSymbolToStringTag,
TypedArrayPrototypeSet,
TypedArrayPrototypeSlice,
@@ -1304,9 +1307,13 @@ function readableByteStreamControllerClose(controller) {
}
if (controller[_pendingPullIntos].length !== 0) {
const firstPendingPullInto = controller[_pendingPullIntos][0];
+<<<<<<< HEAD
if (
firstPendingPullInto.bytesFilled % firstPendingPullInto.elementSize !== 0
) {
+=======
+ if (firstPendingPullInto.bytesFilled > 0) {
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
const e = new TypeError(
"Insufficient bytes to fill elements in the given buffer",
);
@@ -1850,11 +1857,18 @@ function readableStreamDefaultcontrollerShouldCallPull(controller) {
/**
* @param {ReadableStreamBYOBReader} reader
* @param {ArrayBufferView} view
+<<<<<<< HEAD
* @param {number} min
* @param {ReadIntoRequest} readIntoRequest
* @returns {void}
*/
function readableStreamBYOBReaderRead(reader, view, min, readIntoRequest) {
+=======
+ * @param {ReadIntoRequest} readIntoRequest
+ * @returns {void}
+ */
+function readableStreamBYOBReaderRead(reader, view, readIntoRequest) {
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
const stream = reader[_stream];
assert(stream);
stream[_disturbed] = true;
@@ -1864,7 +1878,10 @@ function readableStreamBYOBReaderRead(reader, view, min, readIntoRequest) {
readableByteStreamControllerPullInto(
stream[_controller],
view,
+<<<<<<< HEAD
min,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
readIntoRequest,
);
}
@@ -1940,14 +1957,20 @@ function readableByteStreamControllerProcessReadRequestsUsingQueue(
/**
* @param {ReadableByteStreamController} controller
* @param {ArrayBufferView} view
+<<<<<<< HEAD
* @param {number} min
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
* @param {ReadIntoRequest} readIntoRequest
* @returns {void}
*/
function readableByteStreamControllerPullInto(
controller,
view,
+<<<<<<< HEAD
min,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
readIntoRequest,
) {
const stream = controller[_stream];
@@ -2017,10 +2040,13 @@ function readableByteStreamControllerPullInto(
);
}
+<<<<<<< HEAD
const minimumFill = min * elementSize;
assert(minimumFill >= 0 && minimumFill <= byteLength);
assert(minimumFill % elementSize === 0);
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
try {
buffer = transferArrayBuffer(buffer);
} catch (e) {
@@ -2035,7 +2061,10 @@ function readableByteStreamControllerPullInto(
byteOffset,
byteLength,
bytesFilled: 0,
+<<<<<<< HEAD
minimumFill,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
elementSize,
viewConstructor: ctor,
readerType: "byob",
@@ -2151,7 +2180,11 @@ function readableByteStreamControllerRespondInReadableState(
);
return;
}
+<<<<<<< HEAD
if (pullIntoDescriptor.bytesFilled < pullIntoDescriptor.minimumFill) {
+=======
+ if (pullIntoDescriptor.bytesFilled < pullIntoDescriptor.elementSize) {
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
return;
}
readableByteStreamControllerShiftPendingPullInto(controller);
@@ -2231,7 +2264,11 @@ function readableByteStreamControllerRespondInClosedState(
controller,
firstDescriptor,
) {
+<<<<<<< HEAD
assert(firstDescriptor.bytesFilled % firstDescriptor.elementSize === 0);
+=======
+ assert(firstDescriptor.bytesFilled === 0);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
if (firstDescriptor.readerType === "none") {
readableByteStreamControllerShiftPendingPullInto(controller);
}
@@ -2261,9 +2298,13 @@ function readableByteStreamControllerCommitPullIntoDescriptor(
assert(pullIntoDescriptor.readerType !== "none");
let done = false;
if (stream[_state] === "closed") {
+<<<<<<< HEAD
assert(
pullIntoDescriptor.bytesFilled % pullIntoDescriptor.elementSize === 0,
);
+=======
+ assert(pullIntoDescriptor.bytesFilled === 0);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
done = true;
}
const filledView = readableByteStreamControllerConvertPullIntoDescriptor(
@@ -2354,18 +2395,31 @@ function readableByteStreamControllerFillPullIntoDescriptorFromQueue(
controller,
pullIntoDescriptor,
) {
+<<<<<<< HEAD
+=======
+ const elementSize = pullIntoDescriptor.elementSize;
+ const currentAlignedBytes = pullIntoDescriptor.bytesFilled -
+ (pullIntoDescriptor.bytesFilled % elementSize);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
const maxBytesToCopy = MathMin(
controller[_queueTotalSize],
// deno-lint-ignore prefer-primordials
pullIntoDescriptor.byteLength - pullIntoDescriptor.bytesFilled,
);
const maxBytesFilled = pullIntoDescriptor.bytesFilled + maxBytesToCopy;
+<<<<<<< HEAD
let totalBytesToCopyRemaining = maxBytesToCopy;
let ready = false;
assert(pullIntoDescriptor.bytesFilled < pullIntoDescriptor.minimumFill);
const maxAlignedBytes = maxBytesFilled -
(maxBytesFilled % pullIntoDescriptor.elementSize);
if (maxAlignedBytes >= pullIntoDescriptor.minimumFill) {
+=======
+ const maxAlignedBytes = maxBytesFilled - (maxBytesFilled % elementSize);
+ let totalBytesToCopyRemaining = maxBytesToCopy;
+ let ready = false;
+ if (maxAlignedBytes > currentAlignedBytes) {
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
totalBytesToCopyRemaining = maxAlignedBytes -
pullIntoDescriptor.bytesFilled;
ready = true;
@@ -2415,7 +2469,11 @@ function readableByteStreamControllerFillPullIntoDescriptorFromQueue(
if (!ready) {
assert(controller[_queueTotalSize] === 0);
assert(pullIntoDescriptor.bytesFilled > 0);
+<<<<<<< HEAD
assert(pullIntoDescriptor.bytesFilled < pullIntoDescriptor.minimumFill);
+=======
+ assert(pullIntoDescriptor.bytesFilled < pullIntoDescriptor.elementSize);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
return ready;
}
@@ -3388,7 +3446,11 @@ function readableByteStreamTee(stream) {
reading = false;
},
};
+<<<<<<< HEAD
readableStreamBYOBReaderRead(reader, view, 1, readIntoRequest);
+=======
+ readableStreamBYOBReaderRead(reader, view, readIntoRequest);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
function pull1Algorithm() {
@@ -5556,19 +5618,28 @@ class ReadableStreamBYOBReader {
/**
* @param {ArrayBufferView} view
+<<<<<<< HEAD
* @param {ReadableStreamBYOBReaderReadOptions} options
* @returns {Promise}
*/
read(view, options = {}) {
+=======
+ * @returns {Promise}
+ */
+ read(view) {
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
try {
webidl.assertBranded(this, ReadableStreamBYOBReaderPrototype);
const prefix = "Failed to execute 'read' on 'ReadableStreamBYOBReader'";
view = webidl.converters.ArrayBufferView(view, prefix, "Argument 1");
+<<<<<<< HEAD
options = webidl.converters.ReadableStreamBYOBReaderReadOptions(
options,
prefix,
"Argument 2",
);
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
} catch (err) {
return PromiseReject(err);
}
@@ -5603,6 +5674,7 @@ class ReadableStreamBYOBReader {
);
}
+<<<<<<< HEAD
if (options.min === 0) {
return PromiseReject(new TypeError("options.min must be non-zero"));
}
@@ -5620,6 +5692,8 @@ class ReadableStreamBYOBReader {
}
}
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
if (this[_stream] === undefined) {
return PromiseReject(
new TypeError("Reader has no associated stream."),
@@ -5639,7 +5713,11 @@ class ReadableStreamBYOBReader {
promise.reject(e);
},
};
+<<<<<<< HEAD
readableStreamBYOBReaderRead(this, view, options.min, readIntoRequest);
+=======
+ readableStreamBYOBReaderRead(this, view, readIntoRequest);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
return promise.promise;
}
@@ -5965,7 +6043,10 @@ class ReadableByteStreamController {
byteLength: autoAllocateChunkSize,
bytesFilled: 0,
elementSize: 1,
+<<<<<<< HEAD
minimumFill: 1,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
viewConstructor: Uint8Array,
readerType: "default",
};
@@ -6836,6 +6917,7 @@ webidl.converters.ReadableStreamGetReaderOptions = webidl
converter: webidl.converters.ReadableStreamReaderMode,
}]);
+<<<<<<< HEAD
webidl.converters.ReadableStreamBYOBReaderReadOptions = webidl
.createDictionaryConverter("ReadableStreamBYOBReaderReadOptions", [{
key: "min",
@@ -6847,6 +6929,8 @@ webidl.converters.ReadableStreamBYOBReaderReadOptions = webidl
defaultValue: 1,
}]);
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
webidl.converters.ReadableWritablePair = webidl
.createDictionaryConverter("ReadableWritablePair", [
{
diff --git a/ext/web/06_streams_types.d.ts b/ext/web/06_streams_types.d.ts
index 27a372a234..1e72e0f58b 100644
--- a/ext/web/06_streams_types.d.ts
+++ b/ext/web/06_streams_types.d.ts
@@ -30,7 +30,10 @@ interface PullIntoDescriptor {
byteOffset: number;
byteLength: number;
bytesFilled: number;
+<<<<<<< HEAD
minimumFill: number;
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
elementSize: number;
// deno-lint-ignore no-explicit-any
viewConstructor: any;
diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml
index e2e58f0284..70bf5675af 100644
--- a/ext/web/Cargo.toml
+++ b/ext/web/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_web"
+<<<<<<< HEAD
version = "0.156.0"
+=======
+version = "0.157.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/web/lib.deno_web.d.ts b/ext/web/lib.deno_web.d.ts
index 9b9a55c238..e536461a59 100644
--- a/ext/web/lib.deno_web.d.ts
+++ b/ext/web/lib.deno_web.d.ts
@@ -624,17 +624,23 @@ declare type ReadableStreamBYOBReadResult =
| ReadableStreamBYOBReadValueResult;
/** @category Streams API */
+<<<<<<< HEAD
declare interface ReadableStreamBYOBReaderReadOptions {
min?: number;
}
/** @category Streams API */
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
declare interface ReadableStreamBYOBReader {
readonly closed: Promise;
cancel(reason?: any): Promise;
read(
view: V,
+<<<<<<< HEAD
options?: ReadableStreamBYOBReaderReadOptions,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
): Promise>;
releaseLock(): void;
}
diff --git a/ext/webidl/Cargo.toml b/ext/webidl/Cargo.toml
index 241f80c3dd..5711bb1478 100644
--- a/ext/webidl/Cargo.toml
+++ b/ext/webidl/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_webidl"
+<<<<<<< HEAD
version = "0.125.0"
+=======
+version = "0.126.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml
index ca2e0f5605..7b11d2f176 100644
--- a/ext/websocket/Cargo.toml
+++ b/ext/websocket/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_websocket"
+<<<<<<< HEAD
version = "0.130.0"
+=======
+version = "0.131.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/websocket/autobahn/fuzzingclient.js b/ext/websocket/autobahn/fuzzingclient.js
index ee200e452b..28a04fdeaf 100644
--- a/ext/websocket/autobahn/fuzzingclient.js
+++ b/ext/websocket/autobahn/fuzzingclient.js
@@ -11,6 +11,7 @@ const AUTOBAHN_TESTSUITE_DOCKER =
const self = Deno.execPath();
$`${self} run -A --unstable ${pwd}/autobahn_server.js`.spawn();
+<<<<<<< HEAD
for (let i = 0; i < 6; i++) {
try {
@@ -30,6 +31,9 @@ await $`docker run
--net=host
--rm ${AUTOBAHN_TESTSUITE_DOCKER}
wstest -m fuzzingclient -s fuzzingclient.json`
+=======
+await $`docker run --name fuzzingserver -v ${pwd}/fuzzingclient.json:/fuzzingclient.json:ro -v ${pwd}/reports:/reports -p 9001:9001 --net=host --rm ${AUTOBAHN_TESTSUITE_DOCKER} wstest -m fuzzingclient -s fuzzingclient.json`
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
.cwd(pwd);
const { deno_websocket } = JSON.parse(
diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml
index 51ffaebd2c..b156a92e63 100644
--- a/ext/webstorage/Cargo.toml
+++ b/ext/webstorage/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_webstorage"
+<<<<<<< HEAD
version = "0.120.0"
+=======
+version = "0.121.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 924481b309..bd86dddb01 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_runtime"
+<<<<<<< HEAD
version = "0.133.0"
+=======
+version = "0.134.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/runtime/errors.rs b/runtime/errors.rs
index 2061a5e0b9..fe9a449c84 100644
--- a/runtime/errors.rs
+++ b/runtime/errors.rs
@@ -212,7 +212,11 @@ pub fn get_error_class_name(e: &AnyError) -> Option<&'static str> {
.map(get_url_parse_error_class)
})
.or_else(|| {
+<<<<<<< HEAD
e.downcast_ref::()
+=======
+ e.downcast_ref::()
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
.map(|_| "TypeError")
})
.or_else(|| {
diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js
index bd664d2ea6..bd587d8e57 100644
--- a/runtime/js/90_deno_ns.js
+++ b/runtime/js/90_deno_ns.js
@@ -208,8 +208,11 @@ const denoNsUnstableById = {
8: {
cron: cron.cron,
},
+<<<<<<< HEAD
// Unsafe proto
// 9: {},
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
};
// when editing this list, also update unstableDenoProps in cli/tsc/99_main_compiler.js
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
index 67667427f9..a61594d63d 100644
--- a/runtime/js/99_main.js
+++ b/runtime/js/99_main.js
@@ -1,5 +1,12 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+<<<<<<< HEAD
+=======
+// Removes the `__proto__` for security reasons.
+// https://tc39.es/ecma262/#sec-get-object.prototype.__proto__
+delete Object.prototype.__proto__;
+
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
// Remove Intl.v8BreakIterator because it is a non-standard API.
delete Intl.v8BreakIterator;
@@ -10,7 +17,10 @@ const primordials = globalThis.__bootstrap.primordials;
const {
ArrayPrototypeFilter,
ArrayPrototypeIndexOf,
+<<<<<<< HEAD
ArrayPrototypeIncludes,
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
ArrayPrototypeMap,
ArrayPrototypePush,
ArrayPrototypeShift,
@@ -445,11 +455,14 @@ const finalDenoNs = {
resources: core.resources,
close: core.close,
...denoNs,
+<<<<<<< HEAD
// Deno.test and Deno.bench are noops here, but kept for compatibility; so
// that they don't cause errors when used outside of `deno test`/`deno bench`
// contexts.
test: () => {},
bench: () => {},
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
};
const {
@@ -567,12 +580,15 @@ function bootstrapMainRuntime(runtimeOptions) {
}
}
+<<<<<<< HEAD
if (!ArrayPrototypeIncludes(unstableFeatures, /* unsafe-proto */ 9)) {
// Removes the `__proto__` for security reasons.
// https://tc39.es/ecma262/#sec-get-object.prototype.__proto__
delete Object.prototype.__proto__;
}
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
// Setup `Deno` global - we're actually overriding already existing global
// `Deno` with `Deno` namespace from "./deno.ts".
ObjectDefineProperty(globalThis, "Deno", util.readOnly(finalDenoNs));
@@ -671,6 +687,7 @@ function bootstrapWorkerRuntime(
ObjectAssign(finalDenoNs, denoNsUnstableById[id]);
}
}
+<<<<<<< HEAD
if (!ArrayPrototypeIncludes(unstableFeatures, /* unsafe-proto */ 9)) {
// Removes the `__proto__` for security reasons.
@@ -678,6 +695,8 @@ function bootstrapWorkerRuntime(
delete Object.prototype.__proto__;
}
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
ObjectDefineProperties(finalDenoNs, {
pid: util.getterOnly(opPid),
noColor: util.getterOnly(() => ops.op_bootstrap_no_color()),
diff --git a/runtime/ops/os/README.md b/runtime/ops/os/README.md
index ae1a5958e4..fed1f17885 100644
--- a/runtime/ops/os/README.md
+++ b/runtime/ops/os/README.md
@@ -27,6 +27,10 @@
| Target family | Syscall | Description |
| ------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
+<<<<<<< HEAD
| Linux | sysinfo and `/proc/meminfo` | - |
+=======
+| Linux | sysinfo | - |
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
| Windows | `sysinfoapi::GlobalMemoryStatusEx` | - |
| macOS |
sysctl([CTL_HW, HW_MEMSIZE]);
sysctl([CTL_VM, VM_SWAPUSAGE]);
host_statistics64(mach_host_self(), HOST_VM_INFO64)
| - |
diff --git a/runtime/ops/os/sys_info.rs b/runtime/ops/os/sys_info.rs
index b3d2cd743c..7dc32dc17b 100644
--- a/runtime/ops/os/sys_info.rs
+++ b/runtime/ops/os/sys_info.rs
@@ -211,6 +211,7 @@ pub fn mem_info() -> Option {
mem_info.swap_free = info.freeswap * mem_unit;
mem_info.total = info.totalram * mem_unit;
mem_info.free = info.freeram * mem_unit;
+<<<<<<< HEAD
mem_info.available = mem_info.free;
mem_info.buffers = info.bufferram * mem_unit;
}
@@ -225,6 +226,10 @@ pub fn mem_info() -> Option {
mem_info.available = mem.unwrap_or(0);
}
}
+=======
+ mem_info.buffers = info.bufferram * mem_unit;
+ }
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
#[cfg(target_vendor = "apple")]
{
diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs
index 9e8fc8097a..96c1e87a62 100644
--- a/runtime/web_worker.rs
+++ b/runtime/web_worker.rs
@@ -33,7 +33,10 @@ use deno_core::ModuleId;
use deno_core::ModuleLoader;
use deno_core::ModuleSpecifier;
use deno_core::OpMetricsSummaryTracker;
+<<<<<<< HEAD
use deno_core::PollEventLoopOptions;
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
use deno_core::RuntimeOptions;
use deno_core::SharedArrayBufferStore;
use deno_core::Snapshot;
@@ -693,13 +696,22 @@ impl WebWorker {
maybe_result = &mut receiver => {
debug!("received module evaluate {:#?}", maybe_result);
+<<<<<<< HEAD
maybe_result
+=======
+ maybe_result.expect("Module evaluation result not provided.")
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
event_loop_result = self.js_runtime.run_event_loop(false) => {
event_loop_result?;
+<<<<<<< HEAD
receiver.await
+=======
+ let maybe_result = receiver.await;
+ maybe_result.expect("Module evaluation result not provided.")
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
}
}
@@ -712,26 +724,44 @@ impl WebWorker {
id: ModuleId,
) -> Result<(), AnyError> {
let mut receiver = self.js_runtime.mod_evaluate(id);
+<<<<<<< HEAD
let poll_options = PollEventLoopOptions {
wait_for_inspector: false,
..Default::default()
};
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
tokio::select! {
biased;
maybe_result = &mut receiver => {
debug!("received worker module evaluate {:#?}", maybe_result);
+<<<<<<< HEAD
maybe_result
}
event_loop_result = self.run_event_loop(poll_options) => {
+=======
+ // If `None` is returned it means that runtime was destroyed before
+ // evaluation was complete. This can happen in Web Worker when `self.close()`
+ // is called at top level.
+ maybe_result.unwrap_or(Ok(()))
+ }
+
+ event_loop_result = self.run_event_loop(false) => {
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
if self.internal_handle.is_terminated() {
return Ok(());
}
event_loop_result?;
+<<<<<<< HEAD
receiver.await
+=======
+ let maybe_result = receiver.await;
+ maybe_result.unwrap_or(Ok(()))
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
}
}
@@ -739,7 +769,11 @@ impl WebWorker {
fn poll_event_loop(
&mut self,
cx: &mut Context,
+<<<<<<< HEAD
poll_options: PollEventLoopOptions,
+=======
+ wait_for_inspector: bool,
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
) -> Poll> {
// If awakened because we are terminating, just return Ok
if self.internal_handle.terminate_if_needed() {
@@ -748,7 +782,11 @@ impl WebWorker {
self.internal_handle.terminate_waker.register(cx.waker());
+<<<<<<< HEAD
match self.js_runtime.poll_event_loop2(cx, poll_options) {
+=======
+ match self.js_runtime.poll_event_loop(cx, wait_for_inspector) {
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
Poll::Ready(r) => {
// If js ended because we are terminating, just return Ok
if self.internal_handle.terminate_if_needed() {
@@ -776,9 +814,15 @@ impl WebWorker {
pub async fn run_event_loop(
&mut self,
+<<<<<<< HEAD
poll_options: PollEventLoopOptions,
) -> Result<(), AnyError> {
poll_fn(|cx| self.poll_event_loop(cx, poll_options)).await
+=======
+ wait_for_inspector: bool,
+ ) -> Result<(), AnyError> {
+ poll_fn(|cx| self.poll_event_loop(cx, wait_for_inspector)).await
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
// Starts polling for messages from worker host from JavaScript.
@@ -854,12 +898,16 @@ pub fn run_web_worker(
}
let result = if result.is_ok() {
+<<<<<<< HEAD
worker
.run_event_loop(PollEventLoopOptions {
wait_for_inspector: true,
..Default::default()
})
.await
+=======
+ worker.run_event_loop(true).await
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
} else {
result
};
diff --git a/runtime/worker.rs b/runtime/worker.rs
index 542a1a64bf..5959591dba 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -548,13 +548,22 @@ impl MainWorker {
maybe_result = &mut receiver => {
debug!("received module evaluate {:#?}", maybe_result);
+<<<<<<< HEAD
maybe_result
+=======
+ maybe_result.expect("Module evaluation result not provided.")
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
event_loop_result = self.run_event_loop(false) => {
event_loop_result?;
+<<<<<<< HEAD
receiver.await
+=======
+ let maybe_result = receiver.await;
+ maybe_result.expect("Module evaluation result not provided.")
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
}
}
@@ -603,6 +612,7 @@ impl MainWorker {
cx: &mut Context,
wait_for_inspector: bool,
) -> Poll> {
+<<<<<<< HEAD
self.js_runtime.poll_event_loop2(
cx,
deno_core::PollEventLoopOptions {
@@ -610,12 +620,16 @@ impl MainWorker {
..Default::default()
},
)
+=======
+ self.js_runtime.poll_event_loop(cx, wait_for_inspector)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
pub async fn run_event_loop(
&mut self,
wait_for_inspector: bool,
) -> Result<(), AnyError> {
+<<<<<<< HEAD
self
.js_runtime
.run_event_loop2(deno_core::PollEventLoopOptions {
@@ -623,6 +637,9 @@ impl MainWorker {
..Default::default()
})
.await
+=======
+ self.js_runtime.run_event_loop(wait_for_inspector).await
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
/// Return exit code set by the executed code (either in main worker
diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs
index 8e57426368..65df8e40fd 100644
--- a/test_util/src/lib.rs
+++ b/test_util/src/lib.rs
@@ -1274,7 +1274,11 @@ async fn main_server(
)
}
(&hyper::Method::GET, "/upgrade/sleep/release-latest.txt") => {
+<<<<<<< HEAD
tokio::time::sleep(Duration::from_secs(95)).await;
+=======
+ tokio::time::sleep(Duration::from_secs(45)).await;
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
return Ok(
Response::builder()
.status(StatusCode::OK)
@@ -1283,7 +1287,11 @@ async fn main_server(
);
}
(&hyper::Method::GET, "/upgrade/sleep/canary-latest.txt") => {
+<<<<<<< HEAD
tokio::time::sleep(Duration::from_secs(95)).await;
+=======
+ tokio::time::sleep(Duration::from_secs(45)).await;
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
return Ok(
Response::builder()
.status(StatusCode::OK)
diff --git a/tools/format.js b/tools/format.js
index 98da6662b2..a64dd5149a 100755
--- a/tools/format.js
+++ b/tools/format.js
@@ -14,6 +14,7 @@ const cmd = new Deno.Command("deno", {
"--config=" + configFile,
],
cwd: ROOT_PATH,
+<<<<<<< HEAD
stdout: "piped",
stderr: "inherit",
});
@@ -28,3 +29,11 @@ if (stdoutText.length > 0) {
} else {
Deno.exit(code);
}
+=======
+ stdout: "inherit",
+ stderr: "inherit",
+});
+
+const { code } = await cmd.output();
+Deno.exit(code);
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
diff --git a/tools/node_compat/TODO.md b/tools/node_compat/TODO.md
index d22e8811db..6869151b55 100644
--- a/tools/node_compat/TODO.md
+++ b/tools/node_compat/TODO.md
@@ -3,7 +3,11 @@
NOTE: This file should not be manually edited. Please edit `cli/tests/node_compat/config.json` and run `deno task setup` in `tools/node_compat` dir instead.
+<<<<<<< HEAD
Total: 2999
+=======
+Total: 2923
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [abort/test-abort-backtrace.js](https://github.com/nodejs/node/tree/v18.12.1/test/abort/test-abort-backtrace.js)
- [abort/test-abort-fatal-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/abort/test-abort-fatal-error.js)
@@ -17,7 +21,10 @@ Total: 2999
- [abort/test-zlib-invalid-internals-usage.js](https://github.com/nodejs/node/tree/v18.12.1/test/abort/test-zlib-invalid-internals-usage.js)
- [benchmark/test-benchmark-assert.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-assert.js)
- [benchmark/test-benchmark-async-hooks.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-async-hooks.js)
+<<<<<<< HEAD
- [benchmark/test-benchmark-blob.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-blob.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [benchmark/test-benchmark-buffer.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-buffer.js)
- [benchmark/test-benchmark-child-process.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-child-process.js)
- [benchmark/test-benchmark-cluster.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-cluster.js)
@@ -48,11 +55,17 @@ Total: 2999
- [benchmark/test-benchmark-util.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-util.js)
- [benchmark/test-benchmark-v8.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-v8.js)
- [benchmark/test-benchmark-vm.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-vm.js)
+<<<<<<< HEAD
- [benchmark/test-benchmark-webstreams.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-webstreams.js)
- [benchmark/test-benchmark-worker.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-worker.js)
- [benchmark/test-benchmark-zlib.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-zlib.js)
- [es-module/test-cjs-esm-warn.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-cjs-esm-warn.js)
- [es-module/test-cjs-prototype-pollution.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-cjs-prototype-pollution.js)
+=======
+- [benchmark/test-benchmark-worker.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-worker.js)
+- [benchmark/test-benchmark-zlib.js](https://github.com/nodejs/node/tree/v18.12.1/test/benchmark/test-benchmark-zlib.js)
+- [es-module/test-cjs-esm-warn.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-cjs-esm-warn.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [es-module/test-esm-assertionless-json-import.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-esm-assertionless-json-import.js)
- [es-module/test-esm-cjs-builtins.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-esm-cjs-builtins.js)
- [es-module/test-esm-cjs-exports.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-esm-cjs-exports.js)
@@ -80,7 +93,10 @@ Total: 2999
- [es-module/test-esm-undefined-cjs-global-like-variables.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-esm-undefined-cjs-global-like-variables.js)
- [es-module/test-esm-unknown-or-no-extension.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-esm-unknown-or-no-extension.js)
- [es-module/test-esm-windows.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-esm-windows.js)
+<<<<<<< HEAD
- [es-module/test-loaders-hidden-from-users.js](https://github.com/nodejs/node/tree/v18.12.1/test/es-module/test-loaders-hidden-from-users.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [internet/test-corepack-yarn-install.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-corepack-yarn-install.js)
- [internet/test-dgram-broadcast-multi-process.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-dgram-broadcast-multi-process.js)
- [internet/test-dgram-connect.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-dgram-connect.js)
@@ -90,11 +106,17 @@ Total: 2999
- [internet/test-dgram-multicast-ssm-multi-process.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-dgram-multicast-ssm-multi-process.js)
- [internet/test-dgram-multicast-ssmv6-multi-process.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-dgram-multicast-ssmv6-multi-process.js)
- [internet/test-dns-cares-domains.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-dns-cares-domains.js)
+<<<<<<< HEAD
- [internet/test-dns-getDefaultResultOrder.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-dns-getDefaultResultOrder.js)
- [internet/test-dns-txt-sigsegv.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-dns-txt-sigsegv.js)
- [internet/test-http-dns-fail.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-http-dns-fail.js)
- [internet/test-http2-issue-32922.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-http2-issue-32922.js)
- [internet/test-https-autoselectfamily-slow-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-https-autoselectfamily-slow-timeout.js)
+=======
+- [internet/test-dns-txt-sigsegv.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-dns-txt-sigsegv.js)
+- [internet/test-http-dns-fail.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-http-dns-fail.js)
+- [internet/test-http2-issue-32922.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-http2-issue-32922.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [internet/test-https-issue-43963.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-https-issue-43963.js)
- [internet/test-inspector-help-page.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-inspector-help-page.js)
- [internet/test-net-connect-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-net-connect-timeout.js)
@@ -102,17 +124,25 @@ Total: 2999
- [internet/test-snapshot-dns-lookup.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-snapshot-dns-lookup.js)
- [internet/test-snapshot-dns-resolve.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-snapshot-dns-resolve.js)
- [internet/test-tls-add-ca-cert.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-tls-add-ca-cert.js)
+<<<<<<< HEAD
- [internet/test-tls-autoselectfamily-servername.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-tls-autoselectfamily-servername.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [internet/test-trace-events-dns.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-trace-events-dns.js)
- [internet/test-uv-threadpool-schedule.js](https://github.com/nodejs/node/tree/v18.12.1/test/internet/test-uv-threadpool-schedule.js)
- [known_issues/test-cwd-enoent-file.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-cwd-enoent-file.js)
- [known_issues/test-dgram-bind-shared-ports-after-port-0.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-dgram-bind-shared-ports-after-port-0.js)
- [known_issues/test-fs-writeFileSync-invalid-windows.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-fs-writeFileSync-invalid-windows.js)
- [known_issues/test-http-path-contains-unicode.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-http-path-contains-unicode.js)
+<<<<<<< HEAD
- [known_issues/test-http2-trailers-after-session-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-http2-trailers-after-session-close.js)
- [known_issues/test-inspector-cluster-port-clash.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-inspector-cluster-port-clash.js)
- [known_issues/test-repl-require-context.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-repl-require-context.js)
- [known_issues/test-shadow-realm-gc.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-shadow-realm-gc.js)
+=======
+- [known_issues/test-inspector-cluster-port-clash.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-inspector-cluster-port-clash.js)
+- [known_issues/test-repl-require-context.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-repl-require-context.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [known_issues/test-stdin-is-always-net.socket.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-stdin-is-always-net.socket.js)
- [known_issues/test-stream-writable-sync-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-stream-writable-sync-error.js)
- [known_issues/test-url-parse-conformance.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-url-parse-conformance.js)
@@ -122,14 +152,37 @@ Total: 2999
- [known_issues/test-vm-ownpropertysymbols.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-vm-ownpropertysymbols.js)
- [known_issues/test-vm-timeout-escape-nexttick.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-vm-timeout-escape-nexttick.js)
- [known_issues/test-vm-timeout-escape-queuemicrotask.js](https://github.com/nodejs/node/tree/v18.12.1/test/known_issues/test-vm-timeout-escape-queuemicrotask.js)
+<<<<<<< HEAD
- [message/assert_throws_stack.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/assert_throws_stack.js)
- [message/core_line_numbers.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/core_line_numbers.js)
- [message/eval_messages.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/eval_messages.js)
+=======
+- [message/2100bytes.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/2100bytes.js)
+- [message/assert_throws_stack.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/assert_throws_stack.js)
+- [message/async_error_eval_cjs.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/async_error_eval_cjs.js)
+- [message/async_error_eval_esm.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/async_error_eval_esm.js)
+- [message/async_error_microtask_main.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/async_error_microtask_main.js)
+- [message/async_error_nexttick_main.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/async_error_nexttick_main.js)
+- [message/async_error_sync_main.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/async_error_sync_main.js)
+- [message/console.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/console.js)
+- [message/console_low_stack_space.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/console_low_stack_space.js)
+- [message/core_line_numbers.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/core_line_numbers.js)
+- [message/error_aggregateTwoErrors.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/error_aggregateTwoErrors.js)
+- [message/error_exit.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/error_exit.js)
+- [message/error_with_nul.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/error_with_nul.js)
+- [message/eval_messages.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/eval_messages.js)
+- [message/events_unhandled_error_common_trace.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/events_unhandled_error_common_trace.js)
+- [message/events_unhandled_error_nexttick.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/events_unhandled_error_nexttick.js)
+- [message/events_unhandled_error_sameline.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/events_unhandled_error_sameline.js)
+- [message/events_unhandled_error_subclass.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/events_unhandled_error_subclass.js)
+- [message/hello_world.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/hello_world.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [message/if-error-has-good-stack.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/if-error-has-good-stack.js)
- [message/internal_assert.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/internal_assert.js)
- [message/internal_assert_fail.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/internal_assert_fail.js)
- [message/max_tick_depth.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/max_tick_depth.js)
- [message/nexttick_throw.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/nexttick_throw.js)
+<<<<<<< HEAD
- [message/promise_unhandled_warn_with_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/promise_unhandled_warn_with_error.js)
- [message/source_map_enclosing_function.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_enclosing_function.js)
- [message/source_map_reference_error_tabs.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_reference_error_tabs.js)
@@ -140,6 +193,39 @@ Total: 2999
- [message/stdin_messages.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/stdin_messages.js)
- [message/test-no-extra-info-on-fatal-exception.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test-no-extra-info-on-fatal-exception.js)
- [message/throw_error_with_getter_throw.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/throw_error_with_getter_throw.js)
+=======
+- [message/promise_always_throw_unhandled.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/promise_always_throw_unhandled.js)
+- [message/promise_unhandled_warn_with_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/promise_unhandled_warn_with_error.js)
+- [message/source_map_disabled_by_api.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_disabled_by_api.js)
+- [message/source_map_enabled_by_api.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_enabled_by_api.js)
+- [message/source_map_enclosing_function.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_enclosing_function.js)
+- [message/source_map_eval.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_eval.js)
+- [message/source_map_no_source_file.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_no_source_file.js)
+- [message/source_map_reference_error_tabs.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_reference_error_tabs.js)
+- [message/source_map_sourcemapping_url_string.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_sourcemapping_url_string.js)
+- [message/source_map_throw_catch.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_throw_catch.js)
+- [message/source_map_throw_first_tick.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_throw_first_tick.js)
+- [message/source_map_throw_icu.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_throw_icu.js)
+- [message/source_map_throw_set_immediate.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/source_map_throw_set_immediate.js)
+- [message/stack_overflow.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/stack_overflow.js)
+- [message/stdin_messages.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/stdin_messages.js)
+- [message/test-no-extra-info-on-fatal-exception.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test-no-extra-info-on-fatal-exception.js)
+- [message/test_runner_abort.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_abort.js)
+- [message/test_runner_abort_suite.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_abort_suite.js)
+- [message/test_runner_describe_it.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_describe_it.js)
+- [message/test_runner_hooks.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_hooks.js)
+- [message/test_runner_no_refs.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_no_refs.js)
+- [message/test_runner_no_tests.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_no_tests.js)
+- [message/test_runner_only_tests.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_only_tests.js)
+- [message/test_runner_output.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_output.js)
+- [message/test_runner_test_name_pattern.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_test_name_pattern.js)
+- [message/test_runner_test_name_pattern_with_only.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_test_name_pattern_with_only.js)
+- [message/test_runner_unresolved_promise.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/test_runner_unresolved_promise.js)
+- [message/throw_custom_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/throw_custom_error.js)
+- [message/throw_error_with_getter_throw.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/throw_error_with_getter_throw.js)
+- [message/throw_in_line_with_tabs.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/throw_in_line_with_tabs.js)
+- [message/throw_non_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/throw_non_error.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [message/throw_null.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/throw_null.js)
- [message/throw_undefined.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/throw_undefined.js)
- [message/timeout_throw.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/timeout_throw.js)
@@ -148,8 +234,17 @@ Total: 2999
- [message/util-inspect-error-cause.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/util-inspect-error-cause.js)
- [message/util_inspect_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/util_inspect_error.js)
- [message/v8_warning.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/v8_warning.js)
+<<<<<<< HEAD
- [parallel/test-abortcontroller.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-abortcontroller.js)
- [parallel/test-aborted-util.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-aborted-util.js)
+=======
+- [message/vm_caught_custom_runtime_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/vm_caught_custom_runtime_error.js)
+- [message/vm_display_runtime_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/vm_display_runtime_error.js)
+- [message/vm_display_syntax_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/vm_display_syntax_error.js)
+- [message/vm_dont_display_runtime_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/vm_dont_display_runtime_error.js)
+- [message/vm_dont_display_syntax_error.js](https://github.com/nodejs/node/tree/v18.12.1/test/message/vm_dont_display_syntax_error.js)
+- [parallel/test-abortcontroller.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-abortcontroller.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-abortsignal-cloneable.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-abortsignal-cloneable.js)
- [parallel/test-accessor-properties.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-accessor-properties.js)
- [parallel/test-arm-math-illegal-instruction.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-arm-math-illegal-instruction.js)
@@ -196,12 +291,18 @@ Total: 2999
- [parallel/test-async-hooks-worker-asyncfn-terminate-2.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-hooks-worker-asyncfn-terminate-2.js)
- [parallel/test-async-hooks-worker-asyncfn-terminate-3.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-hooks-worker-asyncfn-terminate-3.js)
- [parallel/test-async-hooks-worker-asyncfn-terminate-4.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-hooks-worker-asyncfn-terminate-4.js)
+<<<<<<< HEAD
- [parallel/test-async-local-storage-bind.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-local-storage-bind.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-async-local-storage-contexts.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-local-storage-contexts.js)
- [parallel/test-async-local-storage-deep-stack.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-local-storage-deep-stack.js)
- [parallel/test-async-local-storage-exit-does-not-leak.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-local-storage-exit-does-not-leak.js)
- [parallel/test-async-local-storage-http-multiclients.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-local-storage-http-multiclients.js)
+<<<<<<< HEAD
- [parallel/test-async-local-storage-snapshot.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-local-storage-snapshot.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-async-wrap-constructor.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-wrap-constructor.js)
- [parallel/test-async-wrap-destroyid.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-wrap-destroyid.js)
- [parallel/test-async-wrap-pop-id-during-load.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-async-wrap-pop-id-during-load.js)
@@ -229,8 +330,11 @@ Total: 2999
- [parallel/test-buffer-constructor-outside-node-modules.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-constructor-outside-node-modules.js)
- [parallel/test-buffer-fill.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-fill.js)
- [parallel/test-buffer-inspect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-inspect.js)
+<<<<<<< HEAD
- [parallel/test-buffer-isascii.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-isascii.js)
- [parallel/test-buffer-isutf8.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-isutf8.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-buffer-pending-deprecation.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-pending-deprecation.js)
- [parallel/test-buffer-pool-untransferable.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-pool-untransferable.js)
- [parallel/test-buffer-prototype-inspect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-buffer-prototype-inspect.js)
@@ -243,7 +347,10 @@ Total: 2999
- [parallel/test-child-process-can-write-to-stdout.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-can-write-to-stdout.js)
- [parallel/test-child-process-constructor.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-constructor.js)
- [parallel/test-child-process-cwd.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-cwd.js)
+<<<<<<< HEAD
- [parallel/test-child-process-destroy.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-destroy.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-child-process-detached.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-detached.js)
- [parallel/test-child-process-disconnect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-disconnect.js)
- [parallel/test-child-process-env.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-env.js)
@@ -285,7 +392,10 @@ Total: 2999
- [parallel/test-child-process-pipe-dataflow.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-pipe-dataflow.js)
- [parallel/test-child-process-promisified.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-promisified.js)
- [parallel/test-child-process-recv-handle.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-recv-handle.js)
+<<<<<<< HEAD
- [parallel/test-child-process-reject-null-bytes.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-reject-null-bytes.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-child-process-send-after-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-send-after-close.js)
- [parallel/test-child-process-send-cb.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-send-cb.js)
- [parallel/test-child-process-send-keep-open.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-child-process-send-keep-open.js)
@@ -378,9 +488,12 @@ Total: 2999
- [parallel/test-cluster-primary-kill.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-primary-kill.js)
- [parallel/test-cluster-process-disconnect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-process-disconnect.js)
- [parallel/test-cluster-rr-domain-listen.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-rr-domain-listen.js)
+<<<<<<< HEAD
- [parallel/test-cluster-rr-handle-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-rr-handle-close.js)
- [parallel/test-cluster-rr-handle-keep-loop-alive.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-rr-handle-keep-loop-alive.js)
- [parallel/test-cluster-rr-handle-ref-unref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-rr-handle-ref-unref.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-cluster-rr-ref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-rr-ref.js)
- [parallel/test-cluster-send-deadlock.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-send-deadlock.js)
- [parallel/test-cluster-send-handle-twice.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cluster-send-handle-twice.js)
@@ -454,7 +567,10 @@ Total: 2999
- [parallel/test-crypto-domains.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-domains.js)
- [parallel/test-crypto-ecb.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-ecb.js)
- [parallel/test-crypto-ecdh-convert-key.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-ecdh-convert-key.js)
+<<<<<<< HEAD
- [parallel/test-crypto-encoding-validation-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-encoding-validation-error.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-crypto-fips.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-fips.js)
- [parallel/test-crypto-from-binary.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-from-binary.js)
- [parallel/test-crypto-getcipherinfo.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-getcipherinfo.js)
@@ -466,14 +582,20 @@ Total: 2999
- [parallel/test-crypto-keygen.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-keygen.js)
- [parallel/test-crypto-lazy-transform-writable.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-lazy-transform-writable.js)
- [parallel/test-crypto-modp1-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-modp1-error.js)
+<<<<<<< HEAD
- [parallel/test-crypto-no-algorithm.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-no-algorithm.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-crypto-op-during-process-exit.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-op-during-process-exit.js)
- [parallel/test-crypto-padding-aes256.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-padding-aes256.js)
- [parallel/test-crypto-padding.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-padding.js)
- [parallel/test-crypto-pbkdf2.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-pbkdf2.js)
- [parallel/test-crypto-private-decrypt-gh32240.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-private-decrypt-gh32240.js)
- [parallel/test-crypto-psychic-signatures.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-psychic-signatures.js)
+<<<<<<< HEAD
- [parallel/test-crypto-publicDecrypt-fails-first-time.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-publicDecrypt-fails-first-time.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-crypto-random.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-random.js)
- [parallel/test-crypto-randomfillsync-regression.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-randomfillsync-regression.js)
- [parallel/test-crypto-randomuuid.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-crypto-randomuuid.js)
@@ -490,6 +612,7 @@ Total: 2999
- [parallel/test-cwd-enoent-repl.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cwd-enoent-repl.js)
- [parallel/test-cwd-enoent.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-cwd-enoent.js)
- [parallel/test-datetime-change-notify.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-datetime-change-notify.js)
+<<<<<<< HEAD
- [parallel/test-debugger-backtrace.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-debugger-backtrace.js)
- [parallel/test-debugger-break.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-debugger-break.js)
- [parallel/test-debugger-breakpoint-exists.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-debugger-breakpoint-exists.js)
@@ -517,6 +640,12 @@ Total: 2999
- [parallel/test-debugger-websocket-secret-mismatch.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-debugger-websocket-secret-mismatch.js)
- [parallel/test-delayed-require.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-delayed-require.js)
- [parallel/test-dgram-abort-closed.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-abort-closed.js)
+=======
+- [parallel/test-debugger-pid.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-debugger-pid.js)
+- [parallel/test-debugger-unavailable-port.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-debugger-unavailable-port.js)
+- [parallel/test-debugger-websocket-secret-mismatch.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-debugger-websocket-secret-mismatch.js)
+- [parallel/test-delayed-require.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-delayed-require.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-dgram-address.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-address.js)
- [parallel/test-dgram-bind-default-address.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-bind-default-address.js)
- [parallel/test-dgram-bind-error-repeat.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-bind-error-repeat.js)
@@ -584,11 +713,17 @@ Total: 2999
- [parallel/test-dgram-udp4.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-udp4.js)
- [parallel/test-dgram-udp6-link-local-address.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-udp6-link-local-address.js)
- [parallel/test-dgram-udp6-send-default-host.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-udp6-send-default-host.js)
+<<<<<<< HEAD
- [parallel/test-dgram-unref-in-cluster.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-unref-in-cluster.js)
- [parallel/test-dgram-unref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-unref.js)
- [parallel/test-diagnostics-channel-http-server-start.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-diagnostics-channel-http-server-start.js)
- [parallel/test-diagnostics-channel-http.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-diagnostics-channel-http.js)
- [parallel/test-diagnostics-channel-memory-leak.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-diagnostics-channel-memory-leak.js)
+=======
+- [parallel/test-dgram-unref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dgram-unref.js)
+- [parallel/test-diagnostics-channel-http-server-start.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-diagnostics-channel-http-server-start.js)
+- [parallel/test-diagnostics-channel-http.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-diagnostics-channel-http.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-diagnostics-channel-net.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-diagnostics-channel-net.js)
- [parallel/test-diagnostics-channel-safe-subscriber-errors.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-diagnostics-channel-safe-subscriber-errors.js)
- [parallel/test-directory-import.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-directory-import.js)
@@ -665,8 +800,11 @@ Total: 2999
- [parallel/test-domain-vm-promise-isolation.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-domain-vm-promise-isolation.js)
- [parallel/test-domain-with-abort-on-uncaught-exception.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-domain-with-abort-on-uncaught-exception.js)
- [parallel/test-domexception-cause.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-domexception-cause.js)
+<<<<<<< HEAD
- [parallel/test-double-tls-client.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-double-tls-client.js)
- [parallel/test-double-tls-server.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-double-tls-server.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-dsa-fips-invalid-key.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dsa-fips-invalid-key.js)
- [parallel/test-dummy-stdio.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-dummy-stdio.js)
- [parallel/test-emit-after-uncaught-exception.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-emit-after-uncaught-exception.js)
@@ -674,7 +812,10 @@ Total: 2999
- [parallel/test-env-var-no-warnings.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-env-var-no-warnings.js)
- [parallel/test-err-name-deprecation.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-err-name-deprecation.js)
- [parallel/test-error-aggregateTwoErrors.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-error-aggregateTwoErrors.js)
+<<<<<<< HEAD
- [parallel/test-error-format-list.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-error-format-list.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-error-prepare-stack-trace.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-error-prepare-stack-trace.js)
- [parallel/test-error-reporting.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-error-reporting.js)
- [parallel/test-error-serdes.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-error-serdes.js)
@@ -715,14 +856,20 @@ Total: 2999
- [parallel/test-event-emitter-max-listeners-warning.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-event-emitter-max-listeners-warning.js)
- [parallel/test-eventemitter-asyncresource.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-eventemitter-asyncresource.js)
- [parallel/test-events-customevent.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-events-customevent.js)
+<<<<<<< HEAD
- [parallel/test-events-getmaxlisteners.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-events-getmaxlisteners.js)
- [parallel/test-events-listener-count-with-listener.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-events-listener-count-with-listener.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-events-static-geteventlisteners.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-events-static-geteventlisteners.js)
- [parallel/test-eventtarget-memoryleakwarning.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-eventtarget-memoryleakwarning.js)
- [parallel/test-eventtarget-once-twice.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-eventtarget-once-twice.js)
- [parallel/test-eventtarget.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-eventtarget.js)
- [parallel/test-file-validate-mode-flag.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-file-validate-mode-flag.js)
+<<<<<<< HEAD
- [parallel/test-file.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-file.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-filehandle-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-filehandle-close.js)
- [parallel/test-filehandle-readablestream.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-filehandle-readablestream.js)
- [parallel/test-fixed-queue.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fixed-queue.js)
@@ -766,7 +913,10 @@ Total: 2999
- [parallel/test-fs-promises-file-handle-chmod.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-promises-file-handle-chmod.js)
- [parallel/test-fs-promises-file-handle-close-errors.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-promises-file-handle-close-errors.js)
- [parallel/test-fs-promises-file-handle-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-promises-file-handle-close.js)
+<<<<<<< HEAD
- [parallel/test-fs-promises-file-handle-dispose.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-promises-file-handle-dispose.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-fs-promises-file-handle-op-errors.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-promises-file-handle-op-errors.js)
- [parallel/test-fs-promises-file-handle-read-worker.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-promises-file-handle-read-worker.js)
- [parallel/test-fs-promises-file-handle-read.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-promises-file-handle-read.js)
@@ -827,7 +977,10 @@ Total: 2999
- [parallel/test-fs-sir-writes-alot.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-sir-writes-alot.js)
- [parallel/test-fs-stat-bigint.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-stat-bigint.js)
- [parallel/test-fs-stat.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-stat.js)
+<<<<<<< HEAD
- [parallel/test-fs-statfs.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-statfs.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-fs-stream-construct-compat-error-read.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-stream-construct-compat-error-read.js)
- [parallel/test-fs-stream-construct-compat-error-write.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-stream-construct-compat-error-write.js)
- [parallel/test-fs-stream-construct-compat-graceful-fs.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-fs-stream-construct-compat-graceful-fs.js)
@@ -895,7 +1048,10 @@ Total: 2999
- [parallel/test-global-webcrypto.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-global-webcrypto.js)
- [parallel/test-global-webstreams.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-global-webstreams.js)
- [parallel/test-global.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-global.js)
+<<<<<<< HEAD
- [parallel/test-h2-large-header-cause-client-to-hangup.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-h2-large-header-cause-client-to-hangup.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-handle-wrap-hasref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-handle-wrap-hasref.js)
- [parallel/test-heap-prof-basic.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-heap-prof-basic.js)
- [parallel/test-heap-prof-dir-absolute.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-heap-prof-dir-absolute.js)
@@ -944,7 +1100,10 @@ Total: 2999
- [parallel/test-http-allow-content-length-304.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-allow-content-length-304.js)
- [parallel/test-http-allow-req-after-204-res.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-allow-req-after-204-res.js)
- [parallel/test-http-automatic-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-automatic-headers.js)
+<<<<<<< HEAD
- [parallel/test-http-autoselectfamily.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-autoselectfamily.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-bind-twice.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-bind-twice.js)
- [parallel/test-http-blank-header.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-blank-header.js)
- [parallel/test-http-buffer-sanity.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-buffer-sanity.js)
@@ -992,7 +1151,10 @@ Total: 2999
- [parallel/test-http-client-reject-cr-no-lf.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-client-reject-cr-no-lf.js)
- [parallel/test-http-client-reject-unexpected-agent.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-client-reject-unexpected-agent.js)
- [parallel/test-http-client-req-error-dont-double-fire.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-client-req-error-dont-double-fire.js)
+<<<<<<< HEAD
- [parallel/test-http-client-request-options.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-client-request-options.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-client-res-destroyed.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-client-res-destroyed.js)
- [parallel/test-http-client-response-domain.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-client-response-domain.js)
- [parallel/test-http-client-response-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-client-response-timeout.js)
@@ -1043,10 +1205,15 @@ Total: 2999
- [parallel/test-http-generic-streams.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-generic-streams.js)
- [parallel/test-http-get-pipeline-problem.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-get-pipeline-problem.js)
- [parallel/test-http-head-request.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-head-request.js)
+<<<<<<< HEAD
- [parallel/test-http-head-response-has-no-body-end-implicit-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-head-response-has-no-body-end-implicit-headers.js)
- [parallel/test-http-head-response-has-no-body-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-head-response-has-no-body-end.js)
- [parallel/test-http-head-response-has-no-body.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-head-response-has-no-body.js)
- [parallel/test-http-head-throw-on-response-body-write.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-head-throw-on-response-body-write.js)
+=======
+- [parallel/test-http-head-response-has-no-body-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-head-response-has-no-body-end.js)
+- [parallel/test-http-head-response-has-no-body.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-head-response-has-no-body.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-header-badrequest.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-header-badrequest.js)
- [parallel/test-http-header-obstext.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-header-obstext.js)
- [parallel/test-http-header-overflow.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-header-overflow.js)
@@ -1093,7 +1260,10 @@ Total: 2999
- [parallel/test-http-max-http-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-max-http-headers.js)
- [parallel/test-http-methods.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-methods.js)
- [parallel/test-http-missing-header-separator-cr.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-missing-header-separator-cr.js)
+<<<<<<< HEAD
- [parallel/test-http-missing-header-separator-lf.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-missing-header-separator-lf.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-multi-line-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-multi-line-headers.js)
- [parallel/test-http-multiple-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-multiple-headers.js)
- [parallel/test-http-mutable-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-mutable-headers.js)
@@ -1147,7 +1317,10 @@ Total: 2999
- [parallel/test-http-request-end-twice.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-request-end-twice.js)
- [parallel/test-http-request-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-request-end.js)
- [parallel/test-http-request-invalid-method-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-request-invalid-method-error.js)
+<<<<<<< HEAD
- [parallel/test-http-request-join-authorization-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-request-join-authorization-headers.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-request-large-payload.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-request-large-payload.js)
- [parallel/test-http-request-methods.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-request-methods.js)
- [parallel/test-http-request-smuggling-content-length.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-request-smuggling-content-length.js)
@@ -1161,7 +1334,10 @@ Total: 2999
- [parallel/test-http-response-no-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-response-no-headers.js)
- [parallel/test-http-response-readable.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-response-readable.js)
- [parallel/test-http-response-remove-header-after-sent.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-response-remove-header-after-sent.js)
+<<<<<<< HEAD
- [parallel/test-http-response-setheaders.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-response-setheaders.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-response-splitting.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-response-splitting.js)
- [parallel/test-http-response-status-message.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-response-status-message.js)
- [parallel/test-http-response-statuscode.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-response-statuscode.js)
@@ -1189,8 +1365,11 @@ Total: 2999
- [parallel/test-http-server-keepalive-req-gc.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-keepalive-req-gc.js)
- [parallel/test-http-server-multiheaders.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-multiheaders.js)
- [parallel/test-http-server-multiheaders2.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-multiheaders2.js)
+<<<<<<< HEAD
- [parallel/test-http-server-non-utf8-header.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-non-utf8-header.js)
- [parallel/test-http-server-options-highwatermark.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-options-highwatermark.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-server-options-incoming-message.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-options-incoming-message.js)
- [parallel/test-http-server-options-server-response.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-options-server-response.js)
- [parallel/test-http-server-reject-chunked-with-content-length.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-reject-chunked-with-content-length.js)
@@ -1205,7 +1384,10 @@ Total: 2999
- [parallel/test-http-server-request-timeouts-mixed.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-request-timeouts-mixed.js)
- [parallel/test-http-server-response-standalone.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-response-standalone.js)
- [parallel/test-http-server-stale-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-stale-close.js)
+<<<<<<< HEAD
- [parallel/test-http-server-timeouts-validation.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-timeouts-validation.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-server-unconsume-consume.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-unconsume-consume.js)
- [parallel/test-http-server-unconsume.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-unconsume.js)
- [parallel/test-http-server-write-after-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-server-write-after-end.js)
@@ -1219,7 +1401,11 @@ Total: 2999
- [parallel/test-http-set-trailers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-set-trailers.js)
- [parallel/test-http-should-keep-alive.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-should-keep-alive.js)
- [parallel/test-http-socket-encoding-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-socket-encoding-error.js)
+<<<<<<< HEAD
- [parallel/test-http-socket-error-listeners.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-socket-error-listeners.js)
+=======
+- [parallel/test-http-socket-listeners.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-socket-listeners.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-http-status-code.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-status-code.js)
- [parallel/test-http-status-message.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-status-message.js)
- [parallel/test-http-status-reason-invalid-chars.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-http-status-reason-invalid-chars.js)
@@ -1509,7 +1695,10 @@ Total: 2999
- [parallel/test-https-agent-unref-socket.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-https-agent-unref-socket.js)
- [parallel/test-https-agent.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-https-agent.js)
- [parallel/test-https-argument-of-creating.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-https-argument-of-creating.js)
+<<<<<<< HEAD
- [parallel/test-https-autoselectfamily.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-https-autoselectfamily.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-https-byteswritten.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-https-byteswritten.js)
- [parallel/test-https-client-checkServerIdentity.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-https-client-checkServerIdentity.js)
- [parallel/test-https-client-get-url.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-https-client-get-url.js)
@@ -1557,11 +1746,15 @@ Total: 2999
- [parallel/test-icu-punycode.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-icu-punycode.js)
- [parallel/test-icu-stringwidth.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-icu-stringwidth.js)
- [parallel/test-icu-transcode.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-icu-transcode.js)
+<<<<<<< HEAD
- [parallel/test-inspect-address-in-use.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspect-address-in-use.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-inspect-async-hook-setup-at-inspect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspect-async-hook-setup-at-inspect.js)
- [parallel/test-inspect-publish-uid.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspect-publish-uid.js)
- [parallel/test-inspect-support-for-node_options.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspect-support-for-node_options.js)
- [parallel/test-inspector-already-activated-cli.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-already-activated-cli.js)
+<<<<<<< HEAD
- [parallel/test-inspector-async-call-stack-abort.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-async-call-stack-abort.js)
- [parallel/test-inspector-async-call-stack.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-async-call-stack.js)
- [parallel/test-inspector-async-hook-after-done.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-async-hook-after-done.js)
@@ -1607,13 +1800,34 @@ Total: 2999
- [parallel/test-inspector-stop-profile-after-done.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-stop-profile-after-done.js)
- [parallel/test-inspector-stops-no-file.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-stops-no-file.js)
- [parallel/test-inspector-stress-http.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-stress-http.js)
+=======
+- [parallel/test-inspector-async-hook-after-done.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-async-hook-after-done.js)
+- [parallel/test-inspector-bindings.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-bindings.js)
+- [parallel/test-inspector-close-worker.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-close-worker.js)
+- [parallel/test-inspector-connect-main-thread.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-connect-main-thread.js)
+- [parallel/test-inspector-console-top-frame.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-console-top-frame.js)
+- [parallel/test-inspector-esm.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-esm.js)
+- [parallel/test-inspector-has-idle.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-has-idle.js)
+- [parallel/test-inspector-heap-allocation-tracker.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-heap-allocation-tracker.js)
+- [parallel/test-inspector-heapdump.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-heapdump.js)
+- [parallel/test-inspector-inspect-brk-node.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-inspect-brk-node.js)
+- [parallel/test-inspector-module.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-module.js)
+- [parallel/test-inspector-multisession-js.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-multisession-js.js)
+- [parallel/test-inspector-multisession-ws.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-multisession-ws.js)
+- [parallel/test-inspector-open-port-integer-overflow.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-open-port-integer-overflow.js)
+- [parallel/test-inspector-port-zero-cluster.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-port-zero-cluster.js)
+- [parallel/test-inspector-reported-host.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-reported-host.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-inspector-tracing-domain.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-tracing-domain.js)
- [parallel/test-inspector-vm-global-accessors-getter-sideeffect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-vm-global-accessors-getter-sideeffect.js)
- [parallel/test-inspector-vm-global-accessors-sideeffects.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-vm-global-accessors-sideeffects.js)
- [parallel/test-inspector-wait-for-connection.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-wait-for-connection.js)
- [parallel/test-inspector-waiting-for-disconnect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-waiting-for-disconnect.js)
- [parallel/test-inspector-workers-flat-list.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector-workers-flat-list.js)
+<<<<<<< HEAD
- [parallel/test-inspector.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-inspector.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-instanceof.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-instanceof.js)
- [parallel/test-internal-assert.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-internal-assert.js)
- [parallel/test-internal-dtrace.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-internal-dtrace.js)
@@ -1637,7 +1851,10 @@ Total: 2999
- [parallel/test-internal-util-weakreference.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-internal-util-weakreference.js)
- [parallel/test-internal-validators-validateoneof.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-internal-validators-validateoneof.js)
- [parallel/test-internal-validators-validateport.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-internal-validators-validateport.js)
+<<<<<<< HEAD
- [parallel/test-internal-webidl-converttoint.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-internal-webidl-converttoint.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-intl-v8BreakIterator.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-intl-v8BreakIterator.js)
- [parallel/test-intl.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-intl.js)
- [parallel/test-js-stream-call-properties.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-js-stream-call-properties.js)
@@ -1647,6 +1864,10 @@ Total: 2999
- [parallel/test-listen-fd-detached.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-listen-fd-detached.js)
- [parallel/test-listen-fd-ebadf.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-listen-fd-ebadf.js)
- [parallel/test-listen-fd-server.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-listen-fd-server.js)
+<<<<<<< HEAD
+=======
+- [parallel/test-loaders-hidden-from-users.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-loaders-hidden-from-users.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-macos-app-sandbox.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-macos-app-sandbox.js)
- [parallel/test-math-random.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-math-random.js)
- [parallel/test-memory-usage-emfile.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-memory-usage-emfile.js)
@@ -1657,8 +1878,11 @@ Total: 2999
- [parallel/test-microtask-queue-integration.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-microtask-queue-integration.js)
- [parallel/test-microtask-queue-run-immediate.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-microtask-queue-run-immediate.js)
- [parallel/test-microtask-queue-run.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-microtask-queue-run.js)
+<<<<<<< HEAD
- [parallel/test-mime-api.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-mime-api.js)
- [parallel/test-mime-whatwg.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-mime-whatwg.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-module-binding.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-binding.js)
- [parallel/test-module-builtin.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-builtin.js)
- [parallel/test-module-cache.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-cache.js)
@@ -1682,17 +1906,23 @@ Total: 2999
- [parallel/test-module-readonly.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-readonly.js)
- [parallel/test-module-relative-lookup.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-relative-lookup.js)
- [parallel/test-module-run-main-monkey-patch.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-run-main-monkey-patch.js)
+<<<<<<< HEAD
- [parallel/test-module-stat.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-stat.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-module-symlinked-peer-modules.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-symlinked-peer-modules.js)
- [parallel/test-module-version.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-version.js)
- [parallel/test-module-wrap.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-wrap.js)
- [parallel/test-module-wrapper.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-module-wrapper.js)
- [parallel/test-net-after-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-after-close.js)
- [parallel/test-net-allow-half-open.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-allow-half-open.js)
+<<<<<<< HEAD
- [parallel/test-net-autoselectfamily-commandline-option.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-autoselectfamily-commandline-option.js)
- [parallel/test-net-autoselectfamily-ipv4first.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-autoselectfamily-ipv4first.js)
- [parallel/test-net-autoselectfamily.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-autoselectfamily.js)
- [parallel/test-net-autoselectfamilydefault.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-autoselectfamilydefault.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-net-better-error-messages-listen.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-better-error-messages-listen.js)
- [parallel/test-net-binary.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-binary.js)
- [parallel/test-net-bind-twice.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-bind-twice.js)
@@ -1701,7 +1931,10 @@ Total: 2999
- [parallel/test-net-bytes-stats.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-bytes-stats.js)
- [parallel/test-net-bytes-written-large.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-bytes-written-large.js)
- [parallel/test-net-can-reset-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-can-reset-timeout.js)
+<<<<<<< HEAD
- [parallel/test-net-child-process-connect-reset.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-child-process-connect-reset.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-net-client-bind-twice.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-client-bind-twice.js)
- [parallel/test-net-connect-abort-controller.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-connect-abort-controller.js)
- [parallel/test-net-connect-buffer.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-connect-buffer.js)
@@ -1763,8 +1996,11 @@ Total: 2999
- [parallel/test-net-settimeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-settimeout.js)
- [parallel/test-net-socket-byteswritten.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-byteswritten.js)
- [parallel/test-net-socket-close-after-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-close-after-end.js)
+<<<<<<< HEAD
- [parallel/test-net-socket-connect-invalid-autoselectfamily.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-connect-invalid-autoselectfamily.js)
- [parallel/test-net-socket-connect-invalid-autoselectfamilyattempttimeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-connect-invalid-autoselectfamilyattempttimeout.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-net-socket-connect-without-cb.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-connect-without-cb.js)
- [parallel/test-net-socket-connecting.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-connecting.js)
- [parallel/test-net-socket-constructor.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-constructor.js)
@@ -1782,11 +2018,17 @@ Total: 2999
- [parallel/test-net-socket-write-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-write-error.js)
- [parallel/test-net-stream.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-stream.js)
- [parallel/test-net-sync-cork.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-sync-cork.js)
+<<<<<<< HEAD
- [parallel/test-net-throttle.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-throttle.js)
- [parallel/test-net-writable.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-writable.js)
- [parallel/test-net-write-after-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-write-after-close.js)
- [parallel/test-net-write-after-end-nt.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-write-after-end-nt.js)
- [parallel/test-net-write-cb-on-destroy-before-connect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-write-cb-on-destroy-before-connect.js)
+=======
+- [parallel/test-net-writable.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-writable.js)
+- [parallel/test-net-write-after-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-write-after-close.js)
+- [parallel/test-net-write-after-end-nt.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-write-after-end-nt.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-net-write-connect-write.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-write-connect-write.js)
- [parallel/test-net-write-fully-async-buffer.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-write-fully-async-buffer.js)
- [parallel/test-net-write-fully-async-hex-string.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-write-fully-async-hex-string.js)
@@ -1830,13 +2072,19 @@ Total: 2999
- [parallel/test-pipe-unref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-pipe-unref.js)
- [parallel/test-pipe-writev.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-pipe-writev.js)
- [parallel/test-policy-crypto-default-encoding.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-crypto-default-encoding.js)
+<<<<<<< HEAD
- [parallel/test-policy-crypto-hash-tampering.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-crypto-hash-tampering.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-policy-dependencies.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-dependencies.js)
- [parallel/test-policy-dependency-conditions.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-dependency-conditions.js)
- [parallel/test-policy-integrity-flag.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-integrity-flag.js)
- [parallel/test-policy-manifest.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-manifest.js)
- [parallel/test-policy-parse-integrity.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-parse-integrity.js)
+<<<<<<< HEAD
- [parallel/test-policy-process-binding.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-process-binding.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-policy-scopes-dependencies.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-scopes-dependencies.js)
- [parallel/test-policy-scopes-integrity.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-scopes-integrity.js)
- [parallel/test-policy-scopes.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-policy-scopes.js)
@@ -1846,7 +2094,10 @@ Total: 2999
- [parallel/test-preload.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-preload.js)
- [parallel/test-primordials-apply.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-primordials-apply.js)
- [parallel/test-primordials-promise.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-primordials-promise.js)
+<<<<<<< HEAD
- [parallel/test-primordials-regexp.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-primordials-regexp.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-priority-queue.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-priority-queue.js)
- [parallel/test-process-abort.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-abort.js)
- [parallel/test-process-argv-0.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-argv-0.js)
@@ -1858,7 +2109,10 @@ Total: 2999
- [parallel/test-process-chdir.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-chdir.js)
- [parallel/test-process-config.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-config.js)
- [parallel/test-process-constants-noatime.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-constants-noatime.js)
+<<<<<<< HEAD
- [parallel/test-process-constrained-memory.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-constrained-memory.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-process-cpuUsage.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-cpuUsage.js)
- [parallel/test-process-dlopen-error-message-crash.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-dlopen-error-message-crash.js)
- [parallel/test-process-dlopen-undefined-exports.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-dlopen-undefined-exports.js)
@@ -1918,6 +2172,10 @@ Total: 2999
- [parallel/test-process-uncaught-exception-monitor.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-uncaught-exception-monitor.js)
- [parallel/test-process-versions.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-versions.js)
- [parallel/test-process-warning.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-warning.js)
+<<<<<<< HEAD
+=======
+- [parallel/test-process-wrap.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-process-wrap.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-promise-handled-rejection-no-warning.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-promise-handled-rejection-no-warning.js)
- [parallel/test-promise-hook-create-hook.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-promise-hook-create-hook.js)
- [parallel/test-promise-hook-exceptions.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-promise-hook-exceptions.js)
@@ -1942,29 +2200,44 @@ Total: 2999
- [parallel/test-queue-microtask-uncaught-asynchooks.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-queue-microtask-uncaught-asynchooks.js)
- [parallel/test-queue-microtask.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-queue-microtask.js)
- [parallel/test-readable-from-iterator-closing.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readable-from-iterator-closing.js)
+<<<<<<< HEAD
- [parallel/test-readable-from-web-enqueue-then-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readable-from-web-enqueue-then-close.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-readable-from.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readable-from.js)
- [parallel/test-readable-large-hwm.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readable-large-hwm.js)
- [parallel/test-readable-single-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readable-single-end.js)
- [parallel/test-readline-async-iterators-backpressure.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-async-iterators-backpressure.js)
- [parallel/test-readline-async-iterators-destroy.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-async-iterators-destroy.js)
- [parallel/test-readline-async-iterators.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-async-iterators.js)
+<<<<<<< HEAD
- [parallel/test-readline-carriage-return-between-chunks.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-carriage-return-between-chunks.js)
- [parallel/test-readline-csi.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-csi.js)
- [parallel/test-readline-input-onerror.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-input-onerror.js)
- [parallel/test-readline-interface-no-trailing-newline.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-interface-no-trailing-newline.js)
- [parallel/test-readline-interface-recursive-writes.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-interface-recursive-writes.js)
+=======
+- [parallel/test-readline-csi.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-csi.js)
+- [parallel/test-readline-input-onerror.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-input-onerror.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-readline-interface.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-interface.js)
- [parallel/test-readline-promises-interface.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-promises-interface.js)
- [parallel/test-readline-promises-tab-complete.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-promises-tab-complete.js)
- [parallel/test-readline-tab-complete.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-readline-tab-complete.js)
- [parallel/test-ref-unref-return.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-ref-unref-return.js)
- [parallel/test-regression-object-prototype.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-regression-object-prototype.js)
+<<<<<<< HEAD
- [parallel/test-release-changelog.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-release-changelog.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-release-npm.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-release-npm.js)
- [parallel/test-repl-array-prototype-tempering.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-array-prototype-tempering.js)
- [parallel/test-repl-autocomplete.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-autocomplete.js)
- [parallel/test-repl-autolibs.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-autolibs.js)
+<<<<<<< HEAD
+=======
+- [parallel/test-repl-built-in-modules.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-built-in-modules.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-repl-clear-immediate-crash.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-clear-immediate-crash.js)
- [parallel/test-repl-cli-eval.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-cli-eval.js)
- [parallel/test-repl-colors.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-colors.js)
@@ -1985,7 +2258,10 @@ Total: 2999
- [parallel/test-repl-inspect-defaults.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-inspect-defaults.js)
- [parallel/test-repl-inspector.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-inspector.js)
- [parallel/test-repl-let-process.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-let-process.js)
+<<<<<<< HEAD
- [parallel/test-repl-load-multiline-no-trailing-newline.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-load-multiline-no-trailing-newline.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-repl-load-multiline.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-load-multiline.js)
- [parallel/test-repl-mode.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-mode.js)
- [parallel/test-repl-multiline.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-repl-multiline.js)
@@ -2039,7 +2315,10 @@ Total: 2999
- [parallel/test-require-delete-array-iterator.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-require-delete-array-iterator.js)
- [parallel/test-require-dot.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-require-dot.js)
- [parallel/test-require-empty-main.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-require-empty-main.js)
+<<<<<<< HEAD
- [parallel/test-require-enoent-dir.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-require-enoent-dir.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-require-exceptions.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-require-exceptions.js)
- [parallel/test-require-extension-over-directory.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-require-extension-over-directory.js)
- [parallel/test-require-extensions-main.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-require-extensions-main.js)
@@ -2059,6 +2338,7 @@ Total: 2999
- [parallel/test-resource-usage.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-resource-usage.js)
- [parallel/test-runner-cli.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-cli.js)
- [parallel/test-runner-concurrency.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-concurrency.js)
+<<<<<<< HEAD
- [parallel/test-runner-coverage.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-coverage.js)
- [parallel/test-runner-exit-code.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-exit-code.js)
- [parallel/test-runner-extraneous-async-activity.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-extraneous-async-activity.js)
@@ -2070,22 +2350,37 @@ Total: 2999
- [parallel/test-runner-string-to-regexp.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-string-to-regexp.js)
- [parallel/test-runner-test-filter.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-test-filter.js)
- [parallel/test-runner-typechecking.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-typechecking.js)
+=======
+- [parallel/test-runner-exit-code.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-exit-code.js)
+- [parallel/test-runner-import-no-scheme.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-import-no-scheme.js)
+- [parallel/test-runner-misc.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-misc.js)
+- [parallel/test-runner-option-validation.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-option-validation.js)
+- [parallel/test-runner-string-to-regexp.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-string-to-regexp.js)
+- [parallel/test-runner-test-filter.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-runner-test-filter.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-safe-get-env.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-safe-get-env.js)
- [parallel/test-security-revert-unknown.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-security-revert-unknown.js)
- [parallel/test-set-http-max-http-headers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-set-http-max-http-headers.js)
- [parallel/test-set-incoming-message-header.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-set-incoming-message-header.js)
- [parallel/test-set-process-debug-port.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-set-process-debug-port.js)
- [parallel/test-setproctitle.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-setproctitle.js)
+<<<<<<< HEAD
- [parallel/test-shadow-realm.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-shadow-realm.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-sigint-infinite-loop.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-sigint-infinite-loop.js)
- [parallel/test-signal-args.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-signal-args.js)
- [parallel/test-signal-handler-remove-on-exit.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-signal-handler-remove-on-exit.js)
- [parallel/test-signal-handler.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-signal-handler.js)
- [parallel/test-signal-safety.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-signal-safety.js)
- [parallel/test-signal-unregister.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-signal-unregister.js)
+<<<<<<< HEAD
- [parallel/test-single-executable-application.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-single-executable-application.js)
- [parallel/test-snapshot-api.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-api.js)
- [parallel/test-snapshot-argv1.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-argv1.js)
+=======
+- [parallel/test-snapshot-api.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-api.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-snapshot-basic.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-basic.js)
- [parallel/test-snapshot-cjs-main.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-cjs-main.js)
- [parallel/test-snapshot-console.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-console.js)
@@ -2096,17 +2391,26 @@ Total: 2999
- [parallel/test-snapshot-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-error.js)
- [parallel/test-snapshot-eval.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-eval.js)
- [parallel/test-snapshot-gzip.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-gzip.js)
+<<<<<<< HEAD
- [parallel/test-snapshot-incompatible.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-incompatible.js)
- [parallel/test-snapshot-namespaced-builtin.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-namespaced-builtin.js)
- [parallel/test-snapshot-typescript.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-typescript.js)
- [parallel/test-snapshot-umd.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-umd.js)
- [parallel/test-snapshot-warning.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-warning.js)
- [parallel/test-snapshot-weak-reference.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-weak-reference.js)
+=======
+- [parallel/test-snapshot-typescript.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-typescript.js)
+- [parallel/test-snapshot-umd.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-umd.js)
+- [parallel/test-snapshot-warning.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-snapshot-warning.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-socket-address.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-socket-address.js)
- [parallel/test-socket-options-invalid.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-socket-options-invalid.js)
- [parallel/test-socket-write-after-fin-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-socket-write-after-fin-error.js)
- [parallel/test-socket-write-after-fin.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-socket-write-after-fin.js)
+<<<<<<< HEAD
- [parallel/test-socket-writes-before-passed-to-tls-socket.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-socket-writes-before-passed-to-tls-socket.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-socketaddress.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-socketaddress.js)
- [parallel/test-source-map-api.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-source-map-api.js)
- [parallel/test-source-map-enable.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-source-map-enable.js)
@@ -2136,11 +2440,17 @@ Total: 2999
- [parallel/test-stdout-stderr-reading.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stdout-stderr-reading.js)
- [parallel/test-stdout-stderr-write.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stdout-stderr-write.js)
- [parallel/test-stdout-to-file.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stdout-to-file.js)
+<<<<<<< HEAD
- [parallel/test-strace-openat-openssl.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-strace-openat-openssl.js)
- [parallel/test-stream-base-prototype-accessors-enumerability.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-base-prototype-accessors-enumerability.js)
- [parallel/test-stream-base-typechecking.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-base-typechecking.js)
- [parallel/test-stream-catch-rejections.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-catch-rejections.js)
- [parallel/test-stream-compose-operator.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-compose-operator.js)
+=======
+- [parallel/test-stream-base-prototype-accessors-enumerability.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-base-prototype-accessors-enumerability.js)
+- [parallel/test-stream-base-typechecking.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-base-typechecking.js)
+- [parallel/test-stream-catch-rejections.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-catch-rejections.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-stream-compose.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-compose.js)
- [parallel/test-stream-consumers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-consumers.js)
- [parallel/test-stream-decoder-objectmode.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-decoder-objectmode.js)
@@ -2154,7 +2464,10 @@ Total: 2999
- [parallel/test-stream-forEach.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-forEach.js)
- [parallel/test-stream-map.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-map.js)
- [parallel/test-stream-passthrough-drain.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-passthrough-drain.js)
+<<<<<<< HEAD
- [parallel/test-stream-pipe-deadlock.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-pipe-deadlock.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-stream-pipe-error-unhandled.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-pipe-error-unhandled.js)
- [parallel/test-stream-pipeline-duplex.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-pipeline-duplex.js)
- [parallel/test-stream-pipeline-http2.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-pipeline-http2.js)
@@ -2166,6 +2479,7 @@ Total: 2999
- [parallel/test-stream-promises.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-promises.js)
- [parallel/test-stream-push-order.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-push-order.js)
- [parallel/test-stream-readable-async-iterators.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-readable-async-iterators.js)
+<<<<<<< HEAD
- [parallel/test-stream-readable-dispose.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-readable-dispose.js)
- [parallel/test-stream-readable-strategy-option.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-readable-strategy-option.js)
- [parallel/test-stream-readable-unpipe-resume.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-readable-unpipe-resume.js)
@@ -2173,6 +2487,12 @@ Total: 2999
- [parallel/test-stream-set-default-hwm.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-set-default-hwm.js)
- [parallel/test-stream-toArray.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-toArray.js)
- [parallel/test-stream-toWeb-allows-server-response.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-toWeb-allows-server-response.js)
+=======
+- [parallel/test-stream-readable-strategy-option.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-readable-strategy-option.js)
+- [parallel/test-stream-readable-unpipe-resume.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-readable-unpipe-resume.js)
+- [parallel/test-stream-reduce.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-reduce.js)
+- [parallel/test-stream-toArray.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-toArray.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-stream-transform-hwm0.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-transform-hwm0.js)
- [parallel/test-stream-wrap-drain.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-wrap-drain.js)
- [parallel/test-stream-wrap-encoding.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-wrap-encoding.js)
@@ -2185,7 +2505,10 @@ Total: 2999
- [parallel/test-stream-writable-samecb-singletick.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream-writable-samecb-singletick.js)
- [parallel/test-stream2-finish-pipe-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream2-finish-pipe-error.js)
- [parallel/test-stream2-httpclient-response-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream2-httpclient-response-end.js)
+<<<<<<< HEAD
- [parallel/test-stream3-pipeline-async-iterator.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-stream3-pipeline-async-iterator.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-string-decoder-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-string-decoder-end.js)
- [parallel/test-string-decoder-fuzz.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-string-decoder-fuzz.js)
- [parallel/test-string-decoder.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-string-decoder.js)
@@ -2203,7 +2526,10 @@ Total: 2999
- [parallel/test-timers-active.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers-active.js)
- [parallel/test-timers-clearImmediate-als.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers-clearImmediate-als.js)
- [parallel/test-timers-destroyed.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers-destroyed.js)
+<<<<<<< HEAD
- [parallel/test-timers-dispose.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers-dispose.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-timers-enroll-invalid-msecs.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers-enroll-invalid-msecs.js)
- [parallel/test-timers-enroll-second-time.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers-enroll-second-time.js)
- [parallel/test-timers-immediate-promisified.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers-immediate-promisified.js)
@@ -2240,7 +2566,10 @@ Total: 2999
- [parallel/test-timers-unrefed-in-callback.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers-unrefed-in-callback.js)
- [parallel/test-timers.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-timers.js)
- [parallel/test-tls-0-dns-altname.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-tls-0-dns-altname.js)
+<<<<<<< HEAD
- [parallel/test-tls-add-context.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-tls-add-context.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-tls-addca.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-tls-addca.js)
- [parallel/test-tls-alert-handling.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-tls-alert-handling.js)
- [parallel/test-tls-alert.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-tls-alert.js)
@@ -2448,10 +2777,15 @@ Total: 2999
- [parallel/test-trace-events-none.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-none.js)
- [parallel/test-trace-events-process-exit.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-process-exit.js)
- [parallel/test-trace-events-promises.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-promises.js)
+<<<<<<< HEAD
- [parallel/test-trace-events-threadpool.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-threadpool.js)
- [parallel/test-trace-events-v8.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-v8.js)
- [parallel/test-trace-events-vm.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-vm.js)
- [parallel/test-trace-events-worker-metadata-with-name.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-worker-metadata-with-name.js)
+=======
+- [parallel/test-trace-events-v8.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-v8.js)
+- [parallel/test-trace-events-vm.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-vm.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-trace-events-worker-metadata.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-events-worker-metadata.js)
- [parallel/test-trace-exit.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-trace-exit.js)
- [parallel/test-tracing-no-crash.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-tracing-no-crash.js)
@@ -2459,9 +2793,13 @@ Total: 2999
- [parallel/test-tty-stdin-pipe.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-tty-stdin-pipe.js)
- [parallel/test-ttywrap-invalid-fd.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-ttywrap-invalid-fd.js)
- [parallel/test-ttywrap-stack.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-ttywrap-stack.js)
+<<<<<<< HEAD
- [parallel/test-tz-version.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-tz-version.js)
- [parallel/test-unhandled-exception-rethrow-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-unhandled-exception-rethrow-error.js)
- [parallel/test-unhandled-exception-with-worker-inuse.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-unhandled-exception-with-worker-inuse.js)
+=======
+- [parallel/test-unhandled-exception-rethrow-error.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-unhandled-exception-rethrow-error.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-unicode-node-options.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-unicode-node-options.js)
- [parallel/test-url-null-char.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-url-null-char.js)
- [parallel/test-url-parse-format.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-url-parse-format.js)
@@ -2478,26 +2816,37 @@ Total: 2999
- [parallel/test-uv-errmap.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-uv-errmap.js)
- [parallel/test-uv-errno.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-uv-errno.js)
- [parallel/test-uv-unmapped-exception.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-uv-unmapped-exception.js)
+<<<<<<< HEAD
- [parallel/test-v8-collect-gc-profile-exit-before-stop.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-collect-gc-profile-exit-before-stop.js)
- [parallel/test-v8-collect-gc-profile-in-worker.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-collect-gc-profile-in-worker.js)
- [parallel/test-v8-collect-gc-profile.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-collect-gc-profile.js)
- [parallel/test-v8-coverage.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-coverage.js)
- [parallel/test-v8-deserialize-buffer.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-deserialize-buffer.js)
- [parallel/test-v8-flag-pool-size-0.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-flag-pool-size-0.js)
+=======
+- [parallel/test-v8-coverage.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-coverage.js)
+- [parallel/test-v8-deserialize-buffer.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-deserialize-buffer.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-v8-flag-type-check.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-flag-type-check.js)
- [parallel/test-v8-flags.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-flags.js)
- [parallel/test-v8-getheapsnapshot-twice.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-getheapsnapshot-twice.js)
- [parallel/test-v8-global-setter.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-global-setter.js)
- [parallel/test-v8-serdes.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-serdes.js)
- [parallel/test-v8-serialize-leak.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-serialize-leak.js)
+<<<<<<< HEAD
- [parallel/test-v8-startup-snapshot-api.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-startup-snapshot-api.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-v8-stats.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-stats.js)
- [parallel/test-v8-stop-coverage.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-stop-coverage.js)
- [parallel/test-v8-take-coverage-noop.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-take-coverage-noop.js)
- [parallel/test-v8-take-coverage.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-take-coverage.js)
- [parallel/test-v8-version-tag.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-v8-version-tag.js)
- [parallel/test-validators.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-validators.js)
+<<<<<<< HEAD
- [parallel/test-vfs.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vfs.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-vm-access-process-env.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-access-process-env.js)
- [parallel/test-vm-api-handles-getter-errors.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-api-handles-getter-errors.js)
- [parallel/test-vm-attributes-property-not-on-sandbox.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-attributes-property-not-on-sandbox.js)
@@ -2520,7 +2869,10 @@ Total: 2999
- [parallel/test-vm-getters.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-getters.js)
- [parallel/test-vm-global-assignment.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-global-assignment.js)
- [parallel/test-vm-global-define-property.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-global-define-property.js)
+<<<<<<< HEAD
- [parallel/test-vm-global-get-own.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-global-get-own.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-vm-global-identity.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-global-identity.js)
- [parallel/test-vm-global-non-writable-properties.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-global-non-writable-properties.js)
- [parallel/test-vm-global-property-interceptors.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-global-property-interceptors.js)
@@ -2543,7 +2895,10 @@ Total: 2999
- [parallel/test-vm-module-reevaluate.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-module-reevaluate.js)
- [parallel/test-vm-module-synthetic.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-module-synthetic.js)
- [parallel/test-vm-new-script-new-context.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-new-script-new-context.js)
+<<<<<<< HEAD
- [parallel/test-vm-not-strict.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-not-strict.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-vm-options-validation.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-options-validation.js)
- [parallel/test-vm-parse-abort-on-uncaught-exception.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-parse-abort-on-uncaught-exception.js)
- [parallel/test-vm-preserves-property.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-preserves-property.js)
@@ -2553,10 +2908,15 @@ Total: 2999
- [parallel/test-vm-run-in-new-context.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-run-in-new-context.js)
- [parallel/test-vm-script-throw-in-tostring.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-script-throw-in-tostring.js)
- [parallel/test-vm-set-property-proxy.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-set-property-proxy.js)
+<<<<<<< HEAD
- [parallel/test-vm-set-proto-null-on-globalthis.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-set-proto-null-on-globalthis.js)
- [parallel/test-vm-sigint-existing-handler.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-sigint-existing-handler.js)
- [parallel/test-vm-sigint.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-sigint.js)
- [parallel/test-vm-source-map-url.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-source-map-url.js)
+=======
+- [parallel/test-vm-sigint-existing-handler.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-sigint-existing-handler.js)
+- [parallel/test-vm-sigint.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-sigint.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-vm-strict-assign.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-strict-assign.js)
- [parallel/test-vm-strict-mode.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-strict-mode.js)
- [parallel/test-vm-symbols.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-symbols.js)
@@ -2568,7 +2928,10 @@ Total: 2999
- [parallel/test-vm-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-vm-timeout.js)
- [parallel/test-warn-sigprof.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-warn-sigprof.js)
- [parallel/test-warn-stream-wrap.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-warn-stream-wrap.js)
+<<<<<<< HEAD
- [parallel/test-wasm-memory-out-of-bound.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-wasm-memory-out-of-bound.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-wasm-simple.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-wasm-simple.js)
- [parallel/test-wasm-web-api.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-wasm-web-api.js)
- [parallel/test-weakref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-weakref.js)
@@ -2597,6 +2960,7 @@ Total: 2999
- [parallel/test-webcrypto-sign-verify-hmac.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webcrypto-sign-verify-hmac.js)
- [parallel/test-webcrypto-sign-verify-rsa.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webcrypto-sign-verify-rsa.js)
- [parallel/test-webcrypto-util.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webcrypto-util.js)
+<<<<<<< HEAD
- [parallel/test-webcrypto-webidl.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webcrypto-webidl.js)
- [parallel/test-webcrypto-wrap-unwrap.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webcrypto-wrap-unwrap.js)
- [parallel/test-webstream-encoding-inspect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webstream-encoding-inspect.js)
@@ -2606,6 +2970,11 @@ Total: 2999
- [parallel/test-webstreams-compose.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webstreams-compose.js)
- [parallel/test-webstreams-finished.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webstreams-finished.js)
- [parallel/test-webstreams-pipeline.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webstreams-pipeline.js)
+=======
+- [parallel/test-webcrypto-wrap-unwrap.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webcrypto-wrap-unwrap.js)
+- [parallel/test-webstream-encoding-inspect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webstream-encoding-inspect.js)
+- [parallel/test-webstream-readablestream-pipeto.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-webstream-readablestream-pipeto.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-whatwg-encoding-custom-fatal-streaming.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-encoding-custom-fatal-streaming.js)
- [parallel/test-whatwg-encoding-custom-internals.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-encoding-custom-internals.js)
- [parallel/test-whatwg-encoding-custom-interop.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-encoding-custom-interop.js)
@@ -2620,7 +2989,10 @@ Total: 2999
- [parallel/test-whatwg-readablebytestream.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-readablebytestream.js)
- [parallel/test-whatwg-readablestream.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-readablestream.js)
- [parallel/test-whatwg-transformstream.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-transformstream.js)
+<<<<<<< HEAD
- [parallel/test-whatwg-url-canparse.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-url-canparse.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-whatwg-url-custom-domainto.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-url-custom-domainto.js)
- [parallel/test-whatwg-url-custom-inspect.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-url-custom-inspect.js)
- [parallel/test-whatwg-url-custom-parsing.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-whatwg-url-custom-parsing.js)
@@ -2690,7 +3062,10 @@ Total: 2999
- [parallel/test-worker-heap-snapshot.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-heap-snapshot.js)
- [parallel/test-worker-heapdump-failure.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-heapdump-failure.js)
- [parallel/test-worker-http2-generic-streams-terminate.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-http2-generic-streams-terminate.js)
+<<<<<<< HEAD
- [parallel/test-worker-http2-stream-terminate.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-http2-stream-terminate.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-worker-init-failure.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-init-failure.js)
- [parallel/test-worker-invalid-workerdata.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-invalid-workerdata.js)
- [parallel/test-worker-load-file-with-extension-other-than-js.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-load-file-with-extension-other-than-js.js)
@@ -2729,13 +3104,19 @@ Total: 2999
- [parallel/test-worker-message-type-unknown.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-message-type-unknown.js)
- [parallel/test-worker-messageport-hasref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-messageport-hasref.js)
- [parallel/test-worker-mjs-workerdata.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-mjs-workerdata.js)
+<<<<<<< HEAD
- [parallel/test-worker-name.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-name.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-worker-nearheaplimit-deadlock.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-nearheaplimit-deadlock.js)
- [parallel/test-worker-nested-on-process-exit.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-nested-on-process-exit.js)
- [parallel/test-worker-nested-uncaught.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-nested-uncaught.js)
- [parallel/test-worker-nexttick-terminate.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-nexttick-terminate.js)
+<<<<<<< HEAD
- [parallel/test-worker-no-atomics.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-no-atomics.js)
- [parallel/test-worker-no-sab.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-no-sab.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-worker-no-stdin-stdout-interaction.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-no-stdin-stdout-interaction.js)
- [parallel/test-worker-non-fatal-uncaught-exception.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-non-fatal-uncaught-exception.js)
- [parallel/test-worker-on-process-exit.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-on-process-exit.js)
@@ -2776,8 +3157,11 @@ Total: 2999
- [parallel/test-worker-unsupported-path.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-unsupported-path.js)
- [parallel/test-worker-unsupported-things.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-unsupported-things.js)
- [parallel/test-worker-vm-context-terminate.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-vm-context-terminate.js)
+<<<<<<< HEAD
- [parallel/test-worker-voluntarily-exit-followed-by-addition.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-voluntarily-exit-followed-by-addition.js)
- [parallel/test-worker-voluntarily-exit-followed-by-throw.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-voluntarily-exit-followed-by-throw.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [parallel/test-worker-workerdata-messageport.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-workerdata-messageport.js)
- [parallel/test-worker-workerdata-sharedarraybuffer.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker-workerdata-sharedarraybuffer.js)
- [parallel/test-worker.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-worker.js)
@@ -2877,10 +3261,18 @@ Total: 2999
- [pummel/test-https-large-response.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-https-large-response.js)
- [pummel/test-https-no-reader.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-https-no-reader.js)
- [pummel/test-keep-alive.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-keep-alive.js)
+<<<<<<< HEAD
+=======
+- [pummel/test-net-bytes-per-incoming-chunk-overhead.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [pummel/test-net-many-clients.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-many-clients.js)
- [pummel/test-net-pause.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-pause.js)
- [pummel/test-net-pingpong-delay.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-pingpong-delay.js)
- [pummel/test-net-pingpong.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-pingpong.js)
+<<<<<<< HEAD
+=======
+- [pummel/test-net-throttle.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-throttle.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [pummel/test-net-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-timeout.js)
- [pummel/test-net-timeout2.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-timeout2.js)
- [pummel/test-net-write-callbacks.js](https://github.com/nodejs/node/tree/v18.12.1/test/pummel/test-net-write-callbacks.js)
@@ -2930,18 +3322,49 @@ Total: 2999
- [sequential/test-cpu-prof-worker-argv.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-cpu-prof-worker-argv.js)
- [sequential/test-crypto-timing-safe-equal.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-crypto-timing-safe-equal.js)
- [sequential/test-debug-prompt.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debug-prompt.js)
+<<<<<<< HEAD
- [sequential/test-debugger-custom-port.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-custom-port.js)
- [sequential/test-debugger-debug-brk.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-debug-brk.js)
- [sequential/test-debugger-invalid-args.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-invalid-args.js)
- [sequential/test-debugger-pid.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-pid.js)
+=======
+- [sequential/test-debugger-backtrace.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-backtrace.js)
+- [sequential/test-debugger-break.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-break.js)
+- [sequential/test-debugger-breakpoint-exists.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-breakpoint-exists.js)
+- [sequential/test-debugger-clear-breakpoints.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-clear-breakpoints.js)
+- [sequential/test-debugger-custom-port.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-custom-port.js)
+- [sequential/test-debugger-debug-brk.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-debug-brk.js)
+- [sequential/test-debugger-exceptions.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-exceptions.js)
+- [sequential/test-debugger-exec.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-exec.js)
+- [sequential/test-debugger-heap-profiler.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-heap-profiler.js)
+- [sequential/test-debugger-invalid-args.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-invalid-args.js)
+- [sequential/test-debugger-list.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-list.js)
+- [sequential/test-debugger-low-level.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-low-level.js)
+- [sequential/test-debugger-object-type-remote-object.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-object-type-remote-object.js)
+- [sequential/test-debugger-pid.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-pid.js)
+- [sequential/test-debugger-preserve-breaks.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-preserve-breaks.js)
+- [sequential/test-debugger-profile-command.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-profile-command.js)
+- [sequential/test-debugger-profile.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-profile.js)
+- [sequential/test-debugger-random-port-with-inspect-port.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-random-port-with-inspect-port.js)
+- [sequential/test-debugger-random-port.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-random-port.js)
+- [sequential/test-debugger-repeat-last.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-repeat-last.js)
+- [sequential/test-debugger-restart-message.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-restart-message.js)
+- [sequential/test-debugger-run-after-quit-restart.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-run-after-quit-restart.js)
+- [sequential/test-debugger-sb-before-load.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-sb-before-load.js)
+- [sequential/test-debugger-scripts.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-scripts.js)
+- [sequential/test-debugger-use-strict.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-debugger-use-strict.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [sequential/test-deprecation-flags.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-deprecation-flags.js)
- [sequential/test-dgram-bind-shared-ports.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-dgram-bind-shared-ports.js)
- [sequential/test-dgram-implicit-bind-failure.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-dgram-implicit-bind-failure.js)
- [sequential/test-dgram-pingpong.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-dgram-pingpong.js)
- [sequential/test-diagnostic-dir-cpu-prof.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-diagnostic-dir-cpu-prof.js)
- [sequential/test-diagnostic-dir-heap-prof.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-diagnostic-dir-heap-prof.js)
+<<<<<<< HEAD
- [sequential/test-fs-opendir-recursive.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-fs-opendir-recursive.js)
- [sequential/test-fs-readdir-recursive.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-fs-readdir-recursive.js)
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [sequential/test-fs-stat-sync-overflow.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-fs-stat-sync-overflow.js)
- [sequential/test-fs-watch.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-fs-watch.js)
- [sequential/test-gc-http-client-onerror.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-gc-http-client-onerror.js)
@@ -2965,7 +3388,39 @@ Total: 2999
- [sequential/test-https-connect-localport.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-https-connect-localport.js)
- [sequential/test-https-server-keep-alive-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-https-server-keep-alive-timeout.js)
- [sequential/test-init.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-init.js)
+<<<<<<< HEAD
- [sequential/test-inspector-port-cluster.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-port-cluster.js)
+=======
+- [sequential/test-inspector-async-call-stack-abort.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-async-call-stack-abort.js)
+- [sequential/test-inspector-async-call-stack.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-async-call-stack.js)
+- [sequential/test-inspector-async-hook-setup-at-inspect-brk.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-async-hook-setup-at-inspect-brk.js)
+- [sequential/test-inspector-async-hook-setup-at-signal.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-async-hook-setup-at-signal.js)
+- [sequential/test-inspector-async-stack-traces-promise-then.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-async-stack-traces-promise-then.js)
+- [sequential/test-inspector-async-stack-traces-set-interval.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-async-stack-traces-set-interval.js)
+- [sequential/test-inspector-break-e.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-break-e.js)
+- [sequential/test-inspector-break-when-eval.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-break-when-eval.js)
+- [sequential/test-inspector-console.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-console.js)
+- [sequential/test-inspector-contexts.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-contexts.js)
+- [sequential/test-inspector-debug-brk-flag.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-debug-brk-flag.js)
+- [sequential/test-inspector-debug-end.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-debug-end.js)
+- [sequential/test-inspector-enabled.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-enabled.js)
+- [sequential/test-inspector-exception.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-exception.js)
+- [sequential/test-inspector-has-inspector-false.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-has-inspector-false.js)
+- [sequential/test-inspector-invalid-args.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-invalid-args.js)
+- [sequential/test-inspector-ip-detection.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-ip-detection.js)
+- [sequential/test-inspector-not-blocked-on-idle.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-not-blocked-on-idle.js)
+- [sequential/test-inspector-open.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-open.js)
+- [sequential/test-inspector-overwrite-config.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-overwrite-config.js)
+- [sequential/test-inspector-port-cluster.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-port-cluster.js)
+- [sequential/test-inspector-port-zero.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-port-zero.js)
+- [sequential/test-inspector-resource-name-to-url.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-resource-name-to-url.js)
+- [sequential/test-inspector-runtime-evaluate-with-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-runtime-evaluate-with-timeout.js)
+- [sequential/test-inspector-scriptparsed-context.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-scriptparsed-context.js)
+- [sequential/test-inspector-stop-profile-after-done.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-stop-profile-after-done.js)
+- [sequential/test-inspector-stops-no-file.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-stops-no-file.js)
+- [sequential/test-inspector-stress-http.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector-stress-http.js)
+- [sequential/test-inspector.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-inspector.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [sequential/test-module-loading.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-module-loading.js)
- [sequential/test-net-GH-5504.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-net-GH-5504.js)
- [sequential/test-net-better-error-messages-port.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-net-better-error-messages-port.js)
@@ -3003,4 +3458,8 @@ Total: 2999
- [sequential/test-worker-eventlooputil.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-worker-eventlooputil.js)
- [sequential/test-worker-fshandles-error-on-termination.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-worker-fshandles-error-on-termination.js)
- [sequential/test-worker-fshandles-open-close-on-termination.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-worker-fshandles-open-close-on-termination.js)
+<<<<<<< HEAD
+=======
+- [sequential/test-worker-http2-stream-terminate.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-worker-http2-stream-terminate.js)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [sequential/test-worker-prof.js](https://github.com/nodejs/node/tree/v18.12.1/test/sequential/test-worker-prof.js)
diff --git a/tools/node_compat/node b/tools/node_compat/node
index b114fad0ec..d0d9c1ba9d 160000
--- a/tools/node_compat/node
+++ b/tools/node_compat/node
@@ -1 +1 @@
-Subproject commit b114fad0ec952fddddefc8972c43d2959388bbc1
+Subproject commit d0d9c1ba9d3facf1086438e21d6d329c599e5a3b
diff --git a/tools/release/release_doc_template.md b/tools/release/release_doc_template.md
index 696138dcaf..7c9bb8f0d0 100644
--- a/tools/release/release_doc_template.md
+++ b/tools/release/release_doc_template.md
@@ -6,8 +6,13 @@
[`denoland/deno`](https://github.com/denoland/deno/),
[`denoland/deno_std`](https://github.com/denoland/deno_std/),
[`denoland/dotcom`](https://github.com/denoland/dotcom/),
+<<<<<<< HEAD
[`denoland/deno_docker`](https://github.com/denoland/deno_docker/),
[`denoland/deno-docs`](https://github.com/denoland/deno-docs)
+=======
+ [`denoland/deno_docker`](https://github.com/denoland/deno_docker/)
+ [`denoland/manual`](https://github.com/denoland/manual/)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
**During this process `main` branch (or any other branch that you're creating
release from) should be frozen and no commits should land until the release is
@@ -131,10 +136,34 @@ verify on GitHub that everything looks correct.
The CI pipeline will create a release draft on GitHub
(https://github.com/denoland/deno/releases).
+<<<<<<< HEAD
+=======
+- [ ] Upload Apple M1 build (`deno-aarch64-apple-darwin.zip`) to the release
+ draft and to https://console.cloud.google.com/storage/browser/dl.deno.land
+
+ Send the following commands:
+
+ ```
+ git fetch upstream $BRANCH_NAME && git checkout -B $BRANCH_NAME upstream/$BRANCH_NAME
+ cargo build --release
+ cd target/release
+ set DENO_VERSION (./deno -V)
+ echo "Built $DENO_VERSION"
+ test $DENO_VERSION = "deno $VERSION"; or begin; echo "Version didn't match!!!"; exit 1; end
+ zip -r deno-aarch64-apple-darwin.zip deno
+ ```
+
+ And ask them to upload to these links:
+
+ - https://console.cloud.google.com/storage/browser/dl.deno.land/release/v$VERSION
+ - https://github.com/denoland/deno/releases/
+
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- ⛔ Verify that:
- [ ] There are 8 assets on the release draft.
- [ ] There are 4 zip files for this version on
[dl.deno.land](https://console.cloud.google.com/storage/browser/dl.deno.land/release/v$VERSION).
+<<<<<<< HEAD
- [ ] Publish the release on Github
@@ -146,6 +175,21 @@ verify on GitHub that everything looks correct.
https://github.com/denoland/deno-docs/actions/workflows/update_versions.yml
to automatically open a PR.
- [ ] Merge the PR.
+=======
+ - [ ] The aarch64 Mac build was built from the correct branch AFTER the
+ version bump and has the same version as the release when doing
+ `deno -V` (ask someone with an M1 Mac to verify this if you don't have
+ one).
+
+- [ ] Publish the release on Github
+
+- [ ] Update https://github.com/denoland/dotcom/blob/main/versions.json, open a
+ PR and merge.
+
+- [ ] Run
+ https://github.com/denoland/deno-docs/actions/workflows/update_versions.yml
+ and merge the PR.
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- [ ] For minor releases: make sure https://github.com/mdn/browser-compat-data
has been updated to reflect Web API changes in this release. Usually done
@@ -162,7 +206,10 @@ script generates the symbols based on the latest tags.
- [ ] Run the release workflow in the apiland_scripts repo on the main branch:
https://github.com/denoland/apiland_scripts/actions/workflows/release.yml
+<<<<<<< HEAD
- [ ] Verify the workflow ran successfully.
+=======
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
Failure Steps
diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
index 3b4b3b9d40..ab920762c5 100644
--- a/tools/wpt/expectation.json
+++ b/tools/wpt/expectation.json
@@ -3204,9 +3204,13 @@
"respond-after-enqueue.any.html": true,
"respond-after-enqueue.any.worker.html": true,
"enqueue-with-detached-buffer.any.html": true,
+<<<<<<< HEAD
"enqueue-with-detached-buffer.any.worker.html": true,
"read-min.any.html": true,
"read-min.any.worker.html": true
+=======
+ "enqueue-with-detached-buffer.any.worker.html": true
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
},
"readable-streams": {
"async-iterator.any.html": true,
+<<<<<<< HEAD
[Deno](https://www.deno.com)
([/ˈdiːnoʊ/](http://ipa-reader.xyz/?text=%CB%88di%CB%90no%CA%8A), pronounced
`dee-no`) is a JavaScript, TypeScript, and WebAssembly runtime with secure
@@ -21,6 +22,28 @@ Install the Deno runtime on your system using one of the commands below. Note
that there are a number of ways to install Deno - a comprehensive list of
installation options can be found
[here](https://docs.deno.com/runtime/manual/getting_started/installation).
+=======
+[Deno](https://deno.com/runtime) is a _simple_, _modern_ and _secure_ runtime
+for **JavaScript** and **TypeScript** that uses V8 and is built in Rust.
+
+### Features
+
+- [Secure by default.](https://deno.land/manual/basics/permissions) No file,
+ network, or environment access, unless explicitly enabled.
+- Provides
+ [web platform functionality and APIs](https://deno.land/manual/runtime/web_platform_apis),
+ e.g. using ES modules, web workers, and `fetch()`.
+- Supports
+ [TypeScript out of the box](https://deno.land/manual/advanced/typescript).
+- Ships only a single executable file.
+- [Built-in tooling](https://deno.land/manual/tools#built-in-tooling) including
+ `deno test`, `deno fmt`, `deno bench`, and more.
+- Includes [a set of reviewed standard modules](https://deno.land/std/)
+ guaranteed to work with Deno.
+- [Supports npm.](https://deno.land/manual/node)
+
+### Install
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
Shell (Mac, Linux):
@@ -46,6 +69,7 @@ brew install deno
choco install deno
```
+<<<<<<< HEAD
### Build and install from source
Complete instructions for building Deno from source can be found in the manual
@@ -89,6 +113,66 @@ Learn more about writing and running Deno programs
We appreciate your help! To contribute, please read our
[contributing instructions](https://docs.deno.com/runtime/manual/references/contributing/).
+=======
+[Scoop](https://scoop.sh/) (Windows):
+
+```powershell
+scoop install deno
+```
+
+Build and install from source using [Cargo](https://crates.io/crates/deno):
+
+```sh
+# Install build dependencies
+apt install -y cmake protobuf-compiler # Linux
+brew install cmake protobuf # macOS
+
+# Build and install Deno
+cargo install deno --locked
+```
+
+See
+[deno_install](https://github.com/denoland/deno_install/blob/master/README.md)
+and [releases](https://github.com/denoland/deno/releases) for other options.
+
+### Getting Started
+
+Try [running a simple program](https://examples.deno.land/hello-world):
+
+```sh
+deno run https://examples.deno.land/hello-world.ts
+```
+
+Or [setup a simple HTTP server](https://examples.deno.land/http-server):
+
+```ts
+Deno.serve((_req) => new Response("Hello, World!"));
+```
+
+[More Examples](https://examples.deno.land)
+
+### Additional Resources
+
+- **[The Deno Manual](https://deno.land/manual)** is a great starting point for
+ [additional examples](https://deno.land/manual/examples),
+ [setting up your environment](https://deno.land/manual/getting_started/setup_your_environment),
+ [using npm](https://deno.land/manual/node), and more.
+- **[Runtime API reference](https://deno.land/api)** documents all APIs built
+ into Deno CLI.
+- **[Deno Standard Modules](https://deno.land/std)** do not have external
+ dependencies and are reviewed by the Deno core team.
+- **[deno.land/x](https://deno.land/x)** is the registry for third party
+ modules.
+- **[Blog](https://deno.com/blog)** is where the Deno team shares important
+ product updates and “how to”s about solving technical problems.
+
+### Contributing
+
+We appreciate your help!
+
+To contribute, please read our
+[contributing instructions](https://deno.land/manual/references/contributing/).
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
[Build status - Cirrus]: https://github.com/denoland/deno/workflows/ci/badge.svg?branch=main&event=push
[Build status]: https://github.com/denoland/deno/actions
diff --git a/Releases.md b/Releases.md
index a651cd34c9..c5e4db4f28 100644
--- a/Releases.md
+++ b/Releases.md
@@ -6,9 +6,23 @@ https://github.com/denoland/deno/releases
We also have one-line install commands at:
https://github.com/denoland/deno_install
+<<<<<<< HEAD
### 1.38.3 / 2023.11.24
- feat(unstable): tar up directory with deno.json (#21228)
+=======
+### 1.38.4 / 2023.11.30
+
+- fix(node): `spawnSync`'s `status` was incorrect (#21359)
+- perf(lsp): add performance marks for TSC requests (#21383)
+- perf(lsp): avoid redundant getNavigationTree() calls (#21396)
+- perf(lsp): cancel ts requests on future drop (#21387)
+- perf(lsp): remove throttling of cancellation token (#21395)
+
+### 1.38.3 / 2023.11.24
+
+- feat(unstable): tar up directory with deno.json (#21228)
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
- fix(ext,runtime): add missing custom inspections (#21219)
- fix(ext/http): avoid lockup in graceful shutdown (#21253)
- fix(ext/http): fix crash in dropped Deno.serve requests (#21252)
diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml
index 4e4d419cb2..84bb1ddbbf 100644
--- a/bench_util/Cargo.toml
+++ b/bench_util/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno_bench_util"
+<<<<<<< HEAD
version = "0.119.0"
+=======
+version = "0.120.0"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index b793d27b0f..b03315e74d 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -2,7 +2,11 @@
[package]
name = "deno"
+<<<<<<< HEAD
version = "1.38.3"
+=======
+version = "1.38.4"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
authors.workspace = true
default-run = "deno"
edition.workspace = true
@@ -27,11 +31,15 @@ harness = false
path = "./bench/lsp_bench_standalone.rs"
[features]
+<<<<<<< HEAD
default = ["upgrade", "__vendored_zlib_ng"]
# A feature that enables the upgrade subcommand and the background check for
# available updates (of deno binary). This is typically disabled for (Linux)
# distribution packages.
upgrade = []
+=======
+default = ["__vendored_zlib_ng"]
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
# A dev feature to disable creations and loading of snapshots in favor of
# loading JS sources at runtime.
__runtime_js_sources = ["deno_runtime/__runtime_js_sources"]
@@ -55,7 +63,11 @@ winres.workspace = true
[dependencies]
deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
deno_cache_dir = "=0.6.1"
+<<<<<<< HEAD
deno_config = "=0.6.5"
+=======
+deno_config = "=0.6.4"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
deno_doc = { version = "=0.73.3", features = ["html"] }
deno_emit = "=0.31.4"
@@ -85,10 +97,16 @@ data-encoding.workspace = true
data-url.workspace = true
dissimilar = "=1.0.4"
dotenvy = "0.15.7"
+<<<<<<< HEAD
dprint-plugin-json = "=0.19.1"
dprint-plugin-jupyter = "=0.1.2"
dprint-plugin-markdown = "=0.16.3"
dprint-plugin-typescript = "=0.88.6"
+=======
+dprint-plugin-json = "=0.19.0"
+dprint-plugin-markdown = "=0.16.2"
+dprint-plugin-typescript = "=0.88.4"
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
encoding_rs.workspace = true
env_logger = "=0.10.0"
fancy-regex = "=0.10.0"
@@ -102,7 +120,11 @@ http.workspace = true
hyper.workspace = true
import_map = { version = "=0.17.0", features = ["ext"] }
indexmap.workspace = true
+<<<<<<< HEAD
jsonc-parser = { version = "=0.23.0", features = ["serde"] }
+=======
+jsonc-parser = { version = "=0.21.1", features = ["serde"] }
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
lazy-regex.workspace = true
libc.workspace = true
libz-sys.workspace = true
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
index 6e79df675f..0c5a42c5ec 100644
--- a/cli/args/flags.rs
+++ b/cli/args/flags.rs
@@ -320,6 +320,7 @@ impl DenoSubcommand {
matches!(self, Self::Run(_))
}
+<<<<<<< HEAD
// Returns `true` if the subcommand depends on testing infrastructure.
pub fn needs_test(&self) -> bool {
matches!(
@@ -330,6 +331,10 @@ impl DenoSubcommand {
| Self::Bench(_)
| Self::Lsp
)
+=======
+ pub fn is_test_or_jupyter(&self) -> bool {
+ matches!(self, Self::Test(_) | Self::Jupyter(_))
+>>>>>>> 8c07f52a7 (1.38.4 (#21398))
}
}
@@ -844,11 +849,53 @@ pub fn flags_from_vec(args: Vec