remove direct cache access, fixes #113

theKashey · May 12, 2020 · 244ccf7 · 244ccf7
1 parent 680ca53
commit 244ccf7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/mockModule.js b/src/mockModule.js
@@ -1,5 +1,5 @@
-import Module, {getModuleParent} from './module';
-import wipeCache from './wipeCache';
+import Module, {getModuleName, getModuleParent} from './module';
+import wipeCache, {safelyRemoveCache} from './wipeCache';
 import createScope from './scope';
 import {getScopeVariable, setScope} from './globals';
 import {
@@ -322,11 +322,12 @@ mockModule.clear = () => {
 };
 
 const cleanup = () => {
-  delete require.cache[require.resolve(__filename)];
+  safelyRemoveCache(getModuleName(module));
 };
 
 
 const addPlugin = (plugin) => {
+  plugin.init();
   scope();
   addPluginAPI(plugin);
 };

diff --git a/src/nested.js b/src/nested.js
@@ -1,3 +1,5 @@
 import * as API from './mockModule';
-delete require.cache[require.resolve(__filename)];
+import {safelyRemoveCache} from "./wipeCache";
+import {getModuleName} from "./module";
+safelyRemoveCache(getModuleName(module));
 export default API.mockModule;