fix(resolve): default moduleResolution to node

fathyb · Dec 15, 2017 · b0d111d · b0d111d
1 parent bc9e6a4
commit b0d111d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/backend/config-loader.ts b/src/backend/config-loader.ts
@@ -22,14 +22,17 @@ export class ConfigurationLoader<T> {
 				const tsconfig = configPath && commentsJson.parse(await readFile(configPath))
 				const transpilerOptions = {
 					compilerOptions: {
-						module: 'commonjs',
-						jsx: 'preserve'
+						module: 'es2015',
+						moduleResolution: 'node'
 					}
 				} as any
 
 				// Overwrite default if config is found
 				if(tsconfig) {
-					transpilerOptions.compilerOptions = tsconfig.compilerOptions
+					transpilerOptions.compilerOptions = {
+						...transpilerOptions.compilerOptions,
+						...tsconfig.compilerOptions
+					}
 					transpilerOptions.files = tsconfig.files
 					transpilerOptions.include = tsconfig.include
 					transpilerOptions.exclude = tsconfig.exclude