mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
8bfd7f05ac
* chore: bump node in DEPS to v20.19.0 * deps, src: simplifying base64 encoding https://github.com/nodejs/node/pull/52714 * module: simplify --inspect-brk handling https://github.com/nodejs/node/pull/55679 * test: make test-crypto-hash compatible with OpenSSL > 3.4.0 https://github.com/nodejs/node/pull/56160 * module: refactor ESM loader for adding future synchronous hooks https://github.com/nodejs/node/pull/54769 * module: detect ESM syntax by trying to recompile as SourceTextModule https://github.com/nodejs/node/pull/52413 * worker: add postMessageToThread https://github.com/nodejs/node/pull/53682 * backport unflagging of require(esm) to v20 https://github.com/nodejs/node/pull/56927 * module: detect ESM syntax by trying to recompile as SourceTextModule https://github.com/nodejs/node/pull/52413 * chore: fixup patch indices * chore: handle filename.json changes - https://github.com/nodejs/node/pull/51711 - https://github.com/nodejs/node/pull/53573 * src: refactor embedded entrypoint loading https://github.com/nodejs/node/pull/53573 * lib: allow CJS source map cache to be reclaimed https://github.com/nodejs/node/pull/51711 * test: make eval snapshot tests more flexible --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
53 lines
2.5 KiB
Diff
53 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Wed, 19 Apr 2023 14:13:23 +0200
|
|
Subject: chore: remove --no-harmony-atomics related code
|
|
|
|
This was removed in https://chromium-review.googlesource.com/c/v8/v8/+/4416459.
|
|
|
|
This patch can be removed when Node.js upgrades to a version of V8 containing
|
|
the above CL.
|
|
|
|
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
|
|
index c028204481d44cb5f35ad98413022e7b07ce04b2..230c2378996c5d1ec18a9183ef138bbf70bba22d 100644
|
|
--- a/lib/.eslintrc.yaml
|
|
+++ b/lib/.eslintrc.yaml
|
|
@@ -30,10 +30,6 @@ rules:
|
|
message: Use `const { AbortController } = require('internal/abort_controller');` instead of the global.
|
|
- name: AbortSignal
|
|
message: Use `const { AbortSignal } = require('internal/abort_controller');` instead of the global.
|
|
- # Atomics is not available in primordials because it can be
|
|
- # disabled with --no-harmony-atomics CLI flag.
|
|
- - name: Atomics
|
|
- message: Use `const { Atomics } = globalThis;` instead of the global.
|
|
- name: Blob
|
|
message: Use `const { Blob } = require('buffer');` instead of the global.
|
|
- name: BroadcastChannel
|
|
diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
|
|
index 54f92797323ef914f23b9cc9174de8bc46ffa7e5..1944fdbf5c7e81bff5a0818c9cac95ed5287a2e7 100644
|
|
--- a/lib/internal/main/worker_thread.js
|
|
+++ b/lib/internal/main/worker_thread.js
|
|
@@ -117,7 +117,7 @@ port.on('message', (message) => {
|
|
require('internal/worker').assignEnvironmentData(environmentData);
|
|
setupMainThreadPort(mainThreadPort);
|
|
|
|
- if (SharedArrayBuffer !== undefined && Atomics !== undefined) {
|
|
+ if (SharedArrayBuffer !== undefined) {
|
|
// The counter is only passed to the workers created by the main thread,
|
|
// not to workers created by other workers.
|
|
let cachedCwd = '';
|
|
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
|
|
index 519faa4ff765f63beda02f6081a4fbf181440053..a0d819bcbabdceba9b521d79c555c8314c10e303 100644
|
|
--- a/lib/internal/worker.js
|
|
+++ b/lib/internal/worker.js
|
|
@@ -102,8 +102,7 @@ let cwdCounter;
|
|
const environmentData = new SafeMap();
|
|
|
|
// SharedArrayBuffers can be disabled with --no-harmony-sharedarraybuffer.
|
|
-// Atomics can be disabled with --no-harmony-atomics.
|
|
-if (isMainThread && SharedArrayBuffer !== undefined && Atomics !== undefined) {
|
|
+if (isMainThread && SharedArrayBuffer !== undefined) {
|
|
cwdCounter = new Uint32Array(new SharedArrayBuffer(4));
|
|
const originalChdir = process.chdir;
|
|
process.chdir = function(path) {
|