File tree Expand file tree Collapse file tree 5 files changed +36
-5
lines changed
addon/ng2/blueprints/ng2/files Expand file tree Collapse file tree 5 files changed +36
-5
lines changed Original file line number Diff line number Diff line change 18
18
/libpeerconnection.log
19
19
npm-debug.log
20
20
testem.log
21
+ /typings/
21
22
22
23
# e2e
23
24
/e2e/*.js
24
25
/e2e/*.map
26
+
Original file line number Diff line number Diff line change 8
8
"playSound" : false
9
9
}
10
10
},
11
+ "scripts" : {
12
+ "start" : " ng server" ,
13
+ "postinstall" : " typings install --ambient"
14
+ },
11
15
"private" : true ,
12
16
"dependencies" : {
13
- "angular2" : " 2.0.0-beta.0 " ,
17
+ "angular2" : " 2.0.0-beta.3 " ,
14
18
"es6-promise" : " ^3.0.2" ,
15
19
"es6-shim" : " ^0.33.3" ,
16
20
"reflect-metadata" : " 0.1.2" ,
17
21
"rxjs" : " 5.0.0-beta.0" ,
18
22
"systemjs" : " 0.19.4" ,
19
- "zone.js" : " 0.5.10 "
23
+ "zone.js" : " 0.5.11 "
20
24
},
21
25
"devDependencies" : {
22
26
"angular-cli" : " 0.0.*" ,
27
31
"karma-chrome-launcher" : " ^0.2.1" ,
28
32
"karma-jasmine" : " ^0.3.6" ,
29
33
"protractor" : " ^3.0.0" ,
30
- "typescript" : " ^1.7.3"
34
+ "typescript" : " ^1.7.3" ,
35
+ "typings" : " ^0.6.6"
31
36
}
32
37
}
Original file line number Diff line number Diff line change 8
8
"moduleResolution" : " node" ,
9
9
"noEmitOnError" : true ,
10
10
"noImplicitAny" : false ,
11
+ "outDir" : " ../dist/" ,
11
12
"rootDir" : " ." ,
12
13
"sourceMap" : true ,
13
14
"sourceRoot" : " /" ,
14
15
"target" : " es5"
15
- }
16
+ },
17
+ "exclude" : [
18
+ " ../typings/main.d.ts"
19
+ ]
16
20
}
Original file line number Diff line number Diff line change
1
+ {
2
+ "dependencies" : {},
3
+ "devDependencies" : {
4
+ },
5
+ "ambientDevDependencies" : {
6
+ "jasmine" : " github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#26c98c8a9530c44f8c801ccc3b2057e2101187ee"
7
+ },
8
+ "ambientDependencies" : {
9
+ }
10
+ }
Original file line number Diff line number Diff line change
1
+ var path = require ( 'path' ) ;
1
2
var Concat = require ( 'broccoli-concat' ) ;
2
3
var configReplace = require ( './broccoli-config-replace' ) ;
3
4
var compileWithTypescript = require ( './broccoli-typescript' ) . default ;
@@ -32,7 +33,16 @@ Angular2App.prototype.toTree = function() {
32
33
vendorNpmFiles = vendorNpmFiles . concat ( this . options . vendorNpmFiles ) ;
33
34
}
34
35
35
- var tsConfigCompilerOptions = JSON . parse ( fs . readFileSync ( 'src/tsconfig.json' , 'utf-8' ) ) . compilerOptions ;
36
+ var tsConfig = JSON . parse ( fs . readFileSync ( 'src/tsconfig.json' , 'utf-8' ) ) ;
37
+ var tsConfigCompilerOptions = tsConfig . compilerOptions ;
38
+
39
+ // `rootFilesPath` is used by the broccoli-typescript to add files to the compilation.
40
+ // It is _not_ part of the `tsconfig.json` spec, so it won't be found in
41
+ // tsConfigCompilerOptions. This adds the typings manually to the compilation step.
42
+ tsConfigCompilerOptions . rootFilePaths = [
43
+ path . join ( process . cwd ( ) , 'typings/browser.d.ts' )
44
+ ] ;
45
+
36
46
var tsTree = compileWithTypescript ( sourceTree , tsConfigCompilerOptions ) ;
37
47
var tsSrcTree = new Funnel ( sourceTree , {
38
48
include : [ '**/*.ts' ] ,
You can’t perform that action at this time.
0 commit comments