inline interopDefault in config loading (#2782)

rollup · Apr 2, 2019 · dba1438 · dba1438
1 parent 8825cdb
commit dba1438
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/bin/src/run/loadConfigFile.ts b/bin/src/run/loadConfigFile.ts
@@ -10,10 +10,6 @@ interface NodeModuleWithCompile extends NodeModule {
 	_compile(code: string, filename: string): any;
 }
 
-function interopDefault<T>(ex: T): T {
-	return ex && typeof ex === 'object' && 'default' in ex ? (ex as any).default : ex;
-}
-
 export default function loadConfigFile(
 	configFile: string,
 	commandOptions: any = {}
@@ -54,8 +50,9 @@ export default function loadConfigFile(
 
 			delete require.cache[configFile];
 
-			return Promise.resolve(interopDefault(require(configFile)))
+			return Promise.resolve(require(configFile))
 				.then(configFileContent => {
+					if (configFileContent.default) configFileContent = configFileContent.default;
 					if (typeof configFileContent === 'function') {
 						return configFileContent(commandOptions);
 					}