@caweb/webpack 1.2.4 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "index.js",
   "type": "module",
@@ -12,7 +12,7 @@
     "preserve": "cd plugins/html && npm i",
     "serve": "set NODE_OPTIONS='--no-selectors' &&  webpack serve --config ./webpack.config.js",
     "build": "npm run build:html",
-    "build:html": "cd ./plugins/html/ && npm run build",
+    "build:html": "cd ./plugins/html/ && npm i && npm run build",
     "u:deps": "node ./scripts/update-deps.js ./plugins",
     "config:test": "webpack configtest ./webpack.config.js",
     "test": "echo \\\"Error: run tests from root\\\" && exit 0",
@@ -39,10 +39,10 @@
   },
   "homepage": "https://github.com/CAWebPublishing/webpack#readme",
   "dependencies": {
-    "@caweb/a11y-webpack-plugin": "^1.0.5",
-    "@caweb/css-audit-webpack-plugin": "^1.0.7",
-    "@caweb/html-webpack-plugin": "^1.2.2",
-    "@caweb/jshint-webpack-plugin": "^1.0.6",
+    "@caweb/a11y-webpack-plugin": "^1.0.6",
+    "@caweb/css-audit-webpack-plugin": "^1.0.9",
+    "@caweb/html-webpack-plugin": "^1.3.0",
+    "@caweb/jshint-webpack-plugin": "^1.0.7",
     "@wordpress/scripts": "^28.4.0",
     "html-webpack-skip-assets-plugin": "^1.0.4"
   }

package/webpack.config.js

@@ -17,38 +17,43 @@ import A11yPlugin from '@caweb/a11y-webpack-plugin';
 
 import {HtmlWebpackSkipAssetsPlugin} from 'html-webpack-skip-assets-plugin';
 
-let template = 'default';
-let scheme = 'oceanside';
+const webpackCommand = 'build' === process.argv[2] ? 'build' : 'serve' ;
 
-// Allow for template to be selected via NODE_OPTIONS env variable
-if( process.env.NODE_OPTIONS ){
-    let opts = process.env.NODE_OPTIONS.split(' ').filter(e=>e).map(o=>o.replaceAll("'", ''))
-    if( opts.includes('--template') ){
-        template = opts[opts.indexOf('--template') + 1]
-    }
-    if( opts.includes('--scheme') ){
-        scheme = opts[opts.indexOf('--scheme') + 1]
+// only if serving do we add the plugins
+if( 'serve' === webpackCommand ){
+    let template = 'default';
+    let scheme = 'oceanside';
+    
+    // Allow for template to be selected via NODE_OPTIONS env variable
+    if( process.env.NODE_OPTIONS ){
+        let opts = process.env.NODE_OPTIONS.split(' ').filter(e=>e).map(o=>o.replaceAll("'", ''))
+        if( opts.includes('--template') ){
+            template = opts[opts.indexOf('--template') + 1]
+        }
+        if( opts.includes('--scheme') ){
+            scheme = opts[opts.indexOf('--scheme') + 1]
+        }
     }
+    
+    // Page Template and additional plugins
+    webpackConfig.plugins.push(
+        new CAWebHTMLPlugin({
+            template,
+            templateParameters: {
+                scheme
+            },
+            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
+              ]
+        }),
+        new HtmlWebpackSkipAssetsPlugin(),
+        new JSHintPlugin(),
+        new CSSAuditPlugin(),
+        new A11yPlugin()
+    )
 }
 
-// Page Template and additional plugins
-webpackConfig.plugins.push(
-    new CAWebHTMLPlugin({
-        template,
-        templateParameters: {
-            scheme
-        },
-        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
-          ]
-    }),
-    new HtmlWebpackSkipAssetsPlugin(),
-    new JSHintPlugin(),
-    new CSSAuditPlugin(),
-    new A11yPlugin()
-)
-
 export default webpackConfig;