Skip to content

Commit aea7447

Browse files
committed
Updated typings to 1.3.1, removed unneeded stuff, and fixed testing output
1 parent 7ca3196 commit aea7447

File tree

6 files changed

+6
-27
lines changed

6 files changed

+6
-27
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
// https://github.com/typings/typings
44
// https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
55

6-
/// <reference path="<%= refToTypings %>/typings/browser.d.ts" />
6+
/// <reference path="<%= refToTypings %>/typings/index.d.ts" />
77
/// <reference path="../node_modules/typescript/lib/lib.es2015.core.d.ts" />
88
/// <reference path="../node_modules/typescript/lib/lib.es2015.collection.d.ts" />
99
/// <reference path="../node_modules/typescript/lib/lib.es2015.promise.d.ts" />
1010

1111
<% if(!isMobile) { %>
12+
declare var System: any;
1213
declare var module: { id: string };
1314
declare var require: any;
1415
<% } %>

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

-21
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747
"ts-node": "0.9.1",
4848
"tslint": "3.11.0",
4949
"typescript": "^1.9.0-dev.20160627-1.0",
50-
"typings": "0.8.1"<%= stylePackage %>
50+
"typings": "^1.3.1"<%= stylePackage %>
5151
}
5252
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"ambientDevDependencies": {
2+
"globalDevDependencies": {
33
"angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
44
"jasmine": "registry:dt/jasmine#2.2.0+20160412134438",
55
"selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
66
},
7-
"ambientDependencies": {
7+
"globalDependencies": {
88
<% if (isMobile) {%>"node": "registry:dt/node#6.0.0+20160621231320" <% } %>
99
}
1010
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export const getWebpackTestConfig = function(projectRoot: string) {
4747
// resolveGlobs: false,
4848
module: "commonjs",
4949
target: "es5",
50-
lib: ['es6', 'dom'],
5150
useForkChecker: true,
5251
removeComments: true
5352
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function(config) {
1616
preprocessors: { './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'] },
1717
webpack: testWebpackConfig,
1818
webpackServer: { noInfo: true },
19-
reporters: [ 'text-summary', 'mocha', 'coverage' ],
19+
reporters: ['progress', 'mocha', 'coverage' ],
2020
port: 9876,
2121
colors: true,
2222
logLevel: config.LOG_INFO,

0 commit comments

Comments
 (0)