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

ci: correct bad bazel merge

Browse Source
This commit is contained in:
Miško Hevery 2017-07-27 11:13:45 -07:00 committed by Miško Hevery
parent 45a10419bc
commit 9a188485f5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -41,7 +41,7 @@ jobs:
- restore_cache: - restore_cache:
key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }} key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
- run: bazel run @io_bazel_rules_typescript_node//:bin/npm install - run: bazel run @build_bazel_rules_typescript_node//:bin/npm install
- run: bazel build ... - run: bazel build ...
- save_cache: - save_cache:
key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }} key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}

6
packages/compiler-cli/src/compiler_host.ts
View File

@ -41,8 +41,8 @@ export class CompilerHost implements AotCompilerHost {
protected program: ts.Program, protected options: AngularCompilerOptions, protected program: ts.Program, protected options: AngularCompilerOptions,
protected context: CompilerHostContext, collectorOptions?: CollectorOptions) { protected context: CompilerHostContext, collectorOptions?: CollectorOptions) {
// normalize the path so that it never ends with '/'. // normalize the path so that it never ends with '/'.
this.basePath = path.normalize(path.join(this.options.basePath, '.')).replace(/\\/g, '/'); this.basePath = path.normalize(path.join(this.options.basePath !, '.')).replace(/\\/g, '/');
this.genDir = path.normalize(path.join(this.options.genDir, '.')).replace(/\\/g, '/'); this.genDir = path.normalize(path.join(this.options.genDir !, '.')).replace(/\\/g, '/');
const genPath: string = path.relative(this.basePath, this.genDir); const genPath: string = path.relative(this.basePath, this.genDir);
this.isGenDirChildOfRootDir = genPath === '' || !genPath.startsWith('..'); this.isGenDirChildOfRootDir = genPath === '' || !genPath.startsWith('..');
@ -312,7 +312,7 @@ export class CompilerHost implements AotCompilerHost {
relativePath = relativePath.substr(3); relativePath = relativePath.substr(3);
} }
return path.join(this.options.genDir, relativePath); return path.join(this.options.genDir !, relativePath);
} }
private hasBundleIndex(filePath: string): boolean { private hasBundleIndex(filePath: string): boolean {

2
packages/compiler-cli/src/extractor.ts
View File

@ -36,7 +36,7 @@ export class Extractor {
return promiseBundle.then(bundle => { return promiseBundle.then(bundle => {
const content = this.serialize(bundle, formatName); const content = this.serialize(bundle, formatName);
const dstFile = outFile || `messages.${ext}`; const dstFile = outFile || `messages.${ext}`;
const dstPath = path.join(this.options.genDir, dstFile); const dstPath = path.join(this.options.genDir !, dstFile);
this.host.writeFile(dstPath, content, false); this.host.writeFile(dstPath, content, false);
return [dstPath]; return [dstPath];
}); });

8
packages/compiler-cli/src/transformers/module_filename_resolver.ts
View File

@ -27,8 +27,8 @@ class SingleRootDirModuleFilenameResolver implements ModuleFilenameResolver {
constructor(private host: ModuleFilenameResolutionHost, private options: CompilerOptions) { constructor(private host: ModuleFilenameResolutionHost, private options: CompilerOptions) {
// normalize the path so that it never ends with '/'. // normalize the path so that it never ends with '/'.
this.basePath = path.normalize(path.join(options.basePath, '.')).replace(/\\/g, '/'); this.basePath = path.normalize(path.join(options.basePath !, '.')).replace(/\\/g, '/');
this.genDir = path.normalize(path.join(options.genDir, '.')).replace(/\\/g, '/'); this.genDir = path.normalize(path.join(options.genDir !, '.')).replace(/\\/g, '/');
const genPath: string = path.relative(this.basePath, this.genDir); const genPath: string = path.relative(this.basePath, this.genDir);
this.isGenDirChildOfRootDir = genPath === '' || !genPath.startsWith('..'); this.isGenDirChildOfRootDir = genPath === '' || !genPath.startsWith('..');
@ -153,7 +153,7 @@ class MultipleRootDirModuleFilenameResolver implements ModuleFilenameResolver {
constructor(private host: ModuleFilenameResolutionHost, private options: CompilerOptions) { constructor(private host: ModuleFilenameResolutionHost, private options: CompilerOptions) {
// normalize the path so that it never ends with '/'. // normalize the path so that it never ends with '/'.
this.basePath = path.normalize(path.join(options.basePath, '.')).replace(/\\/g, '/'); this.basePath = path.normalize(path.join(options.basePath !, '.')).replace(/\\/g, '/');
} }
getNgCanonicalFileName(fileName: string): string { getNgCanonicalFileName(fileName: string): string {
@ -282,4 +282,4 @@ function createModuleFilenameResolverHost(host: ts.ModuleResolutionHost):
resolveModuleNameHost.realpath = (fileName: string) => fileName; resolveModuleNameHost.realpath = (fileName: string) => fileName;
return resolveModuleNameHost; return resolveModuleNameHost;
} }