fix(nonGlobalStepDefinitions): .features files now work with webpack

badeball · Jul 3, 2020 · 8b92ed3 · 8b92ed3
1 parent 7d4a3d5
commit 8b92ed3
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 38 deletions.
diff --git a/lib/featuresLoader.js b/lib/featuresLoader.js
@@ -23,19 +23,30 @@ const createCucumber = (
   window.cucumberJson = ${JSON.stringify(cucumberJson)};
 
   var moduleCache = arguments[5];
+  
+  function clearFromCache(moduleId, instance){
+    if(isWebpack()){
+      delete require.cache[moduleId];
+    } else {
+      clearFromCacheBrowserify(instance);
+    }
+  }
+  
+  function isWebpack(){
+    return !!require.cache
+  }
 
   // Stolen from https://github.com/browserify/browserify/issues/1444
-  function clearFromCache(instance)
-  {
-      for(var key in moduleCache)
+  function clearFromCacheBrowserify(instance) {
+      for(const key in moduleCache)
       {
           if(moduleCache[key].exports == instance)
           {
               delete moduleCache[key];
               return;
           }
       }
-      throw "could not clear instance from module cache";
+      throw new Error("could not clear instance from browserify module cache");
   }
 
   ${globalToRequire.join("\n")}
@@ -70,7 +81,8 @@ module.exports = function(_, filePath = this.resourcePath) {
   if (isNonGlobalStepDefinitionsMode()) {
     nonGlobalStepDefinitionsToRequire = features.map(featurePath => ({
       [featurePath]: getStepDefinitionsPaths(featurePath).map(
-        sdPath => `clearFromCache(require('${sdPath}'))`
+        sdPath =>
+          `clearFromCache(require.resolve && require.resolve('${sdPath}'), require('${sdPath}'))`
       )
     }));
   } else {