fix(@ngtools/webpack): fix tsconfig paths resolver (#3831)

dzonatan · hansl · commit c6d1c9920d40 · 2017-01-10T14:58:26.000-08:00
Fixes #3586
diff --git a/packages/@ngtools/webpack/src/paths-plugin.ts b/packages/@ngtools/webpack/src/paths-plugin.ts
@@ -54,7 +54,7 @@ export class PathsPlugin implements Tapable {
     if (tsConfig.error) {
       throw tsConfig.error;
     }
-    return tsConfig.config;
+    return tsConfig.config.compilerOptions;
   }
 
   constructor(options: PathsPluginOptions) {
@@ -110,7 +110,7 @@ export class PathsPlugin implements Tapable {
   }
 
   apply(resolver: ResolverPlugin): void {
-    let { baseUrl } = this._compilerOptions;
+    let baseUrl = this._compilerOptions.baseUrl || '.';
 
     if (baseUrl) {
       resolver.apply(new ModulesInRootPlugin('module', this._absoluteBaseUrl, 'resolve'));

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export class PathsPlugin implements Tapable {`
`54`	`54`	`if (tsConfig.error) {`
`55`	`55`	`throw tsConfig.error;`
`56`	`56`	`}`
`57`		`- return tsConfig.config;`
	`57`	`+ return tsConfig.config.compilerOptions;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`constructor(options: PathsPluginOptions) {`
`@@ -110,7 +110,7 @@ export class PathsPlugin implements Tapable {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`apply(resolver: ResolverPlugin): void {`
`113`		`- let { baseUrl } = this._compilerOptions;`
	`113`	`+ let baseUrl = this._compilerOptions.baseUrl \|\| '.';`
`114`	`114`
`115`	`115`	`if (baseUrl) {`
`116`	`116`	`resolver.apply(new ModulesInRootPlugin('module', this._absoluteBaseUrl, 'resolve'));`