npm - @caweb/webpack - Versions diffs - 1.3.26 → 1.3.29 - Mend

@caweb/webpack 1.3.26 → 1.3.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/changelog.txt +9 -0
package/package.json +2 -2
package/plugins/html/changelog.txt +13 -0
package/plugins/html/index.js +13 -6
package/plugins/html/package-lock.json +253 -129
package/plugins/html/package.json +4 -4
package/plugins/html/sample/default.html +2 -2
package/plugins/html/sample/search.html +55 -0
package/plugins/html/sample/structural/branding.html +7 -1
package/plugins/html/sample/structural/search.html +1 -3
package/plugins/html/webpack.config.js +29 -0

package/changelog.txt CHANGED Viewed

@@ -1,3 +1,12 @@
+v1.3.29
+- Updated npm packages
+v1.3.28
+- Updated npm packages
+v1.3.27
+- Updated npm packages
 v1.3.26
 - Updated npm packages

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.3.26",
+  "version": "1.3.29",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "index.js",
   "type": "module",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@caweb/a11y-webpack-plugin": "^1.0.9",
     "@caweb/css-audit-webpack-plugin": "^1.0.12",
-    "@caweb/html-webpack-plugin": "^1.5.27",
+    "@caweb/html-webpack-plugin": "^1.6.1",
     "@caweb/jshint-webpack-plugin": "^2.0.1"
   }
 }

package/plugins/html/changelog.txt CHANGED Viewed

@@ -1,3 +1,16 @@
+v1.6.1
+- Fixed issue with scrolling removing styles when adding scroll-margin-top
+v1.6.0
+- Added new Search Engine Results Page (SERP) template
+- Search Bar now only appears in header when not on SERP page
+v1.5.29
+- Added sanity check before scrolling
+v1.5.28
+- Updated npm packages
 v1.5.27
 - Fixed issues with anchor links being hidden behind header still
 - Updated npm packages

package/plugins/html/index.js CHANGED Viewed

@@ -39,7 +39,7 @@ class CAWebHTMLPlugin extends HtmlWebpackPlugin{
   // we change some of the html-webpack-plugin defaults
   constructor(opts = {}) {
-    let templates = ['blank', 'default'];
+    let templates = ['blank', 'default', 'search'];
     let defaultOptions = {
       title: path.basename( appPath ),
@@ -54,6 +54,7 @@ class CAWebHTMLPlugin extends HtmlWebpackPlugin{
         "viewport": "width=device-width, initial-scale=1.0, maximum-scale=2.0"
       },
       templateParameters: {
+        "template": "default",
         "title": path.basename( appPath ),
         "scheme": "oceanside",
         "logo": "https://caweb.cdt.ca.gov/wp-content/uploads/sites/221/2023/06/caweb-publishing-logo.png"
@@ -65,6 +66,17 @@ class CAWebHTMLPlugin extends HtmlWebpackPlugin{
       defaultOptions.templateParameters.title = opts.title;
     }
+    // if template selection is one of ours
+    if( opts.template && templates.includes(opts.template) ){
+      let template = opts.template;
+      // update template file based on template selection
+      opts.template = path.join( currentPath, 'sample', `${template}.html`);
+      // update default.templateParameters.template to match user options.
+      defaultOptions.templateParameters.template = template;
+    }
+    // if there is a caweb.json file we merge the site data with the templateParameters
     if( fs.existsSync( path.join(appPath, 'caweb.json') ) ){
       let dataFile = JSON.parse( fs.readFileSync( path.join(appPath, 'caweb.json') ) );
@@ -80,11 +92,6 @@ class CAWebHTMLPlugin extends HtmlWebpackPlugin{
     }
-    // select template file based on template selection if template is one of ours
-    if( opts.template && templates.includes(opts.template) ){
-      opts.template = path.join( currentPath, 'sample', `${opts.template}.html`);
-    }
     super(deepmerge(defaultOptions, opts));
   }

package/plugins/html/package-lock.json CHANGED Viewed

@@ -1,19 +1,19 @@
 {
     "name": "@caweb/html-webpack-plugin",
-    "version": "1.5.27",
+    "version": "1.6.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@caweb/html-webpack-plugin",
-            "version": "1.5.27",
+            "version": "1.6.1",
             "license": "ISC",
             "dependencies": {
                 "@caweb/a11y-webpack-plugin": "^1.0.9",
                 "@caweb/css-audit-webpack-plugin": "^1.0.12",
                 "@caweb/jshint-webpack-plugin": "^2.0.1",
-                "@wordpress/scripts": "^30.11.0",
-                "css-minimizer-webpack-plugin": "^7.0.0",
+                "@wordpress/scripts": "^30.12.0",
+                "css-minimizer-webpack-plugin": "^7.0.2",
                 "handlebars-loader": "^1.7.3",
                 "html-webpack-link-type-plugin": "^1.1.1",
                 "html-webpack-plugin": "^5.6.3",
@@ -29,7 +29,7 @@
                 "bootstrap-forced-colors-css": "^1.0.7",
                 "chalk": "^5.4.1",
                 "cross-spawn": "^7.0.6",
-                "fast-xml-parser": "^5.0.7",
+                "fast-xml-parser": "^5.0.8",
                 "mini-css-extract-plugin": "^2.9.2"
             }
         },
@@ -3243,9 +3243,9 @@
             }
         },
         "node_modules/@keyv/serialize": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.0.2.tgz",
-            "integrity": "sha512-+E/LyaAeuABniD/RvUezWVXKpeuvwLEA9//nE9952zBaOdBd2mQ3pPoM8cUe2X6IcMByfuSLzmYqnYshG60+HQ==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.0.3.tgz",
+            "integrity": "sha512-qnEovoOp5Np2JDGonIDL6Ayihw0RhnRh6vxPuHo4RDn1UOzwEo4AeIfpL6UGIrsceWrCMiVPgwRjbHu4vYFc3g==",
             "license": "MIT",
             "dependencies": {
                 "buffer": "^6.0.3"
@@ -3622,9 +3622,9 @@
             }
         },
         "node_modules/@paulirish/trace_engine": {
-            "version": "0.0.39",
-            "resolved": "https://registry.npmjs.org/@paulirish/trace_engine/-/trace_engine-0.0.39.tgz",
-            "integrity": "sha512-2Y/ejHX5DDi5bjfWY/0c/BLVSfQ61Jw1Hy60Hnh0hfEO632D3FVctkzT4Q/lVAdvIPR0bUaok9JDTr1pu/OziA==",
+            "version": "0.0.44",
+            "resolved": "https://registry.npmjs.org/@paulirish/trace_engine/-/trace_engine-0.0.44.tgz",
+            "integrity": "sha512-QjDv5qVaUXd5WZzE2ktKvqtGA17v4HFtj6MROCGkK57AZr9n0ZKgcx7dEFho+5EHZ6V6h1upW2eqheo8C4Y4dA==",
             "license": "BSD-3-Clause",
             "dependencies": {
                 "third-party-web": "latest"
@@ -5106,9 +5106,9 @@
             }
         },
         "node_modules/@wordpress/babel-preset-default": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-8.18.0.tgz",
-            "integrity": "sha512-vx/UVMMqFhVDoLqymH8jmUC/YGq4p5oo2pgp9aqlYWBz/TO4H9LxMxWNGtcpZCagFBR85BeZD/467fO6UOO7Lw==",
+            "version": "8.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-8.19.0.tgz",
+            "integrity": "sha512-SGrQjsqa4BulfOCBw0zDYXnvnMzXUWeWLcdpLHPIGCHArSOrDddlyms5UFoJxVYVeN4aiEHVOoJRhxnamo3HUQ==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
                 "@babel/core": "7.25.7",
@@ -5117,8 +5117,8 @@
                 "@babel/preset-env": "7.25.7",
                 "@babel/preset-typescript": "7.25.7",
                 "@babel/runtime": "7.25.7",
-                "@wordpress/browserslist-config": "^6.18.0",
-                "@wordpress/warning": "^3.18.0",
+                "@wordpress/browserslist-config": "^6.19.0",
+                "@wordpress/warning": "^3.19.0",
                 "browserslist": "^4.21.10",
                 "core-js": "^3.31.0",
                 "react": "^18.3.0"
@@ -5288,9 +5288,9 @@
             }
         },
         "node_modules/@wordpress/base-styles": {
-            "version": "5.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-5.18.0.tgz",
-            "integrity": "sha512-3YUNMVRdV2XmhkSuhicxm51/QG+E5NH3uS15YV3wWf0PKiRQP1L72k037/tkNex9snDpIIBAGFAKfMIj5sP9Jw==",
+            "version": "5.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-5.19.0.tgz",
+            "integrity": "sha512-rDRt2G2H1uRLZGRF/aXe2WZGNJJ2yzBup1VaiYBNRKS7io2YRu54vEYMgh/ll1el5eMN+jO9t4A54Ew/DO470Q==",
             "license": "GPL-2.0-or-later",
             "engines": {
                 "node": ">=18.12.0",
@@ -5298,9 +5298,9 @@
             }
         },
         "node_modules/@wordpress/browserslist-config": {
-            "version": "6.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.18.0.tgz",
-            "integrity": "sha512-GhB3p+qrR2xFITPEMi9/w2KoLhz0uzA+sMwtREr4G5UZ37dmgN3XJN55NYe2ZduT6uZnaCVYskOmXGvmx/EEyw==",
+            "version": "6.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.19.0.tgz",
+            "integrity": "sha512-4UR+T9iAx/qdehuZYZosL30PpPvzRVPncePs6aN0+zh7WbJsW4DZDi4ZXDTln6zJMIAQeHWvN84PTXgfsxyz4w==",
             "license": "GPL-2.0-or-later",
             "engines": {
                 "node": ">=18.12.0",
@@ -5308,9 +5308,9 @@
             }
         },
         "node_modules/@wordpress/dependency-extraction-webpack-plugin": {
-            "version": "6.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-6.18.0.tgz",
-            "integrity": "sha512-OKW8CwbZEU5AoTx+hW00iaWBUywa2xuX5nrJuqYOAMi4OVgjiNqcjUmamAHNPWtw4jvxBbodd78B18BHRtEonQ==",
+            "version": "6.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-6.19.0.tgz",
+            "integrity": "sha512-j23efbWFAVww9SvQ5GXGVXrqWEB+9OdlS+4qT5ojjSkXkUgJMm4bOzaFzIlgRmgGZNc3kpJ/0iIJF0lkK3U6uw==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
                 "json2php": "^0.0.7"
@@ -5330,9 +5330,9 @@
             "license": "BSD"
         },
         "node_modules/@wordpress/e2e-test-utils-playwright": {
-            "version": "1.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils-playwright/-/e2e-test-utils-playwright-1.18.0.tgz",
-            "integrity": "sha512-SGYU724cFM/EmDoTu9pVI+H2PLln9/NIKaxOLLhMhCBqb15nf6VzBU1ux1qHtG6YDA62S+kxO3gyI40amvX6Sg==",
+            "version": "1.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils-playwright/-/e2e-test-utils-playwright-1.19.0.tgz",
+            "integrity": "sha512-oVAymk10VFF6vlhOveDvj6M9wqDbz434pyZ7V7OR2lF1O9A6npi1BJ3RNmKx8ar4J79tNaehr3I9G0B45WCH7Q==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
                 "change-case": "^4.1.2",
@@ -5351,16 +5351,16 @@
             }
         },
         "node_modules/@wordpress/eslint-plugin": {
-            "version": "22.4.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-22.4.0.tgz",
-            "integrity": "sha512-h+QrGdBRI3dnsNjlvCRt7Y9m4btzGcve0PymqmOeckmdEUGjt+6CCz2uS2Mbn8DRx5+1PCBD8SxCv6/J7ek2ow==",
+            "version": "22.5.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-22.5.0.tgz",
+            "integrity": "sha512-hmmPqOnyrSup3zNAk/sZGzURK/2+8EXRIMsX3/34kskhDPeWMYSiNt9pApFZ5dDR0fwlDLSmsOiZpDTCsZic+w==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
                 "@babel/eslint-parser": "7.25.7",
                 "@typescript-eslint/eslint-plugin": "^6.4.1",
                 "@typescript-eslint/parser": "^6.4.1",
-                "@wordpress/babel-preset-default": "^8.18.0",
-                "@wordpress/prettier-config": "^4.18.0",
+                "@wordpress/babel-preset-default": "^8.19.0",
+                "@wordpress/prettier-config": "^4.19.0",
                 "cosmiconfig": "^7.0.0",
                 "eslint-config-prettier": "^8.3.0",
                 "eslint-plugin-import": "^2.25.2",
@@ -5437,9 +5437,9 @@
             }
         },
         "node_modules/@wordpress/jest-console": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-8.18.0.tgz",
-            "integrity": "sha512-PzqkJ86yjDSwufWs4hhmWFvGwIUX/t1ADwxiET8n5/fVzERx67SeHDR6YyBxovO5ruwiK6jpdCQ5F9QAPSGM1Q==",
+            "version": "8.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-8.19.0.tgz",
+            "integrity": "sha512-HwXWaRmrT5bA4rWUnIGJNgqQrF7eeQmHxBN/fy8gcag4Le1/v92EpUjsIAT+lMJVahoqmGbyzkXFdZ2TAvwLtw==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
                 "@babel/runtime": "7.25.7",
@@ -5454,12 +5454,12 @@
             }
         },
         "node_modules/@wordpress/jest-preset-default": {
-            "version": "12.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-12.18.0.tgz",
-            "integrity": "sha512-58kidVChlzC6qtRvt56u40/E4NM1nMvilYBynZwev5rEe7r7AdxL/JRSaHDZaIqz1s0ai5Cej64dWC7gMScMxA==",
+            "version": "12.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-12.19.0.tgz",
+            "integrity": "sha512-WciJ2Qiblxd4Y0ysGgGZPTwGPRfvb+WyRF9zyJ5Oa0a5LpfrSUv8tjx9pOTz2hi30vhj34LFoqpWCcGXJZ56Aw==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
-                "@wordpress/jest-console": "^8.18.0",
+                "@wordpress/jest-console": "^8.19.0",
                 "babel-jest": "29.7.0"
             },
             "engines": {
@@ -5472,9 +5472,9 @@
             }
         },
         "node_modules/@wordpress/npm-package-json-lint-config": {
-            "version": "5.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-5.18.0.tgz",
-            "integrity": "sha512-6pjCa0BteHjfo1bdByKIZYR8Cr2wNwXi2DylgazFSkvpabdFa5X04bDXFZZGHGiZq/MkajiJ8iOTUgckpUjATQ==",
+            "version": "5.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-5.19.0.tgz",
+            "integrity": "sha512-6JrZWHAQbji0k8rf7/fEnDP0Ie5qGBLaA5deMkVTC75HtEoiH+rR+ssVsdvv7+KyerM+5LDP6Aef5rVE7vsteA==",
             "license": "GPL-2.0-or-later",
             "engines": {
                 "node": ">=18.12.0",
@@ -5485,12 +5485,12 @@
             }
         },
         "node_modules/@wordpress/postcss-plugins-preset": {
-            "version": "5.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-5.18.0.tgz",
-            "integrity": "sha512-bdw4wNs/1B/o16tPwZoSCp0Q6yApd4lcAFFFuHKCBWhJjLfVxR1yLRYXcUcANJG72kN5TKrPGPmwxkz2B8lXFA==",
+            "version": "5.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-5.19.0.tgz",
+            "integrity": "sha512-sHQ9rasbQztxG2ZgbZ34G7u94CS0RHcvbQFLqijazlSX6QhAFporJlgzHhyHO+yRFNBHQ+3vvDZCS3BMEjxiOg==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
-                "@wordpress/base-styles": "^5.18.0",
+                "@wordpress/base-styles": "^5.19.0",
                 "autoprefixer": "^10.4.20"
             },
             "engines": {
@@ -5502,9 +5502,9 @@
             }
         },
         "node_modules/@wordpress/prettier-config": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-4.18.0.tgz",
-            "integrity": "sha512-VsFFqSBpMw5u2kq1OTQeSMTUrznnAuZ0Z7+41MOsyJjb9DFX2Yq6k1FcmUhBJWDLEvkunMorSZ7kqhUxHWPR+g==",
+            "version": "4.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-4.19.0.tgz",
+            "integrity": "sha512-mGgPuhIupWln2UX0uqLBfvvEzWFb1r2oRCC5Q3RXNtjDdOnkKIqtJOjCqL8IkCxa0sJmQZUymHKxBnStlQxR0w==",
             "license": "GPL-2.0-or-later",
             "engines": {
                 "node": ">=18.12.0",
@@ -5515,24 +5515,24 @@
             }
         },
         "node_modules/@wordpress/scripts": {
-            "version": "30.11.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-30.11.0.tgz",
-            "integrity": "sha512-Iwu90e8ObphMIu4FqmzRNxWSUq5TtHvgG9/hzj1cIksfyD0PkDO8LHnzehMqpcTCVfADypOXmdMaBBWdkGEqXQ==",
+            "version": "30.12.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-30.12.0.tgz",
+            "integrity": "sha512-+Gxdmf1HEOPrH4LaNeMH7Wngc894zAUt3h9ztlzR46pBiz80xGBJmD54fODC7bnevKbvNojhjWc2iOeM5nRHjQ==",
             "license": "GPL-2.0-or-later",
             "dependencies": {
                 "@babel/core": "7.25.7",
                 "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
                 "@svgr/webpack": "^8.0.1",
-                "@wordpress/babel-preset-default": "^8.18.0",
-                "@wordpress/browserslist-config": "^6.18.0",
-                "@wordpress/dependency-extraction-webpack-plugin": "^6.18.0",
-                "@wordpress/e2e-test-utils-playwright": "^1.18.0",
-                "@wordpress/eslint-plugin": "^22.4.0",
-                "@wordpress/jest-preset-default": "^12.18.0",
-                "@wordpress/npm-package-json-lint-config": "^5.18.0",
-                "@wordpress/postcss-plugins-preset": "^5.18.0",
-                "@wordpress/prettier-config": "^4.18.0",
-                "@wordpress/stylelint-config": "^23.10.0",
+                "@wordpress/babel-preset-default": "^8.19.0",
+                "@wordpress/browserslist-config": "^6.19.0",
+                "@wordpress/dependency-extraction-webpack-plugin": "^6.19.0",
+                "@wordpress/e2e-test-utils-playwright": "^1.19.0",
+                "@wordpress/eslint-plugin": "^22.5.0",
+                "@wordpress/jest-preset-default": "^12.19.0",
+                "@wordpress/npm-package-json-lint-config": "^5.19.0",
+                "@wordpress/postcss-plugins-preset": "^5.19.0",
+                "@wordpress/prettier-config": "^4.19.0",
+                "@wordpress/stylelint-config": "^23.11.0",
                 "adm-zip": "^0.5.9",
                 "babel-jest": "29.7.0",
                 "babel-loader": "9.2.1",
@@ -5812,9 +5812,9 @@
             }
         },
         "node_modules/@wordpress/stylelint-config": {
-            "version": "23.10.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-23.10.0.tgz",
-            "integrity": "sha512-e5NgU5UzZsYvM6+7s1pyAlhsQez/GqD3Eyq9tDwNE8Et51twe9rHSpTL9XbmSoZAMe5m3vGak6ctMwiqs/cj7g==",
+            "version": "23.11.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-23.11.0.tgz",
+            "integrity": "sha512-osq25Nlcnwv4RJggYKnkfRbi6QDRI2O8PDMxVAvicL+JhxjtEqXKBwWaKNULHpc4aEWcGBaJtxJpzEE/7ZagBw==",
             "license": "MIT",
             "dependencies": {
                 "@stylistic/stylelint-plugin": "^3.0.1",
@@ -5830,9 +5830,9 @@
             }
         },
         "node_modules/@wordpress/warning": {
-            "version": "3.18.0",
-            "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.18.0.tgz",
-            "integrity": "sha512-Y58A1D38PJbQzFZXokL+4rACzs5Vp5cZMZc/9J+QOYStJdy/xEDQttbhte2P7kq0yF3EUZDC0QnG8RsIV09WSQ==",
+            "version": "3.19.0",
+            "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-3.19.0.tgz",
+            "integrity": "sha512-hxRGkyKC+Ey7fPeiIX59gtYxYHNo2wTbvC3eqMmRI6ywTnJgHMwdx4Tih6Y/F3KimZU6t5Gm9+UWsLhUujOHDw==",
             "license": "GPL-2.0-or-later",
             "engines": {
                 "node": ">=18.12.0",
@@ -6783,13 +6783,13 @@
             }
         },
         "node_modules/bare-os": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.4.0.tgz",
-            "integrity": "sha512-9Ous7UlnKbe3fMi7Y+qh0DwAup6A1JkYgPnjvMDNOlmnxNRQvQ/7Nst+OnUQKzk0iAT0m9BisbDVp9gCv8+ETA==",
+            "version": "3.5.1",
+            "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.5.1.tgz",
+            "integrity": "sha512-LvfVNDcWLw2AnIw5f2mWUgumW3I3N/WYGiWeimhQC1Ybt71n2FjlS9GJKeCnFeg1MKZHxzIFmpFnBXDI+sBeFg==",
             "license": "Apache-2.0",
             "optional": true,
             "engines": {
-                "bare": ">=1.6.0"
+                "bare": ">=1.14.0"
             }
         },
         "node_modules/bare-path": {
@@ -8184,9 +8184,9 @@
             }
         },
         "node_modules/csp_evaluator": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/csp_evaluator/-/csp_evaluator-1.1.1.tgz",
-            "integrity": "sha512-N3ASg0C4kNPUaNxt1XAvzHIVuzdtr8KLgfk1O8WDyimp1GisPAHESupArO2ieHk9QWbrJ/WkQODyh21Ps/xhxw==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/csp_evaluator/-/csp_evaluator-1.1.5.tgz",
+            "integrity": "sha512-EL/iN9etCTzw/fBnp0/uj0f5BOOGvZut2mzsiiBZ/FdT6gFQCKRO/tmcKOxn5drWZ2Ndm/xBb1SI4zwWbGtmIw==",
             "license": "Apache-2.0"
         },
         "node_modules/css-declaration-sorter": {
@@ -8258,15 +8258,15 @@
             }
         },
         "node_modules/css-minimizer-webpack-plugin": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-7.0.0.tgz",
-            "integrity": "sha512-niy66jxsQHqO+EYbhPuIhqRQ1mNcNVUHrMnkzzir9kFOERJUaQDDRhh7dKDz33kBpkWMF9M8Vx0QlDbc5AHOsw==",
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-7.0.2.tgz",
+            "integrity": "sha512-nBRWZtI77PBZQgcXMNqiIXVshiQOVLGSf2qX/WZfG8IQfMbeHUMXaBWQmiiSTmPJUflQxHjZjzAmuyO7tpL2Jg==",
             "license": "MIT",
             "dependencies": {
                 "@jridgewell/trace-mapping": "^0.3.25",
-                "cssnano": "^7.0.1",
+                "cssnano": "^7.0.4",
                 "jest-worker": "^29.7.0",
-                "postcss": "^8.4.38",
+                "postcss": "^8.4.40",
                 "schema-utils": "^4.2.0",
                 "serialize-javascript": "^6.0.2"
             },
@@ -9446,9 +9446,9 @@
             "license": "MIT"
         },
         "node_modules/devtools-protocol": {
-            "version": "0.0.1312386",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
-            "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+            "version": "0.0.1423531",
+            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1423531.tgz",
+            "integrity": "sha512-z6cOcajZWxk80zvFnkTGa7tj3oqF+C5SnOF1KSMeAr5/WW/nLNHlEpKr7voSzMz8IaUoq5rjdI0Mqv5k/BUkhg==",
             "license": "BSD-3-Clause"
         },
         "node_modules/diff-sequences": {
@@ -11183,9 +11183,9 @@
             "license": "BSD-3-Clause"
         },
         "node_modules/fast-xml-parser": {
-            "version": "5.0.7",
-            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.0.7.tgz",
-            "integrity": "sha512-hRgQW2Az3ASwFo7wqBM2Uq9LcLoOVhGhE/yhjsIfd4gdDk0pqwKTHOSQYO1Zf7Nl/7Th2ykdmkPNntCfq3gBFg==",
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.0.8.tgz",
+            "integrity": "sha512-qY8NiI5L8ff00F2giyICiJxSSKHO52tC36LJqx2JtvGyAd5ZfehC/l4iUVVHpmpIa6sM9N5mneSLHQG2INGoHA==",
             "dev": true,
             "funding": [
                 {
@@ -11195,7 +11195,7 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "strnum": "^2.0.4"
+                "strnum": "^2.0.5"
             },
             "bin": {
                 "fxparser": "src/cli/cli.js"
@@ -11492,9 +11492,9 @@
             }
         },
         "node_modules/flatted": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
-            "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
             "license": "ISC"
         },
         "node_modules/follow-redirects": {
@@ -12247,9 +12247,9 @@
             }
         },
         "node_modules/hookified": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.7.0.tgz",
-            "integrity": "sha512-XQdMjqC1AyeOzfs+17cnIk7Wdfu1hh2JtcyNfBf5u9jHrT3iZUlGHxLTntFBuk5lwkqJ6l3+daeQdHK5yByHVA==",
+            "version": "1.7.1",
+            "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.7.1.tgz",
+            "integrity": "sha512-OXcdHsXeOiD7OJ5zvWj8Oy/6RCdLwntAX+wUrfemNcMGn6sux4xbEHi2QXwqePYhjQ/yvxxq2MvCRirdlHscBw==",
             "license": "MIT"
         },
         "node_modules/hosted-git-info": {
@@ -15165,18 +15165,18 @@
             }
         },
         "node_modules/lighthouse": {
-            "version": "12.3.0",
-            "resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-12.3.0.tgz",
-            "integrity": "sha512-OaLE8DasnwQkn2CBo2lKtD+IQv42mNP3T+Vaw29I++rAh0Zpgc6SM15usdIYyzhRMR5EWFxze5Fyb+HENJSh2A==",
+            "version": "12.4.0",
+            "resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-12.4.0.tgz",
+            "integrity": "sha512-1p/YKQpMqfYVSKVOB43RG3xbnxkSUOG0zqVm/bxJHAaAHKrEACgFi8HZxD9CCTFrt+d/Q/x9gjDyeUDarm1SIg==",
             "license": "Apache-2.0",
             "dependencies": {
-                "@paulirish/trace_engine": "0.0.39",
+                "@paulirish/trace_engine": "0.0.44",
                 "@sentry/node": "^7.0.0",
                 "axe-core": "^4.10.2",
                 "chrome-launcher": "^1.1.2",
                 "configstore": "^5.0.1",
-                "csp_evaluator": "1.1.1",
-                "devtools-protocol": "0.0.1312386",
+                "csp_evaluator": "1.1.5",
+                "devtools-protocol": "0.0.1423531",
                 "enquirer": "^2.3.6",
                 "http-link-header": "^1.1.1",
                 "intl-messageformat": "^10.5.3",
@@ -15189,11 +15189,11 @@
                 "metaviewport-parser": "0.3.0",
                 "open": "^8.4.0",
                 "parse-cache-control": "1.0.1",
-                "puppeteer-core": "^23.10.4",
+                "puppeteer-core": "^24.3.0",
                 "robots-parser": "^3.0.1",
                 "semver": "^5.3.0",
                 "speedline-core": "^1.4.3",
-                "third-party-web": "^0.26.1",
+                "third-party-web": "^0.26.5",
                 "tldts-icann": "^6.1.16",
                 "ws": "^7.0.0",
                 "yargs": "^17.3.1",
@@ -15239,6 +15239,96 @@
             "integrity": "sha512-Ug8feS/A+92TMTCK6yHYLwaFMuelK/hAKRMdldYkMNwv+d9PtWxjXEg6rwKtsUXTADajhdrhXyuNCJ5/sfmPFw==",
             "license": "Apache-2.0"
         },
+        "node_modules/lighthouse/node_modules/@puppeteer/browsers": {
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.7.1.tgz",
+            "integrity": "sha512-MK7rtm8JjaxPN7Mf1JdZIZKPD2Z+W7osvrC1vjpvfOX1K0awDIHYbNi89f7eotp7eMUn2shWnt03HwVbriXtKQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "debug": "^4.4.0",
+                "extract-zip": "^2.0.1",
+                "progress": "^2.0.3",
+                "proxy-agent": "^6.5.0",
+                "semver": "^7.7.0",
+                "tar-fs": "^3.0.8",
+                "yargs": "^17.7.2"
+            },
+            "bin": {
+                "browsers": "lib/cjs/main-cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/lighthouse/node_modules/@puppeteer/browsers/node_modules/semver": {
+            "version": "7.7.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/lighthouse/node_modules/puppeteer-core": {
+            "version": "24.3.0",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.3.0.tgz",
+            "integrity": "sha512-x8kQRP/xxtiFav6wWuLzrctO0HWRpSQy+JjaHbqIl+d5U2lmRh2pY9vh5AzDFN0EtOXW2pzngi9RrryY1vZGig==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@puppeteer/browsers": "2.7.1",
+                "chromium-bidi": "2.0.0",
+                "debug": "^4.4.0",
+                "devtools-protocol": "0.0.1402036",
+                "typed-query-selector": "^2.12.0",
+                "ws": "^8.18.1"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/lighthouse/node_modules/puppeteer-core/node_modules/chromium-bidi": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-2.0.0.tgz",
+            "integrity": "sha512-8VmyVj0ewSY4pstZV0Y3rCUUwpomam8uWgHZf1XavRxJEP4vU9/dcpNuoyB+u4AQxPo96CASXz5CHPvdH+dSeQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "mitt": "^3.0.1",
+                "zod": "^3.24.1"
+            },
+            "peerDependencies": {
+                "devtools-protocol": "*"
+            }
+        },
+        "node_modules/lighthouse/node_modules/puppeteer-core/node_modules/devtools-protocol": {
+            "version": "0.0.1402036",
+            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1402036.tgz",
+            "integrity": "sha512-JwAYQgEvm3yD45CHB+RmF5kMbWtXBaOGwuxa87sZogHcLCv8c/IqnThaoQ1y60d7pXWjSKWQphPEc+1rAScVdg==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/lighthouse/node_modules/puppeteer-core/node_modules/ws": {
+            "version": "8.18.1",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+            "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": ">=5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/lighthouse/node_modules/semver": {
             "version": "5.7.2",
             "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
@@ -15248,6 +15338,31 @@
                 "semver": "bin/semver"
             }
         },
+        "node_modules/lighthouse/node_modules/tar-fs": {
+            "version": "3.0.8",
+            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.8.tgz",
+            "integrity": "sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==",
+            "license": "MIT",
+            "dependencies": {
+                "pump": "^3.0.0",
+                "tar-stream": "^3.1.5"
+            },
+            "optionalDependencies": {
+                "bare-fs": "^4.0.1",
+                "bare-path": "^3.0.0"
+            }
+        },
+        "node_modules/lighthouse/node_modules/tar-stream": {
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+            "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+            "license": "MIT",
+            "dependencies": {
+                "b4a": "^1.6.4",
+                "fast-fifo": "^1.2.0",
+                "streamx": "^2.15.0"
+            }
+        },
         "node_modules/lighthouse/node_modules/ws": {
             "version": "7.5.10",
             "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
@@ -15269,6 +15384,15 @@
                 }
             }
         },
+        "node_modules/lighthouse/node_modules/zod": {
+            "version": "3.24.2",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz",
+            "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/colinhacks"
+            }
+        },
         "node_modules/lilconfig": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
@@ -17207,9 +17331,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.5.2",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
-            "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
+            "version": "8.5.3",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+            "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -20168,9 +20292,9 @@
             }
         },
         "node_modules/strnum": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.0.4.tgz",
-            "integrity": "sha512-qrXhLMohxtEPKMlajtNaOp5zvAQUo6L3fNcdiJKzWH98kGfklqGwmxhFjM7DzxsuoVM7rJeiYr+lEcu4Jlu9UQ==",
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.0.5.tgz",
+            "integrity": "sha512-YAT3K/sgpCUxhxNMrrdhtod3jckkpYwH6JAuwmUdXZsmzH1wUyzTMrrK2wYCEEqlKwrWDd35NeuUkbBy/1iK+Q==",
             "dev": true,
             "funding": [
                 {
@@ -20203,9 +20327,9 @@
             }
         },
         "node_modules/stylelint": {
-            "version": "16.14.1",
-            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.14.1.tgz",
-            "integrity": "sha512-oqCL7AC3786oTax35T/nuLL8p2C3k/8rHKAooezrPGRvUX0wX+qqs5kMWh5YYT4PHQgVDobHT4tw55WgpYG6Sw==",
+            "version": "16.15.0",
+            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.15.0.tgz",
+            "integrity": "sha512-OK6Rs7EPdcdmjqiDycadZY4fw3f5/TC1X6/tGjnF3OosbwCeNs7nG+79MCAtjEg7ckwqTJTsku08e0Rmaz5nUw==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -20231,7 +20355,7 @@
                 "debug": "^4.3.7",
                 "fast-glob": "^3.3.3",
                 "fastest-levenshtein": "^1.0.16",
-                "file-entry-cache": "^10.0.5",
+                "file-entry-cache": "^10.0.6",
                 "global-modules": "^2.0.0",
                 "globby": "^11.1.0",
                 "globjoin": "^0.1.4",
@@ -20245,14 +20369,14 @@
                 "micromatch": "^4.0.8",
                 "normalize-path": "^3.0.0",
                 "picocolors": "^1.1.1",
-                "postcss": "^8.5.1",
+                "postcss": "^8.5.3",
                 "postcss-resolve-nested-selector": "^0.1.6",
                 "postcss-safe-parser": "^7.0.1",
-                "postcss-selector-parser": "^7.0.0",
+                "postcss-selector-parser": "^7.1.0",
                 "postcss-value-parser": "^4.2.0",
                 "resolve-from": "^5.0.0",
                 "string-width": "^4.2.3",
-                "supports-hyperlinks": "^3.1.0",
+                "supports-hyperlinks": "^3.2.0",
                 "svg-tags": "^1.0.0",
                 "table": "^6.9.0",
                 "write-file-atomic": "^5.0.1"
@@ -20310,9 +20434,9 @@
             }
         },
         "node_modules/stylelint-scss": {
-            "version": "6.11.0",
-            "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.11.0.tgz",
-            "integrity": "sha512-AvJ6LVzz2iXHxPlPTR9WVy73FC/vmohH54VySNlCKX1NIXNAeuzy/VbIkMJLMyw/xKYqkgY4kAgB+qy5BfCaCg==",
+            "version": "6.11.1",
+            "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.11.1.tgz",
+            "integrity": "sha512-e4rYo0UY+BIMtGeGanghrvHTjcryxgZbyFxUedp8dLFqC4P70aawNdYjRrQxbnKhu3BNr4+lt5e/53tcKXiwFA==",
             "license": "MIT",
             "dependencies": {
                 "css-tree": "^3.0.1",
@@ -20321,7 +20445,7 @@
                 "mdn-data": "^2.15.0",
                 "postcss-media-query-parser": "^0.2.3",
                 "postcss-resolve-nested-selector": "^0.1.6",
-                "postcss-selector-parser": "^7.0.0",
+                "postcss-selector-parser": "^7.1.0",
                 "postcss-value-parser": "^4.2.0"
             },
             "engines": {
@@ -20332,9 +20456,9 @@
             }
         },
         "node_modules/stylelint-scss/node_modules/mdn-data": {
-            "version": "2.15.0",
-            "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.15.0.tgz",
-            "integrity": "sha512-KIrS0lFPOqA4DgeO16vI5fkAsy8p++WBlbXtB5P1EQs8ubBgguAInNd1DnrCeTRfGchY0kgThgDOOIPyOLH2dQ==",
+            "version": "2.17.0",
+            "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.17.0.tgz",
+            "integrity": "sha512-VT5LJBdLRI+cc3DPXJD89PGwI8yXuciE5gZJoSPnH4yeGzMPqxwkZv3BjFSoaWpmOlJNBhVT6HKeQPcZKlNEvA==",
             "license": "CC0-1.0"
         },
         "node_modules/stylelint-scss/node_modules/postcss-selector-parser": {
@@ -21034,18 +21158,18 @@
             "license": "MIT"
         },
         "node_modules/tldts-core": {
-            "version": "6.1.77",
-            "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.77.tgz",
-            "integrity": "sha512-bCaqm24FPk8OgBkM0u/SrEWJgHnhBWYqeBo6yUmcZJDCHt/IfyWBb+14CXdGi4RInMv4v7eUAin15W0DoA+Ytg==",
+            "version": "6.1.79",
+            "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.79.tgz",
+            "integrity": "sha512-HM+Ud/2oQuHt4I43Nvjc213Zji/z25NSH5OkJskJwHXNtYh9DTRlHMDFhms9dFMP7qyve/yVaXFIxmcJ7TdOjw==",
             "license": "MIT"
         },
         "node_modules/tldts-icann": {
-            "version": "6.1.77",
-            "resolved": "https://registry.npmjs.org/tldts-icann/-/tldts-icann-6.1.77.tgz",
-            "integrity": "sha512-cE3Z66CjhVHdzS7jqP3N/1jJZynUo4I6Q3JfIRbZnVAdSu5XQxfFnr+O8xz1DboxCdAQV7bwAMUmKOdg34Ke1g==",
+            "version": "6.1.79",
+            "resolved": "https://registry.npmjs.org/tldts-icann/-/tldts-icann-6.1.79.tgz",
+            "integrity": "sha512-R1ZlNnjrZzEkQs2eN1XNdwMgy3ltl+Tb6BkfZExgociOXCfPhLdj8OjXEzNYXwLnX1lHEE9jZgAmE+mbDlo7rw==",
             "license": "MIT",
             "dependencies": {
-                "tldts-core": "^6.1.77"
+                "tldts-core": "^6.1.79"
             }
         },
         "node_modules/tmp": {

package/plugins/html/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@caweb/html-webpack-plugin",
-    "version": "1.5.27",
+    "version": "1.6.1",
     "description": "CAWebPublishing Sample Page and Configurations",
     "main": "index.js",
     "type": "module",
@@ -112,15 +112,15 @@
         "bootstrap-forced-colors-css": "^1.0.7",
         "chalk": "^5.4.1",
         "cross-spawn": "^7.0.6",
-        "fast-xml-parser": "^5.0.7",
+        "fast-xml-parser": "^5.0.8",
         "mini-css-extract-plugin": "^2.9.2"
     },
     "dependencies": {
         "@caweb/a11y-webpack-plugin": "^1.0.9",
         "@caweb/css-audit-webpack-plugin": "^1.0.12",
         "@caweb/jshint-webpack-plugin": "^2.0.1",
-        "@wordpress/scripts": "^30.11.0",
-        "css-minimizer-webpack-plugin": "^7.0.0",
+        "@wordpress/scripts": "^30.12.0",
+        "css-minimizer-webpack-plugin": "^7.0.2",
         "handlebars-loader": "^1.7.3",
         "html-webpack-link-type-plugin": "^1.1.1",
         "html-webpack-plugin": "^5.6.3",

package/plugins/html/sample/default.html CHANGED Viewed

@@ -27,8 +27,8 @@
   </head>
   <body>
       {{> header }}
-      <div id="page-container" class="page-container ">
-          <div id="main-content" class="main-content " tabindex="-1">
+      <div id="page-container" class="page-container">
+          <div id="main-content" class="main-content" tabindex="-1">
             <main class="main-primary">
               {{#if htmlWebpackPlugin.options.templateParameters.bodyHtmlSnippet }}
               {{{ htmlWebpackPlugin.options.templateParameters.bodyHtmlSnippet }}}

package/plugins/html/sample/search.html ADDED Viewed

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>{{ title }}</title>
+    {{#if scheme }}
+      <!-- Icon Font Library -->
+      <link rel="stylesheet" href="node_modules/@caweb/html-webpack-plugin/build/font-only.css" />
+      <!-- Template Scheme CSS -->
+      <link rel="stylesheet" href="node_modules/@caweb/html-webpack-plugin/build/{{ scheme }}.css" />
+    {{/if}}
+    {{#if htmlWebpackPlugin.options.meta }}
+    {{#each htmlWebpackPlugin.options.meta }}
+    <meta name="{{ @key }}" content="{{ this }}">
+    {{/each}}
+    {{/if}}
+    {{#if assets }}
+    {{#each assets }}
+    {{#if (endsWith this ".css") }}
+    <link rel="stylesheet" href="{{ this }}" />
+    {{/if}}
+    {{/each}}
+    {{/if}}
+  </head>
+  <body class="page-template-serp">
+      {{> header  }}
+      <div id="page-container" class="page-container">
+          <div id="main-content" class="main-content" tabindex="-1">
+            <main class="main-primary">
+              <div class="section">
+                <div class="container">
+                  {{> './structural/search.html' }}
+                  <h1>Search results for: </h1>
+                  <gcse:searchresults-only></gcse:searchresults-only>
+                </div>
+              </div>
+            </main>
+          </div>
+      </div>
+      {{> footer }}
+      {{#if scheme }}
+      <script src="node_modules/@caweb/html-webpack-plugin/build/{{ scheme }}.js"></script>
+      {{/if}}
+      {{#if assets }}
+      {{#each assets }}
+      {{#if (endsWith this ".js") }}
+      <script src="{{ this }}"></script>
+      {{/if}}
+      {{/each}}
+      {{/if}}
+  </body>
+</html>

package/plugins/html/sample/structural/branding.html CHANGED Viewed

@@ -8,7 +8,13 @@
                 {{/if}}
             </a>
         </div>
-        {{> './search.html' }}
+        {{#if google.search  }}
+        {{#ifCond 'search' '!==' htmlWebpackPlugin.options.templateParameters.template }}
+            {{> './search.html' }}
+        {{/ifCond}}
+        {{/if}}
         <button class="mobile-control toggle-menu ca-gov-icon-menu fs-2" data-bs-toggle="collapse" data-bs-target=".mobile-controlled" aria-expanded="false" aria-controls="mobile-controls" aria-label="Open the navigation menu">
         </button>
     </div>

package/plugins/html/sample/structural/search.html CHANGED Viewed

@@ -1,4 +1,3 @@
-{{#if google.search }}
 <!-- Search -->
 <div class="search-container">
     <form action="/serp.html" role="search">
@@ -11,5 +10,4 @@
             </button>
         </div>
     </form>
-</div>
-{{/if}}
+</div>

package/plugins/html/webpack.config.js CHANGED Viewed

@@ -268,6 +268,35 @@ if( 'serve' === webpackCommand ){
     ! flagExists('--no-audit') ? new CSSAuditPlugin() : false,
     ! flagExists('--no-a11y') ? new A11yPlugin() : false
   )
+  // we add the SERP (Search Engine Results Page)
+  // if the caweb.json has a google search id
+  if( fs.existsSync( path.join(appPath, 'caweb.json') ) ){
+    let dataFile = JSON.parse( fs.readFileSync( path.join(appPath, 'caweb.json') ) );
+    if( dataFile.site.google.search ){
+      webpackConfig.plugins.push(
+        new CAWebHTMLPlugin({
+          template: 'search',
+          templateParameters: {
+            scheme: 'false' !== scheme ? scheme : false
+          },
+          filename: 'serp.html',
+          title: 'Search Results Page',
+          skipAssets: [
+            /.*-rtl.css/, // we skip the Right-to-Left Styles
+            /css-audit.*/, // we skip the CSSAudit Files
+            /a11y.*/, // we skip the A11y Files
+            /jshint.*/, // we skip the JSHint Files
+            /font-only.*/, // we skip the font-only Files
+          ]
+        })
+      )
+    }
+  }
 }
 /**