Bump to enable explicit v5 support

Author: stephencookdev

.nvmrc

@@ -1 +1 @@
-12.20.0
+18

CONTRIBUTING.md

@@ -4,6 +4,8 @@ Contributors are welcome to help out with this repository! 😊
 
 Please follow this guide when raising issues, and contributing to the SMP repository.
 
+Running the repo locally and executing the test suite requires Node v18+.
+
 ## Raising an Issue
 
 If you're raising an issue with SMP being incompatible with a particular webpack config, plugin, or loader - then please include reproduction steps.

README.md

@@ -34,7 +34,9 @@ yarn add -D speed-measure-webpack-plugin
 
 ## Requirements
 
-SMP requires at least **Node v6**. But otherwise, accepts **all webpack** versions (1, 2, 3, and 4).
+SMP requires at least **Node v6**. But otherwise, accepts **all webpack** versions (1, 2, 3, 4, and 5).
+
+To work on the repository itself and run the test suite, use **Node v18+**.
 
 ## Usage
 

WrappedPlugin/index.js

@@ -27,12 +27,12 @@ const genWrappedFunc = ({
   // to complete compilation. If this gets invoked and not the subsequent
   // call, then our data will be inaccurate, sadly
   addEndEvent();
-  const normalArgMap = a => wrap(a, pluginName, smp);
+  const normalArgMap = (a) => wrap(a, pluginName, smp);
   let ret;
   if (endType === "wrapDone")
     ret = func.apply(
       context,
-      args.map(a => wrap(a, pluginName, smp, addEndEvent))
+      args.map((a) => wrap(a, pluginName, smp, addEndEvent))
     );
   else if (endType === "async") {
     const argsButLast = args.slice(0, args.length - 1);
@@ -45,7 +45,7 @@ const genWrappedFunc = ({
       })
     );
   } else if (endType === "promise")
-    ret = func.apply(context, args.map(normalArgMap)).then(promiseArg => {
+    ret = func.apply(context, args.map(normalArgMap)).then((promiseArg) => {
       addEndEvent();
       return promiseArg;
     });
@@ -56,7 +56,7 @@ const genWrappedFunc = ({
 };
 
 const genPluginMethod = (orig, pluginName, smp, type) =>
-  function(method, func) {
+  function (method, func) {
     const timeEventName = pluginName + "/" + type + "/" + method;
     const wrappedFunc = genWrappedFunc({
       func,
@@ -70,7 +70,7 @@ const genPluginMethod = (orig, pluginName, smp, type) =>
   };
 
 const wrapTap = (tap, pluginName, smp, type, method) =>
-  function(id, func) {
+  function (id, func) {
     const timeEventName = pluginName + "/" + type + "/" + method;
     const wrappedFunc = genWrappedFunc({
       func,
@@ -83,7 +83,7 @@ const wrapTap = (tap, pluginName, smp, type, method) =>
   };
 
 const wrapTapAsync = (tapAsync, pluginName, smp, type, method) =>
-  function(id, func) {
+  function (id, func) {
     const timeEventName = pluginName + "/" + type + "/" + method;
     const wrappedFunc = genWrappedFunc({
       func,
@@ -97,7 +97,7 @@ const wrapTapAsync = (tapAsync, pluginName, smp, type, method) =>
   };
 
 const wrapTapPromise = (tapPromise, pluginName, smp, type, method) =>
-  function(id, func) {
+  function (id, func) {
     const timeEventName = pluginName + "/" + type + "/" + method;
     const wrappedFunc = genWrappedFunc({
       func,
@@ -115,12 +115,12 @@ const wrapHooks = (orig, pluginName, smp, type) => {
   const hooks = orig.hooks;
   if (!hooks) return hooks;
   const prevWrapped = wrappedHooks.find(
-    w =>
+    (w) =>
       w.pluginName === pluginName && (w.orig === hooks || w.wrapped === hooks)
   );
   if (prevWrapped) return prevWrapped.wrapped;
 
-  const genProxy = method => {
+  const genProxy = (method) => {
     const proxy = new Proxy(hooks[method], {
       get: (target, property) => {
         const raw = Reflect.get(target, property);
@@ -149,6 +149,15 @@ const wrapHooks = (orig, pluginName, smp, type) => {
   };
 
   const wrapped = Object.keys(hooks).reduce((acc, method) => {
+    if (method === "normalModuleLoader") {
+      Object.defineProperty(acc, method, {
+        configurable: true,
+        enumerable: true,
+        get: () => genProxy(method),
+      });
+      return acc;
+    }
+
     acc[method] = genProxy(method);
     return acc;
   }, {});
@@ -170,7 +179,8 @@ const construcNamesToWrap = [
 const wrappedObjs = [];
 const findWrappedObj = (orig, pluginName) => {
   const prevWrapped = wrappedObjs.find(
-    w => w.pluginName === pluginName && (w.orig === orig || w.wrapped === orig)
+    (w) =>
+      w.pluginName === pluginName && (w.orig === orig || w.wrapped === orig)
   );
   if (prevWrapped) return prevWrapped.wrapped;
 };
@@ -179,15 +189,15 @@ const wrap = (orig, pluginName, smp, addEndEvent) => {
   const prevWrapped = findWrappedObj(orig, pluginName);
   if (prevWrapped) return prevWrapped;
 
-  const getOrigConstrucName = target =>
+  const getOrigConstrucName = (target) =>
     target && target.constructor && target.constructor.name;
-  const getShouldWrap = target => {
+  const getShouldWrap = (target) => {
     const origConstrucName = getOrigConstrucName(target);
     return construcNamesToWrap.includes(origConstrucName);
   };
   const shouldWrap = getShouldWrap(orig);
   const shouldSoftWrap = Object.keys(orig)
-    .map(k => orig[k])
+    .map((k) => orig[k])
     .some(getShouldWrap);
 
   let wrappedReturn;
@@ -196,7 +206,7 @@ const wrap = (orig, pluginName, smp, addEndEvent) => {
     const vanillaFunc = orig.name === "next";
     wrappedReturn =
       vanillaFunc && addEndEvent
-        ? function() {
+        ? function () {
             // do this before calling the callback, since the callback can start
             // the next plugin step
             addEndEvent();