diff --git a/.github/lighthouse/lighthouse-config-dev.json b/.github/lighthouse/lighthouse-config-dev.json
index 572efdc629b..e524467f789 100644
--- a/.github/lighthouse/lighthouse-config-dev.json
+++ b/.github/lighthouse/lighthouse-config-dev.json
@@ -30,8 +30,10 @@
"service-worker": "off",
"speed-index": "off",
"splash-screen": "off",
+ "target-size": "off",
"td-has-header": "off",
"themed-omnibox": "off",
+ "third-party-cookies": "off",
"third-party-facades": "off",
"total-byte-weight": "off",
"unminified-css": "off",
diff --git a/.github/lighthouse/lighthouse-config-prod.json b/.github/lighthouse/lighthouse-config-prod.json
index dae7fc8902c..b5657941b61 100644
--- a/.github/lighthouse/lighthouse-config-prod.json
+++ b/.github/lighthouse/lighthouse-config-prod.json
@@ -31,8 +31,10 @@
"service-worker": "off",
"speed-index": "off",
"splash-screen": "off",
+ "target-size": "off",
"td-has-header": "off",
"themed-omnibox": "off",
+ "third-party-cookies": "off",
"third-party-facades": "off",
"total-byte-weight": "off",
"unminified-css": "off",
diff --git a/src/config/last_updated.json b/src/config/last_updated.json
index fa8616919b5..87ba3e25588 100644
--- a/src/config/last_updated.json
+++ b/src/config/last_updated.json
@@ -46,126 +46,126 @@
},
"/static/js/webmentions.js": {
"date_published": "2021-12-01T00:00:00.000Z",
- "date_modified": "2024-02-08T00:00:00.000Z",
- "hash": "32a155a8c31e83fef72aa83a218b5890"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "dbb31a967a22e06b6c1bb62d7a9ff9a0"
},
"/static/pdfs/web_almanac_2019_en.pdf": {
"date_published": "2020-05-15T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "370c044f266d44ea595c3a761c07b48f",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "478ee72119cdebe69dccba35d8d40e53",
"size": 17
},
"/static/pdfs/web_almanac_2019_en_cover_A5.pdf": {
"date_published": "2020-05-15T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "ebe210e0786261c482690dacea1684d3"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "9079644e09c5380e5f960f861592ee6d"
},
"/static/pdfs/web_almanac_2019_en_print_A5.pdf": {
"date_published": "2020-05-15T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "8399cc4166764eb66587450dc912cf68",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "c53bd4f79158f065bb4f6abc142e226a",
"size": 16
},
"/static/pdfs/web_almanac_2019_ja.pdf": {
"date_published": "2020-05-15T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "e53b50bd5e022b75dd03b9d839ab9005",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "3e9546d974fd2cdbe1b35702b5fe2f6f",
"size": 17
},
"/static/pdfs/web_almanac_2019_ja_cover_A5.pdf": {
"date_published": "2020-05-15T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "0514026df0d5083f89f8fe03a57eaa5d"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "cd8189cb58ae15c33b35ee8d5144e4f9"
},
"/static/pdfs/web_almanac_2019_ja_print_A5.pdf": {
"date_published": "2020-05-15T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "f29f5fb99b473c0ca482a5d0162f8317",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "0d30e631eb1704e497d6f634efb465c5",
"size": 16
},
"/static/pdfs/web_almanac_2020_en.pdf": {
"date_published": "2020-12-08T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "4adb47fa4e6982a174ed2faf7dec6551",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "7dde29957cd109800c929374d6a64872",
"size": 24
},
"/static/pdfs/web_almanac_2020_en_cover_A5.pdf": {
"date_published": "2020-12-09T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "919564984b6949a388f094e3b3c736b6"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "c7be7fd88891217e965cece4d5cdaf54"
},
"/static/pdfs/web_almanac_2020_en_print_A5.pdf": {
"date_published": "2020-12-09T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "7445341afd48b2d059257ccb9d2d5af1",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "67e86808c672c93a3c6a8eadd13157a7",
"size": 24
},
"/static/pdfs/web_almanac_2020_ja.pdf": {
"date_published": "2021-10-24T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "09ccaffc177b7b9532429d62fda6b6f4",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "2bb019a821be477c597616dc8eb8ed79",
"size": 25
},
"/static/pdfs/web_almanac_2020_ja_cover_A5.pdf": {
"date_published": "2021-10-24T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "ec124b926c219247de2e2425a6586915"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "2efae9a4c0062e259fdb5d2103e31a1f"
},
"/static/pdfs/web_almanac_2020_ja_print_A5.pdf": {
"date_published": "2021-10-24T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "133ac55a98e40bef1a9a0fe2ee44eaca",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "ef19f4bfc670df6e4df7a7b3772d417a",
"size": 24
},
"/static/pdfs/web_almanac_2021_en.pdf": {
"date_published": "2021-12-01T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "205c8d2e97fb8d839078b874fb96a0d7",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "105d555477cdab2509790d2e328db61c",
"size": 32
},
"/static/pdfs/web_almanac_2021_en_cover_A5.pdf": {
"date_published": "2021-12-01T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "b0f971d669209ca7d7ea89c0de1508ce"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "cc98090d3f1979ee0dd189ffb0daa6fc"
},
"/static/pdfs/web_almanac_2021_en_print_A5.pdf": {
"date_published": "2021-12-01T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "241b0c8297a0a0408eaaa0d3fa111540",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "858a899ab2ac64e0e9b2b3e2ee2e66a9",
"size": 31
},
"/static/pdfs/web_almanac_2021_ja.pdf": {
"date_published": "22-08-01T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "c11a3a87d210f04cf50ae4858579c004",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "21c25817eb7269e3d11f039cff1b7837",
"size": 32
},
"/static/pdfs/web_almanac_2021_ja_cover_A5.pdf": {
"date_published": "22-08-01T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "ce90fde80c36f4851ddf7c302e021b27"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "e64046b0af245e1cdf86d3454cd17904"
},
"/static/pdfs/web_almanac_2021_ja_print_A5.pdf": {
"date_published": "22-08-01T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "1a3d05b23d132d6ec32e11b02019e878",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "e460a14c4f626456732572426e815ccf",
"size": 32
},
"/static/pdfs/web_almanac_2022_en.pdf": {
"date_published": "2022-10-19T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "70a75002e23a12911880d16c4a2dfa46",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "7bcb70b1c1af22ef859df3d4ec986698",
"size": 32
},
"/static/pdfs/web_almanac_2022_en_cover_A5.pdf": {
"date_published": "2022-10-19T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "4fa92f9b4f08a54c11889877a2e9f7fa"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "e4a9b2f2c69202b8dd04063195d677bc"
},
"/static/pdfs/web_almanac_2022_en_print_A5.pdf": {
"date_published": "2022-10-19T00:00:00.000Z",
- "date_modified": "2024-01-04T00:00:00.000Z",
- "hash": "49d63dcb30d287ab209483a317f1d907",
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "db76948f4d106ec5d1274ce603ed2caa",
"size": 31
},
"en/2019/chapters/accessibility.html": {
@@ -300,8 +300,8 @@
},
"en/2020/chapters/caching.html": {
"date_published": "2020-12-09T00:00:00.000Z",
- "date_modified": "2022-04-29T00:00:00.000Z",
- "hash": "35a4f06b35f235533b3a9e7b061b973e"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "cb4ef9d2539e47e5584dd3c825a2c76c"
},
"en/2020/chapters/capabilities.html": {
"date_published": "2020-11-09T00:00:00.000Z",
@@ -1345,8 +1345,8 @@
},
"ja/2020/chapters/caching.html": {
"date_published": "2021-05-31T00:00:00.000Z",
- "date_modified": "2022-08-08T00:00:00.000Z",
- "hash": "d4f1c26a243422be2bdf88e1e8afaa7b"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "74651f774208abb1a7abd381daacfd7d"
},
"ja/2020/chapters/capabilities.html": {
"date_published": "2020-12-09T00:00:00.000Z",
@@ -1720,8 +1720,8 @@
},
"nl/2020/chapters/caching.html": {
"date_published": "2021-05-02T00:00:00.000Z",
- "date_modified": "2022-04-29T00:00:00.000Z",
- "hash": "28a399b909decce3c763c68298b253af"
+ "date_modified": "2024-02-22T00:00:00.000Z",
+ "hash": "3b57bec0e61273a321a52c2937344093"
},
"nl/2020/chapters/capabilities.html": {
"date_published": "2021-01-17T00:00:00.000Z",
diff --git a/src/content/en/2020/caching.md b/src/content/en/2020/caching.md
index 95aacc2a113..3fb9e5839fc 100644
--- a/src/content/en/2020/caching.md
+++ b/src/content/en/2020/caching.md
@@ -694,9 +694,6 @@ The table below details the cache TTL values for mobile requests by type:
-
- Cache TTL percentiles (in hours)
-
Type
10
@@ -789,7 +786,7 @@ The table below details the cache TTL values for mobile requests by type:
- {{ figure_link(caption="Mobile cache TTL percentiles by resource type.", sheets_gid="676954337", sql_file="ttl_by_resource.sql") }}
+ {{ figure_link(caption="Mobile cache TTL hours by percentiles and resource type.", sheets_gid="676954337", sql_file="ttl_by_resource.sql") }}
While most of the median TTLs are high, the lower percentiles highlight some of the missed caching opportunities. For example, the median TTL for images is 720 hours (1 month); however the 25th percentile is just 168 hours (1 week) and the 10th percentile has dropped to just a few hours. Compare this with fonts, which have a very high TTL of 8,760 hours (1 year) all the way down to the 25th percentile, with even the 10th percentile showing a TTL of 1 month.
diff --git a/src/content/ja/2020/caching.md b/src/content/ja/2020/caching.md
index d72681d40c8..596ce7ecda9 100644
--- a/src/content/ja/2020/caching.md
+++ b/src/content/ja/2020/caching.md
@@ -694,9 +694,6 @@ HTTPレスポンスの43.4%がVaryヘッダーを使用しており、その
-
- キャッシュのTTLパーセンタイル(単位:時間)
-
タイプ
10
diff --git a/src/content/nl/2020/caching.md b/src/content/nl/2020/caching.md
index 004574ed703..7d84dfb2e4c 100644
--- a/src/content/nl/2020/caching.md
+++ b/src/content/nl/2020/caching.md
@@ -694,9 +694,6 @@ In de onderstaande tabel worden de cache-TTL-waarden voor mobiele verzoeken per
-
- TTL-percentielen in cache (in uren)
-
Type
10
@@ -789,7 +786,7 @@ In de onderstaande tabel worden de cache-TTL-waarden voor mobiele verzoeken per
- {{ figure_link(caption="TTL-percentielen voor mobiele cache per brontype.", sheets_gid="676954337", sql_file="ttl_by_resource.sql") }}
+ {{ figure_link(caption="TTL in uren voor mobiele cache per percentielen en brontype.", sheets_gid="676954337", sql_file="ttl_by_resource.sql") }}
Hoewel de meeste mediane TTL's hoog zijn, benadrukken de lagere percentielen enkele van de gemiste cachemogelijkheden. De mediane TTL voor afbeeldingen is bijvoorbeeld 720 uur (1 maand); het 25e percentiel is echter slechts 168 uur (1 week) en het 10de percentiel is gedaald tot slechts een paar uur. Vergelijk dit met lettertypen, die een zeer hoge TTL hebben van 8.760 uur (1 jaar) helemaal tot aan het 25e percentiel, waarbij zelfs het 10de percentiel een TTL van 1 maand laat zien.
diff --git a/src/package-lock.json b/src/package-lock.json
index e8554081886..41eb33eba78 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -15,7 +15,7 @@
"node-fetch": "3.3.2",
"node-watch": "0.7.4",
"prettier": "3.2.5",
- "puppeteer": "22.0.0",
+ "puppeteer": "22.2.0",
"rainbow-code": "2.1.7",
"recursive-readdir": "2.2.3",
"run-script-os": "1.1.6",
@@ -186,16 +186,17 @@
}
},
"node_modules/@puppeteer/browsers": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.0.0.tgz",
- "integrity": "sha512-3PS82/5+tnpEaUWonjAFFvlf35QHF15xqyGd34GBa5oP5EPVfFXRsbSxIGYf1M+vZlqBZ3oxT1kRg9OYhtt8ng==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.1.0.tgz",
+ "integrity": "sha512-xloWvocjvryHdUjDam/ZuGMh7zn4Sn3ZAaV4Ah2e2EwEt90N3XphZlSsU3n0VDc1F7kggCjMuH0UuxfPQ5mD9w==",
"dev": true,
"dependencies": {
"debug": "4.3.4",
"extract-zip": "2.0.1",
"progress": "2.0.3",
- "proxy-agent": "6.3.1",
- "tar-fs": "3.0.4",
+ "proxy-agent": "6.4.0",
+ "semver": "7.6.0",
+ "tar-fs": "3.0.5",
"unbzip2-stream": "1.4.3",
"yargs": "17.7.2"
},
@@ -213,9 +214,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "20.11.16",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
- "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==",
+ "version": "20.11.19",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz",
+ "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==",
"dev": true,
"optional": true,
"dependencies": {
@@ -299,9 +300,9 @@
"dev": true
},
"node_modules/b4a": {
- "version": "1.6.4",
- "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
- "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
+ "version": "1.6.6",
+ "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+ "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
"dev": true
},
"node_modules/balanced-match": {
@@ -310,6 +311,43 @@
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
+ "node_modules/bare-events": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.0.tgz",
+ "integrity": "sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg==",
+ "dev": true,
+ "optional": true
+ },
+ "node_modules/bare-fs": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.1.5.tgz",
+ "integrity": "sha512-5t0nlecX+N2uJqdxe9d18A98cp2u9BETelbjKpiVgQqzzmVNFYWEAjQHqS+2Khgto1vcwhik9cXucaj5ve2WWA==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "bare-events": "^2.0.0",
+ "bare-os": "^2.0.0",
+ "bare-path": "^2.0.0",
+ "streamx": "^2.13.0"
+ }
+ },
+ "node_modules/bare-os": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.2.0.tgz",
+ "integrity": "sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag==",
+ "dev": true,
+ "optional": true
+ },
+ "node_modules/bare-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.0.tgz",
+ "integrity": "sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "bare-os": "^2.1.0"
+ }
+ },
"node_modules/base64-js": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -408,9 +446,9 @@
}
},
"node_modules/chromium-bidi": {
- "version": "0.5.8",
- "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.8.tgz",
- "integrity": "sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==",
+ "version": "0.5.9",
+ "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.9.tgz",
+ "integrity": "sha512-wOTX3m2zuHX0zRX4h7Ol1DAGz0cqHzo2IrAPvOqBxdd4ZR32vxg4FKNjmBihi1oP9b1QGSBBG5VNUUXUCsxDfg==",
"dev": true,
"dependencies": {
"mitt": "3.0.1",
@@ -637,9 +675,9 @@
}
},
"node_modules/devtools-protocol": {
- "version": "0.0.1232444",
- "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
- "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==",
+ "version": "0.0.1249869",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1249869.tgz",
+ "integrity": "sha512-Ctp4hInA0BEavlUoRy9mhGq0i+JSo/AwVyX2EFgZmV1kYB+Zq+EMBAn52QWu6FbRr10hRb6pBl420upbp4++vg==",
"dev": true
},
"node_modules/ejs": {
@@ -703,9 +741,9 @@
}
},
"node_modules/escalade": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
- "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+ "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
"dev": true,
"engines": {
"node": ">=6"
@@ -925,61 +963,29 @@
}
},
"node_modules/get-uri": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz",
- "integrity": "sha512-5KLucCJobh8vBY1K07EFV4+cPZH3mrV9YeAruUseCQKHB58SGjjT2l9/eA9LD082IiuMjSlFJEcdJ27TXvbZNw==",
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+ "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
"dev": true,
"dependencies": {
"basic-ftp": "^5.0.2",
- "data-uri-to-buffer": "^6.0.0",
+ "data-uri-to-buffer": "^6.0.2",
"debug": "^4.3.4",
- "fs-extra": "^8.1.0"
+ "fs-extra": "^11.2.0"
},
"engines": {
"node": ">= 14"
}
},
"node_modules/get-uri/node_modules/data-uri-to-buffer": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz",
- "integrity": "sha512-MZd3VlchQkp8rdend6vrx7MmVDJzSNTBvghvKjirLkD+WTChA3KUf0jkE68Q4UyctNqI11zZO9/x2Yx+ub5Cvg==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+ "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
"dev": true,
"engines": {
"node": ">= 14"
}
},
- "node_modules/get-uri/node_modules/fs-extra": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
- "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^4.0.0",
- "universalify": "^0.1.0"
- },
- "engines": {
- "node": ">=6 <7 || >=8"
- }
- },
- "node_modules/get-uri/node_modules/jsonfile": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
- "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
- "dev": true,
- "optionalDependencies": {
- "graceful-fs": "^4.1.6"
- }
- },
- "node_modules/get-uri/node_modules/universalify": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
- "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
- "dev": true,
- "engines": {
- "node": ">= 4.0.0"
- }
- },
"node_modules/graceful-fs": {
"version": "4.2.8",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
@@ -1008,9 +1014,9 @@
}
},
"node_modules/http-proxy-agent": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
- "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
"dev": true,
"dependencies": {
"agent-base": "^7.1.0",
@@ -1021,9 +1027,9 @@
}
},
"node_modules/https-proxy-agent": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
- "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+ "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
"dev": true,
"dependencies": {
"agent-base": "^7.0.2",
@@ -1081,11 +1087,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/ip": {
- "version": "1.1.8",
- "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
- "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
- "dev": true
+ "node_modules/ip-address": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+ "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+ "dev": true,
+ "dependencies": {
+ "jsbn": "1.1.0",
+ "sprintf-js": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 12"
+ }
},
"node_modules/is-arrayish": {
"version": "0.2.1",
@@ -1144,6 +1157,12 @@
"js-yaml": "bin/js-yaml.js"
}
},
+ "node_modules/jsbn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+ "dev": true
+ },
"node_modules/jsdom": {
"version": "24.0.0",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz",
@@ -1256,12 +1275,6 @@
"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
"dev": true
},
- "node_modules/mkdirp-classic": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
- "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
- "dev": true
- },
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -1358,13 +1371,12 @@
}
},
"node_modules/pac-resolver": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz",
- "integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+ "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
"dev": true,
"dependencies": {
"degenerator": "^5.0.0",
- "ip": "^1.1.8",
"netmask": "^2.0.2"
},
"engines": {
@@ -1444,15 +1456,15 @@
}
},
"node_modules/proxy-agent": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
- "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
+ "version": "6.4.0",
+ "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+ "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
"dev": true,
"dependencies": {
"agent-base": "^7.0.2",
"debug": "^4.3.4",
- "http-proxy-agent": "^7.0.0",
- "https-proxy-agent": "^7.0.2",
+ "http-proxy-agent": "^7.0.1",
+ "https-proxy-agent": "^7.0.3",
"lru-cache": "^7.14.1",
"pac-proxy-agent": "^7.0.1",
"proxy-from-env": "^1.1.0",
@@ -1494,15 +1506,15 @@
}
},
"node_modules/puppeteer": {
- "version": "22.0.0",
- "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.0.0.tgz",
- "integrity": "sha512-zYVnjwJngnSB4dbkWp7DHFSIc3nqHvZzrdHyo9+ugV1nq1Lm8obOMcmCFaGfR3PJs0EmYNz+/skBeO45yvASCQ==",
+ "version": "22.2.0",
+ "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.2.0.tgz",
+ "integrity": "sha512-0Ax7zeqqbQL6Zcpo1WAvrqWQAnGsLB4tmQUUwsb5Cfo05XaQ78LWUUjaO4um7qaddKpZfk0vXlGcRVwtedpWfg==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
- "@puppeteer/browsers": "2.0.0",
+ "@puppeteer/browsers": "2.1.0",
"cosmiconfig": "9.0.0",
- "puppeteer-core": "22.0.0"
+ "puppeteer-core": "22.2.0"
},
"bin": {
"puppeteer": "lib/esm/puppeteer/node/cli.js"
@@ -1512,16 +1524,16 @@
}
},
"node_modules/puppeteer-core": {
- "version": "22.0.0",
- "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.0.0.tgz",
- "integrity": "sha512-S3s91rLde0A86PWVeNY82h+P0fdS7CTiNWAicCVH/bIspRP4nS2PnO5j+VTFqCah0ZJizGzpVPAmxVYbLxTc9w==",
+ "version": "22.2.0",
+ "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.2.0.tgz",
+ "integrity": "sha512-rxLM860FP05CxCPAn6dwY0KnVhbnogsXu4XORb+2hb/va69v7R1VdJWLMGHd7EE5wfpT8oFZ7Q6NN85OhOtV9Q==",
"dev": true,
"dependencies": {
- "@puppeteer/browsers": "2.0.0",
- "chromium-bidi": "0.5.8",
+ "@puppeteer/browsers": "2.1.0",
+ "chromium-bidi": "0.5.9",
"cross-fetch": "4.0.0",
"debug": "4.3.4",
- "devtools-protocol": "0.0.1232444",
+ "devtools-protocol": "0.0.1249869",
"ws": "8.16.0"
},
"engines": {
@@ -1625,6 +1637,33 @@
"node": ">=v12.22.7"
}
},
+ "node_modules/semver": {
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+ "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+ "dev": true,
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/semver/node_modules/lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/showdown": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz",
@@ -1662,16 +1701,16 @@
}
},
"node_modules/socks": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
- "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+ "version": "2.7.3",
+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.3.tgz",
+ "integrity": "sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw==",
"dev": true,
"dependencies": {
- "ip": "^2.0.0",
+ "ip-address": "^9.0.5",
"smart-buffer": "^4.2.0"
},
"engines": {
- "node": ">= 10.13.0",
+ "node": ">= 10.0.0",
"npm": ">= 3.0.0"
}
},
@@ -1689,12 +1728,6 @@
"node": ">= 14"
}
},
- "node_modules/socks/node_modules/ip": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
- "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
- "dev": true
- },
"node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -1705,14 +1738,23 @@
"node": ">=0.10.0"
}
},
+ "node_modules/sprintf-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+ "dev": true
+ },
"node_modules/streamx": {
- "version": "2.15.7",
- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.7.tgz",
- "integrity": "sha512-NPEKS5+yjyo597eafGbKW5ujh7Sm6lDLHZQd/lRSz6S0VarpADBJItqfB4PnwpS+472oob1GX5cCY9vzfJpHUA==",
+ "version": "2.16.1",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.16.1.tgz",
+ "integrity": "sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==",
"dev": true,
"dependencies": {
"fast-fifo": "^1.1.0",
"queue-tick": "^1.0.1"
+ },
+ "optionalDependencies": {
+ "bare-events": "^2.2.0"
}
},
"node_modules/string-width": {
@@ -1760,14 +1802,17 @@
"dev": true
},
"node_modules/tar-fs": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
- "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.5.tgz",
+ "integrity": "sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==",
"dev": true,
"dependencies": {
- "mkdirp-classic": "^0.5.2",
"pump": "^3.0.0",
"tar-stream": "^3.1.5"
+ },
+ "optionalDependencies": {
+ "bare-fs": "^2.1.1",
+ "bare-path": "^2.1.0"
}
},
"node_modules/tar-stream": {
@@ -2027,6 +2072,12 @@
"node": ">=10"
}
},
+ "node_modules/yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true
+ },
"node_modules/yargs": {
"version": "17.7.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
@@ -2198,16 +2249,17 @@
}
},
"@puppeteer/browsers": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.0.0.tgz",
- "integrity": "sha512-3PS82/5+tnpEaUWonjAFFvlf35QHF15xqyGd34GBa5oP5EPVfFXRsbSxIGYf1M+vZlqBZ3oxT1kRg9OYhtt8ng==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.1.0.tgz",
+ "integrity": "sha512-xloWvocjvryHdUjDam/ZuGMh7zn4Sn3ZAaV4Ah2e2EwEt90N3XphZlSsU3n0VDc1F7kggCjMuH0UuxfPQ5mD9w==",
"dev": true,
"requires": {
"debug": "4.3.4",
"extract-zip": "2.0.1",
"progress": "2.0.3",
- "proxy-agent": "6.3.1",
- "tar-fs": "3.0.4",
+ "proxy-agent": "6.4.0",
+ "semver": "7.6.0",
+ "tar-fs": "3.0.5",
"unbzip2-stream": "1.4.3",
"yargs": "17.7.2"
}
@@ -2219,9 +2271,9 @@
"dev": true
},
"@types/node": {
- "version": "20.11.16",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
- "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==",
+ "version": "20.11.19",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz",
+ "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==",
"dev": true,
"optional": true,
"requires": {
@@ -2290,9 +2342,9 @@
"dev": true
},
"b4a": {
- "version": "1.6.4",
- "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz",
- "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==",
+ "version": "1.6.6",
+ "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+ "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==",
"dev": true
},
"balanced-match": {
@@ -2301,6 +2353,43 @@
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
+ "bare-events": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.0.tgz",
+ "integrity": "sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg==",
+ "dev": true,
+ "optional": true
+ },
+ "bare-fs": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.1.5.tgz",
+ "integrity": "sha512-5t0nlecX+N2uJqdxe9d18A98cp2u9BETelbjKpiVgQqzzmVNFYWEAjQHqS+2Khgto1vcwhik9cXucaj5ve2WWA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "bare-events": "^2.0.0",
+ "bare-os": "^2.0.0",
+ "bare-path": "^2.0.0",
+ "streamx": "^2.13.0"
+ }
+ },
+ "bare-os": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.2.0.tgz",
+ "integrity": "sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag==",
+ "dev": true,
+ "optional": true
+ },
+ "bare-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.0.tgz",
+ "integrity": "sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "bare-os": "^2.1.0"
+ }
+ },
"base64-js": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -2356,9 +2445,9 @@
}
},
"chromium-bidi": {
- "version": "0.5.8",
- "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.8.tgz",
- "integrity": "sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==",
+ "version": "0.5.9",
+ "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.9.tgz",
+ "integrity": "sha512-wOTX3m2zuHX0zRX4h7Ol1DAGz0cqHzo2IrAPvOqBxdd4ZR32vxg4FKNjmBihi1oP9b1QGSBBG5VNUUXUCsxDfg==",
"dev": true,
"requires": {
"mitt": "3.0.1",
@@ -2524,9 +2613,9 @@
"dev": true
},
"devtools-protocol": {
- "version": "0.0.1232444",
- "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
- "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==",
+ "version": "0.0.1249869",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1249869.tgz",
+ "integrity": "sha512-Ctp4hInA0BEavlUoRy9mhGq0i+JSo/AwVyX2EFgZmV1kYB+Zq+EMBAn52QWu6FbRr10hRb6pBl420upbp4++vg==",
"dev": true
},
"ejs": {
@@ -2575,9 +2664,9 @@
}
},
"escalade": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
- "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+ "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
"dev": true
},
"escape-string-regexp": {
@@ -2729,47 +2818,21 @@
}
},
"get-uri": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz",
- "integrity": "sha512-5KLucCJobh8vBY1K07EFV4+cPZH3mrV9YeAruUseCQKHB58SGjjT2l9/eA9LD082IiuMjSlFJEcdJ27TXvbZNw==",
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+ "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
"dev": true,
"requires": {
"basic-ftp": "^5.0.2",
- "data-uri-to-buffer": "^6.0.0",
+ "data-uri-to-buffer": "^6.0.2",
"debug": "^4.3.4",
- "fs-extra": "^8.1.0"
+ "fs-extra": "^11.2.0"
},
"dependencies": {
"data-uri-to-buffer": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz",
- "integrity": "sha512-MZd3VlchQkp8rdend6vrx7MmVDJzSNTBvghvKjirLkD+WTChA3KUf0jkE68Q4UyctNqI11zZO9/x2Yx+ub5Cvg==",
- "dev": true
- },
- "fs-extra": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
- "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^4.0.0",
- "universalify": "^0.1.0"
- }
- },
- "jsonfile": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
- "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.6"
- }
- },
- "universalify": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
- "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+ "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
"dev": true
}
}
@@ -2796,9 +2859,9 @@
}
},
"http-proxy-agent": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
- "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
"dev": true,
"requires": {
"agent-base": "^7.1.0",
@@ -2806,9 +2869,9 @@
}
},
"https-proxy-agent": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
- "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+ "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
"dev": true,
"requires": {
"agent-base": "^7.0.2",
@@ -2840,11 +2903,15 @@
"resolve-from": "^4.0.0"
}
},
- "ip": {
- "version": "1.1.8",
- "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
- "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
- "dev": true
+ "ip-address": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+ "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+ "dev": true,
+ "requires": {
+ "jsbn": "1.1.0",
+ "sprintf-js": "^1.1.3"
+ }
},
"is-arrayish": {
"version": "0.2.1",
@@ -2891,6 +2958,12 @@
"argparse": "^2.0.1"
}
},
+ "jsbn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+ "dev": true
+ },
"jsdom": {
"version": "24.0.0",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz",
@@ -2978,12 +3051,6 @@
"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
"dev": true
},
- "mkdirp-classic": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
- "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
- "dev": true
- },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3051,13 +3118,12 @@
}
},
"pac-resolver": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz",
- "integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+ "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
"dev": true,
"requires": {
"degenerator": "^5.0.0",
- "ip": "^1.1.8",
"netmask": "^2.0.2"
}
},
@@ -3110,15 +3176,15 @@
"dev": true
},
"proxy-agent": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz",
- "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
+ "version": "6.4.0",
+ "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+ "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
"dev": true,
"requires": {
"agent-base": "^7.0.2",
"debug": "^4.3.4",
- "http-proxy-agent": "^7.0.0",
- "https-proxy-agent": "^7.0.2",
+ "http-proxy-agent": "^7.0.1",
+ "https-proxy-agent": "^7.0.3",
"lru-cache": "^7.14.1",
"pac-proxy-agent": "^7.0.1",
"proxy-from-env": "^1.1.0",
@@ -3154,27 +3220,27 @@
"dev": true
},
"puppeteer": {
- "version": "22.0.0",
- "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.0.0.tgz",
- "integrity": "sha512-zYVnjwJngnSB4dbkWp7DHFSIc3nqHvZzrdHyo9+ugV1nq1Lm8obOMcmCFaGfR3PJs0EmYNz+/skBeO45yvASCQ==",
+ "version": "22.2.0",
+ "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.2.0.tgz",
+ "integrity": "sha512-0Ax7zeqqbQL6Zcpo1WAvrqWQAnGsLB4tmQUUwsb5Cfo05XaQ78LWUUjaO4um7qaddKpZfk0vXlGcRVwtedpWfg==",
"dev": true,
"requires": {
- "@puppeteer/browsers": "2.0.0",
+ "@puppeteer/browsers": "2.1.0",
"cosmiconfig": "9.0.0",
- "puppeteer-core": "22.0.0"
+ "puppeteer-core": "22.2.0"
}
},
"puppeteer-core": {
- "version": "22.0.0",
- "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.0.0.tgz",
- "integrity": "sha512-S3s91rLde0A86PWVeNY82h+P0fdS7CTiNWAicCVH/bIspRP4nS2PnO5j+VTFqCah0ZJizGzpVPAmxVYbLxTc9w==",
+ "version": "22.2.0",
+ "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.2.0.tgz",
+ "integrity": "sha512-rxLM860FP05CxCPAn6dwY0KnVhbnogsXu4XORb+2hb/va69v7R1VdJWLMGHd7EE5wfpT8oFZ7Q6NN85OhOtV9Q==",
"dev": true,
"requires": {
- "@puppeteer/browsers": "2.0.0",
- "chromium-bidi": "0.5.8",
+ "@puppeteer/browsers": "2.1.0",
+ "chromium-bidi": "0.5.9",
"cross-fetch": "4.0.0",
"debug": "4.3.4",
- "devtools-protocol": "0.0.1232444",
+ "devtools-protocol": "0.0.1249869",
"ws": "8.16.0"
}
},
@@ -3259,6 +3325,26 @@
"xmlchars": "^2.2.0"
}
},
+ "semver": {
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+ "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^6.0.0"
+ },
+ "dependencies": {
+ "lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "requires": {
+ "yallist": "^4.0.0"
+ }
+ }
+ }
+ },
"showdown": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz",
@@ -3281,21 +3367,13 @@
"dev": true
},
"socks": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
- "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+ "version": "2.7.3",
+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.3.tgz",
+ "integrity": "sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw==",
"dev": true,
"requires": {
- "ip": "^2.0.0",
+ "ip-address": "^9.0.5",
"smart-buffer": "^4.2.0"
- },
- "dependencies": {
- "ip": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
- "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
- "dev": true
- }
}
},
"socks-proxy-agent": {
@@ -3316,12 +3394,19 @@
"dev": true,
"optional": true
},
+ "sprintf-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+ "dev": true
+ },
"streamx": {
- "version": "2.15.7",
- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.7.tgz",
- "integrity": "sha512-NPEKS5+yjyo597eafGbKW5ujh7Sm6lDLHZQd/lRSz6S0VarpADBJItqfB4PnwpS+472oob1GX5cCY9vzfJpHUA==",
+ "version": "2.16.1",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.16.1.tgz",
+ "integrity": "sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==",
"dev": true,
"requires": {
+ "bare-events": "^2.2.0",
"fast-fifo": "^1.1.0",
"queue-tick": "^1.0.1"
}
@@ -3362,12 +3447,13 @@
"dev": true
},
"tar-fs": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
- "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.5.tgz",
+ "integrity": "sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==",
"dev": true,
"requires": {
- "mkdirp-classic": "^0.5.2",
+ "bare-fs": "^2.1.1",
+ "bare-path": "^2.1.0",
"pump": "^3.0.0",
"tar-stream": "^3.1.5"
}
@@ -3572,6 +3658,12 @@
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true
},
+ "yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true
+ },
"yargs": {
"version": "17.7.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/src/package.json b/src/package.json
index 8dd34c25afd..d73642e672a 100644
--- a/src/package.json
+++ b/src/package.json
@@ -41,7 +41,7 @@
"node-fetch": "3.3.2",
"node-watch": "0.7.4",
"prettier": "3.2.5",
- "puppeteer": "22.0.0",
+ "puppeteer": "22.2.0",
"rainbow-code": "2.1.7",
"recursive-readdir": "2.2.3",
"run-script-os": "1.1.6",
diff --git a/src/requirements.txt b/src/requirements.txt
index 311631c5c2c..5d61628c716 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,7 +1,7 @@
flask==3.0.2
flask-talisman==1.1.0
gunicorn==21.2.0
-pytest==8.0.0
+pytest==8.0.1
pytest-watch==4.2.0
pytest-cov==4.1.0
sqlfluff==1.4.5
diff --git a/src/static/js/webmentions.js b/src/static/js/webmentions.js
index b27b987bbeb..97d32cf5301 100644
--- a/src/static/js/webmentions.js
+++ b/src/static/js/webmentions.js
@@ -377,7 +377,9 @@ function handleShareButton() {
button.classList.remove('hidden');
}
-handleShareButton();
-addTabListeners();
-const BASE_URL = "https://almanac.httparchive.org";
-processWebmentions(BASE_URL + window.location.pathname);
+if (!window.location.search.includes('nowebmentions')) {
+ handleShareButton();
+ addTabListeners();
+ const BASE_URL = "https://almanac.httparchive.org";
+ processWebmentions(BASE_URL + window.location.pathname);
+}
diff --git a/src/tools/scripts/set_lighthouse_urls.sh b/src/tools/scripts/set_lighthouse_urls.sh
index 792d31fe375..f9eef4c791c 100755
--- a/src/tools/scripts/set_lighthouse_urls.sh
+++ b/src/tools/scripts/set_lighthouse_urls.sh
@@ -38,25 +38,26 @@ LIGHTHOUSE_URLS=""
# Set some URLs that should always be checked on pull requests
# to ensure basic coverage
+# We exclude webmentions to avoid Lighthouse issues
BASE_URLS=$(cat <<-END
-http://127.0.0.1:8080/en/2019/
-http://127.0.0.1:8080/en/2019/javascript
-http://127.0.0.1:8080/en/2020/
-http://127.0.0.1:8080/en/2020/css
-http://127.0.0.1:8080/en/2021/
-http://127.0.0.1:8080/en/2021/third-parties
-http://127.0.0.1:8080/en/2022/
-http://127.0.0.1:8080/en/2022/javascript
+http://127.0.0.1:8080/en/2019/?nowebmentions
+http://127.0.0.1:8080/en/2019/javascript?nowebmentions
+http://127.0.0.1:8080/en/2020/?nowebmentions
+http://127.0.0.1:8080/en/2020/css?nowebmentions
+http://127.0.0.1:8080/en/2021/?nowebmentions
+http://127.0.0.1:8080/en/2021/third-parties?nowebmentions
+http://127.0.0.1:8080/en/2022/?nowebmentions
+http://127.0.0.1:8080/en/2022/javascript?nowebmentions
END
)
if [ "${production}" == "1" ]; then
# Get the production URLs from the production sitemap (except PDFs and Stories)
- LIGHTHOUSE_URLS=$(curl -s https://almanac.httparchive.org/sitemap.xml | grep "//g' | sed 's/<\/loc>//g')
+ LIGHTHOUSE_URLS=$(curl -s https://almanac.httparchive.org/sitemap.xml | grep "//g' | sed 's/<\/loc>//g' | sed 's/$/?nowebmentions/g' )
- # Temporarily remove English CDN file as failing in Lighthouse - TODO Try removing this on next Lighthouse upgrade
- LIGHTHOUSE_URLS=$(echo "${LIGHTHOUSE_URLS}" | grep -v "/en/2021/cdn")
+ # Temporarily remove chapters failing in Lighthouse - TODO Try removing this on next Lighthouse upgrade
+ #LIGHTHOUSE_URLS=$(echo "${LIGHTHOUSE_URLS}" | grep -v "/en/2021/cdn" | grep -v '/2021/ecommerce')
# Switch to the Production Config file
LIGHTHOUSE_CONFIG_FILE="${LIGHTHOUSE_PROD_CONFIG_FILE}"
@@ -74,7 +75,10 @@ elif [ "${RUN_TYPE}" == "pull_request" ] && [ "${COMMIT_SHA}" != "" ]; then
git checkout --progress --force "${COMMIT_SHA}"
# Transform the files to http://127.0.0.1:8080 URLs
- LIGHTHOUSE_URLS=$(echo "${CHANGED_FILES}" | sed 's/src\/content/http:\/\/127.0.0.1:8080/g' | sed 's/\.md//g' | sed 's/\/base\//\/en\/2019\//g' | sed 's/src\/templates/http:\/\/127.0.0.1:8080/g' | sed 's/index\.html//g' | sed 's/\.html//g' | sed 's/_/-/g' | sed 's/\/2019\/accessibility-statement/\/accessibility-statement/g' | sed 's/\/2019\/search/\/search/g' )
+ LIGHTHOUSE_URLS=$(echo "${CHANGED_FILES}" | sed 's/src\/content/http:\/\/127.0.0.1:8080/g' | sed 's/\.md//g' | sed 's/\/base\//\/en\/2019\//g' | sed 's/src\/templates/http:\/\/127.0.0.1:8080/g' | sed 's/index\.html//g' | sed 's/\.html//g' | sed 's/_/-/g' | sed 's/\/2019\/accessibility-statement/\/accessibility-statement/g' | sed 's/\/2019\/search/\/search/g' | sed 's/(http://.*)$/\1?nowebmentions/g' )
+
+ # Temporarily remove chapters failing in Lighthouse - TODO Try removing this on next Lighthouse upgrade
+ # LIGHTHOUSE_URLS=$(echo "${LIGHTHOUSE_URLS}" | grep -v "/en/2021/cdn" | grep -v '/2021/ecommerce')
# Add base URLs and strip out newlines
LIGHTHOUSE_URLS=$(echo -e "${LIGHTHOUSE_URLS}\n${BASE_URLS}" | sort -u | sed '/^$/d')
@@ -82,10 +86,10 @@ elif [ "${RUN_TYPE}" == "pull_request" ] && [ "${COMMIT_SHA}" != "" ]; then
else
# Else test every URL (except PDFs and Stories) in the sitemap
- LIGHTHOUSE_URLS=$(grep loc templates/sitemap.xml | grep -v "/static/" | grep -v stories | sed 's/ *//g' | sed 's/<\/loc>//g' | sed 's/https:\/\/almanac.httparchive.org/http:\/\/127.0.0.1:8080/g')
+ LIGHTHOUSE_URLS=$(grep loc templates/sitemap.xml | grep -v "/static/" | grep -v stories | sed 's/ *//g' | sed 's/<\/loc>//g' | sed 's/https:\/\/almanac.httparchive.org/http:\/\/127.0.0.1:8080/g' | sed 's/$/?nowebmentions/g' )
- # Temporarily remove English CDN file as failing in Lighthouse - TODO Try removing this on next Lighthouse upgrade
- LIGHTHOUSE_URLS=$(echo "${LIGHTHOUSE_URLS}" | grep -v "/en/2021/cdn")
+ # Temporarily remove chapters failing in Lighthouse - TODO Try removing this on next Lighthouse upgrade
+ #LIGHTHOUSE_URLS=$(echo "${LIGHTHOUSE_URLS}" | grep -v "/en/2021/cdn" | grep -v '/2021/ecommerce')
fi
echo "URLS to check:"