Merge branch 'develop' into astone123/fix-itgrep-trace

astone123 · web-flow · commit 61311ee73bf5 · 2025-11-03T11:16:57.000-05:00
diff --git a/.circleci/src/pipeline/@pipeline.yml b/.circleci/src/pipeline/@pipeline.yml
@@ -9,12 +9,10 @@ chrome-stable-version: &chrome-stable-version "141.0.7390.107"
 chrome-beta-version: &chrome-beta-version "142.0.7444.34"
 firefox-stable-version: &firefox-stable-version "142.0"
 base-internal-trixie: &base-internal-trixie cypress/base-internal:22.19.0-trixie
-base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry-trixie
+base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry
 # Lowest Node.js version we support of the minimum major version supported
 # See https://docs.cypress.io/app/get-started/install-cypress#Nodejs
 base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:20.15.0
-ubuntu-2004-current: &ubuntu-2004-current ubuntu-2004:2024.11.1
-ubuntu-2004-older: &ubuntu-2004-older ubuntu-2004:2024.05.1
 
 orbs:
   browser-tools: circleci/browser-tools@2.3.1
@@ -118,7 +116,7 @@ commands:
           name: Set environment variable to determine whether or not to persist artifacts
           command: |
             echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
-            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/fix_builds" ]]; then
+            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/remove_unused_anchors" ]]; then
                 export SHOULD_PERSIST_ARTIFACTS=true
             fi' >> "$BASH_ENV"
   # You must run `setup_should_persist_artifacts` command and be using bash before running this command
diff --git a/.circleci/src/pipeline/workflows/@main.yml b/.circleci/src/pipeline/workflows/@main.yml
@@ -4,7 +4,7 @@ linux-x64:
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'ryanm/fix/issue-with-sourcemaps', << pipeline.git.branch >> ]
+      - equal: [ 'chore/remove_unused_anchors', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>
diff --git a/scripts/binary/get-published-artifacts.js b/scripts/binary/get-published-artifacts.js
@@ -12,6 +12,10 @@ const getArtifactJobName = (platformKey) => {
     return 'linux-amd-publish-binary'
   }
 
+  if (platformKey === 'linux-arm64') {
+    return 'linux-arm64-publish-binary'
+  }
+
   return 'publish-binary'
 }
 
diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json
@@ -4082,7 +4082,7 @@
     "./packages/server/lib/environment.ts",
     "./packages/server/lib/exec.ts",
     "./packages/server/lib/experiments.ts",
-    "./packages/server/lib/file_server.js",
+    "./packages/server/lib/file_server.ts",
     "./packages/server/lib/files.js",
     "./packages/server/lib/fixture.js",
     "./packages/server/lib/gui/links.ts",
@@ -4123,11 +4123,11 @@
     "./packages/server/lib/util/electron-app.js",
     "./packages/server/lib/util/ensure-url.ts",
     "./packages/server/lib/util/env-editors.ts",
-    "./packages/server/lib/util/env.js",
+    "./packages/server/lib/util/env.ts",
     "./packages/server/lib/util/escape_filename.ts",
     "./packages/server/lib/util/exit.js",
     "./packages/server/lib/util/file-opener.ts",
-    "./packages/server/lib/util/file.js",
+    "./packages/server/lib/util/file.ts",
     "./packages/server/lib/util/find_process.js",
     "./packages/server/lib/util/get-windows-proxy.js",
     "./packages/server/lib/util/graceful_crash_handling.ts",
@@ -4141,7 +4141,7 @@
     "./packages/server/lib/util/print-run.ts",
     "./packages/server/lib/util/profile_cleaner.js",
     "./packages/server/lib/util/proxy.ts",
-    "./packages/server/lib/util/random.js",
+    "./packages/server/lib/util/random.ts",
     "./packages/server/lib/util/resourceTypeAndCredentialManager.ts",
     "./packages/server/lib/util/server_destroy.ts",
     "./packages/server/lib/util/shell.ts",
@@ -4150,7 +4150,7 @@
     "./packages/server/lib/util/status_code.js",
     "./packages/server/lib/util/stream_buffer.ts",
     "./packages/server/lib/util/system.js",
-    "./packages/server/lib/util/terminal-size.js",
+    "./packages/server/lib/util/terminal-size.ts",
     "./packages/server/lib/util/terminal.js",
     "./packages/server/lib/util/tests_utils.ts",
     "./packages/server/lib/util/trash.ts",
diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json
@@ -4081,7 +4081,7 @@
     "./packages/server/lib/environment.ts",
     "./packages/server/lib/exec.ts",
     "./packages/server/lib/experiments.ts",
-    "./packages/server/lib/file_server.js",
+    "./packages/server/lib/file_server.ts",
     "./packages/server/lib/files.js",
     "./packages/server/lib/fixture.js",
     "./packages/server/lib/gui/links.ts",
@@ -4122,11 +4122,11 @@
     "./packages/server/lib/util/electron-app.js",
     "./packages/server/lib/util/ensure-url.ts",
     "./packages/server/lib/util/env-editors.ts",
-    "./packages/server/lib/util/env.js",
+    "./packages/server/lib/util/env.ts",
     "./packages/server/lib/util/escape_filename.ts",
     "./packages/server/lib/util/exit.js",
     "./packages/server/lib/util/file-opener.ts",
-    "./packages/server/lib/util/file.js",
+    "./packages/server/lib/util/file.ts",
     "./packages/server/lib/util/find_process.js",
     "./packages/server/lib/util/get-windows-proxy.js",
     "./packages/server/lib/util/graceful_crash_handling.ts",
@@ -4140,7 +4140,7 @@
     "./packages/server/lib/util/print-run.ts",
     "./packages/server/lib/util/profile_cleaner.js",
     "./packages/server/lib/util/proxy.ts",
-    "./packages/server/lib/util/random.js",
+    "./packages/server/lib/util/random.ts",
     "./packages/server/lib/util/resourceTypeAndCredentialManager.ts",
     "./packages/server/lib/util/server_destroy.ts",
     "./packages/server/lib/util/shell.ts",
@@ -4149,7 +4149,7 @@
     "./packages/server/lib/util/status_code.js",
     "./packages/server/lib/util/stream_buffer.ts",
     "./packages/server/lib/util/system.js",
-    "./packages/server/lib/util/terminal-size.js",
+    "./packages/server/lib/util/terminal-size.ts",
     "./packages/server/lib/util/terminal.js",
     "./packages/server/lib/util/tests_utils.ts",
     "./packages/server/lib/util/trash.ts",
diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json
@@ -4081,7 +4081,7 @@
     "./packages/server/lib/environment.ts",
     "./packages/server/lib/exec.ts",
     "./packages/server/lib/experiments.ts",
-    "./packages/server/lib/file_server.js",
+    "./packages/server/lib/file_server.ts",
     "./packages/server/lib/files.js",
     "./packages/server/lib/fixture.js",
     "./packages/server/lib/gui/links.ts",
@@ -4122,11 +4122,11 @@
     "./packages/server/lib/util/electron-app.js",
     "./packages/server/lib/util/ensure-url.ts",
     "./packages/server/lib/util/env-editors.ts",
-    "./packages/server/lib/util/env.js",
+    "./packages/server/lib/util/env.ts",
     "./packages/server/lib/util/escape_filename.ts",
     "./packages/server/lib/util/exit.js",
     "./packages/server/lib/util/file-opener.ts",
-    "./packages/server/lib/util/file.js",
+    "./packages/server/lib/util/file.ts",
     "./packages/server/lib/util/find_process.js",
     "./packages/server/lib/util/get-windows-proxy.js",
     "./packages/server/lib/util/graceful_crash_handling.ts",
@@ -4140,7 +4140,7 @@
     "./packages/server/lib/util/print-run.ts",
     "./packages/server/lib/util/profile_cleaner.js",
     "./packages/server/lib/util/proxy.ts",
-    "./packages/server/lib/util/random.js",
+    "./packages/server/lib/util/random.ts",
     "./packages/server/lib/util/resourceTypeAndCredentialManager.ts",
     "./packages/server/lib/util/server_destroy.ts",
     "./packages/server/lib/util/shell.ts",
@@ -4149,7 +4149,7 @@
     "./packages/server/lib/util/status_code.js",
     "./packages/server/lib/util/stream_buffer.ts",
     "./packages/server/lib/util/system.js",
-    "./packages/server/lib/util/terminal-size.js",
+    "./packages/server/lib/util/terminal-size.ts",
     "./packages/server/lib/util/terminal.js",
     "./packages/server/lib/util/tests_utils.ts",
     "./packages/server/lib/util/trash.ts",

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@ const getArtifactJobName = (platformKey) => {`
`12`	`12`	`return 'linux-amd-publish-binary'`
`13`	`13`	`}`
`14`	`14`
	`15`	`+ if (platformKey === 'linux-arm64') {`
	`16`	`+ return 'linux-arm64-publish-binary'`
	`17`	`+ }`
	`18`	`+`
`15`	`19`	`return 'publish-binary'`
`16`	`20`	`}`
`17`	`21`