Merge pull request #215 from gene1wood/webpack5

Update to use Webpack 5

Author: gene1wood

README.md

@@ -79,13 +79,13 @@ Highlighted items from src/js/state.js for use in templates.  See src/js/state.j
 
 ## Building
 
-To publish to GitHub Pages, simply run:
+To publish to GitHub Pages, first generate new `docs/` files by running 
 
 ```bash
 $ npm run build
 ```
 
-Then commit the newly built `docs/` files and push the commit to GitHub
+Then commit the newly built `docs/` files and push the commit to GitHub.
 
 ## Changelog
 

config/webpack.config.js

@@ -37,39 +37,28 @@ const plugins = [
     date: new Date().toISOString().substr(0, 10),
     production,
     revision: revision(),
+
     title: 'Mozilla SSL Configuration Generator',
-    template: 'src/templates/index.ejs'
-  }),
-  new CopyWebpackPlugin({
-    patterns: [
-        {from: 'src/images', to: 'images/'}
-    ]
-  }),
-  new CopyWebpackPlugin({
-    patterns: [
-        {from: 'config/CNAME'}
-    ]
-  }),
-  new CopyWebpackPlugin({
-    patterns: [
-        {from: 'src/static'}
-    ]
+    template: 'src/templates/index.ejs',
+    favicon: 'src/images/favicon.png'
   }),
   new CopyWebpackPlugin({
     patterns: [
+        {from: 'config/CNAME'},
+        {from: 'src/static'},
         {from: 'src/js/analytics.js'}
     ]
   }),
   new MiniCssExtractPlugin({
-    filename: '[hash].index.css',
+    filename: '[contenthash].index.css',
   })
 ];
 
 // either we analyze or watch
 if (process.env.NODE_ENV === 'analyze') {
   plugins.push(
     new BundleAnalyzerPlugin({})
-  )
+  );
 } else {
   plugins.push(
     new BrowserSyncWebpackPlugin({
@@ -79,7 +68,7 @@ if (process.env.NODE_ENV === 'analyze') {
         baseDir: 'build'
       }
     })
-  )
+  );
 }
 
 module.exports = {
@@ -88,7 +77,16 @@ module.exports = {
     library: 'SSLConfigGenerator',
     libraryTarget: 'var',
     path: production ? path.resolve(__dirname, '..', 'docs') : path.resolve(__dirname, '..', 'build'),
-    filename: '[hash].[name]'
+    filename: '[contenthash].[name]'
+  },
+  stats: {
+    errorDetails: true,
+    children: true
+  },
+  resolve: {
+    fallback: {
+      "path": require.resolve("path-browserify")
+    }
   },
   entry: {
     'index.js': ['regenerator-runtime/runtime', path.resolve(__dirname, '..', 'src', 'js', 'index.js')]
@@ -99,9 +97,7 @@ module.exports = {
     rules: [
       {
         test: /\.ejs$/,
-        use: {
-          loader: 'ejs-loader',
-        }
+        use: ['ejs-easy-loader'],
       },
       {
         test: /\.hbs$/,
@@ -138,40 +134,24 @@ module.exports = {
       {
         test: /\.(sa|sc|c)ss$/,
         //include: path.resolve(__dirname, '..', 'src'),
-        use: [{
-          loader: MiniCssExtractPlugin.loader
-        },
-        'css-loader',
-        {
-          loader: 'postcss-loader', // Run post css actions
-          options: {
-            plugins: function () { // post css plugins, can be exported to postcss.config.js
-              return [
-                require('precss'),
-                require('autoprefixer')
-              ];
+        use: [
+          MiniCssExtractPlugin.loader,
+          'css-loader',
+          {
+            loader: 'postcss-loader', // Run post css actions
+            options: {
+              postcssOptions: {
+                plugins: function () { // post css plugins, can be exported to postcss.config.js
+                  return [
+                    require('precss'),
+                    require('autoprefixer')
+                  ];
+                }
+              }
             }
-          }
-        },
-        'sass-loader'
-      ]},
-      {
-        test: /\.(ttf|eot|woff|woff2)$/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: 'fonts/[name].[ext]'
-          }
-        }
-      },
-      {
-        test: /\.(svg)$/,
-        use: {
-          loader: 'file-loader',
-          options: {
-            name: 'img/[name].[ext]'
-          }
-        }
+          },
+          'sass-loader'
+        ]
       }
     ]
   },

docs/analytics.js

@@ -0,0 +1,50 @@
+/*!
+  * Bootstrap v4.6.2 (https://getbootstrap.com/)
+  * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+  */
+
+/*!
+ * clipboard.js v2.0.11
+ * https://clipboardjs.com/
+ *
+ * Licensed MIT © Zeno Rocha
+ */
+
+/*!
+ * jQuery JavaScript Library v3.7.1
+ * https://jquery.com/
+ *
+ * Copyright OpenJS Foundation and other contributors
+ * Released under the MIT license
+ * https://jquery.org/license
+ *
+ * Date: 2023-08-28T13:37Z
+ */
+
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/**!
+ * @fileOverview Kickass library to create and place poppers near their reference elements.
+ * @version 1.16.1
+ * @license
+ * Copyright (c) 2016 Federico Zivolo and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */