mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 119.0.6045.33 (28-x-y) (#40278)
* chore: bump chromium in DEPS to 119.0.6045.33
* chore: update patches
* test: fix Node.js color edge snapshot stack traces
(cherry picked from commit af4943fd1b)
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
committed by
GitHub
parent
0310156be6
commit
eff2ea682d
2
DEPS
2
DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||
|
||||
vars = {
|
||||
'chromium_version':
|
||||
'119.0.6045.21',
|
||||
'119.0.6045.33',
|
||||
'node_version':
|
||||
'v18.18.0',
|
||||
'nan_version':
|
||||
|
||||
@@ -33,10 +33,10 @@ index dcf02923c21e1c4c292eb800f6325e4bb764c823..8738860b44f179685198d2c0b9729fcc
|
||||
"//base",
|
||||
"//build:branding_buildflags",
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
index 6d52b553b21b06a00c0853ce4f4cb02cf47fd7dd..4c1002ff33cc67fa4374fbfd4c016b28b077baa4 100644
|
||||
index 7cb8d3fc03da2017fc5eaa83a9677d51013f4d92..c3a8dea68fc7d4a5c20d1b1946d3fa3120699bb5 100644
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -4800,7 +4800,7 @@ static_library("browser") {
|
||||
@@ -4801,7 +4801,7 @@ static_library("browser") {
|
||||
|
||||
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
|
||||
# than here in :chrome_dll.
|
||||
@@ -46,7 +46,7 @@ index 6d52b553b21b06a00c0853ce4f4cb02cf47fd7dd..4c1002ff33cc67fa4374fbfd4c016b28
|
||||
sources += [ "certificate_viewer_stub.cc" ]
|
||||
}
|
||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
index c967801bade79f71859ad215e62030e6bb2d8ea6..94f6b4f7345a27b5b73e429ef43556223529d1bd 100644
|
||||
index 317aa37c811c4b461cd8a4b8e321a820622df4c3..964514b24c16d5b43439fdb4544467dd5f9f0ecf 100644
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -6900,7 +6900,6 @@ test("unit_tests") {
|
||||
|
||||
@@ -9,7 +9,7 @@ potentially prevent a window from being created.
|
||||
TODO(loc): this patch is currently broken.
|
||||
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
index 4f64b22c22880812318b095b8ae943489d8a3c07..eba5428f82966230252ac01c49a049e9775996b2 100644
|
||||
index 44ab3ea5a90eb31e2bea636c7d7a9aedc4b1823a..82d197413d990a8f08f25498a66f5097681b2793 100644
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -8119,6 +8119,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||
|
||||
@@ -15,7 +15,7 @@ Note that we also need to manually update embedder's
|
||||
`api::WebContents::IsFullscreenForTabOrPending` value.
|
||||
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
index eba5428f82966230252ac01c49a049e9775996b2..710739875dd45e943c43647ff3346bd375d23232 100644
|
||||
index 82d197413d990a8f08f25498a66f5097681b2793..9d967772f7afe3987f67f1440890a43032192735 100644
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -7334,6 +7334,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
||||
|
||||
@@ -40,7 +40,6 @@ fix_do_not_resolve_electron_entrypoints.patch
|
||||
fix_ftbfs_werror_wextra-semi.patch
|
||||
fix_isurl_implementation.patch
|
||||
ci_ensure_node_tests_set_electron_run_as_node.patch
|
||||
chore_update_fixtures_errors_force_colors_snapshot.patch
|
||||
fix_assert_module_in_the_renderer_process.patch
|
||||
src_cast_v8_object_getinternalfield_return_value_to_v8_value.patch
|
||||
fix_add_trusted_space_and_trusted_lo_space_to_the_v8_heap.patch
|
||||
@@ -53,3 +52,4 @@ src_adapt_to_v8_exception_api_change.patch
|
||||
lib_test_do_not_hardcode_buffer_kmaxlength.patch
|
||||
fix_handle_possible_disabled_sharedarraybuffer.patch
|
||||
win_process_avoid_assert_after_spawning_store_app_4152.patch
|
||||
test_fix_edge_snapshot_stack_traces.patch
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Kerr <charles@charleskerr.com>
|
||||
Date: Mon, 7 Aug 2023 20:29:10 -0500
|
||||
Subject: chore: update fixtures/errors/force_colors.snapshot
|
||||
|
||||
The line numbers in the stacktrace from our v8 build don't match what
|
||||
Node's tests are expecting, so update the stacktrace to match our build.
|
||||
|
||||
The specific probably isn't needed for the force_colors test, which is
|
||||
trying to see whether or not the lines are greyed out. One possibility
|
||||
would be to upstream a changed test that doesn't hardcode line numbers.
|
||||
|
||||
diff --git a/test/fixtures/errors/force_colors.snapshot b/test/fixtures/errors/force_colors.snapshot
|
||||
index 4c33acbc2d5c12ac8750b72e0796284176af3da2..56fae731aeec1f3a2870fba56eb0fb24e5d4b87f 100644
|
||||
--- a/test/fixtures/errors/force_colors.snapshot
|
||||
+++ b/test/fixtures/errors/force_colors.snapshot
|
||||
@@ -4,11 +4,12 @@ throw new Error('Should include grayed stack trace')
|
||||
|
||||
Error: Should include grayed stack trace
|
||||
at Object.<anonymous> [90m(/[39mtest*force_colors.js:1:7[90m)[39m
|
||||
-[90m at Module._compile (node:internal*modules*cjs*loader:1256:14)[39m
|
||||
-[90m at Module._extensions..js (node:internal*modules*cjs*loader:1310:10)[39m
|
||||
-[90m at Module.load (node:internal*modules*cjs*loader:1119:32)[39m
|
||||
-[90m at Module._load (node:internal*modules*cjs*loader:960:12)[39m
|
||||
-[90m at Function.executeUserEntryPoint [as runMain] (node:internal*modules*run_main:86:12)[39m
|
||||
+[90m at Module._compile (node:internal*modules*cjs*loader:1271:14)[39m
|
||||
+[90m at Module._extensions..js (node:internal*modules*cjs*loader:1326:10)[39m
|
||||
+[90m at Module.load (node:internal*modules*cjs*loader:1126:32)[39m
|
||||
+[90m at Module._load (node:internal*modules*cjs*loader:967:12)[39m
|
||||
+[90m at Module._load (node:electron*js2c*asar_bundle:763:32)[39m
|
||||
+[90m at Function.executeUserEntryPoint [as runMain] (node:internal*modules*run_main:101:12)[39m
|
||||
[90m at node:internal*main*run_main_module:23:47[39m
|
||||
|
||||
Node.js *
|
||||
141
patches/node/test_fix_edge_snapshot_stack_traces.patch
Normal file
141
patches/node/test_fix_edge_snapshot_stack_traces.patch
Normal file
@@ -0,0 +1,141 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shelley Vohr <shelley.vohr@gmail.com>
|
||||
Date: Wed, 18 Oct 2023 10:40:34 +0200
|
||||
Subject: test: fix edge snapshot stack traces
|
||||
|
||||
https://github.com/nodejs/node/pull/49659
|
||||
|
||||
diff --git a/test/common/assertSnapshot.js b/test/common/assertSnapshot.js
|
||||
index 83ee45f5f906adddcbc701112f373332dd1f66f9..7b6a9d59bfaa0247f4466277097cd5575ff81d0c 100644
|
||||
--- a/test/common/assertSnapshot.js
|
||||
+++ b/test/common/assertSnapshot.js
|
||||
@@ -8,6 +8,10 @@ const assert = require('node:assert/strict');
|
||||
const stackFramesRegexp = /(\s+)((.+?)\s+\()?(?:\(?(.+?):(\d+)(?::(\d+))?)\)?(\s+\{)?(\[\d+m)?(\n|$)/g;
|
||||
const windowNewlineRegexp = /\r/g;
|
||||
|
||||
+function replaceNodeVersion(str) {
|
||||
+ return str.replaceAll(process.version, '*');
|
||||
+}
|
||||
+
|
||||
function replaceStackTrace(str, replacement = '$1*$7$8\n') {
|
||||
return str.replace(stackFramesRegexp, replacement);
|
||||
}
|
||||
@@ -70,6 +74,7 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ...
|
||||
module.exports = {
|
||||
assertSnapshot,
|
||||
getSnapshotPath,
|
||||
+ replaceNodeVersion,
|
||||
replaceStackTrace,
|
||||
replaceWindowsLineEndings,
|
||||
replaceWindowsPaths,
|
||||
diff --git a/test/fixtures/errors/force_colors.snapshot b/test/fixtures/errors/force_colors.snapshot
|
||||
index 4c33acbc2d5c12ac8750b72e0796284176af3da2..21410d492db861876ecfcb82dcc3c1815cba6d09 100644
|
||||
--- a/test/fixtures/errors/force_colors.snapshot
|
||||
+++ b/test/fixtures/errors/force_colors.snapshot
|
||||
@@ -4,11 +4,12 @@ throw new Error('Should include grayed stack trace')
|
||||
|
||||
Error: Should include grayed stack trace
|
||||
at Object.<anonymous> [90m(/[39mtest*force_colors.js:1:7[90m)[39m
|
||||
-[90m at Module._compile (node:internal*modules*cjs*loader:1256:14)[39m
|
||||
-[90m at Module._extensions..js (node:internal*modules*cjs*loader:1310:10)[39m
|
||||
-[90m at Module.load (node:internal*modules*cjs*loader:1119:32)[39m
|
||||
-[90m at Module._load (node:internal*modules*cjs*loader:960:12)[39m
|
||||
-[90m at Function.executeUserEntryPoint [as runMain] (node:internal*modules*run_main:86:12)[39m
|
||||
-[90m at node:internal*main*run_main_module:23:47[39m
|
||||
+[90m at *[39m
|
||||
+[90m at *[39m
|
||||
+[90m at *[39m
|
||||
+[90m at *[39m
|
||||
+[90m at *[39m
|
||||
+[90m at *[39m
|
||||
+[90m at *[39m
|
||||
|
||||
Node.js *
|
||||
diff --git a/test/parallel/test-node-output-errors.mjs b/test/parallel/test-node-output-errors.mjs
|
||||
index b9a55fb7ea22e62553f69bd035797f7aaee1fc38..1f5ce52cf674cfc5fb75ad2cd979752a991c7e28 100644
|
||||
--- a/test/parallel/test-node-output-errors.mjs
|
||||
+++ b/test/parallel/test-node-output-errors.mjs
|
||||
@@ -10,14 +10,15 @@ const skipForceColors =
|
||||
(common.isWindows && (Number(os.release().split('.')[0]) !== 10 || Number(os.release().split('.')[2]) < 14393)); // See https://github.com/nodejs/node/pull/33132
|
||||
|
||||
|
||||
-function replaceNodeVersion(str) {
|
||||
- return str.replaceAll(process.version, '*');
|
||||
-}
|
||||
-
|
||||
function replaceStackTrace(str) {
|
||||
return snapshot.replaceStackTrace(str, '$1at *$7\n');
|
||||
}
|
||||
|
||||
+function replaceForceColorsStackTrace(str) {
|
||||
+ // eslint-disable-next-line no-control-regex
|
||||
+ return str.replaceAll(/(\[90m\W+)at .*node:.*/g, '$1at *[39m');
|
||||
+}
|
||||
+
|
||||
describe('errors output', { concurrency: true }, () => {
|
||||
function normalize(str) {
|
||||
return str.replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '').replaceAll('//', '*').replaceAll(/\/(\w)/g, '*$1').replaceAll('*test*', '*').replaceAll('*fixtures*errors*', '*').replaceAll('file:**', 'file:*/');
|
||||
@@ -28,9 +29,12 @@ describe('errors output', { concurrency: true }, () => {
|
||||
}
|
||||
const common = snapshot
|
||||
.transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths);
|
||||
- const defaultTransform = snapshot.transform(common, normalize, replaceNodeVersion);
|
||||
- const errTransform = snapshot.transform(common, normalizeNoNumbers, replaceNodeVersion);
|
||||
- const promiseTransform = snapshot.transform(common, replaceStackTrace, normalizeNoNumbers, replaceNodeVersion);
|
||||
+ const defaultTransform = snapshot.transform(common, normalize, snapshot.replaceNodeVersion);
|
||||
+ const errTransform = snapshot.transform(common, normalizeNoNumbers, snapshot.replaceNodeVersion);
|
||||
+ const promiseTransform = snapshot.transform(common, replaceStackTrace,
|
||||
+ normalizeNoNumbers, snapshot.replaceNodeVersion);
|
||||
+ const forceColorsTransform = snapshot.transform(common, normalize,
|
||||
+ replaceForceColorsStackTrace, snapshot.replaceNodeVersion);
|
||||
|
||||
const tests = [
|
||||
{ name: 'errors/async_error_eval_cjs.js' },
|
||||
@@ -50,7 +54,11 @@ describe('errors output', { concurrency: true }, () => {
|
||||
{ name: 'errors/throw_in_line_with_tabs.js', transform: errTransform },
|
||||
{ name: 'errors/throw_non_error.js', transform: errTransform },
|
||||
{ name: 'errors/promise_always_throw_unhandled.js', transform: promiseTransform },
|
||||
- !skipForceColors ? { name: 'errors/force_colors.js', env: { FORCE_COLOR: 1 } } : null,
|
||||
+ !skipForceColors ? {
|
||||
+ name: 'errors/force_colors.js',
|
||||
+ transform: forceColorsTransform,
|
||||
+ env: { FORCE_COLOR: 1 }
|
||||
+ } : null,
|
||||
].filter(Boolean);
|
||||
for (const { name, transform, env } of tests) {
|
||||
if (env) env.ELECTRON_RUN_AS_NODE = 1;
|
||||
diff --git a/test/parallel/test-node-output-sourcemaps.mjs b/test/parallel/test-node-output-sourcemaps.mjs
|
||||
index 8e43947ab2188f087056eab39d0e1a11481f9da5..c53a0598958e4e386db1993caeb312dae3f302a8 100644
|
||||
--- a/test/parallel/test-node-output-sourcemaps.mjs
|
||||
+++ b/test/parallel/test-node-output-sourcemaps.mjs
|
||||
@@ -4,10 +4,6 @@ import * as snapshot from '../common/assertSnapshot.js';
|
||||
import * as path from 'node:path';
|
||||
import { describe, it } from 'node:test';
|
||||
|
||||
-function replaceNodeVersion(str) {
|
||||
- return str.replaceAll(process.version, '*');
|
||||
-}
|
||||
-
|
||||
describe('sourcemaps output', { concurrency: true }, () => {
|
||||
function normalize(str) {
|
||||
const result = str
|
||||
@@ -16,7 +12,8 @@ describe('sourcemaps output', { concurrency: true }, () => {
|
||||
.replaceAll('/Users/bencoe/oss/coffee-script-test', '')
|
||||
.replaceAll(/\/(\w)/g, '*$1')
|
||||
.replaceAll('*test*', '*')
|
||||
- .replaceAll('*fixtures*source-map*', '*');
|
||||
+ .replaceAll('*fixtures*source-map*', '*')
|
||||
+ .replaceAll(/(\W+).*node:internal\*modules.*/g, '$1*');
|
||||
if (common.isWindows) {
|
||||
const currentDeviceLetter = path.parse(process.cwd()).root.substring(0, 1).toLowerCase();
|
||||
const regex = new RegExp(`${currentDeviceLetter}:/?`, 'gi');
|
||||
@@ -25,7 +22,8 @@ describe('sourcemaps output', { concurrency: true }, () => {
|
||||
return result;
|
||||
}
|
||||
const defaultTransform = snapshot
|
||||
- .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, normalize, replaceNodeVersion);
|
||||
+ .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths,
|
||||
+ normalize, snapshot.replaceNodeVersion);
|
||||
|
||||
const tests = [
|
||||
{ name: 'source-map/output/source_map_disabled_by_api.js' },
|
||||
Reference in New Issue
Block a user