Skip to content

Commit 0f5c70d

Browse files
ocombeIgorMinar
ocombe
authored and
IgorMinar
committed
build: update npm dependencies (angular#19328)
PR Close angular#19328
1 parent f48b343 commit 0f5c70d

File tree

86 files changed

+960
-1560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+960
-1560
lines changed

‎modules/angular1_router/build.js

+2
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,15 @@ if (require.main === module) {
103103
args.shift(); // node
104104
args.shift(); // scriptfile.js
105105
if (args.length < 2) {
106+
// tslint:disable-next-line:no-console
106107
console.log("usage: $0 outFile path/to/modules");
107108
process.exit(1);
108109
}
109110
var outfile = args.shift();
110111
var directory = args.shift();
111112
fs.writeFileSync(outfile, main(directory));
112113
} catch (e) {
114+
// tslint:disable-next-line:no-console
113115
console.log(e.message);
114116
process.exit(1);
115117
}

‎modules/angular1_router/src/module_template.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function $locationHashPrefixProvider($locationProvider) {
3131
hashPrefix = prefix;
3232
}
3333
return hashPrefixFn(prefix);
34-
}
34+
};
3535

3636
// Return the final hashPrefix as the value of this service
3737
this.$get = function() { return hashPrefix; };
@@ -110,7 +110,7 @@ function routerFactory($q, $location, $browser, $rootScope, $injector, $routerRo
110110
}
111111
}
112112

113-
}
113+
};
114114

115115
var registry = new RouteRegistry($routerRootComponent);
116116
var location = new Location();

‎modules/angular1_router/test/integration/lifecycle_hook_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ describe('Navigation lifecycle', function () {
3232

3333
registerComponent('oneCmp', {
3434
template: '<div>{{oneCmp.number}}</div>',
35-
controller: function () {this.number = 'one'}
35+
controller: function () {this.number = 'one';}
3636
});
3737
registerComponent('twoCmp', {
3838
template: '<div><a ng-link="[\'/Two\']">{{twoCmp.number}}</a></div>',
39-
controller: function () {this.number = 'two'}
39+
controller: function () {this.number = 'two';}
4040
});
4141
});
4242

‎modules/angular1_router/test/integration/navigation_spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ describe('navigation', function () {
3737
});
3838
registerDirective('oneCmp', {
3939
template: '<div>{{oneCmp.number}}</div>',
40-
controller: function () {this.number = 'one'}
40+
controller: function () {this.number = 'one';}
4141
});
4242
registerDirective('twoCmp', {
4343
template: '<div>{{twoCmp.number}}</div>',
44-
controller: function () {this.number = 'two'}
44+
controller: function () {this.number = 'two';}
4545
});
4646
registerComponent('threeCmp', {
4747
template: '<div>{{$ctrl.number}}</div>',
48-
controller: function () {this.number = 'three'}
48+
controller: function () {this.number = 'three';}
4949
});
5050
registerComponent('getParams', {
5151
template: '<div>{{$ctrl.params.x}}</div>',
@@ -54,7 +54,7 @@ describe('navigation', function () {
5454
this.params = next.params;
5555
};
5656
}
57-
})
57+
});
5858
});
5959

6060
it('should work in a simple case', function () {
@@ -331,7 +331,7 @@ describe('navigation', function () {
331331
var definition = {
332332
template: options.template || '',
333333
controller: getController(options),
334-
}
334+
};
335335
applyStaticProperties(definition.controller, options);
336336
$compileProvider.component(name, definition);
337337
}

‎modules/angular1_router/test/integration/router_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe('router', function () {
6868
expect(homeElement.text()).toBe('Home');
6969
expect(homeElement.isolateScope().$ctrl.$router).toBeDefined();
7070
expect(router).toBeDefined();
71-
})
71+
});
7272
});
7373

7474
it('should work when an async route is provided route data', function() {
@@ -126,7 +126,7 @@ describe('router', function () {
126126
var homeElement = elt.find('home-cmp');
127127
expect(homeElement.text()).toBe('Home');
128128
expect($routerOnActivate).toHaveBeenCalled();
129-
})
129+
});
130130
});
131131

132132
it('should provide the current instruction', function() {

‎modules/angular1_router/test/ng_link_spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('ngLink', function () {
6464

6565
it('should allow params in routerLink directive', function () {
6666
setup({baseHref: baseHref, html5Mode: html5Mode, hashPrefix: hashPrefix});
67-
registerComponent('twoLinkCmp', '<div><a ng-link="[\'/Two\', {param: \'lol\'}]">{{twoLinkCmp.number}}</a></div>', function () {this.number = 'two'});
67+
registerComponent('twoLinkCmp', '<div><a ng-link="[\'/Two\', {param: \'lol\'}]">{{twoLinkCmp.number}}</a></div>', function () {this.number = 'two';});
6868
configureRouter([
6969
{ path: '/a', component: 'twoLinkCmp' },
7070
{ path: '/b/:param', component: 'twoCmp', name: 'Two' }
@@ -78,7 +78,7 @@ describe('ngLink', function () {
7878

7979
it('should update the href of links with bound params', function () {
8080
setup({baseHref: baseHref, html5Mode: html5Mode, hashPrefix: hashPrefix});
81-
registerComponent('twoLinkCmp', '<div><a ng-link="[\'/Two\', {param: $ctrl.number}]">{{$ctrl.number}}</a></div>', function () {this.number = 43});
81+
registerComponent('twoLinkCmp', '<div><a ng-link="[\'/Two\', {param: $ctrl.number}]">{{$ctrl.number}}</a></div>', function () {this.number = 43;});
8282
configureRouter([
8383
{ path: '/a', component: 'twoLinkCmp' },
8484
{ path: '/b/:param', component: 'twoCmp', name: 'Two' }
@@ -184,8 +184,8 @@ describe('ngLink', function () {
184184
$locationProvider.hashPrefix(config.hashPrefix);
185185
});
186186
registerComponent('userCmp', '<div>hello {{$ctrl.$routeParams.name}}</div>', function () {});
187-
registerComponent('oneCmp', '<div>{{$ctrl.number}}</div>', function () {this.number = 'one'});
188-
registerComponent('twoCmp', '<div><a ng-link="[\'/Two\']">{{$ctrl.number}}</a></div>', function () {this.number = 'two'});
187+
registerComponent('oneCmp', '<div>{{$ctrl.number}}</div>', function () {this.number = 'one';});
188+
registerComponent('twoCmp', '<div><a ng-link="[\'/Two\']">{{$ctrl.number}}</a></div>', function () {this.number = 'two';});
189189
}
190190

191191
function configureRouter(routeConfig) {

‎modules/angular1_router/test/util.es5.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ function provideHelpers(fn, preInject) {
8383
$rootRouter: $rootRouter,
8484
put: put,
8585
compile: compile
86-
})
87-
}
86+
});
87+
};
8888
}

‎modules/e2e_util/perf_util.ts

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88
export {verifyNoBrowserErrors} from './e2e_util';
99

10-
const yargs = require('yargs');
1110
const nodeUuid = require('node-uuid');
1211
import * as fs from 'fs-extra';
1312

‎modules/playground/src/async/index.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ class AsyncApplication {
4343
multiTimeoutId: any = null;
4444
intervalId: any = null;
4545

46-
increment(): void { this.val1++; };
46+
increment(): void { this.val1++; }
4747

4848
delayedIncrement(): void {
4949
this.cancelDelayedIncrement();
5050
this.timeoutId = setTimeout(() => {
5151
this.val2++;
5252
this.timeoutId = null;
5353
}, 2000);
54-
};
54+
}
5555

5656
multiDelayedIncrements(i: number): void {
5757
this.cancelMultiDelayedIncrements();
@@ -69,33 +69,33 @@ class AsyncApplication {
6969
}, 500);
7070
}
7171
helper(i);
72-
};
72+
}
7373

7474
periodicIncrement(): void {
7575
this.cancelPeriodicIncrement();
7676
this.intervalId = setInterval(() => this.val4++, 2000);
77-
};
77+
}
7878

7979
cancelDelayedIncrement(): void {
8080
if (this.timeoutId != null) {
8181
clearTimeout(this.timeoutId);
8282
this.timeoutId = null;
8383
}
84-
};
84+
}
8585

8686
cancelMultiDelayedIncrements(): void {
8787
if (this.multiTimeoutId != null) {
8888
clearTimeout(this.multiTimeoutId);
8989
this.multiTimeoutId = null;
9090
}
91-
};
91+
}
9292

9393
cancelPeriodicIncrement(): void {
9494
if (this.intervalId != null) {
9595
clearInterval(this.intervalId);
9696
this.intervalId = null;
9797
}
98-
};
98+
}
9999
}
100100

101101
@NgModule(

‎modules/rollup-test/rollup.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ export default {
3939
rollupNG2(),
4040
nodeResolve({ jsnext: true, main: true }),
4141
]
42-
}
42+
};

‎package.json

+26-32
Original file line numberDiff line numberDiff line change
@@ -29,51 +29,49 @@
2929
"zone.js": "^0.8.12"
3030
},
3131
"optionalDependencies": {
32-
"fsevents": "1.0.17"
32+
"fsevents": "1.1.2"
3333
},
3434
"devDependencies": {
3535
"@bazel/typescript": "0.1.x",
36-
"@types/angularjs": "1.5.13-alpha",
36+
"@types/angularjs": "1.5.14-alpha",
3737
"@types/base64-js": "1.2.5",
3838
"@types/chokidar": "1.7.3",
39-
"@types/fs-extra": "0.0.22-alpha",
40-
"@types/hammerjs": "2.0.33",
39+
"@types/fs-extra": "4.0.2",
40+
"@types/hammerjs": "2.0.35",
4141
"@types/jasmine": "2.2.22-alpha",
4242
"@types/node": "6.0.88",
43-
"@types/selenium-webdriver": "3.0.6",
43+
"@types/selenium-webdriver": "3.0.7",
4444
"@types/systemjs": "0.19.32",
4545
"angular": "1.5.0",
4646
"angular-animate": "1.5.0",
4747
"angular-mocks": "1.5.0",
48-
"base64-js": "1.2.0",
49-
"bower": "1.7.2",
50-
"browserstacktunnel-wrapper": "1.4.2",
48+
"base64-js": "1.2.1",
49+
"bower": "1.8.2",
50+
"browserstacktunnel-wrapper": "2.0.1",
5151
"canonical-path": "0.0.2",
52-
"chokidar": "1.4.2",
52+
"chokidar": "1.7.0",
5353
"clang-format": "1.0.41",
5454
"cldr": "4.5.0",
5555
"cldr-data-downloader": "0.3.2",
5656
"cldrjs": "0.5.0",
5757
"conventional-changelog": "1.1.0",
58-
"cors": "2.7.1",
59-
"dgeni": "0.4.2",
60-
"dgeni-packages": "0.16.5",
58+
"cors": "2.8.4",
6159
"domino": "1.0.29",
6260
"entities": "1.1.1",
63-
"firebase-tools": "3.9.2",
64-
"firefox-profile": "0.3.11",
65-
"fs-extra": "0.26.3",
66-
"glob": "4.5.3",
61+
"firebase-tools": "3.12.0",
62+
"firefox-profile": "1.0.3",
63+
"fs-extra": "4.0.2",
64+
"glob": "7.1.2",
6765
"gulp": "3.9.1",
6866
"gulp-clang-format": "1.0.23",
69-
"gulp-connect": "2.3.1",
67+
"gulp-connect": "5.0.0",
7068
"gulp-conventional-changelog": "1.1.0",
71-
"gulp-tslint": "7.0.1",
69+
"gulp-tslint": "8.1.2",
7270
"hammerjs": "2.0.8",
7371
"incremental-dom": "0.4.1",
7472
"jasmine": "2.4.1",
7573
"jasmine-core": "2.4.1",
76-
"jpm": "1.0.0",
74+
"jpm": "1.3.1",
7775
"karma": "0.13.20",
7876
"karma-browserstack-launcher": "0.1.9",
7977
"karma-chrome-launcher": "0.2.0",
@@ -82,34 +80,30 @@
8280
"karma-sourcemap-loader": "0.3.6",
8381
"madge": "0.5.0",
8482
"minimist": "1.2.0",
85-
"nan": "2.4.0",
8683
"node-uuid": "1.4.8",
8784
"protractor": "5.1.2",
88-
"react": "0.14.9",
8985
"rewire": "2.5.2",
90-
"rho": "0.3.0",
9186
"rollup": "0.47.4",
9287
"rollup-plugin-commonjs": "8.1.0",
9388
"rollup-plugin-node-resolve": "3.0.0",
9489
"rollup-plugin-sourcemaps": "0.4.2",
95-
"selenium-webdriver": "3.0.x",
96-
"semver": "5.1.0",
97-
"sorcery": "0.10.0",
98-
"source-map": "0.5.6",
99-
"source-map-support": "0.4.2",
90+
"selenium-webdriver": "3.5.0",
91+
"semver": "5.4.1",
92+
"source-map": "0.5.7",
93+
"source-map-support": "0.4.18",
10094
"systemjs": "0.18.10",
10195
"ts-api-guardian": "0.2.2",
10296
"tsickle": "0.24.x",
103-
"tslint": "4.1.1",
104-
"tslint-eslint-rules": "3.1.0",
97+
"tslint": "5.7.0",
98+
"tslint-eslint-rules": "4.1.1",
10599
"typescript": "2.4.2",
106100
"uglify-js": "2.8.29",
107-
"universal-analytics": "0.3.10",
101+
"universal-analytics": "0.4.15",
108102
"vlq": "0.2.2",
109-
"vrsource-tslint-rules": "4.0.0",
103+
"vrsource-tslint-rules": "5.1.1",
110104
"webpack": "1.12.9",
111105
"xhr2": "0.1.4",
112-
"yargs": "3.31.0",
106+
"yargs": "9.0.1",
113107
"yarn": "1.0.2"
114108
}
115109
}

‎packages/benchpress/src/firefox_extension/lib/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Profiler {
5353
function forceGC() {
5454
Cu.forceGC();
5555
os.notifyObservers(null, 'child-gc-request', null);
56-
};
56+
}
5757

5858
const mod = require('sdk/page-mod');
5959
const data = require('sdk/self').data;

‎packages/benchpress/src/firefox_extension/lib/test_helper.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exports.getFirefoxProfile = function(extensionPath: string) {
2828

2929
const firefoxProfile = new FirefoxProfile();
3030
firefoxProfile.addExtensions([extensionPath], () => {
31-
firefoxProfile.encoded((encodedProfile: any) => {
31+
firefoxProfile.encoded((err: any, encodedProfile: string) => {
3232
const multiCapabilities = [{browserName: 'firefox', firefox_profile: encodedProfile}];
3333
deferred.resolve(multiCapabilities);
3434
});

‎packages/benchpress/test/firefox_extension/parser_util_spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function assertEventsEqual(actualEvents: any[], expectedEvents: any[]) {
1717
expect(actualEvent[key]).toEqual(expectedEvent[key]);
1818
}
1919
}
20-
};
20+
}
2121

2222
export function main() {
2323
describe('convertPerfProfileToEvents', function() {
@@ -97,4 +97,4 @@ export function main() {
9797
assertEventsEqual(perfEvents, [{ph: 'X', ts: 1, name: 'script'}]);
9898
});
9999
});
100-
};
100+
}

‎packages/compiler-cli/browser-rollup.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ export default {
6868
},
6969
banner: banner,
7070
plugins: [{resolveId: resolve}, commonjs()]
71-
}
71+
};

‎packages/compiler-cli/integrationtest/test/test_ngtools_api.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Use of this source code is governed by an MIT-style license that can be
77
* found in the LICENSE file at https://angular.io/license
88
*/
9-
/* tslint:disable:no-console */
109

1110
// Must be imported first, because Angular decorators throw on load.
1211
import 'reflect-metadata';
@@ -18,6 +17,7 @@ import {__NGTOOLS_PRIVATE_API_2, readConfiguration} from '@angular/compiler-cli'
1817

1918
const glob = require('glob');
2019

20+
/* tslint:disable:no-console */
2121
/**
2222
* Main method.
2323
* Standalone program that executes codegen using the ngtools API and tests that files were

‎packages/compiler-cli/integrationtest/test/test_summaries.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Use of this source code is governed by an MIT-style license that can be
77
* found in the LICENSE file at https://angular.io/license
88
*/
9-
/* tslint:disable:no-console */
109

1110
// Must be imported first, because Angular decorators throw on load.
1211
import 'reflect-metadata';
@@ -16,6 +15,7 @@ import * as ts from 'typescript';
1615
import * as assert from 'assert';
1716
import {CompilerOptions, CodeGenerator, CompilerHostContext, NodeCompilerHostContext, readConfiguration} from '@angular/compiler-cli';
1817

18+
/* tslint:disable:no-console */
1919
/**
2020
* Main method.
2121
* Standalone program that executes the real codegen and tests that

0 commit comments

Comments
 (0)