Updated typings to 1.3.1, removed unneeded stuff, and fixed testing o…

…utput
angular · Jul 6, 2016 · aea7447 · aea7447
1 parent 7ca3196
commit aea7447
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 27 deletions.
diff --git a/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts b/addon/ng2/blueprints/ng2/files/__path__/typings.d.ts
@@ -3,12 +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;
 <% } %>

diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js
diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json
@@ -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 %>
   }
 }
diff --git a/addon/ng2/blueprints/ng2/files/typings.json b/addon/ng2/blueprints/ng2/files/typings.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" <% } %>
   }
 }
diff --git a/addon/ng2/models/webpack-build-test.ts b/addon/ng2/models/webpack-build-test.ts
@@ -47,7 +47,6 @@ export const getWebpackTestConfig = function(projectRoot: string) {
                 // resolveGlobs: false,
                 module: "commonjs",
                 target: "es5",
-                lib: ['es6', 'dom'],
                 useForkChecker: true,
                 removeComments: true
               }

diff --git a/addon/ng2/models/webpack-karma-config.ts b/addon/ng2/models/webpack-karma-config.ts
@@ -16,7 +16,7 @@ export default function(config) {
     preprocessors: { './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'] },
     webpack: testWebpackConfig,
     webpackServer: { noInfo: true },
-    reporters: [ 'text-summary', 'mocha', 'coverage' ],
+    reporters: ['progress', 'mocha', 'coverage' ],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,