From 1f9081a306b1ac739af535bad57fc6ec15fd1b18 Mon Sep 17 00:00:00 2001
From: Mikael Lirbank <mikael@airlab.io>
Date: Wed, 27 Feb 2019 15:09:54 -0800
Subject: [PATCH] Change runScript return type to unknown

---
 packages/jest-environment/src/index.ts | 17 +++++++++++------
 packages/jest-runtime/src/index.ts     |  3 ++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/jest-environment/src/index.ts b/packages/jest-environment/src/index.ts
index 693d400a4a0c..00aa0c374451 100644
--- a/packages/jest-environment/src/index.ts
+++ b/packages/jest-environment/src/index.ts
@@ -22,18 +22,23 @@ export type EnvironmentContext = {
 // TODO: type this better: https://nodejs.org/api/modules.html#modules_the_module_wrapper
 type ModuleWrapper = (...args: Array<unknown>) => unknown;
 
+export function hasModuleWrapper(
+  obj: unknown,
+): obj is {[ScriptTransformer.EVAL_RESULT_VARIABLE]: ModuleWrapper} {
+  return (
+    typeof obj === 'object' &&
+    !!obj &&
+    obj.hasOwnProperty(ScriptTransformer.EVAL_RESULT_VARIABLE)
+  );
+}
+
 export declare class JestEnvironment {
   constructor(config: Config.ProjectConfig);
   constructor(config: Config.ProjectConfig, context: EnvironmentContext);
   global: Global.Global;
   fakeTimers: FakeTimers<unknown> | null;
   moduleMocker: ModuleMocker | null;
-  // runScript(
-  //   script: Script,
-  // ): {[ScriptTransformer.EVAL_RESULT_VARIABLE]: ModuleWrapper} | null | unknown;
-  runScript(
-    script: Script,
-  ): {[ScriptTransformer.EVAL_RESULT_VARIABLE]: ModuleWrapper} | null;
+  runScript(script: Script): unknown;
   setup(): Promise<void>;
   teardown(): Promise<void>;
 }
diff --git a/packages/jest-runtime/src/index.ts b/packages/jest-runtime/src/index.ts
index 694738227f3a..137d9f09e4a3 100644
--- a/packages/jest-runtime/src/index.ts
+++ b/packages/jest-runtime/src/index.ts
@@ -12,6 +12,7 @@ import {
   JestEnvironment,
   LocalModuleRequire,
   Module,
+  hasModuleWrapper
 } from '@jest/environment';
 import jestMock, {MockFunctionMetadata} from 'jest-mock';
 import HasteMap, {ModuleMap} from 'jest-haste-map';
@@ -679,7 +680,7 @@ class Runtime {
 
     const runScript = this._environment.runScript(transformedFile.script);
 
-    if (runScript === null) {
+    if (!hasModuleWrapper(runScript)) {
       this._logFormattedReferenceError(
         'You are trying to `import` a file after the Jest environment has been torn down.',
       );