From 1674b91c22b40b1bc5cd8bdd495f01b0a3672972 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 8 Oct 2023 02:42:30 +0000 Subject: [PATCH 01/35] Bump postcss from 8.4.29 to 8.4.31 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.29 to 8.4.31. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.29...8.4.31) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d865b5b203a..7e47906d0ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -75,7 +75,7 @@ "moment": "2.29.4", "npm-run-all": "4.1.5", "patch-package": "8.0.0", - "postcss": "8.4.29", + "postcss": "8.4.31", "postcss-import": "15.1.0", "postcss-nested": "6.0.1", "postcss-preset-env": "9.1.2", @@ -22895,9 +22895,9 @@ } }, "node_modules/postcss": { - "version": "8.4.29", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz", - "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 0eda004e1f1..72d11805302 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "moment": "2.29.4", "npm-run-all": "4.1.5", "patch-package": "8.0.0", - "postcss": "8.4.29", + "postcss": "8.4.31", "postcss-import": "15.1.0", "postcss-nested": "6.0.1", "postcss-preset-env": "9.1.2", From 24876bc0122d383b37e8a7e2a4d36fbdf5ca86d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 18:04:35 +0000 Subject: [PATCH 02/35] Bump postcss-preset-env from 9.1.2 to 9.2.0 Bumps [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) from 9.1.2 to 9.2.0. - [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md) - [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env) --- updated-dependencies: - dependency-name: postcss-preset-env dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 501 +++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 272 insertions(+), 231 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e47906d0ac..c3ab2e2ab53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,7 @@ "postcss": "8.4.31", "postcss-import": "15.1.0", "postcss-nested": "6.0.1", - "postcss-preset-env": "9.1.2", + "postcss-preset-env": "9.2.0", "prettier": "3.0.3", "react-test-renderer": "18.2.0", "rtlcss-webpack-plugin": "4.0.7", @@ -2139,9 +2139,9 @@ "dev": true }, "node_modules/@csstools/cascade-layer-name-parser": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.4.tgz", - "integrity": "sha512-zXMGsJetbLoXe+gjEES07MEGjL0Uy3hMxmnGtVBrRpVKr5KV9OgCB09zr/vLrsEtoVQTgJFewxaU8IYSAE4tjg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.5.tgz", + "integrity": "sha512-v/5ODKNBMfBl0us/WQjlfsvSlYxfZLhNMVIsuCPib2ulTwGKYbKJbwqw671+qH9Y4wvWVnu7LBChvml/wBKjFg==", "dev": true, "funding": [ { @@ -2157,14 +2157,14 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1" } }, "node_modules/@csstools/color-helpers": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-3.0.1.tgz", - "integrity": "sha512-Tsp6FcSPaPN/+4T7iBPxBVopJUs7bimnNx4yuWeGXkH084Vro/y8fmrGg1LGSWH8SU6YuH20fP5Rtqtb979jyw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-3.0.2.tgz", + "integrity": "sha512-NMVs/l7Y9eIKL5XjbCHEgGcG8LOUT2qVcRjX6EzkCdlvftHVKr2tHIPzHavfrULRZ5Q2gxrJ9f44dAlj6fX97Q==", "dev": true, "funding": [ { @@ -2181,9 +2181,9 @@ } }, "node_modules/@csstools/css-calc": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-1.1.3.tgz", - "integrity": "sha512-7mJZ8gGRtSQfQKBQFi5N0Z+jzNC0q8bIkwojP1W0w+APzEqHu5wJoGVsvKxVnVklu9F8tW1PikbBRseYnAdv+g==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-1.1.4.tgz", + "integrity": "sha512-ZV1TSmToiNcQL1P3hfzlzZzA02mmVkVmXGaUDUqpYUG84PmLhVSZpKX+KfxAuOcK7de04UXSQPBrAvaya6iiGg==", "dev": true, "funding": [ { @@ -2199,14 +2199,14 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1" } }, "node_modules/@csstools/css-color-parser": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-1.3.0.tgz", - "integrity": "sha512-jgudbE+TXZLssSTGFRCkJF9gAM8ABZ2c9/gbLupwA8Y1SpcddxK2z74/MOSdWuboUHbshei8uSQNbp9Wu1Bx+Q==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-1.4.0.tgz", + "integrity": "sha512-SlGd8E6ron24JYQPQAIzu5tvmWi1H4sDKTdA7UDnwF45oJv7AVESbOlOO1YjfBhrQFuvLWUgKiOY9DwGoAxwTA==", "dev": true, "funding": [ { @@ -2219,21 +2219,21 @@ } ], "dependencies": { - "@csstools/color-helpers": "^3.0.1", - "@csstools/css-calc": "^1.1.3" + "@csstools/color-helpers": "^3.0.2", + "@csstools/css-calc": "^1.1.4" }, "engines": { "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1" } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.1.tgz", - "integrity": "sha512-xrvsmVUtefWMWQsGgFffqWSK03pZ1vfDki4IVIIUxxDKnGBzqNgv0A7SB1oXtVNEkcVO8xi1ZrTL29HhSu5kGA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.2.tgz", + "integrity": "sha512-sLYGdAdEY2x7TSw9FtmdaTrh2wFtRJO5VMbBrA8tEqEod7GEggFmxTSK9XqExib3yMuYNcvcTdCZIP6ukdjAIA==", "dev": true, "funding": [ { @@ -2249,13 +2249,13 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-tokenizer": "^2.2.1" } }, "node_modules/@csstools/css-tokenizer": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.0.tgz", - "integrity": "sha512-wErmsWCbsmig8sQKkM6pFhr/oPha1bHfvxsUY5CYSQxwyhA9Ulrs8EqCgClhg4Tgg2XapVstGqSVcz0xOYizZA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.1.tgz", + "integrity": "sha512-Zmsf2f/CaEPWEVgw29odOj+WEVoiJy9s9NOv5GgNY9mZ1CZ7394By6wONrONrTsnNDv6F9hR02nvFihrGVGHBg==", "dev": true, "funding": [ { @@ -2272,9 +2272,9 @@ } }, "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.4.tgz", - "integrity": "sha512-V/OUXYX91tAC1CDsiY+HotIcJR+vPtzrX8pCplCpT++i8ThZZsq5F5dzZh/bDM3WUOjrvC1ljed1oSJxMfjqhw==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.5.tgz", + "integrity": "sha512-IxVBdYzR8pYe89JiyXQuYk4aVVoCPhMJkz6ElRwlVysjwURTsTk/bmY/z4FfeRE+CRBMlykPwXEVUg8lThv7AQ==", "dev": true, "funding": [ { @@ -2290,8 +2290,8 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1" } }, "node_modules/@csstools/postcss-cascade-layers": { @@ -2321,9 +2321,9 @@ } }, "node_modules/@csstools/postcss-color-function": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-3.0.2.tgz", - "integrity": "sha512-sfEBBWVMNPE3mHllI+FR43W2qy7eIjqCySAoivPFV068yKbUy6mH8Sra5Gjar54M3p2qvH8S/6KPlvEDBTvrmg==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-3.0.7.tgz", + "integrity": "sha512-/PIB20G1TPCXmQlaJLWIYzTZRZpj6csT4ijgnshIj/kcmniIRroAfDa0xSWnfuO1eNo0NptIaPU7jzUukWn55Q==", "dev": true, "funding": [ { @@ -2336,10 +2336,10 @@ } ], "dependencies": { - "@csstools/css-color-parser": "^1.3.0", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/postcss-progressive-custom-properties": "^3.0.0" + "@csstools/css-color-parser": "^1.4.0", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/postcss-progressive-custom-properties": "^3.0.2" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2349,9 +2349,9 @@ } }, "node_modules/@csstools/postcss-color-mix-function": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.2.tgz", - "integrity": "sha512-121MUtL/fv+lO9FQJKP05UAKC6xYl4hZYyWl+pGbfXIa3KkgCbcMfhkIc0zV2JpwsB5uhls81bwl+XJKhKwECw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.7.tgz", + "integrity": "sha512-57/g8aGo5eKFjEeJMiRKh8Qq43K2rCyk5ZZTvJ34TNl4zUtYU5DvLkIkOnhCtL8/a4z9oMA42aOnFPddRrScUQ==", "dev": true, "funding": [ { @@ -2364,10 +2364,10 @@ } ], "dependencies": { - "@csstools/css-color-parser": "^1.3.0", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/postcss-progressive-custom-properties": "^3.0.0" + "@csstools/css-color-parser": "^1.4.0", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/postcss-progressive-custom-properties": "^3.0.2" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2377,9 +2377,9 @@ } }, "node_modules/@csstools/postcss-exponential-functions": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.0.tgz", - "integrity": "sha512-FPndJ/7oGlML7/4EhLi902wGOukO0Nn37PjwOQGc0BhhjQPy3np3By4d3M8s9Cfmp9EHEKgUHRN2DQ5HLT/hTw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.1.tgz", + "integrity": "sha512-ZLK2iSK4DUxeypGce2PnQSdYugUqDTwxnhNiq1o6OyKMNYgYs4eKbvEhFG8JKr1sJWbeqBi5jRr0017l2EWVvg==", "dev": true, "funding": [ { @@ -2392,9 +2392,9 @@ } ], "dependencies": { - "@csstools/css-calc": "^1.1.3", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-calc": "^1.1.4", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2428,10 +2428,37 @@ "postcss": "^8.4" } }, + "node_modules/@csstools/postcss-gamut-mapping": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-1.0.0.tgz", + "integrity": "sha512-6UQyK8l9YaG5Ao5rBDcCnKHrLsHiQ1E0zeFQuqDJqEtinVzAPb/MwSw3TenZXL1Rnd7th3tb+4CBFHBXdW5tbQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "dependencies": { + "@csstools/css-color-parser": "^1.4.0", + "@csstools/css-parser-algorithms": "2.3.2", + "@csstools/css-tokenizer": "^2.2.1" + }, + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, "node_modules/@csstools/postcss-gradients-interpolation-method": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.2.tgz", - "integrity": "sha512-ogriVRZFMgV/oS4pwuXTdFJ7I+saq0oSHzev/XsvXOoRHXOK9jB2q6zEfl3o1Edl0X2wHmacwtfRk8RBmopnYw==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.7.tgz", + "integrity": "sha512-GT1CzE/Tyr/ei4j5BwKESkHAgg+Gzys/0mAY7W+UiR+XrcYk5hDbOrE/YJIx1rflfO/7La1bDoZtA0YnLl4qNA==", "dev": true, "funding": [ { @@ -2444,10 +2471,10 @@ } ], "dependencies": { - "@csstools/css-color-parser": "^1.3.0", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/postcss-progressive-custom-properties": "^3.0.0" + "@csstools/css-color-parser": "^1.4.0", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/postcss-progressive-custom-properties": "^3.0.2" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2457,9 +2484,9 @@ } }, "node_modules/@csstools/postcss-hwb-function": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.2.tgz", - "integrity": "sha512-K4W97KaMnCLUS7/hfdxsM10ghPtIwfYP+VGUwpMgNYa7LVwE+9vkL/N/hzwqSShICtWD6doX1yAT0qcKUbgs0w==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.6.tgz", + "integrity": "sha512-uQgWt2Ho2yy2S6qthWY7mD5v57NKxi6dD1NB8nAybU5bJSsm+hLXRGm3/zbOH4xNrqO3Cl60DFSNlSrUME3Xjg==", "dev": true, "funding": [ { @@ -2472,9 +2499,9 @@ } ], "dependencies": { - "@csstools/css-color-parser": "^1.3.0", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-color-parser": "^1.4.0", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2484,9 +2511,9 @@ } }, "node_modules/@csstools/postcss-ic-unit": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.0.tgz", - "integrity": "sha512-FH3+zfOfsgtX332IIkRDxiYLmgwyNk49tfltpC6dsZaO4RV2zWY6x9VMIC5cjvmjlDO7DIThpzqaqw2icT8RbQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.2.tgz", + "integrity": "sha512-n28Er7W9qc48zNjJnvTKuVHY26/+6YlA9WzJRksIHiAWOMxSH5IksXkw7FpkIOd+jLi59BMrX/BWrZMgjkLBHg==", "dev": true, "funding": [ { @@ -2499,7 +2526,7 @@ } ], "dependencies": { - "@csstools/postcss-progressive-custom-properties": "^3.0.0", + "@csstools/postcss-progressive-custom-properties": "^3.0.2", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -2509,10 +2536,32 @@ "postcss": "^8.4" } }, + "node_modules/@csstools/postcss-initial": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-initial/-/postcss-initial-1.0.0.tgz", + "integrity": "sha512-1l7iHHjIl5qmVeGItugr4ZOlCREDP71mNKqoEyxlosIoiu3Os1nPWMHpuCvDLCLiWI/ONTOg3nzJh7gwHOrqUA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, "node_modules/@csstools/postcss-is-pseudo-class": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.0.tgz", - "integrity": "sha512-0I6siRcDymG3RrkNTSvHDMxTQ6mDyYE8awkcaHNgtYacd43msl+4ZWDfQ1yZQ/viczVWjqJkLmPiRHSgxn5nZA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.3.tgz", + "integrity": "sha512-/dt5M9Ty/x3Yiq0Nm/5PJJzwkVFchJgdjKVnryBPtoMCb9ohb/nDIJOwr/Wr3hK3FDs1EA1GE6PyRYsUmQPS8Q==", "dev": true, "funding": [ { @@ -2583,9 +2632,9 @@ } }, "node_modules/@csstools/postcss-logical-viewport-units": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.1.tgz", - "integrity": "sha512-R5s19SscS7CHoxvdYNMu2Y3WDwG4JjdhsejqjunDB1GqfzhtHSvL7b5XxCkUWqm2KRl35hI6kJ4HEaCDd/3BXg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.3.tgz", + "integrity": "sha512-xeVxqND5rlQyqLGdH7rX34sIm/JbbQKxpKQP8oD1YQqUHHCLQR9NUS57WqJKajxKN6AcNAMWJhb5LUH5RfPcyA==", "dev": true, "funding": [ { @@ -2598,7 +2647,7 @@ } ], "dependencies": { - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-tokenizer": "^2.2.1" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2608,9 +2657,9 @@ } }, "node_modules/@csstools/postcss-media-minmax": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.0.7.tgz", - "integrity": "sha512-5LGLdu8cJgRPmvkjUNqOPKIKeHbyQmoGKooB5Rh0mp5mLaNI9bl+IjFZ2keY0cztZYsriJsGf6Lu8R5XetuwoQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.1.0.tgz", + "integrity": "sha512-t5Li/DPC5QmW/6VFLfUvsw/4dNYYseWR0tOXDeJg/9EKUodBgNawz5tuk5vYKtNvoj+Q08odMuXcpS5YJj0AFA==", "dev": true, "funding": [ { @@ -2623,10 +2672,10 @@ } ], "dependencies": { - "@csstools/css-calc": "^1.1.3", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/media-query-list-parser": "^2.1.4" + "@csstools/css-calc": "^1.1.4", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/media-query-list-parser": "^2.1.5" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2636,9 +2685,9 @@ } }, "node_modules/@csstools/postcss-media-queries-aspect-ratio-number-values": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.2.tgz", - "integrity": "sha512-kQJR6NvTRidsaRjCdHGjra2+fLoFiDQOm5B2aZrhmXqng/hweXjruboKzB326rxQO2L0m0T+gCKbZgyuncyhLg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.3.tgz", + "integrity": "sha512-IPL8AvnwMYW+cWtp+j8cW3MFN0RyXNT4hLOvs6Rf2N+NcbvXhSyKxZuE3W9Cv4KjaNoNoGx1d0UhT6tktq6tUw==", "dev": true, "funding": [ { @@ -2651,9 +2700,9 @@ } ], "dependencies": { - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/media-query-list-parser": "^2.1.4" + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/media-query-list-parser": "^2.1.5" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2688,9 +2737,9 @@ } }, "node_modules/@csstools/postcss-normalize-display-values": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-3.0.0.tgz", - "integrity": "sha512-6Nw55PRXEKEVqn3bzA8gRRPYxr5tf5PssvcE5DRA/nAxKgKtgNZMCHCSd1uxTCWeyLnkf6h5tYRSB0P1Vh/K/A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-3.0.1.tgz", + "integrity": "sha512-nUvRxI+ALJwkxZdPU4EDyuM380vP91sAGvI3jAOHs/sr3jfcCOzLkY6xKI1Mr526kZ3RivmMoYM/xq+XFyE/bw==", "dev": true, "funding": [ { @@ -2713,9 +2762,9 @@ } }, "node_modules/@csstools/postcss-oklab-function": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.2.tgz", - "integrity": "sha512-tr7HjHDaDvRcnzK559l3VcpfhiAd0ga1jhThGR/tONfVzOVssG9x0QLg0LpLrlx7+niGgHL1SdfgHmFiTJjGIw==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.7.tgz", + "integrity": "sha512-vBFTQD3CARB3u/XIGO44wWbcO7xG/4GsYqJlcPuUGRSK8mtxes6n4vvNFlIByyAZy2k4d4RY63nyvTbMpeNTaQ==", "dev": true, "funding": [ { @@ -2728,10 +2777,10 @@ } ], "dependencies": { - "@csstools/css-color-parser": "^1.3.0", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/postcss-progressive-custom-properties": "^3.0.0" + "@csstools/css-color-parser": "^1.4.0", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/postcss-progressive-custom-properties": "^3.0.2" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2741,9 +2790,9 @@ } }, "node_modules/@csstools/postcss-progressive-custom-properties": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.0.tgz", - "integrity": "sha512-2/D3CCL9DN2xhuUTP8OKvKnaqJ1j4yZUxuGLsCUOQ16wnDAuMLKLkflOmZF5tsPh/02VPeXRmqIN+U595WAulw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.2.tgz", + "integrity": "sha512-YEvTozk1SxnV/PGL5DllBVDuLQ+jiQhyCSQiZJ6CwBMU5JQ9hFde3i1qqzZHuclZfptjrU0JjlX4ePsOhxNzHw==", "dev": true, "funding": [ { @@ -2766,9 +2815,9 @@ } }, "node_modules/@csstools/postcss-relative-color-syntax": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.2.tgz", - "integrity": "sha512-sn2zqcM8QPj4wN2okdNbK0JdwhZU506EEmIeSybh2UOJgTorbyQS7ak2sJ+2Y4LDYr4rPGBs/hBFmyYgoostdg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.7.tgz", + "integrity": "sha512-2AiFbJSVF4EyymLxme4JzSrbXykHolx8DdZECHjYKMhoulhKLltx5ccYgtrK3BmXGd3v3nJrWFCc8JM8bjuiOg==", "dev": true, "funding": [ { @@ -2781,10 +2830,10 @@ } ], "dependencies": { - "@csstools/css-color-parser": "^1.3.0", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/postcss-progressive-custom-properties": "^3.0.0" + "@csstools/css-color-parser": "^1.4.0", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/postcss-progressive-custom-properties": "^3.0.2" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2819,9 +2868,9 @@ } }, "node_modules/@csstools/postcss-stepped-value-functions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.1.tgz", - "integrity": "sha512-y1sykToXorFE+5cjtp//xAMWEAEple0kcZn2QhzEFIZDDNvGOCp5JvvmmPGsC3eDlj6yQp70l9uXZNLnimEYfA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.2.tgz", + "integrity": "sha512-I3wX44MZVv+tDuWfrd3BTvRB/YRIM2F5v1MBtTI89sxpFn47mNpTwpPYUOGPVCgKlRDfZSlxIUYhUQmqRQZZFQ==", "dev": true, "funding": [ { @@ -2834,9 +2883,9 @@ } ], "dependencies": { - "@csstools/css-calc": "^1.1.3", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-calc": "^1.1.4", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1" }, "engines": { "node": "^14 || ^16 || >=18" @@ -2846,9 +2895,9 @@ } }, "node_modules/@csstools/postcss-text-decoration-shorthand": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-3.0.1.tgz", - "integrity": "sha512-a5Ojrf31XfdsmFhbLR41JG8HD9d7mWeOqROUJpTi9MTJDAHeJstvhrmpHS39C11luwSHanLou4v3PI9xLbWolQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-3.0.3.tgz", + "integrity": "sha512-d5J9m49HhqXRcw1S6vTZuviHi/iknUKGjBpChiNK1ARg9sSa3b8m5lsWz5Izs8ISORZdv2bZRwbw5Z2R6gQ9kQ==", "dev": true, "funding": [ { @@ -2861,7 +2910,7 @@ } ], "dependencies": { - "@csstools/color-helpers": "^3.0.1", + "@csstools/color-helpers": "^3.0.2", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -2872,9 +2921,9 @@ } }, "node_modules/@csstools/postcss-trigonometric-functions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.1.tgz", - "integrity": "sha512-hW+JPv0MPQfWC1KARgvJI6bisEUFAZWSvUNq/khGCupYV/h6Z9R2ZFz0Xc633LXBst0ezbXpy7NpnPurSx5Klw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.2.tgz", + "integrity": "sha512-AwzNhF4QOKaLOKvMljwwFkeYXwufhRO15G+kKohHkyoNOL75xWkN+W2Y9ik9tSeAyDv+cYNlYaF+o/a79WjVjg==", "dev": true, "funding": [ { @@ -2887,9 +2936,9 @@ } ], "dependencies": { - "@csstools/css-calc": "^1.1.3", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-calc": "^1.1.4", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1" }, "engines": { "node": "^14 || ^16 || >=18" @@ -9210,9 +9259,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.15", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz", - "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==", + "version": "10.4.16", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz", + "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==", "dev": true, "funding": [ { @@ -9230,8 +9279,8 @@ ], "dependencies": { "browserslist": "^4.21.10", - "caniuse-lite": "^1.0.30001520", - "fraction.js": "^4.2.0", + "caniuse-lite": "^1.0.30001538", + "fraction.js": "^4.3.6", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", "postcss-value-parser": "^4.2.0" @@ -9979,9 +10028,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -9998,10 +10047,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -10220,9 +10269,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001525", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001525.tgz", - "integrity": "sha512-/3z+wB4icFt3r0USMwxujAqRvaD/B7rvGTsKhbhSQErVrJvkZCLhgNLJxU8MevahQVH6hCU9FsHdNUFbiwmE7Q==", + "version": "1.0.30001546", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz", + "integrity": "sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw==", "dev": true, "funding": [ { @@ -11514,9 +11563,9 @@ } }, "node_modules/cssdb": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.7.1.tgz", - "integrity": "sha512-kM+Fs0BFyhJNeE6wbOrlnRsugRdL6vn7QcON0aBDZ7XRd7RI2pMlk+nxoHuTb4Et+aBobXgK0I+6NGLA0LLgTw==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.8.0.tgz", + "integrity": "sha512-SkeezZOQr5AHt9MgJgSFNyiuJwg1p8AwoVln6JwaQJsyxduRW9QJ+HP/gAQzbsz8SIqINtYvpJKjxTRI67zxLg==", "dev": true, "funding": [ { @@ -12556,9 +12605,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.508", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.508.tgz", - "integrity": "sha512-FFa8QKjQK/A5QuFr2167myhMesGrhlOBD+3cYNxO9/S4XzHEXesyTD/1/xF644gC8buFPz3ca6G1LOQD0tZrrg==", + "version": "1.4.545", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.545.tgz", + "integrity": "sha512-G1HKumUw+y5yxMjewGfKz0XrqG6O+Tb4zrlC/Vs1+9riRXBuFlO0hOEXP3xeI+ltlJkbVUuLkYdmjHYH6Jkiow==", "dev": true }, "node_modules/emittery": { @@ -22973,9 +23022,9 @@ } }, "node_modules/postcss-color-functional-notation": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.0.tgz", - "integrity": "sha512-kaWTgnhRKFtfMF8H0+NQBFxgr5CGg05WGe07Mc1ld6XHwwRWlqSbHOW0zwf+BtkBQpsdVUu7+gl9dtdvhWMedw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.2.tgz", + "integrity": "sha512-FsjSmlSufuiFBsIqQ++VxFmvX7zKndZpBkHmfXr4wqhvzM92FTEkAh703iqWTl1U3faTgqioIqCbfqdWiFVwtw==", "dev": true, "funding": [ { @@ -22988,7 +23037,7 @@ } ], "dependencies": { - "@csstools/postcss-progressive-custom-properties": "^3.0.0", + "@csstools/postcss-progressive-custom-properties": "^3.0.2", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -23018,9 +23067,9 @@ } }, "node_modules/postcss-color-rebeccapurple": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-9.0.0.tgz", - "integrity": "sha512-RmUFL+foS05AKglkEoqfx+KFdKRVmqUAxlHNz4jLqIi7046drIPyerdl4B6j/RA2BSP8FI8gJcHmLRrwJOMnHw==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-9.0.1.tgz", + "integrity": "sha512-ds4cq5BjRieizVb2PnvbJ0omg9VCo2/KzluvoFZbxuGpsGJ5BQSD93CHBooinEtangCM5YqUOerGDl4xGmOb6Q==", "dev": true, "funding": [ { @@ -23077,9 +23126,9 @@ } }, "node_modules/postcss-custom-media": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-10.0.0.tgz", - "integrity": "sha512-NxDn7C6GJ7X8TsWOa8MbCdq9rLERRLcPfQSp856k1jzMreL8X9M6iWk35JjPRIb9IfRnVohmxAylDRx7n4Rv4g==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-10.0.2.tgz", + "integrity": "sha512-zcEFNRmDm2fZvTPdI1pIW3W//UruMcLosmMiCdpQnrCsTRzWlKQPYMa1ud9auL0BmrryKK1+JjIGn19K0UjO/w==", "dev": true, "funding": [ { @@ -23092,10 +23141,10 @@ } ], "dependencies": { - "@csstools/cascade-layer-name-parser": "^1.0.3", - "@csstools/css-parser-algorithms": "^2.3.0", - "@csstools/css-tokenizer": "^2.1.1", - "@csstools/media-query-list-parser": "^2.1.2" + "@csstools/cascade-layer-name-parser": "^1.0.5", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/media-query-list-parser": "^2.1.5" }, "engines": { "node": "^14 || ^16 || >=18" @@ -23105,9 +23154,9 @@ } }, "node_modules/postcss-custom-properties": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-13.3.0.tgz", - "integrity": "sha512-q4VgtIKSy5+KcUvQ0WxTjDy9DZjQ5VCXAZ9+tT9+aPMbA0z6s2t1nMw0QHszru1ib5ElkXl9JUpYYU37VVUs7g==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-13.3.2.tgz", + "integrity": "sha512-2Coszybpo8lpLY24vy2CYv9AasiZ39/bs8Imv0pWMq55Gl8NWzfc24OAo3zIX7rc6uUJAqESnVOMZ6V6lpMjJA==", "dev": true, "funding": [ { @@ -23120,9 +23169,9 @@ } ], "dependencies": { - "@csstools/cascade-layer-name-parser": "^1.0.4", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", + "@csstools/cascade-layer-name-parser": "^1.0.5", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -23133,9 +23182,9 @@ } }, "node_modules/postcss-custom-selectors": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-7.1.4.tgz", - "integrity": "sha512-TU2xyUUBTlpiLnwyE2ZYMUIYB41MKMkBZ8X8ntkqRDQ8sdBLhFFsPgNcOliBd5+/zcK51C9hRnSE7hKUJMxQSw==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-7.1.6.tgz", + "integrity": "sha512-svsjWRaxqL3vAzv71dV0/65P24/FB8TbPX+lWyyf9SZ7aZm4S4NhCn7N3Bg+Z5sZunG3FS8xQ80LrCU9hb37cw==", "dev": true, "funding": [ { @@ -23148,9 +23197,9 @@ } ], "dependencies": { - "@csstools/cascade-layer-name-parser": "^1.0.3", - "@csstools/css-parser-algorithms": "^2.3.0", - "@csstools/css-tokenizer": "^2.1.1", + "@csstools/cascade-layer-name-parser": "^1.0.5", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", "postcss-selector-parser": "^6.0.13" }, "engines": { @@ -23234,9 +23283,9 @@ } }, "node_modules/postcss-double-position-gradients": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.0.tgz", - "integrity": "sha512-wR8npIkrIVUTicUpCWSSo1f/g7gAEIH70FMqCugY4m4j6TX4E0T2Q5rhfO0gqv00biBZdLyb+HkW8x6as+iJNQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.2.tgz", + "integrity": "sha512-KTbvdOOy8z8zb0BTkEg4/1vqlRlApdvjw8/pFoehgQl0WVO+fezDGlvo0B8xRA+XccA7ohkQCULKNsiNOx70Cw==", "dev": true, "funding": [ { @@ -23249,7 +23298,7 @@ } ], "dependencies": { - "@csstools/postcss-progressive-custom-properties": "^3.0.0", + "@csstools/postcss-progressive-custom-properties": "^3.0.2", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -23341,9 +23390,9 @@ } }, "node_modules/postcss-image-set-function": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-6.0.0.tgz", - "integrity": "sha512-bg58QnJexFpPBU4IGPAugAPKV0FuFtX5rHYNSKVaV91TpHN7iwyEzz1bkIPCiSU5+BUN00e+3fV5KFrwIgRocw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-6.0.1.tgz", + "integrity": "sha512-VlZncC9hhZ5tg0JllY4g6Z28BeoPO8DIkelioEEkXL0AA0IORlqYpTi2L8TUnl4YQrlwvBgxVy+mdZJw5R/cIQ==", "dev": true, "funding": [ { @@ -23399,19 +23448,10 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/postcss-initial": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz", - "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==", - "dev": true, - "peerDependencies": { - "postcss": "^8.0.0" - } - }, "node_modules/postcss-lab-function": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-6.0.2.tgz", - "integrity": "sha512-OfjeI/1rQWtj38Quy3+D9+mpOReOX3vOXfQNCfsmFIl6xK1AAJ1ta1uGjAswYwsN8uJ9Y52K8U53Jk8QJWfJLg==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-6.0.7.tgz", + "integrity": "sha512-4d1lhDVPukHFqkMv4G5vVcK+tgY52vwb5uR1SWKOaO5389r2q8fMxBWuXSW+YtbCOEGP0/X9KERi9E9le2pJuw==", "dev": true, "funding": [ { @@ -23424,10 +23464,10 @@ } ], "dependencies": { - "@csstools/css-color-parser": "^1.3.0", - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0", - "@csstools/postcss-progressive-custom-properties": "^3.0.0" + "@csstools/css-color-parser": "^1.4.0", + "@csstools/css-parser-algorithms": "^2.3.2", + "@csstools/css-tokenizer": "^2.2.1", + "@csstools/postcss-progressive-custom-properties": "^3.0.2" }, "engines": { "node": "^14 || ^16 || >=18" @@ -23922,9 +23962,9 @@ } }, "node_modules/postcss-preset-env": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-9.1.2.tgz", - "integrity": "sha512-+v7BbUNLgUD1j+dBQw3YRExLnIhroBradExkhDLpkLwZowzhgUQgSYW4PJul2SlST2qyistlEIPaHTJK9tZlEw==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-9.2.0.tgz", + "integrity": "sha512-Lnr4C5gb7t5Cc8akQMJzNdJkqw7s7s7BHUaQSgsuf+CTY9Lsz5lqQTft5yNZr59JyCLz0aFNSAqSLm/xRtcTpg==", "dev": true, "funding": [ { @@ -23938,52 +23978,53 @@ ], "dependencies": { "@csstools/postcss-cascade-layers": "^4.0.0", - "@csstools/postcss-color-function": "^3.0.2", - "@csstools/postcss-color-mix-function": "^2.0.2", - "@csstools/postcss-exponential-functions": "^1.0.0", + "@csstools/postcss-color-function": "^3.0.7", + "@csstools/postcss-color-mix-function": "^2.0.7", + "@csstools/postcss-exponential-functions": "^1.0.1", "@csstools/postcss-font-format-keywords": "^3.0.0", - "@csstools/postcss-gradients-interpolation-method": "^4.0.2", - "@csstools/postcss-hwb-function": "^3.0.2", - "@csstools/postcss-ic-unit": "^3.0.0", - "@csstools/postcss-is-pseudo-class": "^4.0.0", + "@csstools/postcss-gamut-mapping": "^1.0.0", + "@csstools/postcss-gradients-interpolation-method": "^4.0.7", + "@csstools/postcss-hwb-function": "^3.0.6", + "@csstools/postcss-ic-unit": "^3.0.2", + "@csstools/postcss-initial": "^1.0.0", + "@csstools/postcss-is-pseudo-class": "^4.0.3", "@csstools/postcss-logical-float-and-clear": "^2.0.0", "@csstools/postcss-logical-resize": "^2.0.0", - "@csstools/postcss-logical-viewport-units": "^2.0.1", - "@csstools/postcss-media-minmax": "^1.0.7", - "@csstools/postcss-media-queries-aspect-ratio-number-values": "^2.0.2", + "@csstools/postcss-logical-viewport-units": "^2.0.3", + "@csstools/postcss-media-minmax": "^1.1.0", + "@csstools/postcss-media-queries-aspect-ratio-number-values": "^2.0.3", "@csstools/postcss-nested-calc": "^3.0.0", - "@csstools/postcss-normalize-display-values": "^3.0.0", - "@csstools/postcss-oklab-function": "^3.0.2", - "@csstools/postcss-progressive-custom-properties": "^3.0.0", - "@csstools/postcss-relative-color-syntax": "^2.0.2", + "@csstools/postcss-normalize-display-values": "^3.0.1", + "@csstools/postcss-oklab-function": "^3.0.7", + "@csstools/postcss-progressive-custom-properties": "^3.0.2", + "@csstools/postcss-relative-color-syntax": "^2.0.7", "@csstools/postcss-scope-pseudo-class": "^3.0.0", - "@csstools/postcss-stepped-value-functions": "^3.0.1", - "@csstools/postcss-text-decoration-shorthand": "^3.0.1", - "@csstools/postcss-trigonometric-functions": "^3.0.1", + "@csstools/postcss-stepped-value-functions": "^3.0.2", + "@csstools/postcss-text-decoration-shorthand": "^3.0.3", + "@csstools/postcss-trigonometric-functions": "^3.0.2", "@csstools/postcss-unset-value": "^3.0.0", - "autoprefixer": "^10.4.15", - "browserslist": "^4.21.10", + "autoprefixer": "^10.4.16", + "browserslist": "^4.22.1", "css-blank-pseudo": "^6.0.0", "css-has-pseudo": "^6.0.0", "css-prefers-color-scheme": "^9.0.0", - "cssdb": "^7.7.1", + "cssdb": "^7.8.0", "postcss-attribute-case-insensitive": "^6.0.2", "postcss-clamp": "^4.1.0", - "postcss-color-functional-notation": "^6.0.0", + "postcss-color-functional-notation": "^6.0.2", "postcss-color-hex-alpha": "^9.0.2", - "postcss-color-rebeccapurple": "^9.0.0", - "postcss-custom-media": "^10.0.0", - "postcss-custom-properties": "^13.3.0", - "postcss-custom-selectors": "^7.1.4", + "postcss-color-rebeccapurple": "^9.0.1", + "postcss-custom-media": "^10.0.2", + "postcss-custom-properties": "^13.3.2", + "postcss-custom-selectors": "^7.1.6", "postcss-dir-pseudo-class": "^8.0.0", - "postcss-double-position-gradients": "^5.0.0", + "postcss-double-position-gradients": "^5.0.2", "postcss-focus-visible": "^9.0.0", "postcss-focus-within": "^8.0.0", "postcss-font-variant": "^5.0.0", "postcss-gap-properties": "^5.0.0", - "postcss-image-set-function": "^6.0.0", - "postcss-initial": "^4.0.1", - "postcss-lab-function": "^6.0.2", + "postcss-image-set-function": "^6.0.1", + "postcss-lab-function": "^6.0.7", "postcss-logical": "^7.0.0", "postcss-nesting": "^12.0.1", "postcss-opacity-percentage": "^2.0.0", @@ -28087,9 +28128,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 72d11805302..220dd0184cd 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "postcss": "8.4.31", "postcss-import": "15.1.0", "postcss-nested": "6.0.1", - "postcss-preset-env": "9.1.2", + "postcss-preset-env": "9.2.0", "prettier": "3.0.3", "react-test-renderer": "18.2.0", "rtlcss-webpack-plugin": "4.0.7", From a4e9b28a8b0b2bbcc6583bce93a2d84d0f22b684 Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Tue, 3 Oct 2023 17:06:44 +0530 Subject: [PATCH 03/35] Fix deprecation due to `_admin_bar_bump_cb` --- includes/class-amp-theme-support.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php index 08fa48d5e71..00b5e46a04a 100644 --- a/includes/class-amp-theme-support.php +++ b/includes/class-amp-theme-support.php @@ -1225,12 +1225,21 @@ public static function init_admin_bar() { } else { $header_callback = '_admin_bar_bump_cb'; } - remove_action( 'wp_head', $header_callback ); + + // @see . + if ( ! function_exists( 'wp_enqueue_admin_bar_header_styles' ) ) { + remove_action( 'wp_head', $header_callback ); + } + if ( '__return_false' !== $header_callback ) { - ob_start(); - $header_callback(); - $style = ob_get_clean(); - $data = trim( preg_replace( '#]*>(.*)#is', '$1', $style ) ); // See wp_add_inline_style(). + if ( ! function_exists( 'wp_enqueue_admin_bar_header_styles' ) ) { + ob_start(); + $header_callback(); + $style = ob_get_clean(); + $data = trim( preg_replace( '#]*>(.*)#is', '$1', $style ) ); // See wp_add_inline_style(). + } else { + $data = ''; + } // Override AMP's position:relative on the body for the sake of the AMP viewer, which is not relevant an an Admin Bar context. if ( amp_is_dev_mode() ) { From 9d74e5cf035c7c1561dd16a75c1727d48ddc18f6 Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Tue, 3 Oct 2023 17:41:46 +0530 Subject: [PATCH 04/35] Remove decoding attribute from img tag markup in test cases --- tests/php/test-amp-gallery-embed-handler.php | 58 ++++++++++---------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/tests/php/test-amp-gallery-embed-handler.php b/tests/php/test-amp-gallery-embed-handler.php index 526a2efdec9..3c0a4fed002 100644 --- a/tests/php/test-amp-gallery-embed-handler.php +++ b/tests/php/test-amp-gallery-embed-handler.php @@ -70,7 +70,6 @@ public function tear_down() { */ public function get_conversion_data() { $amp_carousel_caption = '
' . self::CAPTION_TEXT . '
'; - $decoding_attribute = version_compare( get_bloginfo( 'version' ), '6.1-alpha', '>' ) ? 'decoding="async"' : ''; return [ 'shortcode_with_invalid_id' => [ @@ -81,9 +80,9 @@ public function get_conversion_data() { '[gallery ids={{id1}},{{id2}},{{id3}}]', ' -
Alt text' . $amp_carousel_caption . '
-
Alt text
-
Alt text
+
Alt text' . $amp_carousel_caption . '
+
Alt text
+
Alt text
', true, ], @@ -92,14 +91,14 @@ public function get_conversion_data() { ' ', @@ -108,18 +107,18 @@ public function get_conversion_data() { '[gallery amp-lightbox=false amp-carousel=true ids={{id1}},{{id2}},{{id3}}]', ' -
Alt text' . $amp_carousel_caption . '
-
Alt text
-
Alt text
+
Alt text' . $amp_carousel_caption . '
+
Alt text
+
Alt text
', ], 'shortcode_with_carousel_linking_to_file' => [ '[gallery amp-lightbox=false amp-carousel=true link="file" ids={{id1}},{{id2}},{{id3}}]', ' -
Alt text' . $amp_carousel_caption . '
-
Alt text
-
Alt text
+
Alt text' . $amp_carousel_caption . '
+
Alt text
+
Alt text
', ], 'shortcode_with_lightbox' => [ @@ -127,13 +126,13 @@ public function get_conversion_data() { ' ', @@ -143,13 +142,13 @@ public function get_conversion_data() { ' ', @@ -158,18 +157,18 @@ public function get_conversion_data() { '[gallery amp-lightbox=true amp-carousel=true ids={{id1}},{{id2}},{{id3}}]', ' ' . - '
Alt text' . $amp_carousel_caption . '
' . - '
Alt text
' . - '
Alt text
' . + '
Alt text' . $amp_carousel_caption . '
' . + '
Alt text
' . + '
Alt text
' . '', ], 'shortcode_with_lightbox_and_carousel_linking_to_file' => [ '[gallery amp-lightbox=true amp-carousel=true link="file" ids={{id1}},{{id2}},{{id3}}]', ' ' . - '
Alt text' . $amp_carousel_caption . '
' . - '
Alt text
' . - '
Alt text
' . + '
Alt text' . $amp_carousel_caption . '
' . + '
Alt text
' . + '
Alt text
' . '', ], 'shortcode_with_no_attributes' => [ @@ -178,14 +177,14 @@ public function get_conversion_data() { ' ', @@ -285,6 +284,9 @@ public function test__conversion( $source, $expected, $use_legacy_mode = false ) // Remove fetchpriority attribute. $content = preg_replace( '/\s+fetchpriority="high"/', '', $content ); + // Remove decoding attribute. + $content = preg_replace( '/\s+decoding="async"/', '', $content ); + $this->assertEquals( $this->normalize( $expected ), $this->normalize( $content ) From bb221a39e68e6a27baf2c943bf86fb6c0546f075 Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Tue, 3 Oct 2023 18:09:55 +0530 Subject: [PATCH 05/35] Update string contains string assertions for amp scripts --- tests/php/test-amp-helper-functions.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php index 0bfa2e6a82d..51720c8033f 100644 --- a/tests/php/test-amp-helper-functions.php +++ b/tests/php/test-amp-helper-functions.php @@ -1450,9 +1450,14 @@ static function ( $script ) { $output = get_echo( 'wp_print_scripts' ); - $this->assertStringContainsString( '', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript - $this->assertStringContainsString( '', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript - $this->assertStringContainsString( '', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript + $this->assertStringContainsString( 'assertStringContainsString( 'https://cdn.ampproject.org/v0.js', $output ); + $this->assertStringContainsString( 'https://cdn.ampproject.org/v0/amp-mathml-0.1.js', $output ); + $this->assertStringContainsString( 'https://cdn.ampproject.org/v0/amp-mustache-latest.js', $output ); + $this->assertStringContainsString( 'async', $output ); + $this->assertStringContainsString( 'custom-element="amp-mathml"', $output ); + $this->assertStringContainsString( 'custom-template="amp-mustache"', $output ); + $this->assertStringContainsString( '', $output ); // Try rendering via amp_render_scripts() instead of amp_render_scripts(), which is how component scripts get added normally. $output = amp_render_scripts( @@ -1463,13 +1468,18 @@ static function ( $script ) { ] ); $this->assertStringNotContainsString( 'amp-mathml', $output, 'The amp-mathml component was already printed above.' ); - $this->assertStringContainsString( '', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript - $this->assertStringContainsString( '', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript + $this->assertStringContainsString( '', $output ); + $this->assertStringContainsString( '', $output ); // Try some experimental component to ensure expected script attributes are added. wp_register_script( 'amp-foo', 'https://cdn.ampproject.org/v0/amp-foo-0.1.js', [ 'amp-runtime' ], null ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter, WordPress.WP.EnqueuedResourceParameters.MissingVersion $output = get_echo( 'wp_print_scripts', [ 'amp-foo' ] ); - $this->assertStringContainsString( '', $output ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript + + $this->assertStringContainsString( 'assertStringContainsString( 'https://cdn.ampproject.org/v0/amp-foo-0.1.js', $output ); + $this->assertStringContainsString( 'async', $output ); + $this->assertStringContainsString( 'custom-element="amp-foo"', $output ); + $this->assertStringContainsString( '', $output ); } /** From c8bff40ee57ba5638970b079443930e11780fd73 Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Tue, 3 Oct 2023 23:56:38 +0530 Subject: [PATCH 06/35] Fix validation sources in AMP validation manager test cases --- .../test-class-amp-validation-manager.php | 45 +------------------ 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/tests/php/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php index 39b03bd2243..2b54183131e 100644 --- a/tests/php/validation/test-class-amp-validation-manager.php +++ b/tests/php/validation/test-class-amp-validation-manager.php @@ -1875,49 +1875,6 @@ public function test_decorate_shortcode_and_filter_source() { 'function' => version_compare( get_bloginfo( 'version' ), '5.5-alpha', '>' ) ? 'wp_filter_content_tags' : 'wp_make_content_images_responsive', ], ]; - } elseif ( has_filter( 'the_content', 'do_blocks' ) ) { - $sources = [ - [ - 'type' => 'plugin', - 'name' => 'gutenberg', - 'function' => 'do_blocks', - ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => 'WP_Embed::run_shortcode', - ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => 'WP_Embed::autoembed', - ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => 'wptexturize', - ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => 'wpautop', - ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => 'shortcode_unautop', - ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => 'prepend_attachment', - ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => 'wp_make_content_images_responsive', - ], - ]; } else { $sources = [ [ @@ -1953,7 +1910,7 @@ public function test_decorate_shortcode_and_filter_source() { [ 'type' => 'core', 'name' => 'wp-includes', - 'function' => 'wp_make_content_images_responsive', + 'function' => version_compare( get_bloginfo( 'version' ), '5.5-alpha', '>' ) ? 'wp_filter_content_tags' : 'wp_make_content_images_responsive', ], ]; } From 818cb53ee89ab94f3efaf91476f6d5b8f621d5fc Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Wed, 4 Oct 2023 00:23:32 +0530 Subject: [PATCH 07/35] Fix source stack trace in AMP validation manager test cases --- .../test-class-amp-validation-manager.php | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/tests/php/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php index 2b54183131e..5a6685c9191 100644 --- a/tests/php/validation/test-class-amp-validation-manager.php +++ b/tests/php/validation/test-class-amp-validation-manager.php @@ -1869,11 +1869,6 @@ public function test_decorate_shortcode_and_filter_source() { 'name' => 'wp-includes', 'function' => 'prepend_attachment', ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => version_compare( get_bloginfo( 'version' ), '5.5-alpha', '>' ) ? 'wp_filter_content_tags' : 'wp_make_content_images_responsive', - ], ]; } else { $sources = [ @@ -1907,11 +1902,16 @@ public function test_decorate_shortcode_and_filter_source() { 'name' => 'wp-includes', 'function' => 'prepend_attachment', ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => version_compare( get_bloginfo( 'version' ), '5.5-alpha', '>' ) ? 'wp_filter_content_tags' : 'wp_make_content_images_responsive', - ], + ]; + } + + // This will be called after `do_shortcode` in WP 6.4 and later. + // @see . + if ( version_compare( get_bloginfo( 'version' ), '6.3', '<=' ) ) { + $sources[] = [ + 'type' => 'core', + 'name' => 'wp-includes', + 'function' => version_compare( get_bloginfo( 'version' ), '5.5-alpha', '>' ) ? 'wp_filter_content_tags' : 'wp_make_content_images_responsive', ]; } @@ -1944,14 +1944,26 @@ public function test_decorate_shortcode_and_filter_source() { 'name' => 'wp-includes', 'function' => 'do_shortcode', ], - [ - 'type' => 'core', - 'name' => 'wp-includes', - 'function' => 'convert_smilies', - ], ] ); + // `wp_filter_content_tags` is called after `do_shortcode` in WP 6.4 and later. + // @see . + if ( version_compare( get_bloginfo( 'version' ), '6.4-alpha', '>=' ) ) { + $sources[] = [ + 'type' => 'core', + 'name' => 'wp-includes', + 'function' => 'wp_filter_content_tags', + ]; + } + + // `wp_filter_content_tags` is called before `convert_smilies` in WP 6.4 and later. + $sources[] = [ + 'type' => 'core', + 'name' => 'wp-includes', + 'function' => 'convert_smilies', + ]; + foreach ( $sources as &$source ) { $function = $source['function']; unset( $source['function'] ); From e256ad94a4d24f2fe3c1ab96f408fc71cf389e40 Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Wed, 4 Oct 2023 00:35:47 +0530 Subject: [PATCH 08/35] Update https status detection in SupportData service --- src/Support/SupportData.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Support/SupportData.php b/src/Support/SupportData.php index 2f6205c4fea..fa06b0263c3 100644 --- a/src/Support/SupportData.php +++ b/src/Support/SupportData.php @@ -251,7 +251,10 @@ public function get_site_info() { $loopback_status = ( ! empty( $loopback_status->status ) ) ? $loopback_status->status : ''; } - if ( function_exists( 'wp_is_https_supported' ) ) { + if ( function_exists( 'wp_get_https_detection_errors' ) ) { + $https_errors = wp_get_https_detection_errors(); + $is_ssl = empty( $https_errors ); + } elseif ( function_exists( 'wp_is_https_supported' ) ) { $is_ssl = wp_is_https_supported(); } else { $is_ssl = is_ssl(); From 4f1c89313791c1f75567f01c5ab1fe4f993e2599 Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Wed, 4 Oct 2023 18:06:29 +0530 Subject: [PATCH 09/35] Fix version compare with alpha version --- tests/php/validation/test-class-amp-validation-manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/php/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php index 5a6685c9191..d3e80922c62 100644 --- a/tests/php/validation/test-class-amp-validation-manager.php +++ b/tests/php/validation/test-class-amp-validation-manager.php @@ -1907,7 +1907,7 @@ public function test_decorate_shortcode_and_filter_source() { // This will be called after `do_shortcode` in WP 6.4 and later. // @see . - if ( version_compare( get_bloginfo( 'version' ), '6.3', '<=' ) ) { + if ( version_compare( get_bloginfo( 'version' ), '6.4-alpha', '<' ) ) { $sources[] = [ 'type' => 'core', 'name' => 'wp-includes', From 08e20ffdfff095ea687d15299a6d31c9ef7dd6ed Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Fri, 6 Oct 2023 22:53:28 +0530 Subject: [PATCH 10/35] Fix test cases in LikelyCulpritDetectorTest --- .../DevTools/LikelyCulpritDetectorTest.php | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tests/php/src/DevTools/LikelyCulpritDetectorTest.php b/tests/php/src/DevTools/LikelyCulpritDetectorTest.php index c72a132df37..af0618a2d2c 100644 --- a/tests/php/src/DevTools/LikelyCulpritDetectorTest.php +++ b/tests/php/src/DevTools/LikelyCulpritDetectorTest.php @@ -128,13 +128,13 @@ public function single_step_trace_data() { ], 'parent theme' => [ - [ get_template_directory() . '/functions.php' ], + [ '{{ get_template_directory }}/functions.php' ], 'theme', 'default', ], 'child theme' => [ - [ get_stylesheet_directory() . '/functions.php' ], + [ '{{ get_stylesheet_directory }}/functions.php' ], 'theme', 'default', ], @@ -167,8 +167,8 @@ public function multi_step_trace_data() { __FILE__, // AMP plugin is skipped. WP_PLUGIN_DIR . '/bad-plugin/bad-plugin.php', // <== Likely culprit. WP_CONTENT_DIR . '/mu-plugins/bad-mu-plugin.php', - get_template_directory() . '/functions.php', - get_stylesheet_directory() . '/functions.php', + '{{ get_template_directory }}/functions.php', + '{{ get_stylesheet_directory }}/functions.php', ], 'plugin', 'bad-plugin', @@ -180,8 +180,8 @@ public function multi_step_trace_data() { __FILE__, // AMP plugin is skipped. WP_CONTENT_DIR . '/mu-plugins/bad-mu-plugin.php', // <== Likely culprit. WP_PLUGIN_DIR . '/bad-plugin/bad-plugin.php', - get_template_directory() . '/functions.php', - get_stylesheet_directory() . '/functions.php', + '{{ get_template_directory }}/functions.php', + '{{ get_stylesheet_directory }}/functions.php', ], 'mu-plugin', 'bad-mu-plugin.php', @@ -191,10 +191,10 @@ public function multi_step_trace_data() { [ ABSPATH . '/wp-includes/some-file.php', // Core is skipped. __FILE__, // AMP plugin is skipped. - get_template_directory() . '/functions.php', // <== Likely culprit. + '{{ get_template_directory }}/functions.php', // <== Likely culprit. WP_PLUGIN_DIR . '/bad-plugin/bad-plugin.php', WP_CONTENT_DIR . '/mu-plugins/bad-mu-plugin.php', - get_stylesheet_directory() . '/functions.php', + '{{ get_stylesheet_directory }}/functions.php', ], 'theme', 'default', @@ -204,10 +204,10 @@ public function multi_step_trace_data() { [ ABSPATH . '/wp-includes/some-file.php', // Core is skipped. __FILE__, // AMP plugin is skipped. - get_stylesheet_directory() . '/functions.php', // <== Likely culprit. + '{{ get_stylesheet_directory }}/functions.php', // <== Likely culprit. WP_PLUGIN_DIR . '/bad-plugin/bad-plugin.php', WP_CONTENT_DIR . '/mu-plugins/bad-mu-plugin.php', - get_template_directory() . '/functions.php', + '{{ get_template_directory }}/functions.php', ], 'theme', 'default', @@ -275,7 +275,12 @@ public function test_analyze_trace( $file_stack, $expected_type, $expected_name private function get_trace_from_file_stack( $file_stack ) { return array_map( static function ( $file ) { - return [ 'file' => $file ]; + $file = str_replace( '{{ get_template_directory }}', get_template_directory(), $file ); + $file = str_replace( '{{ get_stylesheet_directory }}', get_stylesheet_directory(), $file ); + + return [ + 'file' => $file, + ]; }, $file_stack ); From c598023c79673e318f21ff7bb9ff855cf60b1d12 Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Fri, 6 Oct 2023 22:56:17 +0530 Subject: [PATCH 11/35] Update wp emoji styles removal based on latest core changes @see . --- includes/class-amp-theme-support.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php index 00b5e46a04a..f2b6bc9c98a 100644 --- a/includes/class-amp-theme-support.php +++ b/includes/class-amp-theme-support.php @@ -84,6 +84,13 @@ class AMP_Theme_Support { */ const READER_MODE_TEMPLATE_DIRECTORY = 'amp'; + /** + * `wp-emoji-styles` styles handle. + * + * @var string + */ + const WP_EMOJI_STYLES = 'wp-emoji-styles'; + /** * Sanitizers, with keys as class names and values as arguments. * @@ -848,7 +855,13 @@ public static function add_hooks() { // Prevent emoji detection and emoji loading since platforms/browsers now support emoji natively (and Twemoji is not AMP-compatible). add_filter( 'wp_resource_hints', [ __CLASS__, 'filter_resource_hints_to_remove_emoji_dns_prefetch' ], 10, 2 ); remove_action( 'wp_head', 'print_emoji_detection_script', 7 ); - remove_action( 'wp_print_styles', 'print_emoji_styles' ); + + if ( function_exists( 'wp_enqueue_emoji_styles' ) ) { + // By default, emoji styles are enqueued at priority 10. + add_action( 'wp_print_styles', [ __CLASS__, 'dequeue_emoji_styles' ], 11 ); + } else { + remove_action( 'wp_print_styles', 'print_emoji_styles' ); + } // The AMP version of the skip link is implemented by AMP_Accessibility_Sanitizer::add_skip_link(). remove_action( 'wp_footer', 'gutenberg_the_skip_link' ); @@ -907,6 +920,15 @@ static function() { ); } + /** + * Dequeue emoji styles. + * + * @since 2.4.3 + */ + public static function dequeue_emoji_styles() { + wp_dequeue_style( self::WP_EMOJI_STYLES ); + } + /** * Filter resource hints to remove the emoji CDN (s.w.org). * From 6986676946ecf62590b0f7d92e33b03ad6263e0c Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Fri, 6 Oct 2023 22:57:33 +0530 Subject: [PATCH 12/35] Update Test_AMP_Theme_Support test cases --- tests/php/test-class-amp-theme-support.php | 37 +++++++++++++++++----- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/tests/php/test-class-amp-theme-support.php b/tests/php/test-class-amp-theme-support.php index 3870a22be84..00630165ab8 100644 --- a/tests/php/test-class-amp-theme-support.php +++ b/tests/php/test-class-amp-theme-support.php @@ -55,6 +55,7 @@ public function set_up() { unset( $GLOBALS['current_screen'] ); delete_option( AMP_Options_Manager::OPTION_NAME ); // Make sure default reader mode option does not override theme support being added. remove_theme_support( 'amp' ); + switch_theme( 'default' ); $this->register_core_themes(); } @@ -777,7 +778,12 @@ public function test_add_hooks() { $this->assertEquals( 10, has_filter( 'wp_resource_hints', [ self::TESTED_CLASS, 'filter_resource_hints_to_remove_emoji_dns_prefetch' ] ) ); $this->assertFalse( has_action( 'wp_head', 'print_emoji_detection_script' ) ); - $this->assertFalse( has_action( 'wp_print_styles', 'print_emoji_styles' ) ); + + if ( function_exists( 'wp_enqueue_emoji_styles' ) ) { + $this->assertEquals( 11, has_action( 'wp_print_styles', [ self::TESTED_CLASS, 'dequeue_emoji_styles' ] ) ); + } else { + $this->assertFalse( has_action( 'wp_print_styles', 'print_emoji_styles' ) ); + } $this->assertEquals( 20, has_action( 'wp_head', 'amp_add_generator_metadata' ) ); $this->assertEquals( 0, has_action( 'wp_enqueue_scripts', [ self::TESTED_CLASS, 'enqueue_assets' ] ) ); @@ -1043,17 +1049,27 @@ function() { AMP_Theme_Support::init_admin_bar(); $this->assertEquals( 10, has_filter( 'style_loader_tag', [ AMP_Theme_Support::class, 'filter_admin_bar_style_loader_tag' ] ) ); $this->assertEquals( 10, has_filter( 'script_loader_tag', [ AMP_Theme_Support::class, 'filter_admin_bar_script_loader_tag' ] ) ); - $this->assertFalse( has_action( 'wp_head', $callback ) ); + + if ( ! function_exists( 'wp_enqueue_admin_bar_header_styles' ) ) { + $this->assertFalse( has_action( 'wp_head', $callback ) ); + } + + remove_action( 'wp_print_styles', 'print_emoji_styles' ); + ob_start(); wp_print_styles(); wp_print_scripts(); $output = ob_get_clean(); - $this->assertStringContainsString( '