File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed
tools/@angular/tsc-wrapped/src Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -31,11 +31,16 @@ cp -v package.json $TMP
31
31
# TODO(alexeagle): allow this to be npm link instead
32
32
npm install ${LINKABLE_PKGS[*]}
33
33
34
+ ./node_modules/.bin/tsc --version
34
35
# Compile the compiler-cli integration tests
35
36
./node_modules/.bin/ngc
36
37
./node_modules/.bin/ng-xi18n
37
38
38
39
./node_modules/.bin/jasmine init
39
40
# Run compiler-cli integration tests in node
40
41
./node_modules/.bin/jasmine test/* _spec.js
42
+
43
+ # Compile again with a differently named tsconfig file
44
+ mv tsconfig.json othername.json
45
+ ./node_modules/.bin/ngc -p othername.json
41
46
)
Original file line number Diff line number Diff line change @@ -54,9 +54,11 @@ export class Tsc implements CompilerInterface {
54
54
this . basePath = basePath ;
55
55
56
56
// Allow a directory containing tsconfig.json as the project value
57
+ // Note, TS@next returns an empty array, while earlier versions throw
57
58
try {
58
- this . readDirectory ( project ) ;
59
- project = path . join ( project , 'tsconfig.json' ) ;
59
+ if ( this . readDirectory ( project ) . length > 0 ) {
60
+ project = path . join ( project , 'tsconfig.json' ) ;
61
+ }
60
62
} catch ( e ) {
61
63
// Was not a directory, continue on assuming it's a file
62
64
}
You can’t perform that action at this time.
0 commit comments