@caweb/webpack 1.3.35 → 1.3.37

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+v1.3.37
+- Updated npm packages
+
+v1.3.36
+- Updated npm packages
+
 v1.3.35
 - Updated npm packages
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/webpack",
-  "version": "1.3.35",
+  "version": "1.3.37",
   "description": "CAWebPublishing Webpack Configuration",
   "main": "index.js",
   "type": "module",
@@ -32,12 +32,12 @@
   },
   "homepage": "https://github.com/CAWebPublishing/webpack#readme",
   "devDependencies": {
-    "webpack": "^5.99.6"
+    "webpack": "^5.99.7"
   },
   "dependencies": {
     "@caweb/a11y-webpack-plugin": "^1.0.9",
     "@caweb/css-audit-webpack-plugin": "^1.0.12",
-    "@caweb/html-webpack-plugin": "^1.7.4",
+    "@caweb/html-webpack-plugin": "^1.7.6",
     "@caweb/jshint-webpack-plugin": "^2.0.1"
   }
 }

package/plugins/html/CHANGELOG.md

@@ -1,3 +1,16 @@
+v1.7.6
+- Added .tsx rule and ts-loader
+- Added default tsconfig.json config file
+- Removed the WordPress DependencyExtractionPlugin plugin definition
+- Padding to interactive elements changed from .5rem 0 to .5rem
+- Updated npm packages
+
+v1.7.5 
+- Added sr-only to social share links in the footer template
+- Added text-decoration to a:hover:not(.btn) and a:focus:not(.btn)
+- Removed anchor line-height fix and added padding to anchors to correct interactive element not meeting minimum size or spacing 
+- Updated npm packages
+
 v1.7.4
 - Increased anchor line-height from 1.5 to 1.75 to correct interactive element not meeting minimum size or spacing 
 - Updated npm packages

package/plugins/html/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "@caweb/html-webpack-plugin",
-    "version": "1.7.4",
+    "version": "1.7.6",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@caweb/html-webpack-plugin",
-            "version": "1.7.4",
+            "version": "1.7.6",
             "license": "ISC",
             "dependencies": {
                 "@caweb/a11y-webpack-plugin": "^1.0.9",
@@ -20,19 +20,19 @@
                 "html-webpack-skip-assets-plugin": "^1.0.4",
                 "mini-css-extract-plugin": "^2.9.2",
                 "rtlcss-webpack-plugin": "^4.0.7",
-                "webpack": "^5.99.6",
+                "webpack": "^5.99.7",
                 "webpack-cli": "^6.0.1",
                 "webpack-remove-empty-scripts": "^1.0.4"
             },
             "devDependencies": {
-                "@caweb/icon-library": "^1.0.1",
-                "@inquirer/prompts": "^7.4.1",
+                "@caweb/icon-library": "^1.1.0",
+                "@inquirer/prompts": "^7.5.0",
                 "animate.css": "^4.1.1",
                 "bootstrap": "^5.3.5",
                 "bootstrap-forced-colors-css": "^1.0.7",
                 "chalk": "^5.4.1",
                 "cross-spawn": "^7.0.6",
-                "fast-xml-parser": "^5.2.0"
+                "fast-xml-parser": "^5.2.1"
             }
         },
         "node_modules/@ampproject/remapping": {
@@ -1908,15 +1908,11 @@
             }
         },
         "node_modules/@caweb/icon-library": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@caweb/icon-library/-/icon-library-1.0.1.tgz",
-            "integrity": "sha512-zVy/WqiZrJKO6c94O9cPfbmjCl9DXTZEKYXjqaPuPRv/FHPiPa30Eg6TaBcY+3FEZPMadw/G0bJ5RWhe2P5DaQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@caweb/icon-library/-/icon-library-1.1.0.tgz",
+            "integrity": "sha512-FJx8PBXviJo5GQaW9ZBD646RO3qPDisOnIq3cloVE/Cev3EY+SsNeTPXXVob661z9ZWIY2d5VCDDwjhs+03y5g==",
             "dev": true,
-            "license": "GPL2",
-            "engines": {
-                "node": ">=18.0.0",
-                "npm": ">=10.0.0"
-            }
+            "license": "GPL2"
         },
         "node_modules/@caweb/jshint-webpack-plugin": {
             "version": "2.0.1",
@@ -2515,9 +2511,9 @@
             }
         },
         "node_modules/@inquirer/prompts": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.4.1.tgz",
-            "integrity": "sha512-UlmM5FVOZF0gpoe1PT/jN4vk8JmpIWBlMvTL8M+hlvPmzN89K6z03+IFmyeu/oFCenwdwHDr2gky7nIGSEVvlA==",
+            "version": "7.5.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.5.0.tgz",
+            "integrity": "sha512-tk8Bx7l5AX/CR0sVfGj3Xg6v7cYlFBkEahH+EgBB+cZib6Fc83dwerTbzj7f2+qKckjIUGsviWRI1d7lx6nqQA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2528,9 +2524,9 @@
                 "@inquirer/input": "^4.1.9",
                 "@inquirer/number": "^3.0.12",
                 "@inquirer/password": "^4.0.12",
-                "@inquirer/rawlist": "^4.0.12",
+                "@inquirer/rawlist": "^4.1.0",
                 "@inquirer/search": "^3.0.12",
-                "@inquirer/select": "^4.1.1"
+                "@inquirer/select": "^4.2.0"
             },
             "engines": {
                 "node": ">=18"
@@ -2545,9 +2541,9 @@
             }
         },
         "node_modules/@inquirer/rawlist": {
-            "version": "4.0.12",
-            "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.12.tgz",
-            "integrity": "sha512-wNPJZy8Oc7RyGISPxp9/MpTOqX8lr0r+lCCWm7hQra+MDtYRgINv1hxw7R+vKP71Bu/3LszabxOodfV/uTfsaA==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.0.tgz",
+            "integrity": "sha512-6ob45Oh9pXmfprKqUiEeMz/tjtVTFQTgDDz1xAMKMrIvyrYjAmRbQZjMJfsictlL4phgjLhdLu27IkHNnNjB7g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2592,9 +2588,9 @@
             }
         },
         "node_modules/@inquirer/select": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.1.1.tgz",
-            "integrity": "sha512-IUXzzTKVdiVNMA+2yUvPxWsSgOG4kfX93jOM4Zb5FgujeInotv5SPIJVeXQ+fO4xu7tW8VowFhdG5JRmmCyQ1Q==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.2.0.tgz",
+            "integrity": "sha512-KkXQ4aSySWimpV4V/TUJWdB3tdfENZUU765GjOIZ0uPwdbGIG6jrxD4dDf1w68uP+DVtfNhr1A92B+0mbTZ8FA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11188,9 +11184,9 @@
             "license": "BSD-3-Clause"
         },
         "node_modules/fast-xml-parser": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.0.tgz",
-            "integrity": "sha512-Uw9+Mjt4SBRud1IcaYuW/O0lW8SKKdMl5g7g24HiIuyH5fQSD+AVLybSlJtqLYEbytVFjWQa5DMGcNgeksdRBg==",
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.1.tgz",
+            "integrity": "sha512-Kqq/ewnRACQ20e0BlQ5KqHRYWRBp7yv+jttK4Yj2yY+2ldgCoxJkrP1NHUhjypsJ+eQXlGJ/jebM3wa60s1rbQ==",
             "dev": true,
             "funding": [
                 {
@@ -19300,9 +19296,9 @@
             }
         },
         "node_modules/schema-utils": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
             "license": "MIT",
             "dependencies": {
                 "@types/json-schema": "^7.0.9",
@@ -22006,13 +22002,14 @@
             }
         },
         "node_modules/webpack": {
-            "version": "5.99.6",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.6.tgz",
-            "integrity": "sha512-TJOLrJ6oeccsGWPl7ujCYuc0pIq2cNsuD6GZDma8i5o5Npvcco/z+NKvZSFsP0/x6SShVb0+X2JK/JHUjKY9dQ==",
+            "version": "5.99.7",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.7.tgz",
+            "integrity": "sha512-CNqKBRMQjwcmKR0idID5va1qlhrqVUKpovi+Ec79ksW8ux7iS1+A6VqzfZXgVYCFRKl7XL5ap3ZoMpwBJxcg0w==",
             "license": "MIT",
             "dependencies": {
                 "@types/eslint-scope": "^3.7.7",
                 "@types/estree": "^1.0.6",
+                "@types/json-schema": "^7.0.15",
                 "@webassemblyjs/ast": "^1.14.1",
                 "@webassemblyjs/wasm-edit": "^1.14.1",
                 "@webassemblyjs/wasm-parser": "^1.14.1",
@@ -22029,7 +22026,7 @@
                 "loader-runner": "^4.2.0",
                 "mime-types": "^2.1.27",
                 "neo-async": "^2.6.2",
-                "schema-utils": "^4.3.0",
+                "schema-utils": "^4.3.2",
                 "tapable": "^2.1.1",
                 "terser-webpack-plugin": "^5.3.11",
                 "watchpack": "^2.4.1",

package/plugins/html/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@caweb/html-webpack-plugin",
-    "version": "1.7.4",
+    "version": "1.7.6",
     "description": "CAWebPublishing Sample Page and Configurations",
     "main": "index.js",
     "type": "module",
@@ -105,14 +105,14 @@
     },
     "homepage": "https://github.com/CAWebPublishing/webpack/plugins/html#readme",
     "devDependencies": {
-        "@caweb/icon-library": "^1.0.1",
-        "@inquirer/prompts": "^7.4.1",
+        "@caweb/icon-library": "^1.1.0",
+        "@inquirer/prompts": "^7.5.0",
         "animate.css": "^4.1.1",
         "bootstrap": "^5.3.5",
         "bootstrap-forced-colors-css": "^1.0.7",
         "chalk": "^5.4.1",
         "cross-spawn": "^7.0.6",
-        "fast-xml-parser": "^5.2.0"
+        "fast-xml-parser": "^5.2.1"
     },
     "dependencies": {
         "@caweb/a11y-webpack-plugin": "^1.0.9",
@@ -126,7 +126,7 @@
         "html-webpack-skip-assets-plugin": "^1.0.4",
         "mini-css-extract-plugin": "^2.9.2",
         "rtlcss-webpack-plugin": "^4.0.7",
-        "webpack": "^5.99.6",
+        "webpack": "^5.99.7",
         "webpack-cli": "^6.0.1",
         "webpack-remove-empty-scripts": "^1.0.4"
     }

package/plugins/html/sample/structural/footer.html

@@ -22,7 +22,7 @@
           {{#each social }}
             {{#if this }}
             <li class="nav-item">
-              <a href="{{ this }}" class="nav-link ca-gov-icon-{{ @key }}"></a>
+              <a href="{{ this }}" class="nav-link ca-gov-icon-{{ @key }}"><span class="sr-only">{{ @key }}</span></a>
             </li>
             {{/if}}
           {{/each}}

package/plugins/html/tsconfig.json

@@ -0,0 +1,13 @@
+{
+    "compilerOptions": {
+      "allowSyntheticDefaultImports": true,
+      "outDir": "./scripts/",
+      "noImplicitAny": true,
+      "module": "es6",
+      "target": "es5",
+      "jsx": "react",
+      "allowJs": true,
+      "moduleResolution": "node",
+      "resolveJsonModule": true,
+    }
+  }

package/plugins/html/webpack.config.js

@@ -47,7 +47,7 @@ function processArgs( arr ){
 
   arr.filter(Boolean).map((o) => {
     return o.replaceAll("'", '').split('=').forEach((e => tmp.push(e)))
- })
+  });
 
   return tmp
 }
@@ -94,6 +94,10 @@ baseConfig.module.rules.forEach((rule, i) => {
 // instead we use the Webpack output.clean definition
 baseConfig.plugins.splice(1,1, false);
 
+// We remove the WordPress DependencyExtractionPlugin definition
+// otherwise externals are not available in the global scope
+baseConfig.plugins.pop();
+
 /**
  * we remove the WordPress devServer declaration since we can only have 1 when exporting multiple configurations
  * 
@@ -130,6 +134,14 @@ let webpackConfig = {
     maxEntrypointSize: 500000
   },
 
+  // Determine how modules are resolved.
+  // @see https://webpack.js.org/configuration/resolve/
+  resolve: {
+    // Allows extension to be leave off when importing.
+    // @see https://webpack.js.org/configuration/resolve/#resolveextensions
+    extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '...'],
+  },
+
   // This option determine how different types of module within the project will be treated.
   // @see https://webpack.js.org/configuration/module/
   module:{
@@ -155,42 +167,48 @@ let webpackConfig = {
             path.resolve(currentPath, 'helpers', 'string')
           ],
           partialResolver: function(partial, callback){
-              /**
-               * All template partials are loaded from the root sample directory
-               * if the file doesn't exist we fallback to our sample template partials
-               */
-              let partialPath = path.join( process.cwd(), 'sample' );
-              let partialStructurePath = path.join( partialPath, 'structural' );
-
-              // template parameter specific partials
-              switch( partial ){
-                // 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;
-                
-                case 'content': 
-                  // content is served from /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 );
+            /**
+             * All template partials are loaded from the root sample directory
+             * if the file doesn't exist we fallback to our sample template partials
+             */
+            let partialPath = path.join( process.cwd(), 'sample' );
+            let partialStructurePath = path.join( partialPath, 'structural' );
+
+            // template parameter specific partials
+            switch( partial ){
+              // 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;
+              
+              case 'content': 
+                // content is served from /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 );
           }
         }
+      },
+      // Handle `.tsx` and `.ts` files.
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+        exclude: /node_modules/,
       }
     ]
   },
+
   // WordPress already enqueues scripts and makes them available
   // in global scope so those scripts don't need to be included on the bundle. For webpack
   // to recognize those files, the global variable needs to be registered as externals.
@@ -203,11 +221,12 @@ let webpackConfig = {
     lodash: 'lodash',
     react: ['vendor', 'React'],
     'react-dom': ['vendor', 'ReactDOM'],
-    
+
     // WordPress dependencies.
     '@wordpress/hooks': ['vendor', 'wp', 'hooks'],
-
-  },
+    '@wordpress/i18n': ['vendor', 'wp', 'i18n'],
+  
+  }
 };
 
 /**
@@ -217,7 +236,7 @@ if( 'serve' === webpackCommand ){
   const appPath = process.cwd();
   let template = flags.includes('--template') ? getArgVal('--template') : 'default';
   let scheme = flags.includes('--scheme') ? getArgVal('--scheme') : 'oceanside';
-     
+  
   // Dev Server is added
   webpackConfig.devServer = { 
     devMiddleware: {
@@ -283,17 +302,17 @@ if( 'serve' === webpackCommand ){
   // Page Template and additional plugins
   webpackConfig.plugins.push(
     new CAWebHTMLPlugin({
-        template,
-        templateParameters: {
-          scheme: 'false' !== scheme ? scheme : false 
-        },
-        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.js/, // we skip the font-only Files
-          ]
+      template,
+      templateParameters: {
+        scheme: 'false' !== scheme ? scheme : false 
+      },
+      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.js/, // we skip the font-only Files
+      ]
     }),
     new HtmlWebpackSkipAssetsPlugin(),
     new HtmlWebpackLinkTypePlugin(),
@@ -326,10 +345,8 @@ if( 'serve' === webpackCommand ){
         })
       )
     }
-    
-  }
 
-  
+  }
 }
 
 /**
@@ -343,7 +360,7 @@ if( mode === 'production' ){
   // Output
   webpackConfig.output.filename = '[name].min.js';
   webpackConfig.output.chunkFilename = '[name].min.js?v=[chunkhash]';
-    
+  
   // Plugins
   webpackConfig.plugins.push(
     new MiniCSSExtractPlugin( { filename: '[name].min.css' } ),
@@ -361,4 +378,5 @@ if( mode === 'production' ){
 webpackConfig.plugins.push(
   new RemoveEmptyScriptsPlugin()
 );
-export default webpackConfig;
+
+export default webpackConfig;