canopy-webpack-config 3.1.0 → 4.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canopy-webpack-config",
-  "version": "3.1.0",
+  "version": "4.0.0-beta.1",
   "description": "Some defaults for webpack configs at canopy",
   "main": "src/canopy-webpack-config.js",
   "repository": "git@github.com:CanopyTax/canopy-webpack-config.git",
@@ -12,9 +12,9 @@
     "@babel/runtime": ">=7"
   },
   "dependencies": {
-    "clean-webpack-plugin": "^3.0.0",
+    "clean-webpack-plugin": "^4.0.0",
     "unused-files-webpack-plugin": "^3.4.0",
-    "webpack-bundle-analyzer": "^3.3.2",
+    "webpack-bundle-analyzer": "^4.5.0",
     "webpack-merge": "^4.2.1"
   }
 }

package/src/canopy-webpack-config.js

@@ -1,14 +1,14 @@
 const path = require('path')
 const { CleanWebpackPlugin } = require('clean-webpack-plugin')
-const merge = require('webpack-merge')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
-const {UnusedFilesWebpackPlugin} = require('unused-files-webpack-plugin')
+const { UnusedFilesWebpackPlugin } = require('unused-files-webpack-plugin');
+const merge = require('webpack-merge')
 const fs = require("fs")
 const homedir = require("os").homedir()
 
 let isDevServer = false
 
-if (process.argv.some(arg => arg.includes('webpack-dev-server'))) {
+if (process.argv.some(arg => arg.includes('serve'))) {
   isDevServer = true
 }
 
@@ -36,8 +36,12 @@ module.exports = function(name, overridesConfig) {
       entry: `./src/${name}.js`,
       output: {
         filename: `${name}.js`,
-        jsonpFunction: "wpjsonp-"+name,
-        libraryTarget: 'amd',
+        publicPath: '',
+        uniqueName: name,
+        library: {
+          type: 'amd',
+          name: name,
+        },
         path: path.resolve(process.cwd(), 'build'),
         chunkFilename: '[name].js',
       },
@@ -55,12 +59,6 @@ module.exports = function(name, overridesConfig) {
               ],
             },
           },
-          // https://github.com/systemjs/systemjs#compatibility-with-webpack
-          {
-            parser: {
-              system: false,
-            },
-          },
         ],
       },
       resolve: {
@@ -78,10 +76,12 @@ module.exports = function(name, overridesConfig) {
           globOptions: {
             cwd: path.resolve(process.cwd(), 'src'),
             ignore: [
-              "**/*.test.js",
-              "**/*.spec.js",
-              "**/*.js.snap",
-              "**/test-setup.js",
+              '**/*.test.js',
+              '**/*.spec.js',
+              '**/*.js.snap',
+              '**/test-setup.js',
+              '**/*.stories.js',
+              '**/*.story.js',
             ],
           }
         }),
@@ -92,6 +92,7 @@ module.exports = function(name, overridesConfig) {
         /^canopy-sofe-extensions$/,
         /^lodash$/,
         /^moment$/,
+        /^luxon$/,
         /^online-listener$/,
         /^prop-types$/,
         /^react-dom$/,
@@ -111,9 +112,13 @@ module.exports = function(name, overridesConfig) {
           cert: fs.readFileSync(`${homedir}/.canopy-ssl/public.pem`),
           key: fs.readFileSync(`${homedir}/.canopy-ssl/key.pem`)
         },
-        disableHostCheck: true,
-        sockHost: host === "0.0.0.0" ? "localhost" : host, // Use localhost for the socket connection for CSP purposes
-        sockPort: port,
+        allowedHosts: 'all',
+        client: {
+          webSocketURL: {
+            hostname: host === "0.0.0.0" ? "localhost" : host, // Use localhost for the socket connection for CSP purposes
+            port: port,
+          },
+        },
         headers: {
           "Access-Control-Allow-Origin": "*"
         },