Merge branch 'release/1.3.2'

Author: stephencookdev

README.md

@@ -141,6 +141,16 @@ This flag is _experimental_. Some loaders will have inaccurate results:
 
 We will find solutions to these issues before removing the _(experimental)_ flag on this option.
 
+## FAQ
+
+### What does general output time mean?
+
+This tends to be down to webpack reading in from the file-system, but in general it's anything outside of what SMP can actually measure.
+
+### What does modules without loaders mean?
+
+It means vanilla JS files, which webpack can handle out of the box.
+
 ## Contributing
 
 Contributors are welcome! 😊

WrappedPlugin/index.js

@@ -164,12 +164,16 @@ const construcNamesToWrap = [
 ];
 
 const wrappedObjs = [];
-const wrap = (orig, pluginName, smp, addEndEvent) => {
-  if (!orig) return orig;
+const findWrappedObj = (orig, pluginName) => {
   const prevWrapped = wrappedObjs.find(
     w => w.pluginName === pluginName && (w.orig === orig || w.wrapped === orig)
   );
   if (prevWrapped) return prevWrapped.wrapped;
+};
+const wrap = (orig, pluginName, smp, addEndEvent) => {
+  if (!orig) return orig;
+  const prevWrapped = findWrappedObj(orig, pluginName);
+  if (prevWrapped) return prevWrapped;
 
   const getOrigConstrucName = target =>
     target && target.constructor && target.constructor.name;
@@ -217,6 +221,13 @@ const wrap = (orig, pluginName, smp, addEndEvent) => {
             getOrigConstrucName(target)
           );
 
+        if (shouldWrap && property === "compiler") {
+          const prevWrapped = findWrappedObj(raw, pluginName);
+          if (prevWrapped) {
+            return prevWrapped;
+          }
+        }
+
         if (typeof raw === "function") {
           const ret = raw.bind(proxy);
           if (property === "constructor")

loader.js

@@ -7,7 +7,8 @@ let id = 0;
 const NS = path.dirname(fs.realpathSync(__filename));
 
 const getLoaderName = path => {
-  const nodeModuleName = /\/node_modules\/([^\/]+)/.exec(path);
+  const standardPath = path.replace(/\\/g, "/");
+  const nodeModuleName = /\/node_modules\/([^\/]+)/.exec(standardPath);
   return (nodeModuleName && nodeModuleName[1]) || "";
 };
 
@@ -36,7 +37,7 @@ module.exports.pitch = function() {
               });
               return asyncCallback.apply(this, arguments);
             };
-          }.bind(this)
+          }.bind(this),
         });
 
         callback({

utils.js

@@ -51,10 +51,12 @@ module.exports.getLoaderNames = loaders =>
     ? loaders
         .map(l => l.loader || l)
         .map(l =>
-          l.replace(
-            /^.*\/node_modules\/(@[a-z0-9][\w-.]+\/[a-z0-9][\w-.]*|[^\/]+).*$/,
-            (_, m) => m
-          )
+          l
+            .replace(/\\/g, "/")
+            .replace(
+              /^.*\/node_modules\/(@[a-z0-9][\w-.]+\/[a-z0-9][\w-.]*|[^\/]+).*$/,
+              (_, m) => m
+            )
         )
         .filter(l => !l.includes("speed-measure-webpack-plugin"))
     : ["modules with no loaders"];