From e878b93ef2a0f7dacdff9703ec7b52e2d11a6563 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 03:56:31 +0000 Subject: [PATCH 01/27] Update dependency postcss-import to v16 --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dbe84dcd..e9903a6ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "normalize.css": "^8.0.1", "postcss-cli": "^10.0.0", "postcss-easy-import": "^4.0.0", - "postcss-import": "^15.0.0", + "postcss-import": "^16.0.0", "postcss-import-ext-glob": "^2.0.1", "postcss-loader": "^7.0.0", "postcss-nested": "^6.0.0", @@ -17378,16 +17378,16 @@ } }, "node_modules/postcss-import": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.0.0.tgz", - "integrity": "sha512-Y20shPQ07RitgBGv2zvkEAu9bqvrD77C9axhj/aA1BQj4czape2MdClCExvB27EwYEJdGgKZBpKanb0t1rK2Kg==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-16.0.0.tgz", + "integrity": "sha512-e77lhVvrD1I2y7dYmBv0k9ULTdArgEYZt97T4w6sFIU5uxIHvDFQlKgUUyY7v7Barj0Yf/zm5A4OquZN7jKm5Q==", "dependencies": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", "resolve": "^1.1.7" }, "engines": { - "node": ">=14.0.0" + "node": ">=18.0.0" }, "peerDependencies": { "postcss": "^8.0.0" diff --git a/package.json b/package.json index 6fcb77a2a..8dfdd6cbc 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "normalize.css": "^8.0.1", "postcss-cli": "^10.0.0", "postcss-easy-import": "^4.0.0", - "postcss-import": "^15.0.0", + "postcss-import": "^16.0.0", "postcss-import-ext-glob": "^2.0.1", "postcss-loader": "^7.0.0", "postcss-nested": "^6.0.0", From b9a9c4ebaba75a2e58e956cd7e4c401f71a14f37 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 17:14:20 +0000 Subject: [PATCH 02/27] Update dependency sass-loader to v14 --- package-lock.json | 17 ++++++----------- package.json | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index fec643138..6f4383e29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -89,7 +89,7 @@ "pre-commit": "^1.2.2", "prettier": "^3.0.1", "process": "^0.11.10", - "sass-loader": "^13.0.0", + "sass-loader": "^14.0.0", "stylelint": "^15.0.0", "stylelint-config-standard-scss": "^11.0.0", "stylelint-declaration-block-no-ignored-properties": "^2.7.0", @@ -19632,32 +19632,27 @@ } }, "node_modules/sass-loader": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.0.tgz", - "integrity": "sha512-IHCFecI+rbPvXE2zO/mqdVFe8MU7ElGrwga9hh2H65Ru4iaBJAMRteum1c4Gsxi9Cq1FOtTEDd6+/AEYuQDM4Q==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.0.0.tgz", + "integrity": "sha512-oceP9wWbep/yRJ2+sMbCzk0UsXsDzdNis+N8nu9i5GwPXjy6v3DNB6TqfJLSpPO9k4+B8x8p/CEgjA9ZLkoLug==", "dev": true, "dependencies": { - "klona": "^2.0.4", "neo-async": "^2.6.2" }, "engines": { - "node": ">= 14.15.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "fibers": ">= 3.1.0", - "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" }, "peerDependenciesMeta": { - "fibers": { - "optional": true - }, "node-sass": { "optional": true }, diff --git a/package.json b/package.json index 6fcb77a2a..964e92c09 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "pre-commit": "^1.2.2", "prettier": "^3.0.1", "process": "^0.11.10", - "sass-loader": "^13.0.0", + "sass-loader": "^14.0.0", "stylelint": "^15.0.0", "stylelint-config-standard-scss": "^11.0.0", "stylelint-declaration-block-no-ignored-properties": "^2.7.0", From 27e9d78d1fd728cf94ba6471df1174f64d2178d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 09:42:51 +0000 Subject: [PATCH 03/27] Update dependency copy-webpack-plugin to v12 --- package-lock.json | 115 +++++++++++++++++----------------------------- package.json | 2 +- 2 files changed, 43 insertions(+), 74 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6509772f3..6976ac856 100644 --- a/package-lock.json +++ b/package-lock.json @@ -67,7 +67,7 @@ "babel-loader": "^9.0.0", "babel-preset-react": "^6.5.0", "backstopjs": "^6.2.2", - "copy-webpack-plugin": "^11.0.0", + "copy-webpack-plugin": "^12.0.0", "crypto-browserify": "^3.12.0", "css-declaration-sorter": "^7.0.3", "css-loader": "^6.5.0", @@ -8834,20 +8834,20 @@ "dev": true }, "node_modules/copy-webpack-plugin": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz", - "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz", + "integrity": "sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==", "dev": true, "dependencies": { - "fast-glob": "^3.2.11", + "fast-glob": "^3.3.2", "glob-parent": "^6.0.1", - "globby": "^13.1.1", + "globby": "^14.0.0", "normalize-path": "^3.0.0", - "schema-utils": "^4.0.0", - "serialize-javascript": "^6.0.0" + "schema-utils": "^4.2.0", + "serialize-javascript": "^6.0.2" }, "engines": { - "node": ">= 14.15.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", @@ -11739,19 +11739,30 @@ } }, "node_modules/globby": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz", - "integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==", - "dev": true, + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz", + "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==", "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" + "@sindresorhus/merge-streams": "^1.0.0", + "fast-glob": "^3.3.2", + "ignore": "^5.2.4", + "path-type": "^5.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.1.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby/node_modules/path-type": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", + "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", + "engines": { + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -17537,47 +17548,6 @@ "node": ">=14.14" } }, - "node_modules/postcss-cli/node_modules/globby": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz", - "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==", - "dependencies": { - "@sindresorhus/merge-streams": "^1.0.0", - "fast-glob": "^3.3.2", - "ignore": "^5.2.4", - "path-type": "^5.0.0", - "slash": "^5.1.0", - "unicorn-magic": "^0.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/postcss-cli/node_modules/path-type": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", - "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/postcss-cli/node_modules/slash": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", - "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "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", @@ -20351,15 +20321,15 @@ } }, "node_modules/schema-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "ajv": "^8.8.0", + "ajv": "^8.9.0", "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.0.0" + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 12.13.0" @@ -20492,9 +20462,9 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dependencies": { "randombytes": "^2.1.0" } @@ -20658,12 +20628,11 @@ "peer": true }, "node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", "engines": { - "node": ">=12" + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" diff --git a/package.json b/package.json index e846c542b..f0ab8bd37 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "babel-loader": "^9.0.0", "babel-preset-react": "^6.5.0", "backstopjs": "^6.2.2", - "copy-webpack-plugin": "^11.0.0", + "copy-webpack-plugin": "^12.0.0", "crypto-browserify": "^3.12.0", "css-declaration-sorter": "^7.0.3", "css-loader": "^6.5.0", From 9ad2c496a336cb8d763c433d7ee5e6a458eed80e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 09:43:00 +0000 Subject: [PATCH 04/27] Update dependency expose-loader to v5 --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6509772f3..cb3026c6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,7 @@ "eslint-import-resolver-webpack": "0.13.8", "eslint-plugin-import": "^2.25.3", "eslint-plugin-prettier": "^5.0.0", - "expose-loader": "^4.0.0", + "expose-loader": "^5.0.0", "html-loader": "^4.0.0", "html-webpack-plugin": "^5.3.2", "husky": ">=4", @@ -10978,12 +10978,12 @@ } }, "node_modules/expose-loader": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz", - "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-5.0.0.tgz", + "integrity": "sha512-BtUqYRmvx1bEY5HN6eK2I9URUZgNmN0x5UANuocaNjXSgfoDlkXt+wyEMe7i5DzDNh2BKJHPc5F4rBwEdSQX6w==", "dev": true, "engines": { - "node": ">= 14.15.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", diff --git a/package.json b/package.json index e846c542b..a40574945 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "eslint-import-resolver-webpack": "0.13.8", "eslint-plugin-import": "^2.25.3", "eslint-plugin-prettier": "^5.0.0", - "expose-loader": "^4.0.0", + "expose-loader": "^5.0.0", "html-loader": "^4.0.0", "html-webpack-plugin": "^5.3.2", "husky": ">=4", From 24d34e0296c9e97958b3dcd72a9809b3f6b412cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 10:31:29 +0000 Subject: [PATCH 05/27] Update dependency postcss-loader to v8 --- package-lock.json | 89 +++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 57 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d51e7220..dc52c2a01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "postcss-easy-import": "^4.0.0", "postcss-import": "^15.0.0", "postcss-import-ext-glob": "^2.0.1", - "postcss-loader": "^7.0.0", + "postcss-loader": "^8.0.0", "postcss-nested": "^6.0.0", "postcss-nesting": "^12.0.0", "postcss-scss": "^4.0.0", @@ -4407,11 +4407,6 @@ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" - }, "node_modules/@types/prop-types": { "version": "15.7.5", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", @@ -7074,18 +7069,28 @@ "dev": true }, "node_modules/cosmiconfig": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", - "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" + "env-paths": "^2.2.1", + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0" }, "engines": { - "node": ">=10" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/crc-32": { @@ -8066,6 +8071,14 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "engines": { + "node": ">=6" + } + }, "node_modules/envinfo": { "version": "7.8.1", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", @@ -11557,6 +11570,14 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jiti": { + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", + "bin": { + "jiti": "bin/jiti.js" + } + }, "node_modules/jotai": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.6.0.tgz", @@ -11714,6 +11735,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", + "dev": true, "engines": { "node": ">= 8" } @@ -14290,30 +14312,39 @@ } }, "node_modules/postcss-loader": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.0.tgz", - "integrity": "sha512-IDyttebFzTSY6DI24KuHUcBjbAev1i+RyICoPEWcAstZsj03r533uMXtDn506l6/wlsRYiS5XBdx7TpccCsyUg==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz", + "integrity": "sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==", "dependencies": { - "cosmiconfig": "^7.0.0", - "klona": "^2.0.5", - "semver": "^7.3.7" + "cosmiconfig": "^9.0.0", + "jiti": "^1.20.0", + "semver": "^7.5.4" }, "engines": { - "node": ">= 14.15.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, "peerDependencies": { + "@rspack/core": "0.x || 1.x", "postcss": "^7.0.0 || ^8.0.1", "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } } }, "node_modules/postcss-loader/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -18579,14 +18610,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "engines": { - "node": ">= 6" - } - }, "node_modules/yargs": { "version": "17.7.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", diff --git a/package.json b/package.json index 8141b60d8..7c42f6601 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "postcss-easy-import": "^4.0.0", "postcss-import": "^15.0.0", "postcss-import-ext-glob": "^2.0.1", - "postcss-loader": "^7.0.0", + "postcss-loader": "^8.0.0", "postcss-nested": "^6.0.0", "postcss-nesting": "^12.0.0", "postcss-scss": "^4.0.0", From 328abd7edc0a4c11ad3604d1c32a7dc4a78fea1c Mon Sep 17 00:00:00 2001 From: actions-bot Date: Sun, 7 Apr 2024 12:05:11 +0000 Subject: [PATCH 06/27] Updated node modules based on npm audit fix --- package-lock.json | 107 ++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 70 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd538ac70..ec6a53232 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6166,13 +6166,13 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "dev": true, "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -6180,7 +6180,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.1", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -6189,15 +6189,6 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/body-parser/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/body-parser/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -6213,18 +6204,6 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/body-parser/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -6467,6 +6446,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/call-bind": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", @@ -9094,17 +9082,17 @@ } }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dev": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -9136,9 +9124,9 @@ } }, "node_modules/express/node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "dev": true, "engines": { "node": ">= 0.6" @@ -9177,18 +9165,6 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/express/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/express/node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -13070,6 +13046,18 @@ "node": ">=12.13.0" } }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dev": true, + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -15171,9 +15159,9 @@ } }, "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, "dependencies": { "bytes": "3.1.2", @@ -15185,15 +15173,6 @@ "node": ">= 0.8" } }, - "node_modules/raw-body/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/react": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", @@ -16038,18 +16017,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/send/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/send/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", From 792c54be8814b5af170e81dfe1c0f9ff23747f9b Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 9 Apr 2024 18:12:33 +0300 Subject: [PATCH 07/27] UHF-9738: Change hero to use reusable component, add news article templates --- templates/component/hero.twig | 86 +++++++++++++++++++ templates/misc/news-footer.twig | 36 ++++++++ ...elfi-news-article--medium-teaser.html.twig | 6 ++ .../node--news-article--card-teaser.html.twig | 1 + ...ode--news-article--medium-teaser.html.twig | 1 + .../node--news-article--teaser.html.twig | 1 + .../node--news-article--tiny-teaser.html.twig | 1 + .../node--news-article.html.twig | 31 +++++++ .../helfi-news-item/node--news-item.html.twig | 37 +------- .../paragraphs/paragraph--hero.html.twig | 82 ++---------------- 10 files changed, 171 insertions(+), 111 deletions(-) create mode 100644 templates/component/hero.twig create mode 100644 templates/misc/news-footer.twig create mode 100644 templates/module/helfi-news-article/external-entity--helfi-news-article--medium-teaser.html.twig create mode 100644 templates/module/helfi-news-article/node--news-article--card-teaser.html.twig create mode 100644 templates/module/helfi-news-article/node--news-article--medium-teaser.html.twig create mode 100644 templates/module/helfi-news-article/node--news-article--teaser.html.twig create mode 100644 templates/module/helfi-news-article/node--news-article--tiny-teaser.html.twig create mode 100644 templates/module/helfi-news-article/node--news-article.html.twig diff --git a/templates/component/hero.twig b/templates/component/hero.twig new file mode 100644 index 000000000..382e129f8 --- /dev/null +++ b/templates/component/hero.twig @@ -0,0 +1,86 @@ +{# +{% embed '@hdbt/component/hero.twig' with { + design: content.field_hero_design[0]['#markup'], + title: content.field_hero_title, + description: content.field_hero_desc, + image: content.field_hero_image, + } %} +{% endembed %} +#} + +{% if design == "background-image" %} + {% set design_class = "hero--with-image-bottom" %} +{% elseif design == "diagonal" %} + {% set design_class = "hero--diagonal" %} +{% elseif design == "with-image-bottom" %} + {% set design_class = "hero--with-image-bottom" %} +{% elseif design == "with-image-left" %} + {% set design_class = "hero--with-image-left" %} +{% elseif design == "with-image-right" %} + {% set design_class = "hero--with-image-right" %} +{% elseif design == "without-image-center" %} + {% set design_class = "hero--without-image-left" %} +{% elseif design == "without-image-left" %} + {% set design_class = "hero--without-image-left" %} +{% elseif design == "with-search" %} + {% set design_class = "hero--with-search" %} +{% endif %} + + +{% set hero_wrapper_attributes = { + 'class': [ + 'hero', + design_class ? design_class, + ] +} %} + + + {% embed "@hdbt/misc/container.twig" with {container_element: 'hero'} %} + {% block container_content %} +
+ {# Hyphenate the visible title, but share to screen readers unhyphenated version as for example NVDA reads hyphenated text poorly #} +

{{ title }}

+ + + {% if design == "with-search"%} + {% include "@hdbt/component/helfi-search-form.twig" with { + label: 'What are you looking for?'|t({}, {'context': 'Header and hero search label'}), + search_id: 'hero', + } %} + {% endif %} + + {% if description[0]['#text'] is not empty %} + {% if + design == "without-image-left" or + design == "without-image-center" or + design == "with-image-right" or + design == "with-image-left" or + design == "with-image-bottom" or + design == "diagonal" + %} +
+ {{ description }} +
+ {% endif %} + {% endif %} +
+ + {% endblock %} + {% endembed %} + + {% if + design == "with-image-right" or + design == "with-image-left" or + design == "with-image-bottom" or + design == "diagonal" or + design == "with-search" + %} + {% if image|render %} +
+ {% include '@hdbt/misc/koro.twig' with {koro: koro, flip: true } %} + {{ image }} +
+ {% endif %} + {% endif %} + {% include '@hdbt/misc/koro.twig' with {koro: koro, flip: false } %} + diff --git a/templates/misc/news-footer.twig b/templates/misc/news-footer.twig new file mode 100644 index 000000000..c1f2bb103 --- /dev/null +++ b/templates/misc/news-footer.twig @@ -0,0 +1,36 @@ +{# Links and links title #} +{% if content.field_news_item_links_link|render %} +
+ + {% if content.field_news_item_links_title|render %} +
+ {{ content.field_news_item_links_title }} +
+ {% endif %} + +
    + {% for key in content.field_news_item_links_link['#items']|keys %} +
  • {{ content.field_news_item_links_link[key] }}
    • + {% endfor %} +
+
+{% endif %} + +{# Social media share links #} +{{ drupal_block('helfi_platform_config_social_sharing_block') }} + +{# Tags #} +{% include "@hdbt/misc/news-tags.twig" with + { + tags: content.field_news_item_tags, + neighbourhoods: content.field_news_neighbourhoods, + groups: content.field_news_groups, + } +%} + +{# Radioactivity #} +{% if content.field_radioactivity|render %} +
+ {{ content.field_radioactivity }} +
+{% endif %} diff --git a/templates/module/helfi-news-article/external-entity--helfi-news-article--medium-teaser.html.twig b/templates/module/helfi-news-article/external-entity--helfi-news-article--medium-teaser.html.twig new file mode 100644 index 000000000..74e254380 --- /dev/null +++ b/templates/module/helfi-news-article/external-entity--helfi-news-article--medium-teaser.html.twig @@ -0,0 +1,6 @@ +
  • + {% include '@hdbt/module/helfi-news-item/news-teaser-generic.twig' with { + class: 'news-listing__medium-teaser', + heading_level: 'h3' + }%} +
    • \ No newline at end of file diff --git a/templates/module/helfi-news-article/node--news-article--card-teaser.html.twig b/templates/module/helfi-news-article/node--news-article--card-teaser.html.twig new file mode 100644 index 000000000..030546192 --- /dev/null +++ b/templates/module/helfi-news-article/node--news-article--card-teaser.html.twig @@ -0,0 +1 @@ +{% include '@hdbt/module/helfi-news-item/node--news-item--card-teaser.html.twig' %} diff --git a/templates/module/helfi-news-article/node--news-article--medium-teaser.html.twig b/templates/module/helfi-news-article/node--news-article--medium-teaser.html.twig new file mode 100644 index 000000000..d56acad14 --- /dev/null +++ b/templates/module/helfi-news-article/node--news-article--medium-teaser.html.twig @@ -0,0 +1 @@ +{% include '@hdbt/module/helfi-news-item/node--news-item--medium-teaser.html.twig' %} diff --git a/templates/module/helfi-news-article/node--news-article--teaser.html.twig b/templates/module/helfi-news-article/node--news-article--teaser.html.twig new file mode 100644 index 000000000..021c60ed8 --- /dev/null +++ b/templates/module/helfi-news-article/node--news-article--teaser.html.twig @@ -0,0 +1 @@ +{% include '@hdbt/module/helfi-news-item/node--news-item--teaser.html.twig' %} diff --git a/templates/module/helfi-news-article/node--news-article--tiny-teaser.html.twig b/templates/module/helfi-news-article/node--news-article--tiny-teaser.html.twig new file mode 100644 index 000000000..c799a6f34 --- /dev/null +++ b/templates/module/helfi-news-article/node--news-article--tiny-teaser.html.twig @@ -0,0 +1 @@ +{% include '@hdbt/module/helfi-news-item/node--news-item--tiny-teaser.html.twig' %} diff --git a/templates/module/helfi-news-article/node--news-article.html.twig b/templates/module/helfi-news-article/node--news-article.html.twig new file mode 100644 index 000000000..0971fbb6c --- /dev/null +++ b/templates/module/helfi-news-article/node--news-article.html.twig @@ -0,0 +1,31 @@ +{% + set classes = [ + 'node--type-' ~ node.bundle|clean_class, + node.isPromoted() ? 'node--promoted', + node.isSticky() ? 'node--sticky', + not node.isPublished() ? 'node--unpublished', + view_mode ? 'node--view-mode-' ~ view_mode|clean_class, + first_paragraph_grey ? 'has-first-gray-bg-block', + node_class, +] +%} + + + {% embed '@hdbt/component/hero.twig' with { + design: content.field_hero_design[0]['#markup'], + title: label, + description: content.field_lead_in, + image: content.field_main_image, + } %} + {% endembed %} + + {% block main_content %} + {# Content region #} + {% if content.field_content|render %} + {{ content.field_content }} + {% endif %} + + {% include '@hdbt/misc/news-footer.twig' %} + + {% endblock main_content %} + diff --git a/templates/module/helfi-news-item/node--news-item.html.twig b/templates/module/helfi-news-item/node--news-item.html.twig index 6faed5508..3be2cffcd 100644 --- a/templates/module/helfi-news-item/node--news-item.html.twig +++ b/templates/module/helfi-news-item/node--news-item.html.twig @@ -58,42 +58,7 @@ {{ content.field_content }} {% endif %} - {# Links and links title #} - {% if content.field_news_item_links_link|render %} -
    - - {% if content.field_news_item_links_title|render %} -
    - {{ content.field_news_item_links_title }} -
    - {% endif %} - -
      - {% for key in content.field_news_item_links_link['#items']|keys %} -
    • {{ content.field_news_item_links_link[key] }}
      • - {% endfor %} -
    -
    - {% endif %} - - {# Social media share links #} - {{ drupal_block('helfi_platform_config_social_sharing_block') }} - - {# Tags #} - {% include "@hdbt/misc/news-tags.twig" with - { - tags: content.field_news_item_tags, - neighbourhoods: content.field_news_neighbourhoods, - groups: content.field_news_groups, - } - %} - - {# Radioactivity #} - {% if content.field_radioactivity|render %} -
    - {{ content.field_radioactivity }} -
    - {% endif %} + {% include '@hdbt/misc/news-footer.twig' %} {% endblock main_content %} diff --git a/templates/paragraphs/paragraph--hero.html.twig b/templates/paragraphs/paragraph--hero.html.twig index d8641733a..e90fc14a1 100644 --- a/templates/paragraphs/paragraph--hero.html.twig +++ b/templates/paragraphs/paragraph--hero.html.twig @@ -1,80 +1,12 @@ {% set design = content.field_hero_design[0]['#markup'] %} {% set description = content.field_hero_desc %} -{% if design == "background-image" %} - {% set design_class = "hero--with-image-bottom" %} -{% elseif design == "diagonal" %} - {% set design_class = "hero--diagonal" %} -{% elseif design == "with-image-bottom" %} - {% set design_class = "hero--with-image-bottom" %} -{% elseif design == "with-image-left" %} - {% set design_class = "hero--with-image-left" %} -{% elseif design == "with-image-right" %} - {% set design_class = "hero--with-image-right" %} -{% elseif design == "without-image-center" %} - {% set design_class = "hero--without-image-left" %} -{% elseif design == "without-image-left" %} - {% set design_class = "hero--without-image-left" %} -{% elseif design == "with-search" %} - {% set design_class = "hero--with-search" %} -{% endif %} - -{% - set classes = [ - 'hero', - design_class ? design_class, - ] -%} - {% block paragraph %} - - {% embed "@hdbt/misc/container.twig" with {container_element: 'hero'} %} - {% block container_content %} -
    - {# Hyphenate the visible title, but share to screen readers unhyphenated version as for example NVDA reads hyphenated text poorly #} -

    {{ content.field_hero_title }}

    - - - {% if design == "with-search"%} - {% include "@hdbt/component/helfi-search-form.twig" with { - label: 'What are you looking for?'|t({}, {'context': 'Header and hero search label'}), - search_id: 'hero', - } %} - {% endif %} - - {% if description[0]['#text'] is not empty %} - {% if - design == "without-image-left" or - design == "without-image-center" or - design == "with-image-right" or - design == "with-image-left" or - design == "with-image-bottom" or - design == "diagonal" - %} -
    - {{ description }} -
    - {% endif %} - {% endif %} -
    - - {% endblock %} - {% endembed %} - - {% if - design == "with-image-right" or - design == "with-image-left" or - design == "with-image-bottom" or - design == "diagonal" or - design == "with-search" - %} - {% if content.field_hero_image|render %} -
    - {% include '@hdbt/misc/koro.twig' with {koro: koro, flip: true } %} - {{ content.field_hero_image }} -
    - {% endif %} - {% endif %} - {% include '@hdbt/misc/koro.twig' with {koro: koro, flip: false } %} - + {% embed '@hdbt/component/hero.twig' with { + design: content.field_hero_design[0]['#markup'], + title: content.field_hero_title, + description: content.field_hero_desc, + image: content.field_hero_image, + } %} + {% endembed %} {% endblock paragraph %} From aa4dcc6a00011ca808c6d27e0db2890889c3f205 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 10 Apr 2024 13:14:33 +0300 Subject: [PATCH 08/27] UHF-9738: Move the news article templates to away from hdbt --- templates/component/hero.twig | 2 +- ...elfi-news-article--medium-teaser.html.twig | 6 ---- .../node--news-article--card-teaser.html.twig | 1 - ...ode--news-article--medium-teaser.html.twig | 1 - .../node--news-article--teaser.html.twig | 1 - .../node--news-article--tiny-teaser.html.twig | 1 - .../node--news-article.html.twig | 31 ------------------- 7 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 templates/module/helfi-news-article/external-entity--helfi-news-article--medium-teaser.html.twig delete mode 100644 templates/module/helfi-news-article/node--news-article--card-teaser.html.twig delete mode 100644 templates/module/helfi-news-article/node--news-article--medium-teaser.html.twig delete mode 100644 templates/module/helfi-news-article/node--news-article--teaser.html.twig delete mode 100644 templates/module/helfi-news-article/node--news-article--tiny-teaser.html.twig delete mode 100644 templates/module/helfi-news-article/node--news-article.html.twig diff --git a/templates/component/hero.twig b/templates/component/hero.twig index 382e129f8..c58d76cb1 100644 --- a/templates/component/hero.twig +++ b/templates/component/hero.twig @@ -49,7 +49,7 @@ } %} {% endif %} - {% if description[0]['#text'] is not empty %} + {% if description|render|striptags|trim is not empty %} {% if design == "without-image-left" or design == "without-image-center" or diff --git a/templates/module/helfi-news-article/external-entity--helfi-news-article--medium-teaser.html.twig b/templates/module/helfi-news-article/external-entity--helfi-news-article--medium-teaser.html.twig deleted file mode 100644 index 74e254380..000000000 --- a/templates/module/helfi-news-article/external-entity--helfi-news-article--medium-teaser.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -
  • - {% include '@hdbt/module/helfi-news-item/news-teaser-generic.twig' with { - class: 'news-listing__medium-teaser', - heading_level: 'h3' - }%} -
    • \ No newline at end of file diff --git a/templates/module/helfi-news-article/node--news-article--card-teaser.html.twig b/templates/module/helfi-news-article/node--news-article--card-teaser.html.twig deleted file mode 100644 index 030546192..000000000 --- a/templates/module/helfi-news-article/node--news-article--card-teaser.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@hdbt/module/helfi-news-item/node--news-item--card-teaser.html.twig' %} diff --git a/templates/module/helfi-news-article/node--news-article--medium-teaser.html.twig b/templates/module/helfi-news-article/node--news-article--medium-teaser.html.twig deleted file mode 100644 index d56acad14..000000000 --- a/templates/module/helfi-news-article/node--news-article--medium-teaser.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@hdbt/module/helfi-news-item/node--news-item--medium-teaser.html.twig' %} diff --git a/templates/module/helfi-news-article/node--news-article--teaser.html.twig b/templates/module/helfi-news-article/node--news-article--teaser.html.twig deleted file mode 100644 index 021c60ed8..000000000 --- a/templates/module/helfi-news-article/node--news-article--teaser.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@hdbt/module/helfi-news-item/node--news-item--teaser.html.twig' %} diff --git a/templates/module/helfi-news-article/node--news-article--tiny-teaser.html.twig b/templates/module/helfi-news-article/node--news-article--tiny-teaser.html.twig deleted file mode 100644 index c799a6f34..000000000 --- a/templates/module/helfi-news-article/node--news-article--tiny-teaser.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% include '@hdbt/module/helfi-news-item/node--news-item--tiny-teaser.html.twig' %} diff --git a/templates/module/helfi-news-article/node--news-article.html.twig b/templates/module/helfi-news-article/node--news-article.html.twig deleted file mode 100644 index 0971fbb6c..000000000 --- a/templates/module/helfi-news-article/node--news-article.html.twig +++ /dev/null @@ -1,31 +0,0 @@ -{% - set classes = [ - 'node--type-' ~ node.bundle|clean_class, - node.isPromoted() ? 'node--promoted', - node.isSticky() ? 'node--sticky', - not node.isPublished() ? 'node--unpublished', - view_mode ? 'node--view-mode-' ~ view_mode|clean_class, - first_paragraph_grey ? 'has-first-gray-bg-block', - node_class, -] -%} - - - {% embed '@hdbt/component/hero.twig' with { - design: content.field_hero_design[0]['#markup'], - title: label, - description: content.field_lead_in, - image: content.field_main_image, - } %} - {% endembed %} - - {% block main_content %} - {# Content region #} - {% if content.field_content|render %} - {{ content.field_content }} - {% endif %} - - {% include '@hdbt/misc/news-footer.twig' %} - - {% endblock main_content %} - From ff498306412b6c8e0392e03fa14540f4b1c57916 Mon Sep 17 00:00:00 2001 From: j-mys Date: Fri, 5 Apr 2024 22:30:24 +0300 Subject: [PATCH 09/27] UHF-9280: add script to connect content element to chat logic --- src/js/chat-trigger.js | 98 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 src/js/chat-trigger.js diff --git a/src/js/chat-trigger.js b/src/js/chat-trigger.js new file mode 100644 index 000000000..00de3fbf6 --- /dev/null +++ b/src/js/chat-trigger.js @@ -0,0 +1,98 @@ +const triggerTranslations = { + fallBack: { + fi: 'Chatti ei ole saatavilla.', + sv: 'Chatten är inte tillgänglig.', + en: 'The chat is not available.' + }, + openChat: { + fi: 'Avaa chat', + sv: 'Öppna chatten', + en: 'Open the chat' + } +}; + +// Due to current ckeditor rules the custom element +// or custom property button are not available, +// this will insert the chat trigger element to page. +function addCustomTrigger(working = true) { + const trigger = document.createElement('chat-trigger'); + if (working) { + trigger.setAttribute('data-chat-trigger', 'aca-wbc-chat-app-button'); + } else { + trigger.setAttribute('data-chat-trigger', 'this does not work'); + } + trigger.textContent = 'Trigger element content; I will disappear'; + document.querySelector('.component__content.columns--50-50 div').appendChild(trigger); +} + +function init() { + // Get the language, fallback to english. + const lang = window?.drupalSettings?.path?.currentLanguage || 'fi'; + + // There could be a possibility of using a custom HTML tag. + const chatTrigger = document.querySelector('chat-trigger'); + + if (!chatTrigger) { + // This page doesn't have a chat trigger. + return; + } + + // Search for trigger target element - a chatbox. + const targetElementName = chatTrigger.dataset.chatTrigger; + if (typeof targetElementName !== 'string') { + // The target element name is somehow invalid + return; + } + + const chatElement = document.querySelector(targetElementName); + if (!chatElement) { + // The trigger is present but the chat is not available, + // show fallback. + const fallBack = document.createElement('p'); + fallBack.textContent = triggerTranslations.fallBack[lang]; + chatTrigger.replaceWith(fallBack); + return; + } + + // Create a function for clicking the chat open. Could be moved + // to the eventListener when the workaround becomes redundant. + const clickChatBox = () => { + // Due to the chat being live and connected, we shall not + // actually click the button. Using alert for feedback. + alert('*BLOCKS YOUR PATH*'); + console.log(chatElement.querySelector('button')); + // chatElement.querySelector('button').click(); + }; + + // Target element found, turn chat-trigger into a button + // and add an eventListener for it. + const chatButton = document.createElement('button'); + chatButton.textContent = triggerTranslations.openChat[lang]; + chatButton.addEventListener('click', clickChatBox); + + // Possibly wrong styling + chatButton.setAttribute('data-hds-component', 'button'); + chatTrigger.replaceWith(chatButton); +} + +// The load event might not be the optimal one in production. +// We need to make sure that the chat has time to initialize +// before the trigger script is evaluated. +window.addEventListener('load', () => { + // The console is filled with all kinds of messages, + // use delay to clear it before debugging. + const DELAY = 0; + setTimeout(() => { + console.clear(); + init(); + }, DELAY); +}); + +// Development helper to bypass ckeditor filtering. +// Remove this and the addCustomTrigger -function +// when the feature is finished. +window.addEventListener('DOMContentLoaded', () => { + // Add trigger for correct or incorrect selector + addCustomTrigger(true); + // addCustomTrigger(false); +}); From b4a737eb693f611ed5c96eeadcb46f66e91f404f Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Wed, 10 Apr 2024 15:17:06 +0300 Subject: [PATCH 10/27] UHF-9280: UHF-9280: Refactor code to wait for chat button element --- src/js/chat-trigger.js | 163 ++++++++++++++++++++--------------------- 1 file changed, 80 insertions(+), 83 deletions(-) diff --git a/src/js/chat-trigger.js b/src/js/chat-trigger.js index 00de3fbf6..7bea4e5ce 100644 --- a/src/js/chat-trigger.js +++ b/src/js/chat-trigger.js @@ -1,98 +1,95 @@ -const triggerTranslations = { +// This script replaces a chat trigger placeholder element with a button that opens the chat. +(function chatTriggerWrapper() { + const triggerTranslations = { fallBack: { - fi: 'Chatti ei ole saatavilla.', - sv: 'Chatten är inte tillgänglig.', - en: 'The chat is not available.' + fi: 'Chatti ei ole saatavilla.', + sv: 'Chatten är inte tillgänglig.', + en: 'The chat is not available.' }, openChat: { - fi: 'Avaa chat', - sv: 'Öppna chatten', - en: 'Open the chat' + fi: 'Avaa chat', + sv: 'Öppna chatten', + en: 'Open the chat' } -}; + }; -// Due to current ckeditor rules the custom element -// or custom property button are not available, -// this will insert the chat trigger element to page. -function addCustomTrigger(working = true) { - const trigger = document.createElement('chat-trigger'); - if (working) { - trigger.setAttribute('data-chat-trigger', 'aca-wbc-chat-app-button'); - } else { - trigger.setAttribute('data-chat-trigger', 'this does not work'); - } - trigger.textContent = 'Trigger element content; I will disappear'; - document.querySelector('.component__content.columns--50-50 div').appendChild(trigger); -} - -function init() { - // Get the language, fallback to english. - const lang = window?.drupalSettings?.path?.currentLanguage || 'fi'; - - // There could be a possibility of using a custom HTML tag. - const chatTrigger = document.querySelector('chat-trigger'); + /** + * Waits for an element to appear in the DOM and resolves with the element. + * + * @param {string} selector - The CSS selector of the element to wait for. + * @return {Promise} A promise that resolves with the element once it appears in the DOM. + */ + function waitForElement(selector) { + return new Promise(resolve => { + // First check, if the element exists already. + const element = document.querySelector(selector); + if (element) { + resolve(element); + } else { // If not, wait for it to appear. + const observer = new MutationObserver(() => { + const elem = document.querySelector(selector); + if (elem) { + observer.disconnect(); + resolve(elem); + } + }); + observer.observe(document.documentElement, { childList: true, subtree: true, }); + } + }); + } - if (!chatTrigger) { - // This page doesn't have a chat trigger. - return; + /** + * A temporary fix function until CKEditor allows + * Replaces a placeholder element with a chat trigger element. + */ + function temporaryFix() { + const placeholder = document.querySelector('a[href^="https://www.hel.fi/chat-trigger?click="]'); + if (placeholder) { + const chatTrigger = document.createElement('chat-trigger'); + chatTrigger.dataset.chatTrigger = decodeURIComponent(placeholder.getAttribute('href').split('?click=')[1]);; + placeholder.replaceWith(chatTrigger); } + } - // Search for trigger target element - a chatbox. - const targetElementName = chatTrigger.dataset.chatTrigger; - if (typeof targetElementName !== 'string') { - // The target element name is somehow invalid - return; - } + /** + * Try to find the chat trigger placeholder element and replace it with a button that opens the chat. + */ + function init() { + temporaryFix(); // TODO: Remove this temporary fix once CKEditor allows + + // Find the chat trigger placeholder element. + let placeholder = document.querySelector('chat-trigger'); - const chatElement = document.querySelector(targetElementName); - if (!chatElement) { - // The trigger is present but the chat is not available, - // show fallback. - const fallBack = document.createElement('p'); - fallBack.textContent = triggerTranslations.fallBack[lang]; - chatTrigger.replaceWith(fallBack); - return; + // If the chat trigger placeholder is not found, do nothing. + if (!placeholder) { + return; } - // Create a function for clicking the chat open. Could be moved - // to the eventListener when the workaround becomes redundant. - const clickChatBox = () => { - // Due to the chat being live and connected, we shall not - // actually click the button. Using alert for feedback. - alert('*BLOCKS YOUR PATH*'); - console.log(chatElement.querySelector('button')); - // chatElement.querySelector('button').click(); - }; + // Get target selector from attribute + const targetSelector = placeholder.dataset.chatTrigger; - // Target element found, turn chat-trigger into a button - // and add an eventListener for it. - const chatButton = document.createElement('button'); - chatButton.textContent = triggerTranslations.openChat[lang]; - chatButton.addEventListener('click', clickChatBox); + // Get the language, fallback to english. + const lang = window?.drupalSettings?.path?.currentLanguage || 'en'; - // Possibly wrong styling - chatButton.setAttribute('data-hds-component', 'button'); - chatTrigger.replaceWith(chatButton); -} + // The trigger is present but the chat is not available, show fallback until chat is available. + if (!document.querySelector(targetSelector)) { + const fallBack = document.createElement('span'); + fallBack.textContent = triggerTranslations.fallBack[lang]; + placeholder.replaceWith(fallBack); + placeholder = fallBack; + } -// The load event might not be the optimal one in production. -// We need to make sure that the chat has time to initialize -// before the trigger script is evaluated. -window.addEventListener('load', () => { - // The console is filled with all kinds of messages, - // use delay to clear it before debugging. - const DELAY = 0; - setTimeout(() => { - console.clear(); - init(); - }, DELAY); -}); + // Wait for the target element to appear in the DOM and replace the trigger with a button that opens the chat. + waitForElement(targetSelector).then((chatButton) => { + const triggerButton = document.createElement('button'); + triggerButton.textContent = triggerTranslations.openChat[lang]; + triggerButton.setAttribute('data-hds-component', 'button'); + triggerButton.addEventListener('click', () => { + chatButton.click(); + }); + placeholder.replaceWith(triggerButton); + }); + } -// Development helper to bypass ckeditor filtering. -// Remove this and the addCustomTrigger -function -// when the feature is finished. -window.addEventListener('DOMContentLoaded', () => { - // Add trigger for correct or incorrect selector - addCustomTrigger(true); - // addCustomTrigger(false); -}); + window.addEventListener('DOMContentLoaded', init); +})(); From d0aea526d0855dfab7f21e7f0796094cd605962f Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Wed, 10 Apr 2024 16:22:08 +0300 Subject: [PATCH 11/27] UHF-9280: UHF-9280: Remove temporary fix and set button to be secondary style --- src/js/chat-trigger.js | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/js/chat-trigger.js b/src/js/chat-trigger.js index 7bea4e5ce..d45a608e1 100644 --- a/src/js/chat-trigger.js +++ b/src/js/chat-trigger.js @@ -38,27 +38,13 @@ }); } - /** - * A temporary fix function until CKEditor allows - * Replaces a placeholder element with a chat trigger element. - */ - function temporaryFix() { - const placeholder = document.querySelector('a[href^="https://www.hel.fi/chat-trigger?click="]'); - if (placeholder) { - const chatTrigger = document.createElement('chat-trigger'); - chatTrigger.dataset.chatTrigger = decodeURIComponent(placeholder.getAttribute('href').split('?click=')[1]);; - placeholder.replaceWith(chatTrigger); - } - } - /** * Try to find the chat trigger placeholder element and replace it with a button that opens the chat. */ function init() { - temporaryFix(); // TODO: Remove this temporary fix once CKEditor allows // Find the chat trigger placeholder element. - let placeholder = document.querySelector('chat-trigger'); + let placeholder = document.querySelector('p[data-chat-trigger]'); // If the chat trigger placeholder is not found, do nothing. if (!placeholder) { @@ -84,6 +70,7 @@ const triggerButton = document.createElement('button'); triggerButton.textContent = triggerTranslations.openChat[lang]; triggerButton.setAttribute('data-hds-component', 'button'); + triggerButton.setAttribute('data-hds-variant', 'secondary'); triggerButton.addEventListener('click', () => { chatButton.click(); }); From 4e17fe8d990a609c33f9920bd24dc5944c6618d2 Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Thu, 11 Apr 2024 08:29:41 +0300 Subject: [PATCH 12/27] UHF-9280: UHF-9280: Improve language handling --- src/js/chat-trigger.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/js/chat-trigger.js b/src/js/chat-trigger.js index d45a608e1..299c0aa06 100644 --- a/src/js/chat-trigger.js +++ b/src/js/chat-trigger.js @@ -1,7 +1,7 @@ // This script replaces a chat trigger placeholder element with a button that opens the chat. (function chatTriggerWrapper() { const triggerTranslations = { - fallBack: { + fallback: { fi: 'Chatti ei ole saatavilla.', sv: 'Chatten är inte tillgänglig.', en: 'The chat is not available.' @@ -59,16 +59,16 @@ // The trigger is present but the chat is not available, show fallback until chat is available. if (!document.querySelector(targetSelector)) { - const fallBack = document.createElement('span'); - fallBack.textContent = triggerTranslations.fallBack[lang]; - placeholder.replaceWith(fallBack); - placeholder = fallBack; + const fallback = document.createElement('span'); + fallback.textContent = triggerTranslations.fallback[lang] || triggerTranslations.fallback.en; + placeholder.replaceWith(fallback); + placeholder = fallback; } // Wait for the target element to appear in the DOM and replace the trigger with a button that opens the chat. waitForElement(targetSelector).then((chatButton) => { const triggerButton = document.createElement('button'); - triggerButton.textContent = triggerTranslations.openChat[lang]; + triggerButton.textContent = triggerTranslations.openChat[lang] || triggerTranslations.openChat.en; triggerButton.setAttribute('data-hds-component', 'button'); triggerButton.setAttribute('data-hds-variant', 'secondary'); triggerButton.addEventListener('click', () => { From 0c3e773eab57a1ccec923845305afd8d6ea62758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 11 Apr 2024 08:54:29 +0300 Subject: [PATCH 13/27] UHF-9280: Load the chat-trigger library when chat blocks are being rendered. --- hdbt.libraries.yml | 5 +++++ hdbt.theme | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/hdbt.libraries.yml b/hdbt.libraries.yml index c345a3d55..04d86aa70 100644 --- a/hdbt.libraries.yml +++ b/hdbt.libraries.yml @@ -31,6 +31,11 @@ sidebar-menu-toggle: js: dist/js/sidebar-menu-toggle.min.js: {} +chat-trigger: + version: 1.0 + js: + dist/js/chat-trigger.min.js: {} + color-palette: version: 1.0 css: diff --git a/hdbt.theme b/hdbt.theme index aaef9c87f..7b8f7a8e8 100644 --- a/hdbt.theme +++ b/hdbt.theme @@ -705,6 +705,19 @@ function hdbt_preprocess_block(&$variables): void { if ($variables['plugin_id'] == 'profile_block') { $variables['#attached']['drupalSettings']['hdbt']['profile_dropdown'] = TRUE; } + + $chat_blocks = [ + 'ibm_chat_app', + 'telia_ace_widget', + 'chat_leijuke', + ]; + + // Add the chat trigger handler JS to chat blocks. + // It tracks the data-chat-trigger attribute and opens + // a corresponding chat if clicked. + if (in_array($variables['plugin_id'], $chat_blocks)) { + $variables['#attached']['library'][] = 'hdbt/chat-trigger'; + } } /** From 1fd3edcb3b187b22193f409f099d76bfdde09bfa Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Thu, 11 Apr 2024 14:11:41 +0300 Subject: [PATCH 14/27] UHF-9280: UHF-9280: Support multiple chat triggers on page instead of just one --- src/js/chat-trigger.js | 59 ++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/src/js/chat-trigger.js b/src/js/chat-trigger.js index 299c0aa06..d2954dd23 100644 --- a/src/js/chat-trigger.js +++ b/src/js/chat-trigger.js @@ -1,4 +1,4 @@ -// This script replaces a chat trigger placeholder element with a button that opens the chat. +// This script replaces chat trigger placeholder elements with buttons that open the chat. (function chatTriggerWrapper() { const triggerTranslations = { fallback: { @@ -39,42 +39,45 @@ } /** - * Try to find the chat trigger placeholder element and replace it with a button that opens the chat. + * Try to find the chat trigger placeholder elements and replace them with buttons that open the chat. */ function init() { - // Find the chat trigger placeholder element. - let placeholder = document.querySelector('p[data-chat-trigger]'); - - // If the chat trigger placeholder is not found, do nothing. - if (!placeholder) { - return; - } - - // Get target selector from attribute - const targetSelector = placeholder.dataset.chatTrigger; + // Find all chat trigger placeholder elements. + const placeholders = document.querySelectorAll('p[data-chat-trigger]'); // Get the language, fallback to english. const lang = window?.drupalSettings?.path?.currentLanguage || 'en'; - // The trigger is present but the chat is not available, show fallback until chat is available. - if (!document.querySelector(targetSelector)) { - const fallback = document.createElement('span'); - fallback.textContent = triggerTranslations.fallback[lang] || triggerTranslations.fallback.en; - placeholder.replaceWith(fallback); - placeholder = fallback; - } + // Iterate over each placeholder. + placeholders.forEach(placeholder => { + // Get target selector from attribute + const targetSelector = placeholder.dataset.chatTrigger; - // Wait for the target element to appear in the DOM and replace the trigger with a button that opens the chat. - waitForElement(targetSelector).then((chatButton) => { - const triggerButton = document.createElement('button'); - triggerButton.textContent = triggerTranslations.openChat[lang] || triggerTranslations.openChat.en; - triggerButton.setAttribute('data-hds-component', 'button'); - triggerButton.setAttribute('data-hds-variant', 'secondary'); - triggerButton.addEventListener('click', () => { - chatButton.click(); + // The trigger is present but the chat is not available, show fallback until chat is available. + if (!document.querySelector(targetSelector)) { + const content = triggerTranslations.fallback[lang] || triggerTranslations.fallback.en; + placeholder.textContent = content; + } + + // Wait for the target element to appear in the DOM and replace the trigger with a button that opens the chat. + waitForElement(targetSelector).then(() => { + const triggerButton = document.createElement('button'); + triggerButton.textContent = triggerTranslations.openChat[lang] || triggerTranslations.openChat.en; + triggerButton.dataset.hdsComponent = 'button'; + triggerButton.dataset.hdsVariant = 'secondary'; + triggerButton.dataset.clickSelector = targetSelector; + triggerButton.addEventListener('click', (event) => { + const selector = event.target?.dataset?.clickSelector; + if (selector) { + const clickTarget = document.querySelector(selector); + if (clickTarget) { + clickTarget.click(); + } + } + }); + placeholder.replaceWith(triggerButton); }); - placeholder.replaceWith(triggerButton); }); } From 2b17fef63b73da4ae7bb0e700af436e543ace426 Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Fri, 12 Apr 2024 10:19:00 +0300 Subject: [PATCH 15/27] UHF-9280: Change button to be added inside of the p-tag instead of replacing it --- src/js/chat-trigger.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/chat-trigger.js b/src/js/chat-trigger.js index d2954dd23..499d15b88 100644 --- a/src/js/chat-trigger.js +++ b/src/js/chat-trigger.js @@ -76,7 +76,9 @@ } } }); - placeholder.replaceWith(triggerButton); + placeholder.removeAttribute('data-chat-trigger'); + placeholder.innerHTML = ''; + placeholder.appendChild(triggerButton); }); }); } From f5361d692445f958d616ce94887ed77f07b3a563 Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Fri, 12 Apr 2024 10:20:59 +0300 Subject: [PATCH 16/27] UHF-9280: Add dist --- dist/js/chat-trigger.min.js | 1 + package-lock.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 dist/js/chat-trigger.min.js diff --git a/dist/js/chat-trigger.min.js b/dist/js/chat-trigger.min.js new file mode 100644 index 000000000..1e2296922 --- /dev/null +++ b/dist/js/chat-trigger.min.js @@ -0,0 +1 @@ +!function(){const t={fallback:{fi:"Chatti ei ole saatavilla.",sv:"Chatten är inte tillgänglig.",en:"The chat is not available."},openChat:{fi:"Avaa chat",sv:"Öppna chatten",en:"Open the chat"}};window.addEventListener("DOMContentLoaded",(function(){const e=document.querySelectorAll("p[data-chat-trigger]"),n=window?.drupalSettings?.path?.currentLanguage||"en";e.forEach((e=>{const a=e.dataset.chatTrigger;if(!document.querySelector(a)){const a=t.fallback[n]||t.fallback.en;e.textContent=a}var c;(c=a,new Promise((t=>{const e=document.querySelector(c);if(e)t(e);else{const e=new MutationObserver((()=>{const n=document.querySelector(c);n&&(e.disconnect(),t(n))}));e.observe(document.documentElement,{childList:!0,subtree:!0})}}))).then((()=>{const c=document.createElement("button");c.textContent=t.openChat[n]||t.openChat.en,c.dataset.hdsComponent="button",c.dataset.hdsVariant="secondary",c.dataset.clickSelector=a,c.addEventListener("click",(t=>{const e=t.target?.dataset?.clickSelector;if(e){const t=document.querySelector(e);t&&t.click()}})),e.removeAttribute("data-chat-trigger"),e.innerHTML="",e.appendChild(c)}))}))}))}(); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index cd538ac70..620884361 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6530,9 +6530,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001606", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz", - "integrity": "sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==", + "version": "1.0.30001609", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001609.tgz", + "integrity": "sha512-JFPQs34lHKx1B5t1EpQpWH4c+29zIyn/haGsbpfq3suuV9v56enjFt23zqijxGTMwy1p/4H2tjnQMY+p1WoAyA==", "funding": [ { "type": "opencollective", From 0525b719e2612d7f6ef017d6fa6f7ca35e2d6bee Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 12 Apr 2024 12:00:04 +0300 Subject: [PATCH 17/27] UHF-9280: Empty commit to trigger reference image recreation From 5439c7eec17b8ef40c870ba067d3323ede541061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Fri, 12 Apr 2024 13:37:17 +0300 Subject: [PATCH 18/27] UHF-9844: Run npm audit and fixed security issues. --- package-lock.json | 113 ++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 73 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd538ac70..3203cde6c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6166,13 +6166,13 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "dev": true, "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -6180,7 +6180,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.1", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -6189,15 +6189,6 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/body-parser/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/body-parser/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -6213,18 +6204,6 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/body-parser/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -6467,6 +6446,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/call-bind": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", @@ -6530,9 +6518,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001606", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz", - "integrity": "sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==", + "version": "1.0.30001609", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001609.tgz", + "integrity": "sha512-JFPQs34lHKx1B5t1EpQpWH4c+29zIyn/haGsbpfq3suuV9v56enjFt23zqijxGTMwy1p/4H2tjnQMY+p1WoAyA==", "funding": [ { "type": "opencollective", @@ -9094,17 +9082,17 @@ } }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dev": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -9136,9 +9124,9 @@ } }, "node_modules/express/node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "dev": true, "engines": { "node": ">= 0.6" @@ -9177,18 +9165,6 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, - "node_modules/express/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/express/node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -13070,6 +13046,18 @@ "node": ">=12.13.0" } }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dev": true, + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -15171,9 +15159,9 @@ } }, "node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, "dependencies": { "bytes": "3.1.2", @@ -15185,15 +15173,6 @@ "node": ">= 0.8" } }, - "node_modules/raw-body/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/react": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", @@ -16038,18 +16017,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/send/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/send/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", From 41848322f20dd16d3801c84f3b4c7315734cc9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Fri, 12 Apr 2024 14:03:51 +0300 Subject: [PATCH 19/27] UHF-9844: Removed obsolote packages. --- package-lock.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8d7bbda40..e8c91509c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11707,15 +11707,6 @@ "node": ">=0.10.0" } }, - "node_modules/klona": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", - "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "node_modules/known-css-properties": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.27.0.tgz", From 125c54a23578d74c83aa885fd68acd7cd3b61935 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 12 Apr 2024 14:06:34 +0300 Subject: [PATCH 20/27] UHF-9280: Try to fix visual regression tests --- .github/workflows/visual.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/visual.yml b/.github/workflows/visual.yml index 801cfea44..42fc5c119 100644 --- a/.github/workflows/visual.yml +++ b/.github/workflows/visual.yml @@ -24,6 +24,9 @@ jobs: - name: Set theme folder run: echo "THEME_FOLDER=$DRUPAL_ROOT/public/themes/contrib/$THEME_NAME" >> $GITHUB_ENV + - name: Update + run: sudo apt update + - name: Clone platform run: | git clone --depth=1 https://github.com/City-of-Helsinki/drupal-helfi-platform.git $DRUPAL_ROOT From 0998c8ccde615f273fb072856fe3d59f841c57cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Fri, 12 Apr 2024 14:11:41 +0300 Subject: [PATCH 21/27] UHF-9844: UHF-9844: Updated stylelint and dependencies. --- package-lock.json | 812 +++++++++++++--------------------------------- package.json | 12 +- 2 files changed, 235 insertions(+), 589 deletions(-) diff --git a/package-lock.json b/package-lock.json index 723de5281..3d1a568c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,12 +90,12 @@ "prettier": "^3.0.1", "process": "^0.11.10", "sass-loader": "^14.0.0", - "stylelint": "^15.0.0", - "stylelint-config-standard-scss": "^11.0.0", - "stylelint-declaration-block-no-ignored-properties": "^2.7.0", - "stylelint-high-performance-animation": "^1.8.0", - "stylelint-order": "^6.0.3", - "stylelint-scss": "^5.0.0", + "stylelint": "^16.0.0", + "stylelint-config-standard-scss": "^13.0.0", + "stylelint-declaration-block-no-ignored-properties": "^2.8.0", + "stylelint-high-performance-animation": "^1.9.0", + "stylelint-order": "^6.0.4", + "stylelint-scss": "^6.0.0", "svg-inline-loader": "^0.8.0", "svg-sprite": "https://github.com/svg-sprite/svg-sprite/archive/refs/tags/v3.0.0-beta3.tar.gz", "ts-loader": "^9.4.2", @@ -2075,9 +2075,9 @@ } }, "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.6.1", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.1.tgz", + "integrity": "sha512-ubEkAaTfVZa+WwGhs5jbo5Xfqpeaybr/RvWzvFxRs4jfq16wH8l8Ty/QEEpINxll4xhuGfdMbipRyz5QZh9+FA==", "dev": true, "funding": [ { @@ -2093,13 +2093,13 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-tokenizer": "^2.2.4" } }, "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.4", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.4.tgz", + "integrity": "sha512-PuWRAewQLbDhGeTvFuq2oClaSCKPIBmHyIobCV39JHRYN0byDcUWJl5baPeNUcqrjtdMNqFooE0FGl31I3JOqw==", "dev": true, "funding": [ { @@ -2116,9 +2116,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.9", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.9.tgz", + "integrity": "sha512-qqGuFfbn4rUmyOB0u8CVISIp5FfJ5GAR3mBrZ9/TKndHakdnm6pY0L/fbLcpPnrzwCyyTEZl1nUcXAYHEWneTA==", "dev": true, "funding": [ { @@ -2134,8 +2134,8 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.3.1", - "@csstools/css-tokenizer": "^2.2.0" + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4" } }, "node_modules/@csstools/postcss-cascade-layers": { @@ -2765,9 +2765,9 @@ } }, "node_modules/@csstools/selector-specificity": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz", - "integrity": "sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.3.tgz", + "integrity": "sha512-KEPNw4+WW5AVEIyzC80rTbWEUatTW2lXpN8+8ILC8PiPeWPjwUzrPZDIOZ2wwqDmeqOYTdSGyL3+vE5GC3FB3Q==", "funding": [ { "type": "github", @@ -2805,6 +2805,16 @@ "node": ">=10.0.0" } }, + "node_modules/@dual-bundle/import-meta-resolve": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz", + "integrity": "sha512-ZKXyJeFAzcpKM2kk8ipoGIPUqx9BX52omTGnfwjJvxOCaZTM2wtDK7zN0aIgPRbT9XYAlha0HtmZ+XKteuh0Gw==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/@emotion/styled-base": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-11.0.0.tgz", @@ -4390,23 +4400,11 @@ "integrity": "sha512-gCd/HcCgjqSxfMrgtqxCgYk/22NBQfypwFUG7ZAyG/4pqs51WLTcUzVp1hqTbieDYeHS3WoVEh2Yv/2l+7B0Vg==", "dev": true }, - "node_modules/@types/minimist": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz", - "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==", - "dev": true - }, "node_modules/@types/node": { "version": "18.0.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz", "integrity": "sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==" }, - "node_modules/@types/normalize-package-data": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", - "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", - "dev": true - }, "node_modules/@types/prop-types": { "version": "15.7.5", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", @@ -5599,15 +5597,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/asn1.js": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", @@ -6482,36 +6471,6 @@ "tslib": "^2.0.3" } }, - "node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/camelcase-keys": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz", - "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==", - "dev": true, - "dependencies": { - "camelcase": "^6.3.0", - "map-obj": "^4.1.0", - "quick-lru": "^5.1.1", - "type-fest": "^1.2.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/caniuse-lite": { "version": "1.0.30001609", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001609.tgz", @@ -7234,12 +7193,12 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz", - "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", + "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", "dev": true, "engines": { - "node": ">=12.22" + "node": ">=12 || >=16" } }, "node_modules/css-has-pseudo": { @@ -7487,40 +7446,6 @@ } } }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decamelize-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", - "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", - "dev": true, - "dependencies": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decamelize-keys/node_modules/map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/deep-equal": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.1.0.tgz", @@ -9391,9 +9316,9 @@ } }, "node_modules/flatted": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==" }, "node_modules/fn.name": { "version": "1.1.0", @@ -9816,15 +9741,6 @@ "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", "dev": true }, - "node_modules/hard-rejection": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", - "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -10064,18 +9980,6 @@ "react-is": "^16.7.0" } }, - "node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/html-dom-parser": { "version": "5.0.6", "resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.6.tgz", @@ -10405,9 +10309,9 @@ ] }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "engines": { "node": ">= 4" } @@ -10782,15 +10686,6 @@ "node": ">=8" } }, - "node_modules/is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-plain-object": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", @@ -11619,6 +11514,12 @@ "node": ">=4" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -11709,6 +11610,15 @@ "node": ">=8.5.0" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -11719,9 +11629,9 @@ } }, "node_modules/known-css-properties": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.27.0.tgz", - "integrity": "sha512-uMCj6+hZYDoffuvAJjFAPz56E9uoowFHmTkqRtRq5WyC5Q6Cu/fTZKNQpX/RbzChBYLLl3lo8CjFZBAZXq9qFg==", + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.30.0.tgz", + "integrity": "sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==", "dev": true }, "node_modules/kuler": { @@ -12382,18 +12292,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/map-obj": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", - "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/mathml-tag-names": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", @@ -12452,81 +12350,12 @@ "dev": true }, "node_modules/meow": { - "version": "10.1.5", - "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz", - "integrity": "sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==", - "dev": true, - "dependencies": { - "@types/minimist": "^1.2.2", - "camelcase-keys": "^7.0.0", - "decamelize": "^5.0.0", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "4.1.0", - "normalize-package-data": "^3.0.2", - "read-pkg-up": "^8.0.0", - "redent": "^4.0.0", - "trim-newlines": "^4.0.2", - "type-fest": "^1.2.2", - "yargs-parser": "^20.2.9" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/decamelize": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz", - "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz", + "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==", "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/indent-string": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", - "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/redent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz", - "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==", - "dev": true, - "dependencies": { - "indent-string": "^5.0.0", - "strip-indent": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/meow/node_modules/strip-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz", - "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==", - "dev": true, - "dependencies": { - "min-indent": "^1.0.1" - }, - "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -12676,20 +12505,6 @@ "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, - "node_modules/minimist-options": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", - "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", - "dev": true, - "dependencies": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", - "kind-of": "^6.0.3" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/minipass": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", @@ -12736,9 +12551,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "funding": [ { "type": "github", @@ -12850,36 +12665,6 @@ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==" }, - "node_modules/normalize-package-data": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", - "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^4.0.1", - "is-core-module": "^2.5.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -13651,9 +13436,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "funding": [ { "type": "opencollective", @@ -13669,9 +13454,9 @@ } ], "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -14332,7 +14117,7 @@ "node_modules/postcss-media-query-parser": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", - "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", "dev": true }, "node_modules/postcss-modules-extract-imports": { @@ -14659,25 +14444,35 @@ "dev": true }, "node_modules/postcss-safe-parser": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", - "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz", + "integrity": "sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss-safe-parser" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "engines": { - "node": ">=12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" + "node": ">=18.0" }, "peerDependencies": { - "postcss": "^8.3.3" + "postcss": "^8.4.31" } }, "node_modules/postcss-scss": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.7.tgz", - "integrity": "sha512-xPv2GseoyXPa58Nro7M73ZntttusuCmZdeOojUFR5PZDz2BR62vfYx1w9TyOnp1+nYFowgOMipsCBhxzVkAEPw==", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", + "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", "funding": [ { "type": "opencollective", @@ -14696,7 +14491,7 @@ "node": ">=12.0" }, "peerDependencies": { - "postcss": "^8.4.19" + "postcss": "^8.4.29" } }, "node_modules/postcss-selector-not": { @@ -14719,9 +14514,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.13", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", - "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", + "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -15111,18 +14906,6 @@ "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", "dev": true }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -15300,111 +15083,6 @@ "node": ">=0.10.0" } }, - "node_modules/read-pkg": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz", - "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==", - "dev": true, - "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^3.0.2", - "parse-json": "^5.2.0", - "type-fest": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz", - "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==", - "dev": true, - "dependencies": { - "find-up": "^5.0.0", - "read-pkg": "^6.0.0", - "type-fest": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/readable-stream": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.1.tgz", @@ -16211,9 +15889,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "engines": { "node": ">=0.10.0" } @@ -16255,38 +15933,6 @@ "os-shim": "^0.1.2" } }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", - "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==", - "dev": true - }, "node_modules/stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", @@ -16550,12 +16196,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/style-search": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", - "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=", - "dev": true - }, "node_modules/style-to-js": { "version": "1.1.10", "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.10.tgz", @@ -16573,47 +16213,46 @@ } }, "node_modules/stylelint": { - "version": "15.10.2", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.2.tgz", - "integrity": "sha512-UxqSb3hB74g4DTO45QhUHkJMjKKU//lNUAOWyvPBVPZbCknJ5HjOWWZo+UDuhHa9FLeVdHBZXxu43eXkjyIPWg==", + "version": "16.3.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.3.1.tgz", + "integrity": "sha512-/JOwQnBvxEKOT2RtNgGpBVXnCSMBgKOL2k7w0K52htwCyJls4+cHvc4YZgXlVoAZS9QJd2DgYAiRnja96pTgxw==", "dev": true, "dependencies": { - "@csstools/css-parser-algorithms": "^2.3.0", - "@csstools/css-tokenizer": "^2.1.1", - "@csstools/media-query-list-parser": "^2.1.2", - "@csstools/selector-specificity": "^3.0.0", + "@csstools/css-parser-algorithms": "^2.6.1", + "@csstools/css-tokenizer": "^2.2.4", + "@csstools/media-query-list-parser": "^2.1.9", + "@csstools/selector-specificity": "^3.0.2", + "@dual-bundle/import-meta-resolve": "^4.0.0", "balanced-match": "^2.0.0", "colord": "^2.9.3", - "cosmiconfig": "^8.2.0", - "css-functions-list": "^3.2.0", + "cosmiconfig": "^9.0.0", + "css-functions-list": "^3.2.1", "css-tree": "^2.3.1", "debug": "^4.3.4", - "fast-glob": "^3.3.0", + "fast-glob": "^3.3.2", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", "html-tags": "^3.3.1", - "ignore": "^5.2.4", - "import-lazy": "^4.0.0", + "ignore": "^5.3.1", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.27.0", + "known-css-properties": "^0.30.0", "mathml-tag-names": "^2.1.3", - "meow": "^10.1.5", + "meow": "^13.2.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.25", + "postcss": "^8.4.38", "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^6.0.0", - "postcss-selector-parser": "^6.0.13", + "postcss-safe-parser": "^7.0.0", + "postcss-selector-parser": "^6.0.16", "postcss-value-parser": "^4.2.0", "resolve-from": "^5.0.0", "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "style-search": "^0.1.0", + "strip-ansi": "^7.1.0", "supports-hyperlinks": "^3.0.0", "svg-tags": "^1.0.0", "table": "^6.8.1", @@ -16623,7 +16262,7 @@ "stylelint": "bin/stylelint.mjs" }, "engines": { - "node": "^14.13.1 || >=16.0.0" + "node": ">=18.12.0" }, "funding": { "type": "opencollective", @@ -16631,30 +16270,33 @@ } }, "node_modules/stylelint-config-recommended": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-13.0.0.tgz", - "integrity": "sha512-EH+yRj6h3GAe/fRiyaoO2F9l9Tgg50AOFhaszyfov9v6ayXJ1IkSHwTxd7lB48FmOeSGDPLjatjO11fJpmarkQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.0.tgz", + "integrity": "sha512-jSkx290CglS8StmrLp2TxAppIajzIBZKYm3IxT89Kg6fGlxbPiTiyH9PS5YUuVAFwaJLl1ikiXX0QWjI0jmgZQ==", "dev": true, "engines": { - "node": "^14.13.1 || >=16.0.0" + "node": ">=18.12.0" }, "peerDependencies": { - "stylelint": "^15.10.0" + "stylelint": "^16.0.0" } }, "node_modules/stylelint-config-recommended-scss": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-13.0.0.tgz", - "integrity": "sha512-7AmMIsHTsuwUQm7I+DD5BGeIgCvqYZ4BpeYJJpb1cUXQwrJAKjA+GBotFZgUEGP8lAM+wmd91ovzOi8xfAyWEw==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.0.0.tgz", + "integrity": "sha512-HDvpoOAQ1RpF+sPbDOT2Q2/YrBDEJDnUymmVmZ7mMCeNiFSdhRdyGEimBkz06wsN+HaFwUh249gDR+I9JR7Onw==", "dev": true, "dependencies": { - "postcss-scss": "^4.0.7", - "stylelint-config-recommended": "^13.0.0", - "stylelint-scss": "^5.1.0" + "postcss-scss": "^4.0.9", + "stylelint-config-recommended": "^14.0.0", + "stylelint-scss": "^6.0.0" + }, + "engines": { + "node": ">=18.12.0" }, "peerDependencies": { "postcss": "^8.3.3", - "stylelint": "^15.10.0" + "stylelint": "^16.0.2" }, "peerDependenciesMeta": { "postcss": { @@ -16663,32 +16305,35 @@ } }, "node_modules/stylelint-config-standard": { - "version": "34.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-34.0.0.tgz", - "integrity": "sha512-u0VSZnVyW9VSryBG2LSO+OQTjN7zF9XJaAJRX/4EwkmU0R2jYwmBSN10acqZisDitS0CLiEiGjX7+Hrq8TAhfQ==", + "version": "36.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-36.0.0.tgz", + "integrity": "sha512-3Kjyq4d62bYFp/Aq8PMKDwlgUyPU4nacXsjDLWJdNPRUgpuxALu1KnlAHIj36cdtxViVhXexZij65yM0uNIHug==", "dev": true, "dependencies": { - "stylelint-config-recommended": "^13.0.0" + "stylelint-config-recommended": "^14.0.0" }, "engines": { - "node": "^14.13.1 || >=16.0.0" + "node": ">=18.12.0" }, "peerDependencies": { - "stylelint": "^15.10.0" + "stylelint": "^16.1.0" } }, "node_modules/stylelint-config-standard-scss": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-11.0.0.tgz", - "integrity": "sha512-fGE79NBOLg09a9afqGH/guJulRULCaQWWv4cv1v2bMX92B+fGb0y56WqIguwvFcliPmmUXiAhKrrnXilIeXoHA==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-13.1.0.tgz", + "integrity": "sha512-Eo5w7/XvwGHWkeGLtdm2FZLOMYoZl1omP2/jgFCXyl2x5yNz7/8vv4Tj6slHvMSSUNTaGoam/GAZ0ZhukvalfA==", "dev": true, "dependencies": { - "stylelint-config-recommended-scss": "^13.0.0", - "stylelint-config-standard": "^34.0.0" + "stylelint-config-recommended-scss": "^14.0.0", + "stylelint-config-standard": "^36.0.0" + }, + "engines": { + "node": ">=18.12.0" }, "peerDependencies": { "postcss": "^8.3.3", - "stylelint": "^15.10.0" + "stylelint": "^16.3.1" }, "peerDependenciesMeta": { "postcss": { @@ -16697,81 +16342,85 @@ } }, "node_modules/stylelint-declaration-block-no-ignored-properties": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/stylelint-declaration-block-no-ignored-properties/-/stylelint-declaration-block-no-ignored-properties-2.7.0.tgz", - "integrity": "sha512-44SpI9+9Oc1ICuwwRfwS/3npQ2jPobDSTnwWdNgZGryGqQCp17CgEIWjCv1BgUOSzND3RqywNCNLKvO1AOxbfg==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/stylelint-declaration-block-no-ignored-properties/-/stylelint-declaration-block-no-ignored-properties-2.8.0.tgz", + "integrity": "sha512-Ws8Cav7Y+SPN0JsV407LrnNXWOrqGjxShf+37GBtnU/C58Syve9c0+I/xpLcFOosST3ternykn3Lp77f3ITnFw==", "dev": true, "engines": { "node": ">=6" }, "peerDependencies": { - "stylelint": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0" + "stylelint": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, "node_modules/stylelint-high-performance-animation": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/stylelint-high-performance-animation/-/stylelint-high-performance-animation-1.8.0.tgz", - "integrity": "sha512-wxHt+F7Z54mtGZpbdMwUtpfQwr81uiml39EFCCdZAbVnEO7Wl0Mh5ncmgbxH42xpB5z79eIgHI62qtKfUmWzhg==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/stylelint-high-performance-animation/-/stylelint-high-performance-animation-1.10.0.tgz", + "integrity": "sha512-YzNI+E6taN8pwgaM0INazRg4tw23VA17KNMKUVdOeohpnpSyJLBnLVT9NkRcaCFLodK/67smS5VZK+Qe4Ohrvw==", "dev": true, "dependencies": { "postcss-value-parser": "^4.2.0" }, "peerDependencies": { - "stylelint": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0" + "stylelint": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, "node_modules/stylelint-order": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-6.0.3.tgz", - "integrity": "sha512-1j1lOb4EU/6w49qZeT2SQVJXm0Ht+Qnq9GMfUa3pMwoyojIWfuA+JUDmoR97Bht1RLn4ei0xtLGy87M7d29B1w==", + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-6.0.4.tgz", + "integrity": "sha512-0UuKo4+s1hgQ/uAxlYU4h0o0HS4NiQDud0NAUNI0aa8FJdmYHA5ZZTFHiV5FpmE3071e9pZx5j0QpVJW5zOCUA==", "dev": true, "dependencies": { - "postcss": "^8.4.21", + "postcss": "^8.4.32", "postcss-sorting": "^8.0.2" }, "peerDependencies": { - "stylelint": "^14.0.0 || ^15.0.0" + "stylelint": "^14.0.0 || ^15.0.0 || ^16.0.1" } }, "node_modules/stylelint-scss": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-5.1.0.tgz", - "integrity": "sha512-E+KlQFXv1Euha43qw3q+wKBSli557wxbbo6/39DWhRNXlUa9Cz+FYrcgz+PT6ag0l6UisCYjAGCNhoSl4FcwlA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.2.1.tgz", + "integrity": "sha512-ZoGLbVb1keZYRVGQlhB8G6sZOoNqw61whzzzGFWp05N12ErqLFfBv3JPrXiMLZaW98sBS7K/vUQhRnvUj4vwdw==", "dev": true, "dependencies": { + "known-css-properties": "^0.29.0", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", - "postcss-selector-parser": "^6.0.13", + "postcss-selector-parser": "^6.0.15", "postcss-value-parser": "^4.2.0" }, + "engines": { + "node": ">=18.12.0" + }, "peerDependencies": { - "stylelint": "^14.5.1 || ^15.0.0" + "stylelint": "^16.0.2" } }, - "node_modules/stylelint/node_modules/balanced-match": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", - "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", + "node_modules/stylelint-scss/node_modules/known-css-properties": { + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", "dev": true }, - "node_modules/stylelint/node_modules/cosmiconfig": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz", - "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==", + "node_modules/stylelint/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, - "dependencies": { - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "parse-json": "^5.0.0", - "path-type": "^4.0.0" - }, "engines": { - "node": ">=14" + "node": ">=12" }, "funding": { - "url": "https://github.com/sponsors/d-fischer" + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, + "node_modules/stylelint/node_modules/balanced-match": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", + "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", + "dev": true + }, "node_modules/stylelint/node_modules/css-tree": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", @@ -16785,6 +16434,31 @@ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" } }, + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/stylelint/node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, "node_modules/stylelint/node_modules/globby": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", @@ -16829,6 +16503,21 @@ "node": ">=8" } }, + "node_modules/stylelint/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/super-simple-web-server": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/super-simple-web-server/-/super-simple-web-server-1.1.4.tgz", @@ -17440,18 +17129,6 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", "dev": true }, - "node_modules/trim-newlines": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz", - "integrity": "sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/triple-beam": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", @@ -17638,18 +17315,6 @@ "node": ">= 0.8.0" } }, - "node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -17969,16 +17634,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -18549,15 +18204,6 @@ "node": ">=12" } }, - "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/yargs/node_modules/yargs-parser": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", diff --git a/package.json b/package.json index 2f79d8782..1db0d467b 100644 --- a/package.json +++ b/package.json @@ -113,12 +113,12 @@ "prettier": "^3.0.1", "process": "^0.11.10", "sass-loader": "^14.0.0", - "stylelint": "^15.0.0", - "stylelint-config-standard-scss": "^11.0.0", - "stylelint-declaration-block-no-ignored-properties": "^2.7.0", - "stylelint-high-performance-animation": "^1.8.0", - "stylelint-order": "^6.0.3", - "stylelint-scss": "^5.0.0", + "stylelint": "^16.0.0", + "stylelint-config-standard-scss": "^13.0.0", + "stylelint-declaration-block-no-ignored-properties": "^2.8.0", + "stylelint-high-performance-animation": "^1.9.0", + "stylelint-order": "^6.0.4", + "stylelint-scss": "^6.0.0", "svg-inline-loader": "^0.8.0", "svg-sprite": "https://github.com/svg-sprite/svg-sprite/archive/refs/tags/v3.0.0-beta3.tar.gz", "ts-loader": "^9.4.2", From fa292d1689d55acc6e71cd26937c3051d6822a56 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 12 Apr 2024 14:28:25 +0300 Subject: [PATCH 22/27] UHF-9844: Fix visual regression tests --- .github/workflows/visual.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/visual.yml b/.github/workflows/visual.yml index 801cfea44..42fc5c119 100644 --- a/.github/workflows/visual.yml +++ b/.github/workflows/visual.yml @@ -24,6 +24,9 @@ jobs: - name: Set theme folder run: echo "THEME_FOLDER=$DRUPAL_ROOT/public/themes/contrib/$THEME_NAME" >> $GITHUB_ENV + - name: Update + run: sudo apt update + - name: Clone platform run: | git clone --depth=1 https://github.com/City-of-Helsinki/drupal-helfi-platform.git $DRUPAL_ROOT From 1ba306cbc514422a1f7eabe61bd8aae6793d9608 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:38:23 +0000 Subject: [PATCH 23/27] Update hasura/comment-progress action to v2.3.0 --- .github/workflows/visual.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/visual.yml b/.github/workflows/visual.yml index 42fc5c119..b13229348 100644 --- a/.github/workflows/visual.yml +++ b/.github/workflows/visual.yml @@ -142,7 +142,7 @@ jobs: destination_dir: pull/${{github.event.number}} - name: Update comment - uses: hasura/comment-progress@v2.2.0 + uses: hasura/comment-progress@v2.3.0 if: github.ref != 'refs/heads/main' with: github-token: ${{ secrets.GITHUB_TOKEN }} From a3edfd7fb5f830ff9fecf337a750793b2c66e993 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:38:39 +0000 Subject: [PATCH 24/27] Update dependency css-loader to v7 --- package-lock.json | 55 +++++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index a51f12b92..a46ecb073 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,7 +70,7 @@ "copy-webpack-plugin": "^12.0.0", "crypto-browserify": "^3.12.0", "css-declaration-sorter": "^7.0.3", - "css-loader": "^6.5.0", + "css-loader": "^7.0.0", "dotenv": "^16.3.1", "eslint": "^8.52.0", "eslint-config-airbnb": "^19.0.4", @@ -7229,35 +7229,44 @@ } }, "node_modules/css-loader": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz", - "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.1.tgz", + "integrity": "sha512-OxIR5P2mjO1PSXk44bWuQ8XtMK4dpEqpIyERCx3ewOo3I8EmbcxMPUc5ScLtQfgXtOojoMv57So4V/C02HQLsw==", "dev": true, "dependencies": { "icss-utils": "^5.1.0", - "postcss": "^8.4.7", - "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", - "postcss-modules-scope": "^3.0.0", + "postcss": "^8.4.33", + "postcss-modules-extract-imports": "^3.1.0", + "postcss-modules-local-by-default": "^4.0.5", + "postcss-modules-scope": "^3.2.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.2.0", - "semver": "^7.3.5" + "semver": "^7.5.4" }, "engines": { - "node": ">= 12.13.0" + "node": ">= 18.12.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/webpack" }, "peerDependencies": { - "webpack": "^5.0.0" + "@rspack/core": "0.x || 1.x", + "webpack": "^5.27.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } } }, "node_modules/css-loader/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "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" @@ -14121,9 +14130,9 @@ "dev": true }, "node_modules/postcss-modules-extract-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", + "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", "dev": true, "engines": { "node": "^10 || ^12 || >= 14" @@ -14133,9 +14142,9 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", + "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", "dev": true, "dependencies": { "icss-utils": "^5.0.0", @@ -14150,9 +14159,9 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", + "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.4" diff --git a/package.json b/package.json index e7f81028d..a59b45c37 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "copy-webpack-plugin": "^12.0.0", "crypto-browserify": "^3.12.0", "css-declaration-sorter": "^7.0.3", - "css-loader": "^6.5.0", + "css-loader": "^7.0.0", "dotenv": "^16.3.1", "eslint": "^8.52.0", "eslint-config-airbnb": "^19.0.4", From 07b002f7e15779316503be3546b78efdd778cd00 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:39:11 +0000 Subject: [PATCH 25/27] Update dependency husky to v9 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index a51f12b92..c04690207 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "hds-design-tokens": "^3.3.0", "hds-react": "^3.3.0", "html-react-parser": "^5.0.11", - "husky": "^8.0.0", + "husky": "^9.0.0", "hyphenopoly": "^5.0.0", "jotai": "^2.6.0", "luxon": "^3.3.0", @@ -10243,15 +10243,15 @@ } }, "node_modules/husky": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", - "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", + "version": "9.0.11", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", + "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", "dev": true, "bin": { - "husky": "lib/bin.js" + "husky": "bin.mjs" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/typicode" diff --git a/package.json b/package.json index e7f81028d..a233d2452 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "hds-design-tokens": "^3.3.0", "hds-react": "^3.3.0", "html-react-parser": "^5.0.11", - "husky": "^8.0.0", + "husky": "^9.0.0", "hyphenopoly": "^5.0.0", "jotai": "^2.6.0", "luxon": "^3.3.0", From 53de860c542705c09cc44908f92a6e574d64ed1d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:38:19 +0000 Subject: [PATCH 26/27] UHF-9844: Update dependency node to v18.20.2 --- .nvmrc | 2 +- package-lock.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.nvmrc b/.nvmrc index a9d087399..123b05279 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.19.0 +18.20.2 diff --git a/package-lock.json b/package-lock.json index a51f12b92..d569d1453 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6472,9 +6472,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001609", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001609.tgz", - "integrity": "sha512-JFPQs34lHKx1B5t1EpQpWH4c+29zIyn/haGsbpfq3suuV9v56enjFt23zqijxGTMwy1p/4H2tjnQMY+p1WoAyA==", + "version": "1.0.30001610", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz", + "integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==", "funding": [ { "type": "opencollective", From 5fbcb5c755af014205729059958b722b866589b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 08:40:47 +0000 Subject: [PATCH 27/27] Update peter-evans/create-pull-request action to v6 --- .github/workflows/npm-audit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-audit.yml b/.github/workflows/npm-audit.yml index 549b0b3ea..564fc2480 100644 --- a/.github/workflows/npm-audit.yml +++ b/.github/workflows/npm-audit.yml @@ -36,7 +36,7 @@ jobs: - name: Create Pull Request if: steps.npm_audit.outputs.CREATE_PR == 'true' - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v6 with: committer: GitHub author: actions-bot