From 2ee32fb02ceb9f05c9bf1d95abe22d590ee4e6c5 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Tue, 22 Sep 2015 12:03:39 -0700 Subject: [PATCH] chore(typescript 1.6 upgrade): fix build.tools --- gulpfile.js | 4 +- npm-shrinkwrap.clean.json | 308 ++++++++++-- npm-shrinkwrap.json | 575 ++++++++++++++++++----- package.json | 2 +- tools/broccoli/broccoli-typescript.ts | 7 +- tools/broccoli/broccoli-writer.d.ts | 10 +- tools/broccoli/multi_copy.ts | 2 + tools/broccoli/ts2dart.d.ts | 23 +- tools/tsconfig.json | 13 + tools/tsd.json | 4 +- tools/tslint/requireParameterTypeRule.ts | 2 +- tools/tslint/requireReturnTypeRule.ts | 2 +- 12 files changed, 747 insertions(+), 205 deletions(-) create mode 100644 tools/tsconfig.json diff --git a/gulpfile.js b/gulpfile.js index 50b5cb59eb..ce7ca44088 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -944,7 +944,7 @@ gulp.task('!build.tools', function() { var stream = gulp.src(['tools/**/*.ts']) .pipe(sourcemaps.init()) .pipe(tsc({target: 'ES5', module: 'commonjs', - // Don't use the version of typescript that gulp-typescript depends on, we need 1.5 + // Don't use the version of typescript that gulp-typescript depends on // see https://github.com/ivogabe/gulp-typescript#typescript-version typescript: require('typescript')})) .on('error', function(error) { @@ -1147,7 +1147,7 @@ gulp.task('!bundle.js.sfx.dev', ['build.js.dev'], function() { .then(function() { return bundler.bundle(devBundleConfig, 'angular2/http', './dist/build/http.sfx.dev.js', {sourceMaps: true}, - /* self-executing */ true) + /* self-executing */ true); }); }); diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index eca1589da4..994bc5c3cc 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -2172,14 +2172,6 @@ } } } - }, - "fsevents": { - "version": "0.3.6", - "dependencies": { - "nan": { - "version": "1.8.4" - } - } } } }, @@ -2871,14 +2863,6 @@ }, "async-each": { "version": "0.1.6" - }, - "fsevents": { - "version": "0.3.6", - "dependencies": { - "nan": { - "version": "1.8.4" - } - } } } } @@ -6855,10 +6839,10 @@ } }, "gulp-typescript": { - "version": "2.6.0", + "version": "2.9.0", "dependencies": { "gulp-util": { - "version": "3.0.4", + "version": "3.0.6", "dependencies": { "array-differ": { "version": "1.0.0" @@ -6867,30 +6851,35 @@ "version": "1.0.2" }, "beeper": { - "version": "1.0.0" + "version": "1.1.0" }, "chalk": { - "version": "1.0.0", + "version": "1.1.1", "dependencies": { "ansi-styles": { - "version": "2.0.1" + "version": "2.1.0" }, "escape-string-regexp": { "version": "1.0.3" }, "has-ansi": { - "version": "1.0.3", + "version": "2.0.0", "dependencies": { "ansi-regex": { - "version": "1.1.1" - }, - "get-stdin": { - "version": "4.0.1" + "version": "2.0.0" + } + } + }, + "strip-ansi": { + "version": "3.0.0", + "dependencies": { + "ansi-regex": { + "version": "2.0.0" } } }, "supports-color": { - "version": "1.3.1" + "version": "2.0.0" } } }, @@ -6898,16 +6887,16 @@ "version": "1.0.11", "dependencies": { "get-stdin": { - "version": "4.0.1" + "version": "5.0.0" }, "meow": { - "version": "3.1.0", + "version": "3.3.0", "dependencies": { "camelcase-keys": { "version": "1.0.0", "dependencies": { "camelcase": { - "version": "1.0.2" + "version": "1.2.1" }, "map-obj": { "version": "1.0.1" @@ -6928,34 +6917,34 @@ "version": "3.0.0" }, "lodash.template": { - "version": "3.5.1", + "version": "3.6.2", "dependencies": { "lodash._basecopy": { "version": "3.0.1" }, "lodash._basetostring": { - "version": "3.0.0" + "version": "3.0.1" }, "lodash._basevalues": { "version": "3.0.0" }, "lodash._isiterateecall": { - "version": "3.0.7" + "version": "3.0.9" }, "lodash.escape": { "version": "3.0.0" }, - "lodash.isnative": { - "version": "3.0.2" - }, "lodash.keys": { - "version": "3.0.7", + "version": "3.1.2", "dependencies": { + "lodash._getnative": { + "version": "3.9.1" + }, "lodash.isarguments": { - "version": "3.0.2" + "version": "3.0.4" }, "lodash.isarray": { - "version": "3.0.2" + "version": "3.0.4" } } }, @@ -6995,23 +6984,244 @@ } }, "object-assign": { - "version": "2.0.0" + "version": "3.0.0" }, "replace-ext": { "version": "0.0.1" + }, + "vinyl": { + "version": "0.5.3", + "dependencies": { + "clone": { + "version": "1.0.2" + }, + "clone-stats": { + "version": "0.0.1" + } + } } } }, "source-map": { - "version": "0.4.2", + "version": "0.5.0" + }, + "through2": { + "version": "2.0.0", "dependencies": { - "amdefine": { - "version": "0.1.0" + "readable-stream": { + "version": "2.0.2", + "dependencies": { + "core-util-is": { + "version": "1.0.1" + }, + "inherits": { + "version": "2.0.1" + }, + "isarray": { + "version": "0.0.1" + }, + "process-nextick-args": { + "version": "1.0.3" + }, + "string_decoder": { + "version": "0.10.31" + }, + "util-deprecate": { + "version": "1.0.1" + } + } } } }, - "typescript": { - "version": "1.4.1" + "vinyl-fs": { + "version": "1.0.0", + "dependencies": { + "duplexify": { + "version": "3.4.2", + "dependencies": { + "end-of-stream": { + "version": "1.0.0", + "dependencies": { + "once": { + "version": "1.3.2", + "dependencies": { + "wrappy": { + "version": "1.0.1" + } + } + } + } + }, + "readable-stream": { + "version": "2.0.2", + "dependencies": { + "core-util-is": { + "version": "1.0.1" + }, + "inherits": { + "version": "2.0.1" + }, + "isarray": { + "version": "0.0.1" + }, + "process-nextick-args": { + "version": "1.0.3" + }, + "string_decoder": { + "version": "0.10.31" + }, + "util-deprecate": { + "version": "1.0.1" + } + } + } + } + }, + "glob-stream": { + "version": "4.1.1", + "dependencies": { + "ordered-read-streams": { + "version": "0.1.0" + }, + "glob2base": { + "version": "0.0.12", + "dependencies": { + "find-index": { + "version": "0.1.1" + } + } + }, + "unique-stream": { + "version": "2.2.0", + "dependencies": { + "through2-filter": { + "version": "2.0.0", + "dependencies": { + "through2": { + "version": "2.0.0", + "dependencies": { + "readable-stream": { + "version": "2.0.2", + "dependencies": { + "core-util-is": { + "version": "1.0.1" + }, + "inherits": { + "version": "2.0.1" + }, + "isarray": { + "version": "0.0.1" + }, + "process-nextick-args": { + "version": "1.0.3" + }, + "string_decoder": { + "version": "0.10.31" + }, + "util-deprecate": { + "version": "1.0.1" + } + } + } + } + } + } + } + } + } + } + }, + "glob-watcher": { + "version": "0.0.8", + "dependencies": { + "gaze": { + "version": "0.5.1", + "dependencies": { + "globule": { + "version": "0.1.0", + "dependencies": { + "lodash": { + "version": "1.0.2" + }, + "glob": { + "version": "3.1.21", + "dependencies": { + "graceful-fs": { + "version": "1.2.3" + }, + "inherits": { + "version": "1.0.2" + } + } + }, + "minimatch": { + "version": "0.2.14", + "dependencies": { + "lru-cache": { + "version": "2.7.0" + }, + "sigmund": { + "version": "1.0.1" + } + } + } + } + } + } + } + } + }, + "graceful-fs": { + "version": "3.0.8" + }, + "merge-stream": { + "version": "0.1.8" + }, + "mkdirp": { + "version": "0.5.1", + "dependencies": { + "minimist": { + "version": "0.0.8" + } + } + }, + "object-assign": { + "version": "2.1.1" + }, + "strip-bom": { + "version": "1.0.0", + "dependencies": { + "first-chunk-stream": { + "version": "1.0.0" + }, + "is-utf8": { + "version": "0.2.0" + } + } + }, + "through2": { + "version": "0.6.5", + "dependencies": { + "readable-stream": { + "version": "1.0.33", + "dependencies": { + "core-util-is": { + "version": "1.0.1" + }, + "isarray": { + "version": "0.0.1" + }, + "string_decoder": { + "version": "0.10.31" + }, + "inherits": { + "version": "2.0.1" + } + } + } + } + } + } } } }, @@ -9838,10 +10048,6 @@ } } } - }, - "typescript": { - "version": "1.5.3", - "resolved": "git://github.com/microsoft/TypeScript.git#a24aa6f57d281bafd3535f0f4c3f492364a8b4d6" } } }, @@ -10461,8 +10667,8 @@ } }, "typescript": { - "version": "1.5.3", - "resolved": "git://github.com/alexeagle/TypeScript.git#d5acfd6ddd05801e48c2af1aed6f0360d1be55ac" + "version": "1.6.2", + "resolved": "git://github.com/alexeagle/TypeScript.git#64a03791c15c828c45c19cecd1f1b13df5b271a3" }, "vinyl": { "version": "0.4.6", diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 86611a2cda..59ba83dc36 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3353,18 +3353,6 @@ } } } - }, - "fsevents": { - "version": "0.3.6", - "from": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.6.tgz", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.6.tgz", - "dependencies": { - "nan": { - "version": "1.8.4", - "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz" - } - } } } }, @@ -4435,18 +4423,6 @@ "version": "0.1.6", "from": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz", "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz" - }, - "fsevents": { - "version": "0.3.6", - "from": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.6.tgz", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.6.tgz", - "dependencies": { - "nan": { - "version": "1.8.4", - "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz" - } - } } } } @@ -10603,97 +10579,104 @@ } }, "gulp-typescript": { - "version": "2.6.0", - "from": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.6.0.tgz", - "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.6.0.tgz", + "version": "2.9.0", + "from": "gulp-typescript@2.9.0", + "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.9.0.tgz", "dependencies": { "gulp-util": { - "version": "3.0.4", - "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz", + "version": "3.0.6", + "from": "gulp-util@>=3.0.6 <3.1.0", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.6.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.0.0", - "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz" + "version": "1.1.0", + "from": "beeper@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz" }, "chalk": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", + "version": "1.1.1", + "from": "chalk@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", "dependencies": { "ansi-styles": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz" + "version": "2.1.0", + "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": "1.0.3", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", + "version": "2.0.0", + "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": "1.1.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" - }, - "get-stdin": { - "version": "4.0.1", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" + "version": "2.0.0", + "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": "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": "ansi-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "supports-color": { - "version": "1.3.1", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz" + "version": "2.0.0", + "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": "4.0.1", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" + "version": "5.0.0", + "from": "get-stdin@*", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz" }, "meow": { - "version": "3.1.0", - "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz", + "version": "3.3.0", + "from": "meow@*", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.3.0.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.0.2", - "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz" + "version": "1.2.1", + "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" } } @@ -10704,116 +10687,116 @@ }, "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.5.1", - "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.5.1.tgz", + "version": "3.6.2", + "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.0", - "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz" + "version": "3.0.1", + "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.7", - "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.7.tgz" + "version": "3.0.9", + "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.isnative": { - "version": "3.0.2", - "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz", - "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz" - }, "lodash.keys": { - "version": "3.0.7", - "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.7.tgz", + "version": "3.1.2", + "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": "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.2", - "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.2.tgz" + "version": "3.0.4", + "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.2", - "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz" + "version": "3.0.4", + "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" } } @@ -10823,33 +10806,372 @@ } }, "object-assign": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz" + "version": "3.0.0", + "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" + }, + "vinyl": { + "version": "0.5.3", + "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": "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": "clone-stats@>=0.0.1 <0.0.2", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz" + } + } } } }, "source-map": { - "version": "0.4.2", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz", + "version": "0.5.0", + "from": "source-map@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.0.tgz" + }, + "through2": { + "version": "2.0.0", + "from": "through2@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz", "dependencies": { - "amdefine": { - "version": "0.1.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz" + "readable-stream": { + "version": "2.0.2", + "from": "readable-stream@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", + "dependencies": { + "core-util-is": { + "version": "1.0.1", + "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": "inherits@>=2.0.1 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + }, + "process-nextick-args": { + "version": "1.0.3", + "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": "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": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz" + } + } } } }, - "typescript": { - "version": "1.4.1", - "from": "https://registry.npmjs.org/typescript/-/typescript-1.4.1.tgz", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.4.1.tgz" + "vinyl-fs": { + "version": "1.0.0", + "from": "vinyl-fs@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz", + "dependencies": { + "duplexify": { + "version": "3.4.2", + "from": "duplexify@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz", + "dependencies": { + "end-of-stream": { + "version": "1.0.0", + "from": "end-of-stream@1.0.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz", + "dependencies": { + "once": { + "version": "1.3.2", + "from": "once@>=1.3.0 <1.4.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" + } + } + } + } + }, + "readable-stream": { + "version": "2.0.2", + "from": "readable-stream@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", + "dependencies": { + "core-util-is": { + "version": "1.0.1", + "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": "inherits@>=2.0.1 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + }, + "process-nextick-args": { + "version": "1.0.3", + "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": "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": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz" + } + } + } + } + }, + "glob-stream": { + "version": "4.1.1", + "from": "glob-stream@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz", + "dependencies": { + "ordered-read-streams": { + "version": "0.1.0", + "from": "ordered-read-streams@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz" + }, + "glob2base": { + "version": "0.0.12", + "from": "glob2base@>=0.0.12 <0.0.13", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "dependencies": { + "find-index": { + "version": "0.1.1", + "from": "find-index@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz" + } + } + }, + "unique-stream": { + "version": "2.2.0", + "from": "unique-stream@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz", + "dependencies": { + "through2-filter": { + "version": "2.0.0", + "from": "through2-filter@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", + "dependencies": { + "through2": { + "version": "2.0.0", + "from": "through2@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz", + "dependencies": { + "readable-stream": { + "version": "2.0.2", + "from": "readable-stream@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", + "dependencies": { + "core-util-is": { + "version": "1.0.1", + "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": "inherits@>=2.0.1 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + }, + "process-nextick-args": { + "version": "1.0.3", + "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": "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": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz" + } + } + } + } + } + } + } + } + } + } + }, + "glob-watcher": { + "version": "0.0.8", + "from": "glob-watcher@>=0.0.8 <0.0.9", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz", + "dependencies": { + "gaze": { + "version": "0.5.1", + "from": "gaze@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz", + "dependencies": { + "globule": { + "version": "0.1.0", + "from": "globule@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", + "dependencies": { + "lodash": { + "version": "1.0.2", + "from": "lodash@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz" + }, + "glob": { + "version": "3.1.21", + "from": "glob@>=3.1.21 <3.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "dependencies": { + "graceful-fs": { + "version": "1.2.3", + "from": "graceful-fs@>=1.2.0 <1.3.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" + }, + "inherits": { + "version": "1.0.2", + "from": "inherits@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz" + } + } + }, + "minimatch": { + "version": "0.2.14", + "from": "minimatch@>=0.2.11 <0.3.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "dependencies": { + "lru-cache": { + "version": "2.7.0", + "from": "lru-cache@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz" + }, + "sigmund": { + "version": "1.0.1", + "from": "sigmund@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + } + } + } + } + } + } + } + } + }, + "graceful-fs": { + "version": "3.0.8", + "from": "graceful-fs@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz" + }, + "merge-stream": { + "version": "0.1.8", + "from": "merge-stream@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz" + }, + "mkdirp": { + "version": "0.5.1", + "from": "mkdirp@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "dependencies": { + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + } + } + }, + "object-assign": { + "version": "2.1.1", + "from": "object-assign@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz" + }, + "strip-bom": { + "version": "1.0.0", + "from": "strip-bom@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", + "dependencies": { + "first-chunk-stream": { + "version": "1.0.0", + "from": "first-chunk-stream@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz" + }, + "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" + } + } + }, + "through2": { + "version": "0.6.5", + "from": "through2@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "dependencies": { + "readable-stream": { + "version": "1.0.33", + "from": "readable-stream@>=1.0.33-1 <1.1.0-0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", + "dependencies": { + "core-util-is": { + "version": "1.0.1", + "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": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + }, + "string_decoder": { + "version": "0.10.31", + "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": "inherits@>=2.0.1 <2.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + } + } + } + } + } + } } } }, @@ -15208,11 +15530,6 @@ } } } - }, - "typescript": { - "version": "1.5.3", - "from": "git://github.com/microsoft/TypeScript.git#a24aa6f57d281bafd3535f0f4c3f492364a8b4d6", - "resolved": "git://github.com/microsoft/TypeScript.git#a24aa6f57d281bafd3535f0f4c3f492364a8b4d6" } } }, @@ -16174,9 +16491,9 @@ } }, "typescript": { - "version": "1.5.3", - "from": "git://github.com/alexeagle/TypeScript.git#d5acfd6ddd05801e48c2af1aed6f0360d1be55ac", - "resolved": "git://github.com/alexeagle/TypeScript.git#d5acfd6ddd05801e48c2af1aed6f0360d1be55ac" + "version": "1.6.2", + "from": "git://github.com/alexeagle/TypeScript.git#64a03791c15c828c45c19cecd1f1b13df5b271a3", + "resolved": "git://github.com/alexeagle/TypeScript.git#64a03791c15c828c45c19cecd1f1b13df5b271a3" }, "vinyl": { "version": "0.4.6", diff --git a/package.json b/package.json index 6bf4c78fa9..cb735ea2cd 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "through2": "^0.6.1", "ts2dart": "^0.7.0", "tsd": "^0.6.5-beta", - "typescript": "alexeagle/TypeScript#1.5_error_is_class", + "typescript": "alexeagle/TypeScript#1.6_error_is_class", "vinyl": "^0.4.6", "walk-sync": "^0.1.3", "which": "~1", diff --git a/tools/broccoli/broccoli-typescript.ts b/tools/broccoli/broccoli-typescript.ts index beb0f58a47..e59dc2274d 100644 --- a/tools/broccoli/broccoli-typescript.ts +++ b/tools/broccoli/broccoli-typescript.ts @@ -1,10 +1,9 @@ /// -/// +/// import fs = require('fs'); import fse = require('fs-extra'); import path = require('path'); -import ts = require('typescript'); import {wrapDiffingPlugin, DiffingBroccoliPlugin, DiffResult} from './diffing-broccoli-plugin'; @@ -19,10 +18,10 @@ const FS_OPTS = { * Broccoli plugin that implements incremental Typescript compiler. * * It instantiates a typescript compiler instance that keeps all the state about the project and - * can reemit only the files that actually changed. + * can re-emit only the files that actually changed. * * Limitations: only files that map directly to the changed source file via naming conventions are - * reemited. This primarily affects code that uses `const enum`s, because changing the enum value + * re-emitted. This primarily affects code that uses `const enum`s, because changing the enum value * requires global emit, which can affect many files. */ class DiffingTSCompiler implements DiffingBroccoliPlugin { diff --git a/tools/broccoli/broccoli-writer.d.ts b/tools/broccoli/broccoli-writer.d.ts index ee52f3437f..059d8a557d 100644 --- a/tools/broccoli/broccoli-writer.d.ts +++ b/tools/broccoli/broccoli-writer.d.ts @@ -1,6 +1,8 @@ /// - -declare class Writer { write(readTree: (tree) => Promise, destDir: string): Promise; } - -export = Writer; +declare module "broccoli-writer" { + class Writer { + write(readTree:(tree) => Promise, destDir:string):Promise; + } + export = Writer; +} diff --git a/tools/broccoli/multi_copy.ts b/tools/broccoli/multi_copy.ts index f53f56e674..18573be43b 100644 --- a/tools/broccoli/multi_copy.ts +++ b/tools/broccoli/multi_copy.ts @@ -1,5 +1,7 @@ /// /// +/// + import Writer = require('broccoli-writer'); import fs = require('fs'); import fsx = require('fs-extra'); diff --git a/tools/broccoli/ts2dart.d.ts b/tools/broccoli/ts2dart.d.ts index f9cf4de920..8f7bc2a462 100644 --- a/tools/broccoli/ts2dart.d.ts +++ b/tools/broccoli/ts2dart.d.ts @@ -1,15 +1,18 @@ // TODO(martinprobst): This is a hand-written declarations file. Replace with an automatically // generated one when TypeScript has a strategy to distribute TS source via npm. -export interface TranspilerOptions { - failFast?: boolean; - generateLibraryName?: boolean; - generateSourceMap?: boolean; - basePath?: string; - translateBuiltins?: boolean; -} +declare module "ts2dart" { + export interface TranspilerOptions { + failFast?: boolean; + generateLibraryName?: boolean; + generateSourceMap?: boolean; + basePath?: string; + translateBuiltins?: boolean; + } -export class Transpiler { - constructor(options: TranspilerOptions); - transpile(fileNames: string[], outdir?: string); + export class Transpiler { + constructor(options:TranspilerOptions); + + transpile(fileNames:string[], outdir?:string); + } } diff --git a/tools/tsconfig.json b/tools/tsconfig.json new file mode 100644 index 0000000000..2fd87b4217 --- /dev/null +++ b/tools/tsconfig.json @@ -0,0 +1,13 @@ +{ + "compilerOptions": { + "module": "commonjs", + "target": "es5", + "noImplicitAny": false, + "outDir": "../dist/tools", + "rootDir": ".", + "sourceMap": false + }, + "exclude": [ + "node_modules" + ] +} diff --git a/tools/tsd.json b/tools/tsd.json index b22b848fe3..87c70954a4 100644 --- a/tools/tsd.json +++ b/tools/tsd.json @@ -6,10 +6,10 @@ "bundle": "typings/tsd.d.ts", "installed": { "fs-extra/fs-extra.d.ts": { - "commit": "612ac88c26d767ca586908da31a4675867d8ee16" + "commit": "fa52db59121913b35e9641a0f73ccc3ffba58840" }, "node/node.d.ts": { - "commit": "d5f92f93bdb49f332fa662ff1d0cc8700f02e4dc" + "commit": "285e6b692a5898ccc1dc19475187429deafb69d7" }, "es6-promise/es6-promise.d.ts": { "commit": "d5f92f93bdb49f332fa662ff1d0cc8700f02e4dc" diff --git a/tools/tslint/requireParameterTypeRule.ts b/tools/tslint/requireParameterTypeRule.ts index 2f6e944f22..69013a047d 100644 --- a/tools/tslint/requireParameterTypeRule.ts +++ b/tools/tslint/requireParameterTypeRule.ts @@ -1,4 +1,4 @@ -/// +/// /// export class Rule extends Lint.Rules.AbstractRule { diff --git a/tools/tslint/requireReturnTypeRule.ts b/tools/tslint/requireReturnTypeRule.ts index f1e3de778d..e2751908d3 100644 --- a/tools/tslint/requireReturnTypeRule.ts +++ b/tools/tslint/requireReturnTypeRule.ts @@ -1,4 +1,4 @@ -/// +/// /// export class Rule extends Lint.Rules.AbstractRule {