Update Cypress and Chromium
I was debugging some QR code detection and wondered if the old
versions of these 2 pieces had anything to do with the issues.
Upgrading didn't help, but I figured it's worth keeping.
This patch updates Chromium to latest and Cypress to near-latest. I
had to pull in an upstream patch for rules_cypress because upstream
Cypress changed their released tarballs. So the checksums needed to
change. I didn't update Cypress to latest because of a reported issue:
https://github.com/aspect-build/rules_cypress/pull/56#issuecomment-1827125915
As far as I can tell, there are no functional changes.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I04592e367cf1de94fe4243c7542d06ce7b16a418
diff --git a/WORKSPACE b/WORKSPACE
index 82a0dd4..f56dc7d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -988,6 +988,11 @@
http_archive(
name = "aspect_rules_cypress",
+ patch_args = ["-p1"],
+ patches = [
+ "//third_party:rules_cypress/0001-fix-incorrect-linux-checksums.patch",
+ "//third_party:rules_cypress/0002-Add-support-for-cypress-13.6.6.patch",
+ ],
sha256 = "76947778d8e855eee3c15931e1fcdc1c2a25d56d6c0edd110b2227c05b794d08",
strip_prefix = "rules_cypress-0.3.2",
urls = [
@@ -1002,7 +1007,7 @@
cypress_register_toolchains(
name = "cypress",
- cypress_version = "12.3.0",
+ cypress_version = "13.3.1",
)
# Copied from:
@@ -1013,7 +1018,7 @@
# LASTCHANGE_URL="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2FLAST_CHANGE?alt=media"
# CHROME_REVISION=$(curl -s -S $LASTCHANGE_URL)
# echo "latest CHROME_REVISION_LINUX is $CHROME_REVISION"
-CHROME_REVISION_LINUX = "1072361"
+CHROME_REVISION_LINUX = "1264932"
http_archive(
name = "chrome_linux",
@@ -1022,7 +1027,7 @@
srcs = glob(["**"]),
visibility = ["//visibility:public"],
)""",
- sha256 = "0df22f743facd1e090eff9b7f8d8bdc293fb4dc31ce9156d2ef19b515974a72b",
+ sha256 = "4de54f43b2fc4812b9fad4145e44df6ed3063969174a8883ea42ed4c1ee58301",
strip_prefix = "chrome-linux",
urls = [
"https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F" + CHROME_REVISION_LINUX + "%2Fchrome-linux.zip?alt=media",
diff --git a/package.json b/package.json
index df5df67..8f05d0f 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"@types/babel__core": "^7.20.5",
"@types/babel__generator": "^7.6.8",
"html-insert-assets": "0.14.3",
- "cypress": "12.3.0",
+ "cypress": "13.3.1",
"prettier": "2.6.1",
"requirejs": "2.3.6",
"rollup": "4.12.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8f37b3b..d44c82a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -57,8 +57,8 @@
specifier: 20.11.19
version: 20.11.19
cypress:
- specifier: 12.3.0
- version: 12.3.0
+ specifier: 13.3.1
+ version: 13.3.1
html-insert-assets:
specifier: 0.14.3
version: 0.14.3
@@ -569,8 +569,8 @@
dev: true
optional: true
- /@cypress/request@2.88.11:
- resolution: {integrity: sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==}
+ /@cypress/request@3.0.1:
+ resolution: {integrity: sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==}
engines: {node: '>= 6'}
dependencies:
aws-sign2: 0.7.0
@@ -588,7 +588,7 @@
performance-now: 2.1.0
qs: 6.10.4
safe-buffer: 5.2.1
- tough-cookie: 2.5.0
+ tough-cookie: 4.1.3
tunnel-agent: 0.6.0
uuid: 8.3.2
dev: true
@@ -984,8 +984,10 @@
resolution: {integrity: sha512-SWyMrjgdAUHNQmutvDcKablrJhkDLy4wunTme8oYLjKp41GnHGxMRXr2MQMvy/qy8H3LdzwQk9gH4hZ6T++H8g==}
dev: true
- /@types/node@14.18.53:
- resolution: {integrity: sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A==}
+ /@types/node@18.19.18:
+ resolution: {integrity: sha512-80CP7B8y4PzZF0GWx15/gVWRrB5y/bIjNI84NK3cmQJu0WZwvmj2WMA5LcofQFVfLqqCSp545+U2LsrVzX36Zg==}
+ dependencies:
+ undici-types: 5.26.5
dev: true
/@types/node@20.11.19:
@@ -1318,7 +1320,7 @@
/call-bind@1.0.2:
resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
dependencies:
- function-bind: 1.1.1
+ function-bind: 1.1.2
get-intrinsic: 1.2.1
dev: true
@@ -1480,8 +1482,8 @@
engines: {node: '>= 6'}
dev: true
- /commander@5.1.0:
- resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
+ /commander@6.2.1:
+ resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
engines: {node: '>= 6'}
dev: true
@@ -1519,15 +1521,15 @@
which: 2.0.2
dev: true
- /cypress@12.3.0:
- resolution: {integrity: sha512-ZQNebibi6NBt51TRxRMYKeFvIiQZ01t50HSy7z/JMgRVqBUey3cdjog5MYEbzG6Ktti5ckDt1tfcC47lmFwXkw==}
- engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
+ /cypress@13.3.1:
+ resolution: {integrity: sha512-g4mJLZxYN+UAF2LMy3Znd4LBnUmS59Vynd81VES59RdW48Yt+QtR2cush3melOoVNz0PPbADpWr8DcUx6mif8Q==}
+ engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
hasBin: true
requiresBuild: true
dependencies:
- '@cypress/request': 2.88.11
+ '@cypress/request': 3.0.1
'@cypress/xvfb': 1.2.4(supports-color@8.1.1)
- '@types/node': 14.18.53
+ '@types/node': 18.19.18
'@types/sinonjs__fake-timers': 8.1.1
'@types/sizzle': 2.3.3
arch: 2.2.0
@@ -1539,7 +1541,7 @@
check-more-types: 2.24.0
cli-cursor: 3.1.0
cli-table3: 0.6.3
- commander: 5.1.0
+ commander: 6.2.1
common-tags: 1.8.2
dayjs: 1.11.9
debug: 4.3.4(supports-color@8.1.1)
@@ -1560,9 +1562,10 @@
minimist: 1.2.8
ospath: 1.2.2
pretty-bytes: 5.6.0
+ process: 0.11.10
proxy-from-env: 1.0.0
request-progress: 3.0.0
- semver: 7.5.3
+ semver: 7.6.0
supports-color: 8.1.1
tmp: 0.2.1
untildify: 4.0.0
@@ -1879,7 +1882,7 @@
/get-intrinsic@1.2.1:
resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
dependencies:
- function-bind: 1.1.1
+ function-bind: 1.1.2
has: 1.0.3
has-proto: 1.0.1
has-symbols: 1.0.3
@@ -2902,6 +2905,11 @@
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
dev: true
+ /process@0.11.10:
+ resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+ engines: {node: '>= 0.6.0'}
+ dev: true
+
/promise-inflight@1.0.1:
resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
peerDependencies:
@@ -2946,6 +2954,10 @@
side-channel: 1.0.4
dev: true
+ /querystringify@2.2.0:
+ resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+ dev: true
+
/read-package-json-fast@3.0.2:
resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -3006,6 +3018,10 @@
hasBin: true
dev: true
+ /requires-port@1.0.0:
+ resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+ dev: true
+
/resolve@1.22.2:
resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==}
hasBin: true
@@ -3096,14 +3112,6 @@
hasBin: true
dev: true
- /semver@7.5.3:
- resolution: {integrity: sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==}
- engines: {node: '>=10'}
- hasBin: true
- dependencies:
- lru-cache: 6.0.0
- dev: true
-
/semver@7.5.4:
resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
engines: {node: '>=10'}
@@ -3414,12 +3422,14 @@
is-number: 7.0.0
dev: true
- /tough-cookie@2.5.0:
- resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
- engines: {node: '>=0.8'}
+ /tough-cookie@4.1.3:
+ resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
+ engines: {node: '>=6'}
dependencies:
psl: 1.9.0
punycode: 2.3.0
+ universalify: 0.2.0
+ url-parse: 1.5.10
dev: true
/tslib@2.6.0:
@@ -3489,6 +3499,11 @@
imurmurhash: 0.1.4
dev: true
+ /universalify@0.2.0:
+ resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
+ engines: {node: '>= 4.0.0'}
+ dev: true
+
/universalify@2.0.0:
resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
engines: {node: '>= 10.0.0'}
@@ -3516,6 +3531,13 @@
punycode: 2.3.0
dev: true
+ /url-parse@1.5.10:
+ resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+ dependencies:
+ querystringify: 2.2.0
+ requires-port: 1.0.0
+ dev: true
+
/util-deprecate@1.0.2:
resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
dev: true
diff --git a/third_party/rules_cypress/0001-fix-incorrect-linux-checksums.patch b/third_party/rules_cypress/0001-fix-incorrect-linux-checksums.patch
new file mode 100644
index 0000000..b69e828
--- /dev/null
+++ b/third_party/rules_cypress/0001-fix-incorrect-linux-checksums.patch
@@ -0,0 +1,42 @@
+From 500a658a00cbd7839d2431e51003429d542b7f4a Mon Sep 17 00:00:00 2001
+From: Jack Vincent <50340752+jackvincentnz@users.noreply.github.com>
+Date: Fri, 19 Jan 2024 21:12:12 -0800
+Subject: [PATCH] fix: incorrect linux checksums
+
+---
+ cypress/private/versions.bzl | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cypress/private/versions.bzl b/cypress/private/versions.bzl
+index 8fad4be..f4b3a1f 100644
+--- a/cypress/private/versions.bzl
++++ b/cypress/private/versions.bzl
+@@ -6,22 +6,22 @@ TOOL_VERSIONS = {
+ "13.3.1": {
+ "darwin-x64": "417c5f1d77e15c8aef0a55f155c16c3dbbc637f918c1e51f8fec6eb1c73a9ba9",
+ "darwin-arm64": "143d905779c0b0a8a9049b0eb68b4b156db3d838d4546ce5082a8f7bd5dc5232",
+- "linux-x64": "a165aa290d23d03f191852df2e8c3cb25ddccf1d4e226518a0a217f4ec405328",
+- "linux-arm64": "b51810d7fda748f67d5d875d5e265ee22bb394af2bb4a545b78c99f1aae91cb0",
++ "linux-x64": "bb0ddd980bd82792a477b1c39ce8a0a7b275481031c559c065c94f1131151b0c",
++ "linux-arm64": "fbca9958e2a153f3f1ffdef1bb506db65401a8586229b9d9424cd16228d0353d",
+ "win32-x64": "acf1e478634e4da254bd7c3695d9032010c2ed17955e7339e1ea7d79cf8c9f7b",
+ },
+ "12.12.0": {
+ "darwin-x64": "53ddd917112a2c5c3c22d12f5bcffda596474c7cd0932a997e575b2b97ae36c0",
+ "darwin-arm64": "2daadfe4431a98f9dc6442c155239aaed2746b12a59721424e3b5fdaaf27c766",
+- "linux-x64": "18bf251f683e0b0ca70918c2a51b7a457be6e5298be52203bd16d4e0eb361837",
+- "linux-arm64": "1f754c912eb719d4ac4abe31f3cc6d5b65cf08e0266cf6808f376c099928c88e",
++ "linux-x64": "7f41d45da094380cc0d6716c8357b60f9c9304c2475cf502ea60649f040d52ad",
++ "linux-arm64": "55531b5ba8d03a979a5ef92981d27964583897c652eec3788f24ec8677d05dd2",
+ "win32-x64": "ffc47314ce5f74888066bc4a15ee18d375ee9680f9cca1b94eda7293e1dea4e5",
+ },
+ "12.3.0": {
+ "darwin-x64": "beae3678dd859ce89cc45c377eef97b67558ee1f2a0079e9b4c824260ef3801a",
+ "darwin-arm64": "bb08f247110dda9b180d2552a661b8669441f931b0332d818c306a14e8c7071a",
+- "linux-x64": "57dd85936373e6ce2ae5378f9035a3ad118899341e0c6e71783c3e58c039ce92",
+- "linux-arm64": "47c1188506b11644a332ab0949eab0b33179a64e4857e561d3c836c6f6f2cadf",
++ "linux-x64": "3a300d6c903a8f5fced488183dcc7faa06e9df14c946d6dab4b5822ec738e9cd",
++ "linux-arm64": "501671011a63fd450b87e1cae1b3ba3fabccf37e9c1c8c26e1d5f189f9afe688",
+ "win32-x64": "639a0e0ca5498fc5330064c3fa441c741e6b6cd01234bfa9851de9a33f4f56a6",
+ },
+ "10.8.0": {
diff --git a/third_party/rules_cypress/0002-Add-support-for-cypress-13.6.6.patch b/third_party/rules_cypress/0002-Add-support-for-cypress-13.6.6.patch
new file mode 100644
index 0000000..d4d9144
--- /dev/null
+++ b/third_party/rules_cypress/0002-Add-support-for-cypress-13.6.6.patch
@@ -0,0 +1,27 @@
+From 2c8ec34c8fd4f6f485a7c7036e73fa82cd99859d Mon Sep 17 00:00:00 2001
+From: Philipp Schrader <philipp.schrader@gmail.com>
+Date: Sat, 24 Feb 2024 16:08:46 -0800
+Subject: [PATCH] Add support for cypress 13.6.6
+
+---
+ cypress/private/versions.bzl | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/cypress/private/versions.bzl b/cypress/private/versions.bzl
+index f4b3a1f..6a3e665 100644
+--- a/cypress/private/versions.bzl
++++ b/cypress/private/versions.bzl
+@@ -3,6 +3,13 @@
+ # Use /scripts/mirror_release.sh to add a newer version below.
+ # Versions should be descending order so TOOL_VERSIONS.keys()[0] is the latest version.
+ TOOL_VERSIONS = {
++ "13.6.6": {
++ "darwin-x64": "4b845921f35f520b8217a4ebb9106180c56de37a9db7f57f14352060c9eddca6",
++ "darwin-arm64": "4c8818534bdab028a82aefc1936a552481fa0efb2a7c5c64350e9d9d1c709c85",
++ "linux-x64": "0fe6f52c41912245a71f71c0978a3a64e0dcc9dec4449809c5bf0442032a9912",
++ "linux-arm64": "0fc709f4ae9121f5f7f1bb68423b8ec9c9d9f6c9baf85fcbe0cde3ee9627cc38",
++ "win32-x64": "a31751f41f74af9c3f74860c00d50d0a0e5d5a5fa7c9049db9d56c6082382483",
++ },
+ "13.3.1": {
+ "darwin-x64": "417c5f1d77e15c8aef0a55f155c16c3dbbc637f918c1e51f8fec6eb1c73a9ba9",
+ "darwin-arm64": "143d905779c0b0a8a9049b0eb68b4b156db3d838d4546ce5082a8f7bd5dc5232",