diff --git a/gulpfile.js b/gulpfile.js index 5368d54ef7..afef32cf33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -294,14 +294,15 @@ gulp.task('lint', ['build.tools'], function() { // https://github.com/palantir/tslint#supported-rules var tslintConfig = { "rules": { - "semicolon": true, + "requireParameterType": true, "requireReturnType": true, - "requireParameterType": true + "semicolon": true, + "variable-name": [true, "ban-keywords"] } }; return gulp.src(['modules/angular2/src/**/*.ts', '!modules/angular2/src/testing/**']) .pipe(tslint({ - tslint: require('tslint'), + tslint: require('tslint').default, configuration: tslintConfig, rulesDirectory: 'dist/tools/tslint' })) diff --git a/modules/angular2/src/core/facade/intl.ts b/modules/angular2/src/core/facade/intl.ts index 02a4605489..4a0494047b 100644 --- a/modules/angular2/src/core/facade/intl.ts +++ b/modules/angular2/src/core/facade/intl.ts @@ -48,7 +48,7 @@ export enum NumberFormatStyle { } export class NumberFormatter { - static format(number: number, locale: string, style: NumberFormatStyle, + static format(num: number, locale: string, style: NumberFormatStyle, {minimumIntegerDigits = 1, minimumFractionDigits = 0, maximumFractionDigits = 3, currency, currencyAsSymbol = false}: { minimumIntegerDigits?: number, @@ -67,7 +67,7 @@ export class NumberFormatter { intlOptions.currency = currency; intlOptions.currencyDisplay = currencyAsSymbol ? 'symbol' : 'code'; } - return new Intl.NumberFormat(locale, intlOptions).format(number); + return new Intl.NumberFormat(locale, intlOptions).format(num); } } diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index d01028ded9..6001cc3309 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -7263,10 +7263,10 @@ } }, "gulp-tslint": { - "version": "3.3.0-beta", + "version": "3.4.0", "dependencies": { "gulp-util": { - "version": "3.0.6", + "version": "3.0.7", "dependencies": { "array-differ": { "version": "1.0.0" @@ -7314,7 +7314,7 @@ "version": "5.0.0" }, "meow": { - "version": "3.3.0", + "version": "3.4.2", "dependencies": { "camelcase-keys": { "version": "1.0.0", @@ -7326,11 +7326,198 @@ "version": "1.0.1" } } + }, + "loud-rejection": { + "version": "1.0.0" + }, + "minimist": { + "version": "1.2.0" + }, + "normalize-package-data": { + "version": "2.3.4", + "dependencies": { + "hosted-git-info": { + "version": "2.1.4" + }, + "is-builtin-module": { + "version": "1.0.0", + "dependencies": { + "builtin-modules": { + "version": "1.1.0" + } + } + }, + "validate-npm-package-license": { + "version": "3.0.1", + "dependencies": { + "spdx-correct": { + "version": "1.0.2", + "dependencies": { + "spdx-license-ids": { + "version": "1.1.0" + } + } + }, + "spdx-expression-parse": { + "version": "1.0.0", + "dependencies": { + "spdx-exceptions": { + "version": "1.0.3" + }, + "spdx-license-ids": { + "version": "1.1.0" + } + } + } + } + } + } + }, + "object-assign": { + "version": "4.0.1" + }, + "read-pkg-up": { + "version": "1.0.1", + "dependencies": { + "find-up": { + "version": "1.0.0", + "dependencies": { + "path-exists": { + "version": "2.0.0" + }, + "pinkie-promise": { + "version": "1.0.0", + "dependencies": { + "pinkie": { + "version": "1.0.0" + } + } + } + } + }, + "read-pkg": { + "version": "1.1.0", + "dependencies": { + "load-json-file": { + "version": "1.0.1", + "dependencies": { + "graceful-fs": { + "version": "4.1.2" + }, + "parse-json": { + "version": "2.2.0", + "dependencies": { + "error-ex": { + "version": "1.2.0" + } + } + }, + "pify": { + "version": "2.3.0" + }, + "pinkie-promise": { + "version": "1.0.0", + "dependencies": { + "pinkie": { + "version": "1.0.0" + } + } + }, + "strip-bom": { + "version": "2.0.0", + "dependencies": { + "is-utf8": { + "version": "0.2.0" + } + } + } + } + }, + "path-type": { + "version": "1.0.0", + "dependencies": { + "graceful-fs": { + "version": "4.1.2" + }, + "pify": { + "version": "2.3.0" + }, + "pinkie-promise": { + "version": "1.0.0", + "dependencies": { + "pinkie": { + "version": "1.0.0" + } + } + } + } + } + } + } + } + }, + "redent": { + "version": "1.0.0", + "dependencies": { + "indent-string": { + "version": "2.1.0", + "dependencies": { + "repeating": { + "version": "2.0.0", + "dependencies": { + "is-finite": { + "version": "1.0.1", + "dependencies": { + "number-is-nan": { + "version": "1.0.0" + } + } + } + } + } + } + }, + "strip-indent": { + "version": "1.0.1", + "dependencies": { + "get-stdin": { + "version": "4.0.1" + } + } + } + } + }, + "trim-newlines": { + "version": "1.0.0" } } } } }, + "fancy-log": { + "version": "1.1.0" + }, + "gulplog": { + "version": "1.0.0", + "dependencies": { + "glogg": { + "version": "1.0.0", + "dependencies": { + "sparkles": { + "version": "1.0.0" + } + } + } + } + }, + "has-gulplog": { + "version": "0.1.0", + "dependencies": { + "sparkles": { + "version": "1.0.0" + } + } + }, "lodash._reescape": { "version": "3.0.0" }, @@ -7417,7 +7604,7 @@ "version": "2.0.0", "dependencies": { "readable-stream": { - "version": "2.0.2", + "version": "2.0.3", "dependencies": { "core-util-is": { "version": "1.0.1" @@ -7435,7 +7622,7 @@ "version": "0.10.31" }, "util-deprecate": { - "version": "1.0.1" + "version": "1.0.2" } } } @@ -7475,6 +7662,54 @@ }, "through": { "version": "2.3.8" + }, + "tslint": { + "version": "2.5.1", + "dependencies": { + "findup-sync": { + "version": "0.2.1", + "dependencies": { + "glob": { + "version": "4.3.5", + "dependencies": { + "inflight": { + "version": "1.0.4", + "dependencies": { + "wrappy": { + "version": "1.0.1" + } + } + }, + "inherits": { + "version": "2.0.1" + }, + "once": { + "version": "1.3.2", + "dependencies": { + "wrappy": { + "version": "1.0.1" + } + } + } + } + } + } + }, + "optimist": { + "version": "0.6.1", + "dependencies": { + "wordwrap": { + "version": "0.0.3" + }, + "minimist": { + "version": "0.0.10" + } + } + }, + "underscore.string": { + "version": "3.1.1" + } + } } } }, @@ -9346,28 +9581,6 @@ }, "ultron": { "version": "1.0.2" - }, - "bufferutil": { - "version": "1.2.1", - "dependencies": { - "bindings": { - "version": "1.2.1" - }, - "nan": { - "version": "2.0.9" - } - } - }, - "utf-8-validate": { - "version": "1.2.1", - "dependencies": { - "bindings": { - "version": "1.2.1" - }, - "nan": { - "version": "2.0.9" - } - } } } } @@ -9488,28 +9701,6 @@ }, "ultron": { "version": "1.0.2" - }, - "bufferutil": { - "version": "1.2.1", - "dependencies": { - "bindings": { - "version": "1.2.1" - }, - "nan": { - "version": "2.0.9" - } - } - }, - "utf-8-validate": { - "version": "1.2.1", - "dependencies": { - "bindings": { - "version": "1.2.1" - }, - "nan": { - "version": "2.0.9" - } - } } } }, @@ -10651,28 +10842,6 @@ }, "ultron": { "version": "1.0.2" - }, - "bufferutil": { - "version": "1.2.1", - "dependencies": { - "bindings": { - "version": "1.2.1" - }, - "nan": { - "version": "2.0.9" - } - } - }, - "utf-8-validate": { - "version": "1.2.1", - "dependencies": { - "bindings": { - "version": "1.2.1" - }, - "nan": { - "version": "2.0.9" - } - } } } }, @@ -11586,7 +11755,7 @@ } }, "tslint": { - "version": "2.5.0", + "version": "3.0.0-dev.1", "dependencies": { "findup-sync": { "version": "0.2.1", @@ -11630,6 +11799,9 @@ }, "underscore.string": { "version": "3.1.1" + }, + "typescript": { + "version": "1.8.0-dev.20151027" } } }, diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index cb6a950de2..7365e03f3f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -11219,224 +11219,505 @@ } }, "gulp-tslint": { - "version": "3.3.0-beta", - "from": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-3.3.0-beta.tgz", - "resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-3.3.0-beta.tgz", + "version": "3.4.0", + "from": "gulp-tslint@3.4.0", + "resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-3.4.0.tgz", "dependencies": { "gulp-util": { - "version": "3.0.6", - "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.6.tgz", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.6.tgz", + "version": "3.0.7", + "from": "gulp-util@>=3.0.7 <3.1.0", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz", "dependencies": { "array-differ": { "version": "1.0.0", - "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "from": "array-differ@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz" }, "array-uniq": { "version": "1.0.2", - "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz", + "from": "array-uniq@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz" }, "beeper": { "version": "1.1.0", - "from": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz", + "from": "beeper@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz" }, "chalk": { "version": "1.1.1", - "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", + "from": "chalk@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", "dependencies": { "ansi-styles": { "version": "2.1.0", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz", + "from": "ansi-styles@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" }, "escape-string-regexp": { "version": "1.0.3", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, "has-ansi": { "version": "2.0.0", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "from": "has-ansi@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "strip-ansi": { "version": "3.0.0", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz", + "from": "strip-ansi@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "supports-color": { "version": "2.0.0", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "from": "supports-color@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" } } }, "dateformat": { "version": "1.0.11", - "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz", + "from": "dateformat@>=1.0.11 <2.0.0", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz", "dependencies": { "get-stdin": { "version": "5.0.0", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz", + "from": "get-stdin@*", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz" }, "meow": { - "version": "3.3.0", - "from": "https://registry.npmjs.org/meow/-/meow-3.3.0.tgz", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.3.0.tgz", + "version": "3.4.2", + "from": "meow@*", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.4.2.tgz", "dependencies": { "camelcase-keys": { "version": "1.0.0", - "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", + "from": "camelcase-keys@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", "dependencies": { "camelcase": { "version": "1.2.1", - "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "from": "camelcase@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" }, "map-obj": { "version": "1.0.1", - "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "from": "map-obj@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz" } } + }, + "loud-rejection": { + "version": "1.0.0", + "from": "loud-rejection@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.0.0.tgz" + }, + "minimist": { + "version": "1.2.0", + "from": "minimist@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + }, + "normalize-package-data": { + "version": "2.3.4", + "from": "normalize-package-data@>=2.3.4 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz", + "dependencies": { + "hosted-git-info": { + "version": "2.1.4", + "from": "hosted-git-info@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz" + }, + "is-builtin-module": { + "version": "1.0.0", + "from": "is-builtin-module@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "dependencies": { + "builtin-modules": { + "version": "1.1.0", + "from": "builtin-modules@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz" + } + } + }, + "validate-npm-package-license": { + "version": "3.0.1", + "from": "validate-npm-package-license@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "dependencies": { + "spdx-correct": { + "version": "1.0.2", + "from": "spdx-correct@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "dependencies": { + "spdx-license-ids": { + "version": "1.1.0", + "from": "spdx-license-ids@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz" + } + } + }, + "spdx-expression-parse": { + "version": "1.0.0", + "from": "spdx-expression-parse@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz", + "dependencies": { + "spdx-exceptions": { + "version": "1.0.3", + "from": "spdx-exceptions@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz" + }, + "spdx-license-ids": { + "version": "1.1.0", + "from": "spdx-license-ids@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz" + } + } + } + } + } + } + }, + "object-assign": { + "version": "4.0.1", + "from": "object-assign@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz" + }, + "read-pkg-up": { + "version": "1.0.1", + "from": "read-pkg-up@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "dependencies": { + "find-up": { + "version": "1.0.0", + "from": "find-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.0.0.tgz", + "dependencies": { + "path-exists": { + "version": "2.0.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.0.0.tgz" + }, + "pinkie-promise": { + "version": "1.0.0", + "from": "pinkie-promise@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", + "dependencies": { + "pinkie": { + "version": "1.0.0", + "from": "pinkie@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz" + } + } + } + } + }, + "read-pkg": { + "version": "1.1.0", + "from": "read-pkg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "dependencies": { + "load-json-file": { + "version": "1.0.1", + "from": "load-json-file@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.0.1.tgz", + "dependencies": { + "graceful-fs": { + "version": "4.1.2", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" + }, + "parse-json": { + "version": "2.2.0", + "from": "parse-json@>=2.2.0 <3.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "dependencies": { + "error-ex": { + "version": "1.2.0", + "from": "error-ex@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.2.0.tgz" + } + } + }, + "pify": { + "version": "2.3.0", + "from": "pify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" + }, + "pinkie-promise": { + "version": "1.0.0", + "from": "pinkie-promise@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", + "dependencies": { + "pinkie": { + "version": "1.0.0", + "from": "pinkie@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz" + } + } + }, + "strip-bom": { + "version": "2.0.0", + "from": "strip-bom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "dependencies": { + "is-utf8": { + "version": "0.2.0", + "from": "is-utf8@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz" + } + } + } + } + }, + "path-type": { + "version": "1.0.0", + "from": "path-type@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.0.0.tgz", + "dependencies": { + "graceful-fs": { + "version": "4.1.2", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" + }, + "pify": { + "version": "2.3.0", + "from": "pify@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" + }, + "pinkie-promise": { + "version": "1.0.0", + "from": "pinkie-promise@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", + "dependencies": { + "pinkie": { + "version": "1.0.0", + "from": "pinkie@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz" + } + } + } + } + } + } + } + } + }, + "redent": { + "version": "1.0.0", + "from": "redent@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "dependencies": { + "indent-string": { + "version": "2.1.0", + "from": "indent-string@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "dependencies": { + "repeating": { + "version": "2.0.0", + "from": "repeating@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz", + "dependencies": { + "is-finite": { + "version": "1.0.1", + "from": "is-finite@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz", + "dependencies": { + "number-is-nan": { + "version": "1.0.0", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" + } + } + } + } + } + } + }, + "strip-indent": { + "version": "1.0.1", + "from": "strip-indent@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "dependencies": { + "get-stdin": { + "version": "4.0.1", + "from": "get-stdin@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" + } + } + } + } + }, + "trim-newlines": { + "version": "1.0.0", + "from": "trim-newlines@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" } } } } }, + "fancy-log": { + "version": "1.1.0", + "from": "fancy-log@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.1.0.tgz" + }, + "gulplog": { + "version": "1.0.0", + "from": "gulplog@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "dependencies": { + "glogg": { + "version": "1.0.0", + "from": "glogg@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", + "dependencies": { + "sparkles": { + "version": "1.0.0", + "from": "sparkles@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz" + } + } + } + } + }, + "has-gulplog": { + "version": "0.1.0", + "from": "has-gulplog@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "dependencies": { + "sparkles": { + "version": "1.0.0", + "from": "sparkles@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz" + } + } + }, "lodash._reescape": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "from": "lodash._reescape@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz" }, "lodash._reevaluate": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "from": "lodash._reevaluate@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz" }, "lodash._reinterpolate": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "from": "lodash._reinterpolate@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz" }, "lodash.template": { "version": "3.6.2", - "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "from": "lodash.template@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", "dependencies": { "lodash._basecopy": { "version": "3.0.1", - "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "from": "lodash._basecopy@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz" }, "lodash._basetostring": { "version": "3.0.1", - "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "from": "lodash._basetostring@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz" }, "lodash._basevalues": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "from": "lodash._basevalues@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz" }, "lodash._isiterateecall": { "version": "3.0.9", - "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "from": "lodash._isiterateecall@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz" }, "lodash.escape": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz", + "from": "lodash.escape@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz" }, "lodash.keys": { "version": "3.1.2", - "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "from": "lodash.keys@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "dependencies": { "lodash._getnative": { "version": "3.9.1", - "from": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "from": "lodash._getnative@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz" }, "lodash.isarguments": { "version": "3.0.4", - "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz", + "from": "lodash.isarguments@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz" }, "lodash.isarray": { "version": "3.0.4", - "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "from": "lodash.isarray@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz" } } }, "lodash.restparam": { "version": "3.6.1", - "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "from": "lodash.restparam@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz" }, "lodash.templatesettings": { "version": "3.1.0", - "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz", + "from": "lodash.templatesettings@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz" } } }, "multipipe": { "version": "0.1.2", - "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "from": "multipipe@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", "dependencies": { "duplexer2": { "version": "0.0.2", - "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "from": "duplexer2@0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", "dependencies": { "readable-stream": { "version": "1.1.13", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", + "from": "readable-stream@>=1.1.9 <1.2.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -11447,53 +11728,53 @@ }, "object-assign": { "version": "3.0.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "from": "object-assign@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz" }, "replace-ext": { "version": "0.0.1", - "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "from": "replace-ext@0.0.1", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz" }, "through2": { "version": "2.0.0", - "from": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz", + "from": "through2@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz", "dependencies": { "readable-stream": { - "version": "2.0.2", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", + "version": "2.0.3", + "from": "readable-stream@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "process-nextick-args": { "version": "1.0.3", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz", + "from": "process-nextick-args@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "util-deprecate": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz" + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" } } } @@ -11501,17 +11782,17 @@ }, "vinyl": { "version": "0.5.3", - "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "from": "vinyl@>=0.5.0 <0.6.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", "dependencies": { "clone": { "version": "1.0.2", - "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "from": "clone@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" }, "clone-stats": { "version": "0.0.1", - "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "from": "clone-stats@>=0.0.1 <0.0.2", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz" } } @@ -11520,27 +11801,27 @@ }, "map-stream": { "version": "0.1.0", - "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "from": "map-stream@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz" }, "rcloader": { "version": "0.1.4", - "from": "https://registry.npmjs.org/rcloader/-/rcloader-0.1.4.tgz", + "from": "rcloader@>=0.1.4 <0.2.0", "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.1.4.tgz", "dependencies": { "lodash": { "version": "3.10.1", - "from": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "from": "lodash@>=3.0.1 <4.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz" }, "rcfinder": { "version": "0.1.8", - "from": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.8.tgz", + "from": "rcfinder@>=0.1.6 <0.2.0", "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.8.tgz", "dependencies": { "lodash": { "version": "2.4.2", - "from": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", + "from": "lodash@>=2.4.1 <2.5.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz" } } @@ -11549,8 +11830,80 @@ }, "through": { "version": "2.3.8", - "from": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "from": "through@>=2.3.8 <2.4.0", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + }, + "tslint": { + "version": "2.5.1", + "from": "tslint@>=2.5.1 <2.6.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-2.5.1.tgz", + "dependencies": { + "findup-sync": { + "version": "0.2.1", + "from": "findup-sync@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz", + "dependencies": { + "glob": { + "version": "4.3.5", + "from": "glob@>=4.3.0 <4.4.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz", + "dependencies": { + "inflight": { + "version": "1.0.4", + "from": "inflight@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", + "dependencies": { + "wrappy": { + "version": "1.0.1", + "from": "wrappy@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" + } + } + }, + "inherits": { + "version": "2.0.1", + "from": "inherits@>=2.0.1 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + }, + "once": { + "version": "1.3.2", + "from": "once@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", + "dependencies": { + "wrappy": { + "version": "1.0.1", + "from": "wrappy@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" + } + } + } + } + } + } + }, + "optimist": { + "version": "0.6.1", + "from": "optimist@>=0.6.0 <0.7.0", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "dependencies": { + "wordwrap": { + "version": "0.0.3", + "from": "wordwrap@>=0.0.2 <0.1.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" + }, + "minimist": { + "version": "0.0.10", + "from": "minimist@>=0.0.1 <0.1.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" + } + } + }, + "underscore.string": { + "version": "3.1.1", + "from": "underscore.string@>=3.1.1 <3.2.0", + "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.1.1.tgz" + } + } } } }, @@ -14440,40 +14793,6 @@ "version": "1.0.2", "from": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz" - }, - "bufferutil": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz", - "dependencies": { - "bindings": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" - }, - "nan": { - "version": "2.0.9", - "from": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz" - } - } - }, - "utf-8-validate": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz", - "dependencies": { - "bindings": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" - }, - "nan": { - "version": "2.0.9", - "from": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz" - } - } } } } @@ -14658,40 +14977,6 @@ "version": "1.0.2", "from": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz" - }, - "bufferutil": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz", - "dependencies": { - "bindings": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" - }, - "nan": { - "version": "2.0.9", - "from": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz" - } - } - }, - "utf-8-validate": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz", - "dependencies": { - "bindings": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" - }, - "nan": { - "version": "2.0.9", - "from": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz" - } - } } } }, @@ -16451,40 +16736,6 @@ "version": "1.0.2", "from": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz" - }, - "bufferutil": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz", - "dependencies": { - "bindings": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" - }, - "nan": { - "version": "2.0.9", - "from": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz" - } - } - }, - "utf-8-validate": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz", - "dependencies": { - "bindings": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" - }, - "nan": { - "version": "2.0.9", - "from": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz" - } - } } } }, @@ -17892,45 +18143,45 @@ } }, "tslint": { - "version": "2.5.0", - "from": "https://registry.npmjs.org/tslint/-/tslint-2.5.0.tgz", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-2.5.0.tgz", + "version": "3.0.0-dev.1", + "from": "tslint@3.0.0-dev.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-3.0.0-dev.1.tgz", "dependencies": { "findup-sync": { "version": "0.2.1", - "from": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz", + "from": "findup-sync@>=0.2.1 <0.3.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz", "dependencies": { "glob": { "version": "4.3.5", - "from": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz", + "from": "glob@>=4.3.0 <4.4.0", "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz", "dependencies": { "inflight": { "version": "1.0.4", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", + "from": "inflight@>=1.0.4 <2.0.0", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", "dependencies": { "wrappy": { "version": "1.0.1", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" } } }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "once": { "version": "1.3.2", - "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", + "from": "once@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", "dependencies": { "wrappy": { "version": "1.0.1", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" } } @@ -17941,25 +18192,30 @@ }, "optimist": { "version": "0.6.1", - "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "from": "optimist@>=0.6.0 <0.7.0", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "from": "wordwrap@>=0.0.2 <0.1.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" }, "minimist": { "version": "0.0.10", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "from": "minimist@>=0.0.1 <0.1.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" } } }, "underscore.string": { "version": "3.1.1", - "from": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.1.1.tgz", + "from": "underscore.string@>=3.1.1 <3.2.0", "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.1.1.tgz" + }, + "typescript": { + "version": "1.8.0-dev.20151027", + "from": "typescript@next", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.8.0-dev.20151027.tgz" } } }, diff --git a/package.json b/package.json index 8208ab01a4..d145cb2326 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "gulp-sourcemaps": "1.3.*", "gulp-template": "^3.0.0", "gulp-traceur": "0.17.*", - "gulp-tslint": "^3.3.0-beta", + "gulp-tslint": "^3.4.0", "gulp-typescript": "^2.9.0", "gulp-uglify": "^1.2.0", "gulp-webserver": "^0.8.7", @@ -130,7 +130,7 @@ "through2": "^0.6.1", "ts2dart": "^0.7.12", "tsd": "^0.6.5-beta", - "tslint": "^2.5.0", + "tslint": "^3.0.0-dev.1", "typescript": "^1.6.2", "universal-analytics": "^0.3.9", "vinyl": "^0.4.6", diff --git a/tools/tslint/requireParameterTypeRule.ts b/tools/tslint/requireParameterTypeRule.ts index b577ec6ff8..416ee44f3b 100644 --- a/tools/tslint/requireParameterTypeRule.ts +++ b/tools/tslint/requireParameterTypeRule.ts @@ -1,16 +1,18 @@ -/// -/// +import {RuleFailure} from 'tslint/lib/lint'; +import {AbstractRule} from 'tslint/lib/rules'; +import {RuleWalker} from 'tslint/lib/language/walker'; +import * as ts from 'tslint/node_modules/typescript'; -export class Rule extends Lint.Rules.AbstractRule { +export class Rule extends AbstractRule { public static FAILURE_STRING = "missing type declaration"; - public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] { + public apply(sourceFile: ts.SourceFile): RuleFailure[] { const typedefWalker = new TypedefWalker(sourceFile, this.getOptions()); return this.applyWithWalker(typedefWalker); } } -class TypedefWalker extends Lint.RuleWalker { +class TypedefWalker extends RuleWalker { public visitMethodDeclaration(node: ts.MethodDeclaration) { if (node.name.getText().charAt(0) !== '_') { node.parameters.forEach((p: ts.ParameterDeclaration) => { diff --git a/tools/tslint/requireReturnTypeRule.ts b/tools/tslint/requireReturnTypeRule.ts index dae0d120e0..a0797cc7bc 100644 --- a/tools/tslint/requireReturnTypeRule.ts +++ b/tools/tslint/requireReturnTypeRule.ts @@ -1,16 +1,18 @@ -/// -/// +import {RuleFailure} from 'tslint/lib/lint'; +import {AbstractRule} from 'tslint/lib/rules'; +import {RuleWalker} from 'tslint/lib/language/walker'; +import * as ts from 'tslint/node_modules/typescript'; -export class Rule extends Lint.Rules.AbstractRule { +export class Rule extends AbstractRule { public static FAILURE_STRING = "missing type declaration"; - public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] { + public apply(sourceFile: ts.SourceFile): RuleFailure[] { const typedefWalker = new TypedefWalker(sourceFile, this.getOptions()); return this.applyWithWalker(typedefWalker); } } -class TypedefWalker extends Lint.RuleWalker { +class TypedefWalker extends RuleWalker { hasReturnStatement: boolean; public visitFunctionDeclaration(node: ts.FunctionDeclaration) {