From a3fcfd3963e559cee55a8a057cef4d2a3b6c7817 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Tue, 26 Aug 2025 17:38:15 -0700 Subject: [PATCH] Bump WebKit (#22145) ### What does this PR do? ### How did you verify your code works? --------- Co-authored-by: Jarred-Sumner <709451+Jarred-Sumner@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- cmake/tools/SetupWebKit.cmake | 2 +- test/integration/next-pages/test/next-build.test.ts | 2 ++ test/js/bun/shell/shell-immediate-exit-fixture.js | 4 ++-- test/js/bun/shell/shell-load.test.ts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/tools/SetupWebKit.cmake b/cmake/tools/SetupWebKit.cmake index a7fd8ceae4..62e9d31cdb 100644 --- a/cmake/tools/SetupWebKit.cmake +++ b/cmake/tools/SetupWebKit.cmake @@ -2,7 +2,7 @@ option(WEBKIT_VERSION "The version of WebKit to use") option(WEBKIT_LOCAL "If a local version of WebKit should be used instead of downloading") if(NOT WEBKIT_VERSION) - set(WEBKIT_VERSION 9dba2893ab70f873d8bb6950ee1bccb6b20c10b9) + set(WEBKIT_VERSION f9e86fe8dc0aa2fc1f137cc94777cb10637c23a4) endif() string(SUBSTRING ${WEBKIT_VERSION} 0 16 WEBKIT_VERSION_PREFIX) diff --git a/test/integration/next-pages/test/next-build.test.ts b/test/integration/next-pages/test/next-build.test.ts index ccdd2c59ab..4057cf36d5 100644 --- a/test/integration/next-pages/test/next-build.test.ts +++ b/test/integration/next-pages/test/next-build.test.ts @@ -95,6 +95,8 @@ function normalizeOutput(stdout: string) { .replace(/\d+(\.\d+)? [km]?b/gi, data => " ".repeat(data.length)) // normalize "Compiled successfully in Xms" timestamps .replace(/Compiled successfully in (\d|\.)+(ms|s)/gi, "Compiled successfully in 1000ms") + // normalize counter logging that may appear in different spots + .replaceAll("\ncounter a", "") .split("\n") .map(x => x.trim()) .join("\n") diff --git a/test/js/bun/shell/shell-immediate-exit-fixture.js b/test/js/bun/shell/shell-immediate-exit-fixture.js index 43ec46feab..b8f1848dfb 100644 --- a/test/js/bun/shell/shell-immediate-exit-fixture.js +++ b/test/js/bun/shell/shell-immediate-exit-fixture.js @@ -1,12 +1,12 @@ import { $, which } from "bun"; -const cat = which("cat"); +const cmd = which("true"); const promises = []; for (let j = 0; j < 300; j++) { for (let i = 0; i < 100; i++) { - promises.push($`${cat} ${import.meta.path}`.text().then(() => {})); + promises.push($`${cmd}`.text().then(() => {})); } if (j % 10 === 0) { await Promise.all(promises); diff --git a/test/js/bun/shell/shell-load.test.ts b/test/js/bun/shell/shell-load.test.ts index 01889c3ae6..6f7dca0554 100644 --- a/test/js/bun/shell/shell-load.test.ts +++ b/test/js/bun/shell/shell-load.test.ts @@ -9,7 +9,7 @@ describe("shell load", () => { expect([path.join(import.meta.dir, "./shell-immediate-exit-fixture.js")]).toRun(); }, { - timeout: 1000 * 15, + timeout: 1000 * 90, }, ); });