@caweb/webpack 1.3.27 → 1.3.29

package/changelog.txt

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.3.27",
+  "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.29",
+    "@caweb/html-webpack-plugin": "^1.6.1",
     "@caweb/jshint-webpack-plugin": "^2.0.1"
   }
 }

package/plugins/html/changelog.txt

@@ -1,3 +1,10 @@
+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 
 

package/plugins/html/index.js

@@ -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

@@ -1,19 +1,19 @@
 {
     "name": "@caweb/html-webpack-plugin",
-    "version": "1.5.29",
+    "version": "1.6.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@caweb/html-webpack-plugin",
-            "version": "1.5.29",
+            "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.12.0",
-                "css-minimizer-webpack-plugin": "^7.0.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",
@@ -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"
             },

package/plugins/html/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@caweb/html-webpack-plugin",
-    "version": "1.5.29",
+    "version": "1.6.1",
     "description": "CAWebPublishing Sample Page and Configurations",
     "main": "index.js",
     "type": "module",
@@ -120,7 +120,7 @@
         "@caweb/css-audit-webpack-plugin": "^1.0.12",
         "@caweb/jshint-webpack-plugin": "^2.0.1",
         "@wordpress/scripts": "^30.12.0",
-        "css-minimizer-webpack-plugin": "^7.0.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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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
+          ]
+        })
+      )
+    }
+    
+  }
+
+  
 }
 
 /**