@caweb/webpack 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "index.js",
   "type": "module",
@@ -12,7 +12,7 @@
     "serve": "webpack serve --entry-reset --entry ./plugins/html/src/index.js",
     "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",
-    "u:deps": "node ./scripts/update-deps.js",
+    "u:deps": "node ./scripts/update-deps.js ./plugins",
     "test": "echo \\\"Error: run tests from root\\\" && exit 0",
     "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"
@@ -42,10 +42,10 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@caweb/a11y-webpack-plugin": "^1.0.1",
-    "@caweb/css-audit-webpack-plugin": "^1.0.1",
-    "@caweb/html-webpack-plugin": "^1.0.1",
-    "@caweb/jshint-webpack-plugin": "^1.0.2",
+    "@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.3",
     "@wordpress/scripts": "^28.3.0",
     "html-webpack-plugin": "^5.6.0",
     "html-webpack-skip-assets-plugin": "^1.0.4"

package/webpack.config.js

@@ -69,7 +69,30 @@ let webpackConfig = {
        */
       {
         test: /\.html$/,
-        loader: 'handlebars-loader'
+        loader: 'handlebars-loader',
+        options:{
+          rootRelative: process.cwd(),
+          partialResolver: function(partial, callback){
+              // all template partials are loaded from the root sample directory
+              let partialPath = path.join( process.cwd(), 'sample' );
+
+              // template parameter specific partials
+              switch( partial ){
+                case 'content': // content is served from the /sample/index.html
+                  partialPath = fs.existsSync(path.join( partialPath, '/index.html' )) ? path.join( partialPath, '/index.html' ) :
+                  './missing/content.html';
+                  
+                  break;
+                
+                // if not a template parameter we let the loader handle it
+                default:
+                  partialPath = partial;
+              }
+
+
+              callback(false, partialPath );
+          }
+        }
       }
     ]
   },
@@ -84,13 +107,7 @@ let webpackConfig = {
  */
 if( 'serve' === webpackCommand ){
   const appPath = process.cwd();
-
-  // if the project has a sample index page we load it,
-  // otherwise fallback to @caweb/html-webpack-plugin/sample
-  const samplePath = fs.existsSync(path.join(appPath, 'sample')) ?
-    path.join( appPath, 'sample') : path.join( appPath, 'node_modules', '@caweb', 'html-webpack-plugin', 'sample');
-  //const srcPath = path.join( appPath, 'src');
-  //const dataPath = path.join( srcPath, 'data');
+  const samplePath = path.join( appPath, 'sample');
 
   // Dev Server is added
   webpackConfig.devServer = { 
@@ -149,7 +166,7 @@ if( 'serve' === webpackCommand ){
   let pageTemplate = {
     title : path.basename(appPath),
     filename: path.join( appPath, 'public', 'index.html'),
-    template: path.join(samplePath, 'index.html'),
+    template: path.join( appPath, 'node_modules', '@caweb', 'html-webpack-plugin', 'sample', 'index.html'),
     favicon: fs.existsSync(path.join(samplePath, 'favicon.ico')) ? path.join(samplePath, 'favicon.ico') : false,
     minify: false,
     scriptLoading: 'blocking',
@@ -161,7 +178,8 @@ if( 'serve' === webpackCommand ){
       "viewport": "width=device-width, initial-scale=1.0, minimum-scale=1.0"
     },
     templateParameters: {
-      "title" : path.basename(appPath)
+      "title" : path.basename(appPath),
+      "content": '/sample/index.html'
     },
     skipAssets: [
       '**/*-rtl.css', // we skip the Right-to-Left Styles