- fix for #131

ezolenko · Jan 16, 2019 · d1082d8 · d1082d8
1 parent 8dcdfb8
commit d1082d8
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 79 deletions.
diff --git a/dist/check-tsconfig.d.ts.map b/dist/check-tsconfig.d.ts.map
diff --git a/dist/get-option-defaults.d.ts b/dist/get-option-defaults.d.ts
diff --git a/dist/get-option-defaults.d.ts.map b/dist/get-option-defaults.d.ts.map
diff --git a/dist/get-options-overrides.d.ts.map b/dist/get-options-overrides.d.ts.map
diff --git a/dist/parse-tsconfig.d.ts.map b/dist/parse-tsconfig.d.ts.map
diff --git a/dist/rollup-plugin-typescript2.cjs.js b/dist/rollup-plugin-typescript2.cjs.js
@@ -24957,38 +24957,25 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
         allowNonTsExtensions: true,
     };
     if (preParsedTsconfig) {
+        if (preParsedTsconfig.options.module === undefined)
+            overrides.module = tsModule.ModuleKind.ES2015;
         const declaration = preParsedTsconfig.options.declaration;
         if (!declaration)
-            overrides.declarationDir = null;
+            overrides.declarationDir = undefined;
         if (declaration && !useTsconfigDeclarationDir)
             overrides.declarationDir = process.cwd();
         // unsetting sourceRoot if sourceMap is not enabled (in case original tsconfig had inlineSourceMap set that is being unset and would cause TS5051)
         const sourceMap = preParsedTsconfig.options.sourceMap;
         if (!sourceMap)
-            overrides.sourceRoot = null;
+            overrides.sourceRoot = undefined;
     }
     return overrides;
 }
 
 function checkTsConfig(parsedConfig) {
     const module = parsedConfig.options.module;
-    switch (module) {
-        case tsModule.ModuleKind.ES2015:
-        case tsModule.ModuleKind.ESNext:
-            break;
-        case undefined:
-            throw new Error(`Incompatible tsconfig option. Missing module option. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
-        default:
-            throw new Error(`Incompatible tsconfig option. Module resolves to '${tsModule.ModuleKind[module]}'. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
-    }
-}
-
-function getOptionsDefaults() {
-    return {
-        compilerOptions: {
-            module: "ES2015",
-        },
-    };
+    if (module !== tsModule.ModuleKind.ES2015 && module !== tsModule.ModuleKind.ESNext)
+        throw new Error(`Incompatible tsconfig option. Module resolves to '${tsModule.ModuleKind[module]}'. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
 }
 
 function parseTsConfig(context, pluginOptions) {
@@ -25015,7 +25002,7 @@ function parseTsConfig(context, pluginOptions) {
         configFileName = fileName;
     }
     const mergedConfig = {};
-    lodash_14(mergedConfig, getOptionsDefaults(), pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
+    lodash_14(mergedConfig, pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
     const preParsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, getOptionsOverrides(pluginOptions), configFileName);
     const compilerOptionsOverride = getOptionsOverrides(pluginOptions, preParsedTsConfig);
     const parsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, compilerOptionsOverride, configFileName);

diff --git a/dist/rollup-plugin-typescript2.cjs.js.map b/dist/rollup-plugin-typescript2.cjs.js.map
diff --git a/dist/rollup-plugin-typescript2.es.js b/dist/rollup-plugin-typescript2.es.js
@@ -24953,38 +24953,25 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
         allowNonTsExtensions: true,
     };
     if (preParsedTsconfig) {
+        if (preParsedTsconfig.options.module === undefined)
+            overrides.module = tsModule.ModuleKind.ES2015;
         const declaration = preParsedTsconfig.options.declaration;
         if (!declaration)
-            overrides.declarationDir = null;
+            overrides.declarationDir = undefined;
         if (declaration && !useTsconfigDeclarationDir)
             overrides.declarationDir = process.cwd();
         // unsetting sourceRoot if sourceMap is not enabled (in case original tsconfig had inlineSourceMap set that is being unset and would cause TS5051)
         const sourceMap = preParsedTsconfig.options.sourceMap;
         if (!sourceMap)
-            overrides.sourceRoot = null;
+            overrides.sourceRoot = undefined;
     }
     return overrides;
 }
 
 function checkTsConfig(parsedConfig) {
     const module = parsedConfig.options.module;
-    switch (module) {
-        case tsModule.ModuleKind.ES2015:
-        case tsModule.ModuleKind.ESNext:
-            break;
-        case undefined:
-            throw new Error(`Incompatible tsconfig option. Missing module option. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
-        default:
-            throw new Error(`Incompatible tsconfig option. Module resolves to '${tsModule.ModuleKind[module]}'. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
-    }
-}
-
-function getOptionsDefaults() {
-    return {
-        compilerOptions: {
-            module: "ES2015",
-        },
-    };
+    if (module !== tsModule.ModuleKind.ES2015 && module !== tsModule.ModuleKind.ESNext)
+        throw new Error(`Incompatible tsconfig option. Module resolves to '${tsModule.ModuleKind[module]}'. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
 }
 
 function parseTsConfig(context, pluginOptions) {
@@ -25011,7 +24998,7 @@ function parseTsConfig(context, pluginOptions) {
         configFileName = fileName;
     }
     const mergedConfig = {};
-    lodash_14(mergedConfig, getOptionsDefaults(), pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
+    lodash_14(mergedConfig, pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
     const preParsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, getOptionsOverrides(pluginOptions), configFileName);
     const compilerOptionsOverride = getOptionsOverrides(pluginOptions, preParsedTsConfig);
     const parsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, compilerOptionsOverride, configFileName);

diff --git a/dist/rollup-plugin-typescript2.es.js.map b/dist/rollup-plugin-typescript2.es.js.map
diff --git a/src/check-tsconfig.ts b/src/check-tsconfig.ts
@@ -3,16 +3,8 @@ import * as tsTypes from "typescript";
 
 export function checkTsConfig(parsedConfig: tsTypes.ParsedCommandLine): void
 {
-	const module = parsedConfig.options.module;
+	const module = parsedConfig.options.module!;
 
-	switch (module)
-	{
-		case tsModule.ModuleKind.ES2015:
-		case tsModule.ModuleKind.ESNext:
-			break;
-		case undefined:
-			throw new Error(`Incompatible tsconfig option. Missing module option. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
-		default:
-			throw new Error(`Incompatible tsconfig option. Module resolves to '${tsModule.ModuleKind[module]}'. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
-	}
+	if (module !== tsModule.ModuleKind.ES2015 && module !== tsModule.ModuleKind.ESNext)
+		throw new Error(`Incompatible tsconfig option. Module resolves to '${tsModule.ModuleKind[module]}'. This is incompatible with rollup, please use 'module: "ES2015"' or 'module: "ESNext"'.`);
 }
diff --git a/src/get-option-defaults.ts b/src/get-option-defaults.ts
diff --git a/src/get-options-overrides.ts b/src/get-options-overrides.ts
@@ -5,7 +5,7 @@ import * as _ from "lodash";
 
 export function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }: IOptions, preParsedTsconfig?: tsTypes.ParsedCommandLine): tsTypes.CompilerOptions
 {
-	const overrides = {
+	const overrides: tsTypes.CompilerOptions = {
 		noEmitHelpers: false,
 		importHelpers: true,
 		noResolve: false,
@@ -18,16 +18,19 @@ export function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }: IO
 
 	if (preParsedTsconfig)
 	{
+		if (preParsedTsconfig.options.module === undefined)
+			overrides.module = tsModule.ModuleKind.ES2015;
+
 		const declaration = preParsedTsconfig.options.declaration;
 		if (!declaration)
-			(overrides as any).declarationDir = null;
+			overrides.declarationDir = undefined;
 		if (declaration && !useTsconfigDeclarationDir)
-			(overrides as any).declarationDir = process.cwd();
+			overrides.declarationDir = process.cwd();
 
 		// unsetting sourceRoot if sourceMap is not enabled (in case original tsconfig had inlineSourceMap set that is being unset and would cause TS5051)
 		const sourceMap = preParsedTsconfig.options.sourceMap;
 		if (!sourceMap)
-			(overrides as any).sourceRoot = null;
+			overrides.sourceRoot = undefined;
 	}
 
 	return overrides;

diff --git a/src/parse-tsconfig.ts b/src/parse-tsconfig.ts
@@ -8,7 +8,6 @@ import { getOptionsOverrides } from "./get-options-overrides";
 import { IOptions } from "./ioptions";
 import * as _ from "lodash";
 import { checkTsConfig } from "./check-tsconfig";
-import { getOptionsDefaults } from "./get-option-defaults";
 
 export function parseTsConfig(context: IContext, pluginOptions: IOptions): tsTypes.ParsedCommandLine
 {
@@ -43,7 +42,7 @@ export function parseTsConfig(context: IContext, pluginOptions: IOptions): tsTyp
 	}
 
 	const mergedConfig = {};
-	_.merge(mergedConfig, getOptionsDefaults(), pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
+	_.merge(mergedConfig, pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
 
 	const preParsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, getOptionsOverrides(pluginOptions), configFileName);
 	const compilerOptionsOverride = getOptionsOverrides(pluginOptions, preParsedTsConfig);

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	 "extends": "./tsconfig.base",
+	"extends": "./tsconfig.base",
 	"compilerOptions": {
 		"target": "es6",
 		"noImplicitAny": true,