@caweb/webpack 1.0.5 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.0.5",
+  "version": "1.1.1",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "index.js",
   "type": "module",
@@ -9,13 +9,15 @@
   ],
   "scripts": {
     "webpack": "webpack",
-    "serve": "webpack serve --entry-reset --entry ./plugins/html/src/index.js",
+    "serve": "set NODE_OPTIONS='--no-selectors' &&  webpack serve --config ./webpack.config.js ./plugins/html/entry/oceanside.js --merge",
     "build": "npm run build:html",
-    "build:html": "webpack build --entry-reset --entry ./plugins/html/src/index.js --output-path ./plugins/html/build/ && renamer --find main --replace index ./plugins/html/build/*.* -s",
+    "build:html": "cd ./plugins/html/ && 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",
+    "i:deps": "npm i @caweb/a11y-webpack-plugin @caweb/css-audit-webpack-plugin @caweb/html-webpack-plugin @caweb/jshint-webpack-plugin",
     "i:local": "npm i plugins/a11y/ plugins/css-audit/ plugins/html/ plugins/jshint/ ",
-    "un:local": "npm un plugins/a11y/ plugins/css-audit/ plugins/html/ plugins/jshint/ --force"
+    "un:local": "npm un @caweb/a11y-webpack-plugin @caweb/css-audit-webpack-plugin @caweb/html-webpack-plugin @caweb/jshint-webpack-plugin --force"
   },
   "repository": {
     "type": "git",
@@ -36,18 +38,18 @@
   },
   "homepage": "https://github.com/CAWebPublishing/webpack#readme",
   "devDependencies": {
-    "renamer": "^5.0.1",
     "rimraf": "^6.0.1",
     "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@caweb/a11y-webpack-plugin": "^1.0.2",
-    "@caweb/css-audit-webpack-plugin": "^1.0.2",
-    "@caweb/html-webpack-plugin": "^1.0.2",
-    "@caweb/jshint-webpack-plugin": "^1.0.4",
-    "@wordpress/scripts": "^28.3.0",
+    "@caweb/a11y-webpack-plugin": "^1.0.4",
+    "@caweb/css-audit-webpack-plugin": "^1.0.4",
+    "@caweb/html-webpack-plugin": "^1.1.1",
+    "@caweb/jshint-webpack-plugin": "^1.0.5",
+    "@wordpress/scripts": "^28.4.0",
+    "handlebars-loader": "^1.7.3",
     "html-webpack-plugin": "^5.6.0",
     "html-webpack-skip-assets-plugin": "^1.0.4"
   }
-}
+}

package/webpack.config.js

@@ -53,11 +53,11 @@ let webpackConfig = {
   ...baseConfig,
   target: 'web',
   cache: false,
-  stats: 'errors-warnings',
+  stats: 'errors',
   output: {
     ...baseConfig.output,
     clean: true,
-    publicPath: `/public`
+    //publicPath: `/public`
   },
   module: {
     ...baseConfig.module,
@@ -75,10 +75,20 @@ let webpackConfig = {
           partialResolver: function(partial, callback){
               // all template partials are loaded from the root sample directory
               let partialPath = path.join( process.cwd(), 'sample' );
+              let partialStructurePath = path.join( partialPath, 'structural' );
 
               // template parameter specific partials
               switch( partial ){
-                case 'content': // content is served from the /sample/index.html
+                // header/footer is served from the /sample/structural/ directory
+                case 'footer':
+                case 'header': 
+                  partialPath = fs.existsSync(path.join( partialStructurePath, `/${partial}.html` )) ? path.join( partialStructurePath, `/${partial}.html` ) :
+                  `./structural/${partial}.html`
+                  
+                  break;
+                
+                // content is served from the /sample/index.html
+                case 'content': 
                   partialPath = fs.existsSync(path.join( partialPath, '/index.html' )) ? path.join( partialPath, '/index.html' ) :
                   './missing/content.html';
                   
@@ -179,13 +189,15 @@ if( 'serve' === webpackCommand ){
     },
     templateParameters: {
       "title" : path.basename(appPath),
-      "content": '/sample/index.html'
+      "header": '/sample/structural/header.html',
+      "content": '/sample/index.html',
+      "footer": '/sample/structural/footer.html'
     },
     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
+      /.*-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
     ]
   }