Skip to content

Commit db585b2

Browse files
author
borysn
committed
typescript 2 beta
1 parent af24685 commit db585b2

File tree

3 files changed

+27
-16
lines changed

3 files changed

+27
-16
lines changed

src/main/web/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
<link rel="stylesheet" type="text/css" href="/css/style.css">
1212

1313
<!-- libs -->
14-
<script src="/js/lib/zone.js"></script>
1514
<script src="/js/lib/Reflect.js"></script>
15+
<script src="/js/lib/zone.js"></script>
1616
<script src="/js/lib/system.src.js"></script>
1717
<script src="/js/lib/jquery.js"></script>
18+
<script src="/js/lib/moment.js"></script>
1819
<script src="/js/lib/tether.js"></script>
1920
<script src="/js/lib/bootstrap.js"></script>
2021
<script src="/js/lib/ng2-bootstrap.js"></script>

src/main/web/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"@angular/upgrade": "2.0.0-rc.5",
2323
"angular2-in-memory-web-api": "0.0.15",
2424
"bootstrap": "^4.0.0-alpha.2",
25-
"es6-shim": "^0.35.1",
2625
"font-awesome": "^4.6.3",
2726
"jquery": "^2.2.4",
2827
"moment": "^2.14.1",
@@ -32,7 +31,7 @@
3231
"symbol-observable": "^1.0.2",
3332
"systemjs": "0.19.36",
3433
"tether": "^1.3.4",
35-
"zone.js": "^0.6.12"
34+
"zone.js": "^0.6.13"
3635
},
3736
"devDependencies": {
3837
"@types/jasmine": "^2.2.31",
@@ -44,6 +43,7 @@
4443
"gulp-sass": "^2.3.2",
4544
"gulp-typescript": "2.13.6",
4645
"jasmine-core": "2.4.1",
47-
"lite-server": "^2.2.2"
46+
"lite-server": "^2.2.2",
47+
"typescript": "^2.0.0-beta"
4848
}
49-
}
49+
}

src/main/web/tsconfig.json

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
{
22
"compilerOptions": {
3-
"target": "es6",
4-
"module": "system",
5-
"moduleResolution": "node",
6-
"sourceMap": true,
7-
"emitDecoratorMetadata": true,
8-
"experimentalDecorators": true,
9-
"removeComments": false,
10-
"noImplicitAny": false,
11-
"outDir": "../../../build/generated-web-resources/static/app/"
3+
"target": "es6",
4+
"module": "system",
5+
"moduleResolution": "node",
6+
"emitDecoratorMetadata": true,
7+
"experimentalDecorators": true,
8+
"sourceMap": true,
9+
"outDir": "../../../build/generated-web-resources/static/app/",
10+
"lib": ["es6", "dom"],
11+
"strictNullChecks": false,
12+
"baseUrl": "./app",
13+
"paths": [
14+
],
15+
"types": [
16+
"jasmine"
17+
]
1218
},
1319

1420
"exclude": [
15-
"node_modules"
16-
]
21+
"node_modules"
22+
],
23+
24+
"compileOnSave": false,
25+
"buildOnSave": false,
26+
"atom": { "rewriteTsconfig": false }
1727
}

0 commit comments

Comments
 (0)