cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tsc-wrapped): ensure valid path separators in metadata

Browse Source 
* Fixes that `tsc-wrapped` stores invalid path separators in the bundled metadata files. Previous errors could have been: `Cannot find module '.corecoordinationnique-selection-dispatcher'.` (See https://github.com/angular/material2/issues/3834)
* Fixes failing tests on Windows. Now all tooling tests are green on Windows.

Related to #15403
This commit is contained in:
Paul Gschwendtner
2017-03-30 23:31:22 +02:00
committed by Hans
parent 258d5392d5
commit 96aa2365ae
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/@angular/tsc-wrapped/src/bundler.ts
View File

@ -522,12 +522,14 @@ export class CompilerHostAdapter implements MetadataBundlerHost {
function resolveModule(importName: string, from: string): string {
if (importName.startsWith('.') && from) {
const normalPath = path.normalize(path.join(path.dirname(from), importName));
let normalPath = path.normalize(path.join(path.dirname(from), importName));
if (!normalPath.startsWith('.') && from.startsWith('.')) {
// path.normalize() preserves leading '../' but not './'. This adds it back.
return `.${path.sep}${normalPath}`;
normalPath = `.${path.sep}${normalPath}`;
}
return normalPath;
// Replace windows path delimiters with forward-slashes. Otherwise the paths are not
// TypeScript compatible when building the bundle.
return normalPath.replace(/\\/g, '/');
}
return importName;
}