chore(client:ts): remove typings, use @types

Author: Awk34

templates/app/_package.json

@@ -65,6 +65,22 @@
     "@angular/platform-browser-dynamic": "~2.4.9",
     "@angular/router": "^3.4.7",
     "@angularclass/hmr": "^1.2.1",
+  <%_ if(filters.ts) { -%>
+    "@types/core-js": "^0.9.41",
+    <%_ if(filters.jasmine) { -%>
+    "@types/jasmine": "^2.5.47",
+    <%_ } -%>
+    "@types/lodash": "^4.14.63",
+    <%_ if(filters.mocha) { -%>
+    "@types/mocha": "^2.2.41",
+    "@types/chai": "^3.5.2",
+    "@types/sinon": "^2.1.3",
+    "@types/sinon-chai": "^2.7.27",
+    <%_ } -%>
+    "@types/node": "^7.0.14",
+    "@types/selenium-webdriver": "^3.0.3",
+    "@types/webpack": "^2.2.15",
+  <%_ } -%>
     "angular2-universal": "2.1.0-rc.1",
     "angular2-jwt": "^0.1.24",
     <% if(filters.auth) { %>
@@ -195,18 +211,14 @@
     "proxyquire": "^1.0.1",
     "strip-ansi": "^3.0.1",
     "supertest": "^1.1.0"<% if(filters.ts) { %>,
-    "tslint": "^3.5.0",
-    "typings": "^0.8.1"<% } %>
+    "tslint": "^3.5.0"<% } %>
   },
   "engines": {
     "node": "^6.2.2",
     "npm": "^3.9.5"
   },
   "scripts": {
     "test": "gulp test",
-    <%_ if(filters.ts) { -%>
-    "postinstall": "./node_modules/.bin/typings install",
-    <%_ } -%>
     <%_ if(filters.flow) { -%>
     "flow": "flow",
     <%_ } -%>

templates/app/gulpfile.babel.js

@@ -30,8 +30,7 @@ const paths = {
         images: `${clientPath}/assets/images/**/*`,
         revManifest: `${clientPath}/assets/rev-manifest.json`,
         scripts: [
-            `${clientPath}/**/!(*.spec|*.mock).<%= scriptExt %>`<% if(filters.ts) { %>,
-            `!${clientPath}/{typings,test_typings}/**/*`<% } %>
+            `${clientPath}/**/!(*.spec|*.mock).<%= scriptExt %>`
         ],
         styles: [`${clientPath}/{app,components}/**/*.<%= styleExt %>`],
         mainStyle: `${clientPath}/app/app.<%= styleExt %>`,
@@ -241,13 +240,6 @@ function webpackCompile(options, cb) {
 gulp.task('webpack:dev', cb => webpackCompile({ DEV: true }, cb));
 gulp.task('webpack:dist', cb => webpackCompile({ BUILD: true }, cb));
 gulp.task('webpack:test', cb => webpackCompile({ TEST: true }, cb));
-<%_ if(filters.ts) { -%>
-
-// Install DefinitelyTyped TypeScript definition files
-gulp.task('typings', () => {
-    return gulp.src("./typings.json")
-        .pipe(plugins.typings());
-});<% } %>
 
 gulp.task('styles', () => {
     <%_ if(!filters.css) { _%>
@@ -352,8 +344,7 @@ gulp.task('serve', cb => {
             'lint:scripts',
             'inject',
             'copy:fonts:dev',
-            'env:all'<% if(filters.ts) { %>,
-            'typings'<% } %>
+            'env:all'
         ],
         // 'webpack:dev',
         ['start:server', 'start:client'],
@@ -369,8 +360,7 @@ gulp.task('serve:debug', cb => {
             'lint:scripts',
             'inject',
             'copy:fonts:dev',
-            'env:all'<% if(filters.ts) { %>,
-            'typings'<% } %>
+            'env:all'
         ],
         'webpack:dev',
         'start:inspector',
@@ -481,8 +471,7 @@ gulp.task('build', cb => {
         'inject',
         'transpile:server',
         [
-            'build:images'<% if(filters.ts) { %>,
-            'typings'<% } %>
+            'build:images'
         ],
         [
             'copy:extras',

templates/app/tsconfig(ts).json

@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "sourceMap": true,
+    "rootDir": "./client",
+    "module": "es6",
+    "outDir": ".tmp",
+    "removeComments": false,
+    "target": "ES5"
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "filesGlob": [
+    "client/{app,components}/**/!(*.spec).ts"
+  ],
+  "awesomeTypescriptLoaderOptions": {
+    "resolveGlobs": true,
+    "forkChecker": true
+  }
+}

templates/app/tsconfig.client(ts).json

@@ -134,7 +134,7 @@ module.exports = function makeWebpackConfig(options) {
                 loader: 'awesome-typescript-loader',
                 <%_ if(filters.ts) { -%>
                 options: {
-                    tsconfig: path.resolve(__dirname, 'tsconfig.client.json')
+                    tsconfig: path.resolve(__dirname, 'tsconfig.json')
                 },<% } %>
             }].concat(DEV ? '@angularclass/hmr-loader' : []),
             include: [