Skip to content

Commit

Permalink
build: update npm dependencies (#19328)
Browse files Browse the repository at this point in the history
PR Close #19328
  • Loading branch information
ocombe authored and IgorMinar committed Sep 22, 2017
1 parent f48b343 commit 0f5c70d
Show file tree
Hide file tree
Showing 86 changed files with 960 additions and 1,560 deletions.
2 changes: 2 additions & 0 deletions modules/angular1_router/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,15 @@ if (require.main === module) {
args.shift(); // node
args.shift(); // scriptfile.js
if (args.length < 2) {
// tslint:disable-next-line:no-console
console.log("usage: $0 outFile path/to/modules");
process.exit(1);
}
var outfile = args.shift();
var directory = args.shift();
fs.writeFileSync(outfile, main(directory));
} catch (e) {
// tslint:disable-next-line:no-console
console.log(e.message);
process.exit(1);
}
Expand Down
4 changes: 2 additions & 2 deletions modules/angular1_router/src/module_template.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function $locationHashPrefixProvider($locationProvider) {
hashPrefix = prefix;
}
return hashPrefixFn(prefix);
}
};

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

}
};

var registry = new RouteRegistry($routerRootComponent);
var location = new Location();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ describe('Navigation lifecycle', function () {

registerComponent('oneCmp', {
template: '<div>{{oneCmp.number}}</div>',
controller: function () {this.number = 'one'}
controller: function () {this.number = 'one';}
});
registerComponent('twoCmp', {
template: '<div><a ng-link="[\'/Two\']">{{twoCmp.number}}</a></div>',
controller: function () {this.number = 'two'}
controller: function () {this.number = 'two';}
});
});

Expand Down
10 changes: 5 additions & 5 deletions modules/angular1_router/test/integration/navigation_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ describe('navigation', function () {
});
registerDirective('oneCmp', {
template: '<div>{{oneCmp.number}}</div>',
controller: function () {this.number = 'one'}
controller: function () {this.number = 'one';}
});
registerDirective('twoCmp', {
template: '<div>{{twoCmp.number}}</div>',
controller: function () {this.number = 'two'}
controller: function () {this.number = 'two';}
});
registerComponent('threeCmp', {
template: '<div>{{$ctrl.number}}</div>',
controller: function () {this.number = 'three'}
controller: function () {this.number = 'three';}
});
registerComponent('getParams', {
template: '<div>{{$ctrl.params.x}}</div>',
Expand All @@ -54,7 +54,7 @@ describe('navigation', function () {
this.params = next.params;
};
}
})
});
});

it('should work in a simple case', function () {
Expand Down Expand Up @@ -331,7 +331,7 @@ describe('navigation', function () {
var definition = {
template: options.template || '',
controller: getController(options),
}
};
applyStaticProperties(definition.controller, options);
$compileProvider.component(name, definition);
}
Expand Down
4 changes: 2 additions & 2 deletions modules/angular1_router/test/integration/router_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('router', function () {
expect(homeElement.text()).toBe('Home');
expect(homeElement.isolateScope().$ctrl.$router).toBeDefined();
expect(router).toBeDefined();
})
});
});

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

it('should provide the current instruction', function() {
Expand Down
8 changes: 4 additions & 4 deletions modules/angular1_router/test/ng_link_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe('ngLink', function () {

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

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

function configureRouter(routeConfig) {
Expand Down
4 changes: 2 additions & 2 deletions modules/angular1_router/test/util.es5.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ function provideHelpers(fn, preInject) {
$rootRouter: $rootRouter,
put: put,
compile: compile
})
}
});
};
}
1 change: 0 additions & 1 deletion modules/e2e_util/perf_util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/
export {verifyNoBrowserErrors} from './e2e_util';

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

Expand Down
14 changes: 7 additions & 7 deletions modules/playground/src/async/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ class AsyncApplication {
multiTimeoutId: any = null;
intervalId: any = null;

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

delayedIncrement(): void {
this.cancelDelayedIncrement();
this.timeoutId = setTimeout(() => {
this.val2++;
this.timeoutId = null;
}, 2000);
};
}

multiDelayedIncrements(i: number): void {
this.cancelMultiDelayedIncrements();
Expand All @@ -69,33 +69,33 @@ class AsyncApplication {
}, 500);
}
helper(i);
};
}

periodicIncrement(): void {
this.cancelPeriodicIncrement();
this.intervalId = setInterval(() => this.val4++, 2000);
};
}

cancelDelayedIncrement(): void {
if (this.timeoutId != null) {
clearTimeout(this.timeoutId);
this.timeoutId = null;
}
};
}

cancelMultiDelayedIncrements(): void {
if (this.multiTimeoutId != null) {
clearTimeout(this.multiTimeoutId);
this.multiTimeoutId = null;
}
};
}

cancelPeriodicIncrement(): void {
if (this.intervalId != null) {
clearInterval(this.intervalId);
this.intervalId = null;
}
};
}
}

@NgModule(
Expand Down
2 changes: 1 addition & 1 deletion modules/rollup-test/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ export default {
rollupNG2(),
nodeResolve({ jsnext: true, main: true }),
]
}
};
58 changes: 26 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,51 +29,49 @@
"zone.js": "^0.8.12"
},
"optionalDependencies": {
"fsevents": "1.0.17"
"fsevents": "1.1.2"
},
"devDependencies": {
"@bazel/typescript": "0.1.x",
"@types/angularjs": "1.5.13-alpha",
"@types/angularjs": "1.5.14-alpha",
"@types/base64-js": "1.2.5",
"@types/chokidar": "1.7.3",
"@types/fs-extra": "0.0.22-alpha",
"@types/hammerjs": "2.0.33",
"@types/fs-extra": "4.0.2",
"@types/hammerjs": "2.0.35",
"@types/jasmine": "2.2.22-alpha",
"@types/node": "6.0.88",
"@types/selenium-webdriver": "3.0.6",
"@types/selenium-webdriver": "3.0.7",
"@types/systemjs": "0.19.32",
"angular": "1.5.0",
"angular-animate": "1.5.0",
"angular-mocks": "1.5.0",
"base64-js": "1.2.0",
"bower": "1.7.2",
"browserstacktunnel-wrapper": "1.4.2",
"base64-js": "1.2.1",
"bower": "1.8.2",
"browserstacktunnel-wrapper": "2.0.1",
"canonical-path": "0.0.2",
"chokidar": "1.4.2",
"chokidar": "1.7.0",
"clang-format": "1.0.41",
"cldr": "4.5.0",
"cldr-data-downloader": "0.3.2",
"cldrjs": "0.5.0",
"conventional-changelog": "1.1.0",
"cors": "2.7.1",
"dgeni": "0.4.2",
"dgeni-packages": "0.16.5",
"cors": "2.8.4",
"domino": "1.0.29",
"entities": "1.1.1",
"firebase-tools": "3.9.2",
"firefox-profile": "0.3.11",
"fs-extra": "0.26.3",
"glob": "4.5.3",
"firebase-tools": "3.12.0",
"firefox-profile": "1.0.3",
"fs-extra": "4.0.2",
"glob": "7.1.2",
"gulp": "3.9.1",
"gulp-clang-format": "1.0.23",
"gulp-connect": "2.3.1",
"gulp-connect": "5.0.0",
"gulp-conventional-changelog": "1.1.0",
"gulp-tslint": "7.0.1",
"gulp-tslint": "8.1.2",
"hammerjs": "2.0.8",
"incremental-dom": "0.4.1",
"jasmine": "2.4.1",
"jasmine-core": "2.4.1",
"jpm": "1.0.0",
"jpm": "1.3.1",
"karma": "0.13.20",
"karma-browserstack-launcher": "0.1.9",
"karma-chrome-launcher": "0.2.0",
Expand All @@ -82,34 +80,30 @@
"karma-sourcemap-loader": "0.3.6",
"madge": "0.5.0",
"minimist": "1.2.0",
"nan": "2.4.0",
"node-uuid": "1.4.8",
"protractor": "5.1.2",
"react": "0.14.9",
"rewire": "2.5.2",
"rho": "0.3.0",
"rollup": "0.47.4",
"rollup-plugin-commonjs": "8.1.0",
"rollup-plugin-node-resolve": "3.0.0",
"rollup-plugin-sourcemaps": "0.4.2",
"selenium-webdriver": "3.0.x",
"semver": "5.1.0",
"sorcery": "0.10.0",
"source-map": "0.5.6",
"source-map-support": "0.4.2",
"selenium-webdriver": "3.5.0",
"semver": "5.4.1",
"source-map": "0.5.7",
"source-map-support": "0.4.18",
"systemjs": "0.18.10",
"ts-api-guardian": "0.2.2",
"tsickle": "0.24.x",
"tslint": "4.1.1",
"tslint-eslint-rules": "3.1.0",
"tslint": "5.7.0",
"tslint-eslint-rules": "4.1.1",
"typescript": "2.4.2",
"uglify-js": "2.8.29",
"universal-analytics": "0.3.10",
"universal-analytics": "0.4.15",
"vlq": "0.2.2",
"vrsource-tslint-rules": "4.0.0",
"vrsource-tslint-rules": "5.1.1",
"webpack": "1.12.9",
"xhr2": "0.1.4",
"yargs": "3.31.0",
"yargs": "9.0.1",
"yarn": "1.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/benchpress/src/firefox_extension/lib/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Profiler {
function forceGC() {
Cu.forceGC();
os.notifyObservers(null, 'child-gc-request', null);
};
}

const mod = require('sdk/page-mod');
const data = require('sdk/self').data;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports.getFirefoxProfile = function(extensionPath: string) {

const firefoxProfile = new FirefoxProfile();
firefoxProfile.addExtensions([extensionPath], () => {
firefoxProfile.encoded((encodedProfile: any) => {
firefoxProfile.encoded((err: any, encodedProfile: string) => {
const multiCapabilities = [{browserName: 'firefox', firefox_profile: encodedProfile}];
deferred.resolve(multiCapabilities);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function assertEventsEqual(actualEvents: any[], expectedEvents: any[]) {
expect(actualEvent[key]).toEqual(expectedEvent[key]);
}
}
};
}

export function main() {
describe('convertPerfProfileToEvents', function() {
Expand Down Expand Up @@ -97,4 +97,4 @@ export function main() {
assertEventsEqual(perfEvents, [{ph: 'X', ts: 1, name: 'script'}]);
});
});
};
}
2 changes: 1 addition & 1 deletion packages/compiler-cli/browser-rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ export default {
},
banner: banner,
plugins: [{resolveId: resolve}, commonjs()]
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
/* tslint:disable:no-console */

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

const glob = require('glob');

/* tslint:disable:no-console */
/**
* Main method.
* Standalone program that executes codegen using the ngtools API and tests that files were
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
/* tslint:disable:no-console */

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

/* tslint:disable:no-console */
/**
* Main method.
* Standalone program that executes the real codegen and tests that
Expand Down
Loading

0 comments on commit 0f5c70d

Please sign in to comment.