Set up SMP to work as expected with multi-configs, and generated configs

Author: stephencookdev

__tests__/common/smp.test.js

@@ -3,70 +3,101 @@ const webpack = require("webpack");
 const { readFileSync } = require("fs");
 const webpackConfig = require("./webpack.config");
 
-const genSmpWebpackConfig = smp =>
-  smp.wrap(
-    Object.assign({}, webpackConfig, {
-      output: {
-        path: webpackConfig.output.path + "/_smp_" + new Date().getTime(),
-      },
-    })
+const getStandardConf = conf => {
+  if (typeof conf === "function") conf = conf();
+  const arr = Array.isArray(conf) ? conf : [conf];
+
+  return arr.map(
+    subConf => (typeof subConf === "function" ? subConf() : subConf)
   );
+};
+
+let i = 0;
+const prepareSmpWebpackConfig = conf => {
+  if (Array.isArray(conf)) return conf.map(prepareSmpWebpackConfig);
+  if (typeof conf === "function")
+    return (...args) => prepareSmpWebpackConfig(conf(...args));
+
+  return Object.assign({}, conf, {
+    output: {
+      path: conf.output.path + "/_smp_" + i++ + "_" + new Date().getTime(),
+    },
+  });
+};
+
+const genSmpWebpackConfig = smp =>
+  smp.wrap(prepareSmpWebpackConfig(webpackConfig));
 
 const runWebpack = config =>
   new Promise((resolve, reject) => {
-    webpack(config, (err, stats) => {
+    const standardConf = getStandardConf(config);
+    webpack(standardConf, (err, stats) => {
       if (err || stats.hasErrors()) return reject(err || stats);
-      resolve(readFileSync(config.output.path + "/bundle.js").toString());
+      const fileContent = standardConf.map(conf =>
+        readFileSync(conf.output.path + "/bundle.js").toString()
+      );
+      resolve(fileContent.join("\n///////// new file /////////\n"));
     });
   });
 
 jest.setTimeout(20000);
 
-describe("smp - " + __dirname.split("/").pop(), () => {
-  let distApp;
-  beforeAll(() => runWebpack(webpackConfig).then(file => (distApp = file)));
+const testRef = {};
 
-  describe("vanilla config", () => {
-    let smpOutput;
-    let smpDistApp;
+describe("smp", () => {
+  beforeAll(() =>
+    runWebpack(webpackConfig).then(file => (testRef.distApp = file))
+  );
+
+  describe(__dirname.split("/").pop(), () => {
     const smp = new SpeedMeasurePlugin({
-      outputTarget: output => (smpOutput = output),
+      outputTarget: output => (testRef.smpOutput = output),
     });
     const smpWebpackConfig = genSmpWebpackConfig(smp);
 
     beforeAll(() =>
-      runWebpack(smpWebpackConfig).then(file => (smpDistApp = file))
+      runWebpack(smpWebpackConfig).then(file => (testRef.smpDistApp = file))
     );
 
     it("should generate the same app.js content", () => {
-      expect(smpDistApp).toEqual(distApp);
+      expect(testRef.smpDistApp).toEqual(testRef.distApp);
     });
 
     it("should generate the same app.js content after 2 runs", () => {
       const dupSmpWebpackConfig = genSmpWebpackConfig(smp);
 
       return runWebpack(dupSmpWebpackConfig).then(dupSmpDistApp => {
-        expect(dupSmpDistApp).toEqual(smpDistApp);
-        expect(dupSmpDistApp).toEqual(distApp);
+        expect(dupSmpDistApp).toEqual(testRef.smpDistApp);
+        expect(dupSmpDistApp).toEqual(testRef.distApp);
       });
     });
 
     it("should state the time taken overall", () => {
-      expect(smpOutput).toMatch(
+      expect(testRef.smpOutput).toMatch(
         /General output time took .*([0-9]+ mins? )?[0-9]+(\.[0-9]+)? secs/
       );
     });
 
     it("should state the time taken by the plugins", () => {
-      expect(smpOutput).toMatch(
+      expect(testRef.smpOutput).toMatch(
         /DefinePlugin.* took .*([0-9]+ mins? )?[0-9]+(\.[0-9]+)? secs/
       );
     });
 
     it("should state the time taken by the loaders", () => {
-      expect(smpOutput).toMatch(
+      expect(testRef.smpOutput).toMatch(
         /babel-loader.* took .*([0-9]+ mins? )?[0-9]+(\.[0-9]+)? secs.*\n\s+module count\s+= [0-9]+/
       );
     });
+
+    let customTests;
+    try {
+      customTests = require("./customTests");
+    } catch (_) {
+      // do nothing, we expect `require` to fail if no tests exist
+    }
+    if (customTests) {
+      describe("custom tests", () => customTests(testRef));
+    }
   });
 });

__tests__/setups/.gitignore

@@ -4,3 +4,4 @@ styles.css
 smp.test.js
 jest.config.js
 dist
+dist2