canopy-webpack-config 4.4.3 → 4.4.5

package/.yarnrc.yml

@@ -4,4 +4,15 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.10.3.cjs
+npmMinimalAgeGate: 7d
+
+npmPreapprovedPackages:
+  - "@canopytax/*"
+  - browserslist-config-canopy
+  - canopy-webpack-config
+  - eslint-config-canopy
+  - kremling
+  - single-spa
+  - single-spa-canopy
+
+yarnPath: .yarn/releases/yarn-4.14.1.cjs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canopy-webpack-config",
-  "version": "4.4.3",
+  "version": "4.4.5",
   "description": "Some defaults for webpack configs at canopy",
   "main": "src/canopy-webpack-config.js",
   "exports": {
@@ -22,5 +22,5 @@
     "webpack-bundle-analyzer": "^4.7.0",
     "webpack-merge": "^4.2.1"
   },
-  "packageManager": "yarn@4.10.3"
+  "packageManager": "yarn@4.14.1"
 }

package/src/canopy-webpack-config-esm.mjs

@@ -3,7 +3,9 @@ import { CleanWebpackPlugin } from "clean-webpack-plugin";
 import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
 import merge from "webpack-merge";
 import fs from "fs";
-import { homedir } from "os";
+import os from "os";
+
+const homedir = os.homedir();
 
 let isDevServer = false;
 if (process.argv.some((arg) => arg.includes("serve"))) {
@@ -34,6 +36,11 @@ const externalPatterns = [
   /^react\/lib.*/,
   /^react$/,
   /^rxjs\/?.*$/,
+  // Built out of the common-dependencies repo rather than npm. They keep their bare
+  // specifiers under ESM, same as under SystemJS, so consuming source needs no edit —
+  // online-listener in particular owns a singleton observable that must not be duplicated.
+  /^online-listener$/,
+  /^cp-analytics$/,
   /^single-spa-canopy$/,
   /^single-spa$/,
   /^@canopytax\//,
@@ -98,7 +105,6 @@ export default function (name, overridesConfig = {}, options = {}) {
       optimization: {
         runtimeChunk: false,
         splitChunks: { chunks: "async" },
-        minimize: false,
       },
 
       externalsType: "module",
@@ -123,20 +129,7 @@ export default function (name, overridesConfig = {}, options = {}) {
           {
             test: /\.(js|jsx|ts|tsx)$/,
             exclude: /node_modules/,
-            use: {
-              loader: "babel-loader",
-              options: {
-                presets: [
-                  [
-                    "@babel/preset-env",
-                    { targets: "defaults", modules: false },
-                  ],
-                  ["@babel/preset-react", { runtime: "automatic" }],
-                  "@babel/preset-typescript",
-                ],
-                plugins: ["@babel/plugin-transform-runtime"],
-              },
-            },
+            use: "babel-loader",
           },
         ],
       },
@@ -160,23 +153,13 @@ export default function (name, overridesConfig = {}, options = {}) {
         ? {
             host,
             port,
-            server: (() => {
-              const sslPath = path.join(homedir(), ".canopy-ssl");
-              const keyPath = path.join(sslPath, "key.pem");
-              const certPath = path.join(sslPath, "public.pem");
-
-              if (fs.existsSync(keyPath) && fs.existsSync(certPath)) {
-                return {
-                  type: "https",
-                  options: {
-                    key: fs.readFileSync(keyPath),
-                    cert: fs.readFileSync(certPath),
-                    // http2: true, // optional
-                  },
-                };
-              }
-              return { type: "http" };
-            })(),
+            server: {
+              type: "https",
+              options: {
+                cert: fs.readFileSync(`${homedir}/.canopy-ssl/public.pem`),
+                key: fs.readFileSync(`${homedir}/.canopy-ssl/key.pem`),
+              },
+            },
             headers: {
               "Access-Control-Allow-Origin": "*",
               "Access-Control-Allow-Methods":
@@ -187,8 +170,14 @@ export default function (name, overridesConfig = {}, options = {}) {
             },
             allowedHosts: "all",
             hot: false,
-            liveReload: false,
-            client: false,
+            liveReload: true,
+            client: {
+              webSocketURL: {
+                protocol: "wss",
+                hostname: host === "0.0.0.0" ? "localhost" : host, // Use localhost for the socket connection for CSP purposes
+                port,
+              },
+            },
           }
         : undefined,
     };