feat: use @types instead of typings

README.md

@@ -265,16 +265,13 @@ ng new sassy-project --style=sass
 
 Simply install your library via `npm install lib-name` and import it in your code.
 
-If the library does not include typings, you can search and install them using `npm run typings` npm script provided:
+If the library does not include typings, you can install them using npm:
 
 ```bash
 npm install moment
-npm run typings -- search moment
-npm run typings -- install dt~moment --global
+npm install @types/moment
 ```
 
-See https://github.com/typings/typings for more information about the `typings` tool.
-
 ### Updating angular-cli
 
 To update `angular-cli` to a new version, you must update both the global package and your project's local package.

addon/ng2/blueprints/ng2/files/__path__/tsconfig.json

@@ -9,6 +9,12 @@
     "moduleResolution": "node",
     "outDir": "<%= relativeRootPath %>/dist/out-tsc",
     "sourceMap": true,
-    "target": "es5"
+    "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types"
+    ],
+    "types": [
+      "jasmine"
+    ]
   }
 }

addon/ng2/blueprints/ng2/files/__path__/typings.d.ts

@@ -2,10 +2,7 @@
 // https://github.com/typings/typings
 // https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
 
-/// <reference path="<%= relativeRootPath %>/typings/index.d.ts" />
-<% if(!isMobile) { %>
 declare var System: any;
-<% if(!isMobile) { %>declare var module: { id: string };<% } %>
+declare var module: { id: string };
 declare var require: any;
-<% } %>
 

addon/ng2/blueprints/ng2/files/config/karma.conf.js

@@ -1,3 +1,6 @@
+// Karma configuration file, see link for more information		
+// https://karma-runner.github.io/0.13/config/configuration-file.html
+
 module.exports = function (config) {
   config.set({
     basePath: '..',
@@ -22,7 +25,7 @@ module.exports = function (config) {
       './src/test.ts': ['angular-cli']
     },
     angularCliConfig: './angular-cli.json',
-    reporters: ['progress'],
+    reporters: ['coverage', 'progress'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

addon/ng2/blueprints/ng2/files/e2e/tsconfig.json

@@ -8,6 +8,9 @@
     "moduleResolution": "node",
     "outDir": "../dist/out-tsc-e2e",
     "sourceMap": true,
-    "target": "es5"
+    "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types"
+    ]
   }
 }

addon/ng2/blueprints/ng2/files/package.json

@@ -5,12 +5,10 @@
   "angular-cli": {},
   "scripts": {
     "start": "ng serve",
-    "postinstall": "typings install",
     "lint": "tslint \"<%= sourceDir %>/**/*.ts\"",
     "test": "ng test",
     "pree2e": "webdriver-manager update",
-    "e2e": "protractor",
-    "typings": "typings"
+    "e2e": "protractor"
   },
   "private": true,
   "dependencies": {
@@ -36,19 +34,19 @@
     "angular2-universal-polyfills": "0.4.1",
     "preboot": "2.1.2",
     "parse5": "1.5.1",<% } %>
+    "@types/jasmine": "^2.2.30",
+    "@types/protractor": "^1.5.16",
     "angular-cli": "^<%= version %>",
-    "codelyzer": "0.0.20",
-    "ember-cli-inject-live-reload": "1.4.0",
+    "codelyzer": "0.0.26",
     "jasmine-core": "2.4.1",
     "jasmine-spec-reporter": "2.5.0",
     "karma": "0.13.22",
     "karma-chrome-launcher": "0.2.3",
     "karma-coverage": "^1.0.0",
     "karma-jasmine": "0.3.8",
     "protractor": "3.3.0",
-    "ts-node": "0.9.1",
-    "tslint": "3.11.0",
-    "typescript": "^1.9.0-dev.20160627-1.0",
-    "typings": "^1.3.1"
+    "ts-node": "1.2.1",
+    "tslint": "3.13.0",
+    "typescript": "^2.0.0"
   }
 }

addon/ng2/models/webpack-build-common.ts

@@ -3,25 +3,14 @@ import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as HtmlWebpackPlugin from 'html-webpack-plugin';
 import * as webpack from 'webpack';
 import { ForkCheckerPlugin } from 'awesome-typescript-loader';
-import { LoaderConfig, PathsPlugin } from '../utilities/ts-path-mappings-webpack-plugin';
 import { CliConfig } from './config';
 
 export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
-  const awesomeTypescriptLoaderConfig: LoaderConfig | any = {
-    useWebpackText: true,
-    useForkChecker: true,
-    tsconfig: path.resolve(projectRoot, `./${sourceDir}/tsconfig.json`)
-  }
-
   return {
     devtool: 'inline-source-map',
     resolve: {
       extensions: ['', '.ts', '.js'],
-      root: path.resolve(projectRoot, `./${sourceDir}`),
-      moduleDirectories: ['node_modules'],
-      plugins: [
-        new PathsPlugin(awesomeTypescriptLoaderConfig);
-      ]
+      root: path.resolve(projectRoot, `./${sourceDir}`)
     },
     context: path.resolve(__dirname, './'),
     entry: {
@@ -49,7 +38,10 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
           loaders: [
             {
               loader: 'awesome-typescript-loader',
-              query: awesomeTypescriptLoaderConfig
+              query: {
+                useForkChecker: true,
+                tsconfig: path.resolve(projectRoot, `./${sourceDir}/tsconfig.json`)
+              }
             },
             {
               loader: 'angular2-template-loader'

addon/ng2/models/webpack-build-test.js

@@ -42,7 +42,6 @@ const getWebpackTestConfig = function(projectRoot, sourceDir) {
             {
               loader: 'awesome-typescript-loader',
               query: {
-                useWebpackText: true,
                 tsconfig: path.resolve(projectRoot, `./${sourceDir}/tsconfig.json`),
                 module: 'commonjs',
                 target: 'es5',