@abcnews/aunty 13.0.0 → 13.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abcnews/aunty",
-  "version": "13.0.0",
+  "version": "13.0.3",
   "description": "A toolkit for working with ABC News projects",
   "repository": "abcnews/aunty",
   "license": "MIT",
@@ -44,7 +44,7 @@
     "chalk": "^4.1.2",
     "cli-select": "^1.1.0",
     "copy-webpack-plugin": "^8.1.1",
-    "css-loader": "^5.2.1",
+    "css-loader": "^6.7.1",
     "csv-loader": "^3.0.3",
     "deepmerge": "^4.0.0",
     "del": "^6.0.0",

package/src/config/serve.js

@@ -23,32 +23,7 @@ const DEFAULT_HOST = (module.exports.DEFAULT_HOST = probe(`nucwed${INTERNAL_SUFF
   : 'localhost');
 const DEFAULT_PORT = 8000;
 
-const serveConfigPromise = getServeConfigPromise();
-
-module.exports.getServeConfig = () => serveConfigPromise;
-
-async function getServeConfigPromise() {
-  const { serve } = getProjectConfig();
-
-  const config = combine(
-    {
-      hasBundleAnalysis: false,
-      host: DEFAULT_HOST,
-      hot: process.env.NODE_ENV === 'development',
-      https: true,
-      port: DEFAULT_PORT
-    },
-    serve,
-    addEnvironmentVariables,
-    addUserSSLConfig
-  );
-  const port = await findPort(config.port, config.port + 100, config.host);
-  config.port = port;
-
-  return config;
-}
-
-function addEnvironmentVariables(config) {
+const addEnvironmentVariables = config => {
   if (process.env.AUNTY_HOST) {
     config.host = process.env.AUNTY_HOST;
   }
@@ -58,7 +33,7 @@ function addEnvironmentVariables(config) {
   }
 
   return config;
-}
+};
 
 const getSSLPath = (module.exports.getSSLPath = (host, name) => join(HOME_DIR, SSL_DIR, host, name || '.'));
 
@@ -66,7 +41,7 @@ const getSSLPath = (module.exports.getSSLPath = (host, name) => join(HOME_DIR, S
 Set config.https to cert & key generated with `aunty sign-cert` (if they both exist)
 We expect them to be in: ~/.aunty/ssl/<host>/server.{cert|key}
 */
-function addUserSSLConfig(config) {
+const addUserSSLConfig = config => {
   if (config.https === true) {
     try {
       config.https = {
@@ -77,9 +52,9 @@ function addUserSSLConfig(config) {
   }
 
   return config;
-}
+};
 
-async function findPort(port, max = port + 100, host = '0.0.0.0') {
+const findPort = async (port, max = port + 100, host = '0.0.0.0') => {
   return new Promise((resolve, reject) => {
     const socket = new Socket();
 
@@ -115,4 +90,41 @@ async function findPort(port, max = port + 100, host = '0.0.0.0') {
 
     socket.connect(port, host);
   });
-}
+};
+
+const _getServeConfig = async () => {
+  const { serve } = getProjectConfig();
+
+  const config = combine(
+    {
+      hasBundleAnalysis: false,
+      host: DEFAULT_HOST,
+      hot: process.env.NODE_ENV === 'development',
+      https: true,
+      port: DEFAULT_PORT
+    },
+    serve,
+    addEnvironmentVariables,
+    addUserSSLConfig
+  );
+  const port = await findPort(config.port, config.port + 100, config.host);
+  config.port = port;
+
+  return config;
+};
+
+let _serveConfigPromiseSingleton;
+
+// getServeConfig is called twice during server startup, because the `serve`
+// command calls it directly, then indirectly, via getWebpackDevServerConfig.
+// Because it won't change during a single `serve` command, and because we
+// don't want to waste time doing port lookups with `findPort` multiple times
+// we just cache the promise created on the first run, and return that later.
+
+module.exports.getServeConfig = async () => {
+  if (!_serveConfigPromiseSingleton) {
+    _serveConfigPromiseSingleton = _getServeConfig();
+  }
+
+  return _serveConfigPromiseSingleton;
+};

package/src/config/webpack.js

@@ -191,8 +191,8 @@ function createWebpackConfig({ isModernJS } = {}) {
                     exportLocalsConvention: 'camelCase',
                     localIdentContext: __dirname,
                     //  ^^^ https://github.com/webpack-contrib/css-loader/issues/413#issuecomment-299578180
-                    localIdentName: `${isProd ? '' : '[folder]-[name]__[local]-'}[contenthash:base64:6]`,
-                    localIdentHashPrefix: `${pkg.name}@${pkg.version}`
+                    localIdentHashSalt: `${pkg.name}@${pkg.version}`,
+                    localIdentName: `${isProd ? '' : '[folder]-[name]__[local]--'}[hash:base64:6]`
                   },
                   sourceMap: !isProd
                 }