Merge remote-tracking branch 'origin' into webpack

Author: TheLarkInn

addon/ng2/blueprints/ng2/files/__path__/test.ts

@@ -1,3 +1,4 @@
+
 /*global jasmine, __karma__, window*/
 require('core-js/es6');
 require('core-js/es7/reflect');
@@ -15,22 +16,25 @@ require('zone.js/dist/sync-test');
 // RxJS
 require('rxjs/Rx');
 
-let testing: any = require('@angular/core/testing');
-let browser: any = require('@angular/platform-browser-dynamic/testing');
+Promise.all([
+    System.import('@angular/core/testing'),
+    System.import('@angular/platform-browser-dynamic/testing')
+  ]).then(function (providers) {
+    let testing = providers[0];
+    let testingBrowser = providers[1];
 
-testing.setBaseTestProviders(
-  browser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
-  browser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS
-);
+    testing.setBaseTestProviders(testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+    testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
+});
 
-let testContext: any = require.context('../src', true, /\.spec\.ts/);
+let testContext = require.context('../src', true, /\.spec\.ts/);
 
 /*
  * get all the files, for each file, call the context function
  * that will require the file and load it up here. Context will
  * loop and require those spec files here
  */
-function requireAll(requireContext: any) {
+function requireAll(requireContext) {
   return requireContext.keys().map(requireContext);
 }
 

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

@@ -6,7 +6,6 @@
     "experimentalDecorators": true,
     "module": "es6",
     "target": "es5",
-    "lib": ["es6", "dom"],
     "moduleResolution": "node",
     "outDir": "./dist/",
     "rootDir": ".",
@@ -19,6 +18,6 @@
     "bower_components"
   ],
   "files": [
-    "./src/typings.d.ts"
+    "typings.d.ts"
   ]
 }

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

@@ -3,8 +3,13 @@
 // https://github.com/typings/typings
 // https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
 
-/// <reference path="<%= refToTypings %>/typings/browser.d.ts" />
+/// <reference path="<%= refToTypings %>/typings/index.d.ts" />
+/// <reference path="../node_modules/typescript/lib/lib.es2015.core.d.ts" />
+/// <reference path="../node_modules/typescript/lib/lib.es2015.collection.d.ts" />
+/// <reference path="../node_modules/typescript/lib/lib.es2015.promise.d.ts" />
+
 <% if(!isMobile) { %>
+declare var System: any;
 declare var module: { id: string };
 declare var require: any;
 <% } %>

addon/ng2/blueprints/ng2/files/angular-cli-build.js

@@ -47,6 +47,6 @@
     "ts-node": "0.9.1",
     "tslint": "3.11.0",
     "typescript": "^1.9.0-dev.20160627-1.0",
-    "typings": "0.8.1"<%= stylePackage %>
+    "typings": "^1.3.1"<%= stylePackage %>
   }
 }

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

@@ -1,10 +1,10 @@
 {
-  "ambientDevDependencies": {
+  "globalDevDependencies": {
     "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
     "jasmine": "registry:dt/jasmine#2.2.0+20160412134438",
     "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
   },
-  "ambientDependencies": {
+  "globalDependencies": {
     <% if (isMobile) {%>"node": "registry:dt/node#6.0.0+20160621231320" <% } %>
   }
 }

addon/ng2/blueprints/ng2/files/typings.json

@@ -47,7 +47,6 @@ export const getWebpackTestConfig = function(projectRoot: string) {
                 // resolveGlobs: false,
                 module: "commonjs",
                 target: "es5",
-                lib: ['es6', 'dom'],
                 useForkChecker: true,
                 removeComments: true
               }

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

@@ -16,7 +16,7 @@ export default function(config) {
     preprocessors: { './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'] },
     webpack: testWebpackConfig,
     webpackServer: { noInfo: true },
-    reporters: [ 'mocha', 'coverage' ],
+    reporters: ['progress', 'mocha', 'coverage' ],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

addon/ng2/models/webpack-karma-config.ts

@@ -31,10 +31,9 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@angular/compiler-cli": "^0.2.0",
-    "@angularclass/webpack-toolkit": "^1.0.1",
     "@types/webpack": "^1.12.22-alpha",
     "angular2-template-loader": "^0.4.0",
-    "awesome-typescript-loader": "^2.0.0-rc.3",
+    "awesome-typescript-loader": "1.1.1",
     "babel-core": "^6.9.1",
     "babel-loader": "^6.2.4",
     "babel-preset-es2015-webpack": "^6.4.1",