Don't reuse cache of a module if there are new globals (codesandbox#3897)

CompuIves · web-flow · commit f7e4efed818f · 2020-04-14T14:52:26.000+02:00
* Don't reuse cache of a module if there are new globals

* Make param optional
diff --git a/packages/app/src/sandbox/eval/manager.ts b/packages/app/src/sandbox/eval/manager.ts
@@ -326,7 +326,7 @@ export default class Manager {
 
   evaluateModule(
     module: Module,
-    { force = false, globals = {} }: { force?: boolean; globals?: object } = {}
+    { force = false, globals }: { force?: boolean; globals?: object } = {}
   ) {
     if (this.hardReload && !this.isFirstLoad) {
       // Do a hard reload
@@ -364,7 +364,7 @@ export default class Manager {
   evaluateTranspiledModule(
     transpiledModule: TranspiledModule,
     initiator?: TranspiledModule,
-    { force = false, globals = {} }: { force?: boolean; globals?: object } = {}
+    { force = false, globals }: { force?: boolean; globals?: object } = {}
   ) {
     if (force && transpiledModule.compilation) {
       transpiledModule.compilation = null;
diff --git a/packages/app/src/sandbox/eval/tests/jest-lite.ts b/packages/app/src/sandbox/eval/tests/jest-lite.ts
@@ -144,7 +144,7 @@ export default class TestRunner {
     test.skip = skip;
 
     const it = test;
-    const { window: jsdomWindow } = this.dom;
+    const jsdomWindow = this.dom.window.document.defaultView;
     const { document: jsdomDocument } = jsdomWindow;
 
     // Set the modules that are not set on JSDOM
@@ -258,6 +258,20 @@ export default class TestRunner {
     });
   }
 
+  oldEnvVars: { [key: string]: string };
+  async setup() {
+    this.oldEnvVars = { ...this.manager.envVariables };
+    this.manager.envVariables.NODE_ENV = 'test';
+  }
+
+  async teardown() {
+    const global = this.dom.window.document.defaultView;
+    global.close();
+    Object.defineProperty(global, 'document', { value: null });
+    this.dom = null;
+    this.manager.envVariables = this.oldEnvVars;
+  }
+
   /* istanbul ignore next */
   async runTests(force: boolean = false) {
     if (!this.watching && !force) {
@@ -313,6 +327,8 @@ export default class TestRunner {
 
     resetTestState();
 
+    await this.setup();
+
     await Promise.all(
       tests.map(async t => {
         dispatch(actions.error.clear(t.path, 'jest'));
@@ -341,6 +357,7 @@ export default class TestRunner {
     );
 
     await run();
+    await this.teardown();
 
     setTimeout(() => {
       this.sendMessage(messages.TOTAL_TEST_END);
diff --git a/packages/app/src/sandbox/eval/transpiled-module.ts b/packages/app/src/sandbox/eval/transpiled-module.ts
@@ -140,9 +140,10 @@ export type LoaderContext = {
 };
 /* eslint-enable */
 
-type Compilation = {
+export type Compilation = {
   id: string;
   exports: any;
+  globals: object | undefined;
   hot: {
     accept: (() => void) | ((arg: string | string[], cb: () => void) => void);
     decline: (path: string | Array<string>) => void;
@@ -770,12 +771,24 @@ export default class TranspiledModule {
     }
   };
 
+  isCompilationCached = (globals?: object) => {
+    if (!this.compilation || !this.compilation.exports) {
+      return false;
+    }
+
+    if (this.compilation.globals === globals) {
+      return true;
+    }
+
+    return false;
+  };
+
   evaluate(
     manager: Manager,
     {
       asUMD = false,
       force = false,
-      globals = {},
+      globals,
     }: { asUMD?: boolean; force?: boolean; globals?: any } = {},
     initiator?: TranspiledModule
   ) {
@@ -845,7 +858,7 @@ export default class TranspiledModule {
       ) {
         return this.compilation.exports;
       }
-    } else if (this.compilation && this.compilation.exports && !this.isEntry) {
+    } else if (this.isCompilationCached(globals) && !this.isEntry) {
       return this.compilation.exports;
     }
 
@@ -864,7 +877,8 @@ export default class TranspiledModule {
     this.compilation = this.compilation || {
       id: this.getId(),
       exports: {},
-      hot: {
+      globals,
+      hot: manager.envVariables.NODE_ENV !== 'test' && {
         accept: (path: string | Array<string>, cb) => {
           if (
             typeof path === 'undefined' ||
@@ -926,7 +940,9 @@ export default class TranspiledModule {
         removeStatusHandler: manager.removeStatusHandler,
       },
     };
-    this.compilation.hot.data = hotData;
+    if (this.compilation.hot) {
+      this.compilation.hot.data = hotData;
+    }
 
     const transpiledModule = this;
 
@@ -985,7 +1001,7 @@ export default class TranspiledModule {
         // of that compilation
         const cache = requiredTranspiledModule.compilation;
 
-        return cache
+        return requiredTranspiledModule.isCompilationCached(globals)
           ? cache.exports
           : manager.evaluateTranspiledModule(
               requiredTranspiledModule,
@@ -1001,15 +1017,16 @@ export default class TranspiledModule {
         return foundModule.path;
       };
 
-      globals.__dirname = pathUtils.dirname(this.module.path);
-      globals.__filename = this.module.path;
+      const usedGlobals = globals || {};
+      usedGlobals.__dirname = pathUtils.dirname(this.module.path);
+      usedGlobals.__filename = this.module.path;
 
       const exports = evaluate(
         this.source.compiledCode,
         require,
         this.compilation,
         manager.envVariables,
-        globals,
+        usedGlobals,
         { asUMD }
       );
 
