From 7a53f825162f3c73ddd93e9b5ce225ca109eddb1 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Wed, 23 Sep 2015 15:02:37 -0700 Subject: [PATCH] chore(typescript 1.6 upgrade): fix build.js and docs --- .../processors/readTypeScriptModules.js | 11 +- .../services/tsParser/createCompilerHost.js | 9 +- .../tsParser/createCompilerHost.spec.js | 4 +- .../services/tsParser/getFileInfo.js | 5 +- gulpfile.js | 3 +- modules/angular2/src/http/interfaces.ts | 3 + npm-shrinkwrap.clean.json | 2 +- npm-shrinkwrap.json | 226 +++++++++--------- package.json | 2 +- tools/broccoli/broccoli-typescript.ts | 3 + tools/broccoli/trees/browser_tree.ts | 1 + tools/broccoli/trees/node_tree.ts | 3 +- 12 files changed, 148 insertions(+), 124 deletions(-) diff --git a/docs/typescript-package/processors/readTypeScriptModules.js b/docs/typescript-package/processors/readTypeScriptModules.js index 51e56a4242..8ddb726eaa 100644 --- a/docs/typescript-package/processors/readTypeScriptModules.js +++ b/docs/typescript-package/processors/readTypeScriptModules.js @@ -59,7 +59,10 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo, if (anyMatches(ignoreExportsMatching, exportSymbol.name)) return; // If the symbol is an Alias then for most things we want the original resolved symbol - var resolvedExport = exportSymbol.resolvedSymbol || exportSymbol; + var resolvedExport = exportSymbol; + if (exportSymbol.resolvedSymbol && exportSymbol.resolvedSymbol.name !== "unknown") { + resolvedExport = exportSymbol.resolvedSymbol; + } var exportDoc = createExportDoc(exportSymbol.name, resolvedExport, moduleDoc, basePath, parseInfo.typeChecker); log.debug('>>>> EXPORT: ' + exportDoc.name + ' (' + exportDoc.docType + ') from ' + moduleDoc.id); @@ -282,7 +285,11 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo, function getDecorators(symbol) { - var declaration = symbol.valueDeclaration || symbol.declarations[0]; + var declaration = symbol.valueDeclaration; + if (!declaration) { + console.log("missing declaration for symbol", declaration); + return []; + } var sourceFile = ts.getSourceFileOfNode(declaration); var decorators = declaration.decorators && declaration.decorators.map(function(decorator) { diff --git a/docs/typescript-package/services/tsParser/createCompilerHost.js b/docs/typescript-package/services/tsParser/createCompilerHost.js index 5f7d672baf..0b718ebeac 100644 --- a/docs/typescript-package/services/tsParser/createCompilerHost.js +++ b/docs/typescript-package/services/tsParser/createCompilerHost.js @@ -56,7 +56,14 @@ module.exports = function createCompilerHost(log) { }, getNewLine: function() { return ts.sys.newLine; + }, + fileExists: function(fileName) { + var stats; + fs.stat(fileName, function(err, s) { + stats = s; + }); + return !!stats; } }; }; -}; \ No newline at end of file +}; diff --git a/docs/typescript-package/services/tsParser/createCompilerHost.spec.js b/docs/typescript-package/services/tsParser/createCompilerHost.spec.js index 38eecb91e0..10135176df 100644 --- a/docs/typescript-package/services/tsParser/createCompilerHost.spec.js +++ b/docs/typescript-package/services/tsParser/createCompilerHost.spec.js @@ -38,7 +38,7 @@ describe('createCompilerHost', function() { describe('getDefaultLibFileName', function() { it('should return a path to the default library', function() { - expect(host.getDefaultLibFileName(options)).toContain('typescript/bin/lib.d.ts'); + expect(host.getDefaultLibFileName(options)).toContain('typescript/lib/lib.d.ts'); }); }); @@ -77,4 +77,4 @@ describe('createCompilerHost', function() { expect(host.getNewLine()).toEqual(require('os').EOL); }); }); -}); \ No newline at end of file +}); diff --git a/docs/typescript-package/services/tsParser/getFileInfo.js b/docs/typescript-package/services/tsParser/getFileInfo.js index 3074a084ac..5c753835e1 100644 --- a/docs/typescript-package/services/tsParser/getFileInfo.js +++ b/docs/typescript-package/services/tsParser/getFileInfo.js @@ -4,6 +4,9 @@ var ts = require('typescript'); module.exports = function getFileInfo(log) { return function (symbol, basePath) { + if (!symbol.declarations) { + console.log("ouch", symbol); + } var fileName = ts.getSourceFileOfNode(symbol.declarations[0]).fileName; var file = path.resolve(basePath, fileName); @@ -17,4 +20,4 @@ module.exports = function getFileInfo(log) { }; return fileInfo; }; -}; \ No newline at end of file +}; diff --git a/gulpfile.js b/gulpfile.js index ce7ca44088..68d6cf471e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -40,7 +40,6 @@ var insert = require('gulp-insert'); var buildRouter = require('./modules/angular1_router/build'); var uglify = require('gulp-uglify'); var shouldLog = require('./tools/build/logging'); -var tslint = require('gulp-tslint'); var dartSdk = require('./tools/build/dart'); var sauceConf = require('./sauce.conf'); var os = require('os'); @@ -288,6 +287,7 @@ gulp.task('enforce-format', function() { }); gulp.task('lint', ['build.tools'], function() { + var tslint = require('gulp-tslint'); // Built-in rules are at // https://github.com/palantir/tslint#supported-rules var tslintConfig = { @@ -297,7 +297,6 @@ gulp.task('lint', ['build.tools'], function() { "requireParameterType": true } }; - return gulp.src(['modules/angular2/src/**/*.ts', '!modules/angular2/src/test_lib/**']) .pipe(tslint({configuration: tslintConfig, rulesDirectory: 'dist/tools/tslint'})) .pipe(tslint.report('prose', {emitError: true})); diff --git a/modules/angular2/src/http/interfaces.ts b/modules/angular2/src/http/interfaces.ts index 99e40cf8e9..7422836598 100644 --- a/modules/angular2/src/http/interfaces.ts +++ b/modules/angular2/src/http/interfaces.ts @@ -40,6 +40,9 @@ export type RequestOptionsArgs = { headers?: Headers; // TODO: Support Blob, ArrayBuffer, JSON, URLSearchParams, FormData body?: string; + mode?: any; + credentials?: any; + cache?: any; } /** diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 994bc5c3cc..11143381ef 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -10026,7 +10026,7 @@ } }, "ts2dart": { - "version": "0.7.4", + "version": "0.7.5", "dependencies": { "source-map": { "version": "0.4.4", diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 59ba83dc36..cbe591dc97 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -10580,103 +10580,103 @@ }, "gulp-typescript": { "version": "2.9.0", - "from": "gulp-typescript@2.9.0", + "from": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.9.0.tgz", "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.9.0.tgz", "dependencies": { "gulp-util": { "version": "3.0.6", - "from": "gulp-util@>=3.0.6 <3.1.0", + "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", "dependencies": { "array-differ": { "version": "1.0.0", - "from": "array-differ@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz" }, "array-uniq": { "version": "1.0.2", - "from": "array-uniq@>=1.0.2 <2.0.0", + "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz" }, "beeper": { "version": "1.1.0", - "from": "beeper@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz", "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz" }, "chalk": { "version": "1.1.1", - "from": "chalk@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", "dependencies": { "ansi-styles": { "version": "2.1.0", - "from": "ansi-styles@>=2.1.0 <3.0.0", + "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" }, "escape-string-regexp": { "version": "1.0.3", - "from": "escape-string-regexp@>=1.0.2 <2.0.0", + "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, "has-ansi": { "version": "2.0.0", - "from": "has-ansi@>=2.0.0 <3.0.0", + "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "ansi-regex@>=2.0.0 <3.0.0", + "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", "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", + "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz", "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", + "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "supports-color": { "version": "2.0.0", - "from": "supports-color@>=2.0.0 <3.0.0", + "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" } } }, "dateformat": { "version": "1.0.11", - "from": "dateformat@>=1.0.11 <2.0.0", + "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz", "dependencies": { "get-stdin": { "version": "5.0.0", - "from": "get-stdin@*", + "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz" }, "meow": { "version": "3.3.0", - "from": "meow@*", + "from": "https://registry.npmjs.org/meow/-/meow-3.3.0.tgz", "resolved": "https://registry.npmjs.org/meow/-/meow-3.3.0.tgz", "dependencies": { "camelcase-keys": { "version": "1.0.0", - "from": "camelcase-keys@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", "dependencies": { "camelcase": { "version": "1.2.1", - "from": "camelcase@>=1.0.1 <2.0.0", + "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" }, "map-obj": { "version": "1.0.1", - "from": "map-obj@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz" } } @@ -10687,116 +10687,116 @@ }, "lodash._reescape": { "version": "3.0.0", - "from": "lodash._reescape@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz" }, "lodash._reevaluate": { "version": "3.0.0", - "from": "lodash._reevaluate@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz" }, "lodash._reinterpolate": { "version": "3.0.0", - "from": "lodash._reinterpolate@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz" }, "lodash.template": { "version": "3.6.2", - "from": "lodash.template@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", "dependencies": { "lodash._basecopy": { "version": "3.0.1", - "from": "lodash._basecopy@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz" }, "lodash._basetostring": { "version": "3.0.1", - "from": "lodash._basetostring@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz" }, "lodash._basevalues": { "version": "3.0.0", - "from": "lodash._basevalues@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz" }, "lodash._isiterateecall": { "version": "3.0.9", - "from": "lodash._isiterateecall@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz" }, "lodash.escape": { "version": "3.0.0", - "from": "lodash.escape@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz", "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz" }, "lodash.keys": { "version": "3.1.2", - "from": "lodash.keys@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "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", + "from": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz" }, "lodash.isarguments": { "version": "3.0.4", - "from": "lodash.isarguments@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz" }, "lodash.isarray": { "version": "3.0.4", - "from": "lodash.isarray@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz" } } }, "lodash.restparam": { "version": "3.6.1", - "from": "lodash.restparam@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz" }, "lodash.templatesettings": { "version": "3.1.0", - "from": "lodash.templatesettings@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz", "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz" } } }, "multipipe": { "version": "0.1.2", - "from": "multipipe@>=0.1.2 <0.2.0", + "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", "dependencies": { "duplexer2": { "version": "0.0.2", - "from": "duplexer2@0.0.2", + "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", "dependencies": { "readable-stream": { "version": "1.1.13", - "from": "readable-stream@>=1.1.9 <1.2.0", + "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@>=1.0.0 <1.1.0", + "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", "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", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "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", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "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", + "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -10807,27 +10807,27 @@ }, "object-assign": { "version": "3.0.0", - "from": "object-assign@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz" }, "replace-ext": { "version": "0.0.1", - "from": "replace-ext@0.0.1", + "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", "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", + "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", "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", + "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", "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", + "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz" } } @@ -10836,47 +10836,47 @@ }, "source-map": { "version": "0.5.0", - "from": "source-map@>=0.5.0 <0.6.0", + "from": "https://registry.npmjs.org/source-map/-/source-map-0.5.0.tgz", "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", + "from": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz", "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", + "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", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@>=1.0.0 <1.1.0", + "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", "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", + "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "isarray@0.0.1", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "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", + "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz", "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", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "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", + "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" } } @@ -10885,27 +10885,27 @@ }, "vinyl-fs": { "version": "1.0.0", - "from": "vinyl-fs@>=1.0.0 <1.1.0", + "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz", "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", + "from": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz", "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", + "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz", "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", + "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", "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", + "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" } } @@ -10914,37 +10914,37 @@ }, "readable-stream": { "version": "2.0.2", - "from": "readable-stream@>=2.0.0 <3.0.0", + "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", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@>=1.0.0 <1.1.0", + "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", "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", + "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "isarray@0.0.1", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "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", + "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz", "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", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "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", + "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" } } @@ -10953,74 +10953,74 @@ }, "glob-stream": { "version": "4.1.1", - "from": "glob-stream@>=4.0.1 <5.0.0", + "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz", "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", + "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", "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", + "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", "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", + "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", "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", + "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz", "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", + "from": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", "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", + "from": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz", "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", + "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", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@>=1.0.0 <1.1.0", + "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", "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", + "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "isarray@0.0.1", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "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", + "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz", "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", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "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", + "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" } } @@ -11035,54 +11035,54 @@ }, "glob-watcher": { "version": "0.0.8", - "from": "glob-watcher@>=0.0.8 <0.0.9", + "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz", "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", + "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz", "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", + "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", "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", + "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz" }, "glob": { "version": "3.1.21", - "from": "glob@>=3.1.21 <3.2.0", + "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", "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", + "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", "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", + "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz" } } }, "minimatch": { "version": "0.2.14", - "from": "minimatch@>=0.2.11 <0.3.0", + "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", "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", + "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz", "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", + "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" } } @@ -11095,76 +11095,76 @@ }, "graceful-fs": { "version": "3.0.8", - "from": "graceful-fs@>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz", "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", + "from": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz", "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", + "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "dependencies": { "minimist": { "version": "0.0.8", - "from": "minimist@0.0.8", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "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", + "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", "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", + "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", "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", + "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", "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", + "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz", "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", + "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "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", + "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "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", + "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", "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", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "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", + "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "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", + "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -15496,35 +15496,35 @@ } }, "ts2dart": { - "version": "0.7.4", - "from": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.4.tgz", - "resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.4.tgz", + "version": "0.7.5", + "from": "ts2dart@0.7.5", + "resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.5.tgz", "dependencies": { "source-map": { "version": "0.4.4", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "from": "source-map@>=0.4.2 <0.5.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "dependencies": { "amdefine": { "version": "1.0.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", + "from": "amdefine@>=0.0.4", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" } } }, "source-map-support": { "version": "0.3.2", - "from": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz", + "from": "source-map-support@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz", "dependencies": { "source-map": { "version": "0.1.32", - "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz", + "from": "source-map@0.1.32", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz", "dependencies": { "amdefine": { "version": "1.0.0", - "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz", + "from": "amdefine@>=0.0.4", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" } } diff --git a/package.json b/package.json index cb735ea2cd..cba5d689e6 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.1.0-beta", + "gulp-tslint": "^3.3.0-beta", "gulp-typescript": "^2.6.0", "gulp-uglify": "^1.2.0", "gulp-webserver": "^0.8.7", diff --git a/tools/broccoli/broccoli-typescript.ts b/tools/broccoli/broccoli-typescript.ts index e59dc2274d..c70a93d6bf 100644 --- a/tools/broccoli/broccoli-typescript.ts +++ b/tools/broccoli/broccoli-typescript.ts @@ -4,6 +4,7 @@ import fs = require('fs'); import fse = require('fs-extra'); import path = require('path'); +import * as ts from 'typescript'; import {wrapDiffingPlugin, DiffingBroccoliPlugin, DiffResult} from './diffing-broccoli-plugin'; @@ -187,6 +188,7 @@ class CustomLanguageServiceHost implements ts.LanguageServiceHost { constructor(private compilerOptions: ts.CompilerOptions, private fileNames: string[], private fileRegistry: FileRegistry, private treeInputPath: string) { this.currentDirectory = process.cwd(); + console.log("compilerOptions", compilerOptions); this.defaultLibFilePath = ts.getDefaultLibFilePath(compilerOptions).replace(/\\/g, '/'); } @@ -238,6 +240,7 @@ class CustomLanguageServiceHost implements ts.LanguageServiceHost { getDefaultLibFileName(options: ts.CompilerOptions): string { + console.log("defaultLibFilePath", this.defaultLibFilePath); // ignore options argument, options should not change during the lifetime of the plugin return this.defaultLibFilePath; } diff --git a/tools/broccoli/trees/browser_tree.ts b/tools/broccoli/trees/browser_tree.ts index 37518a59d6..068e097103 100644 --- a/tools/broccoli/trees/browser_tree.ts +++ b/tools/broccoli/trees/browser_tree.ts @@ -125,6 +125,7 @@ module.exports = function makeBrowserTree(options, destinationPath) { experimentalDecorators: true, mapRoot: '', // force sourcemaps to use relative path module: 'CommonJS', + moduleResolution: 1 /* classic */, noEmitOnError: false, rootDir: '.', sourceMap: true, diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index de222aaa00..696463d503 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -37,6 +37,7 @@ module.exports = function makeNodeTree(destinationPath) { declaration: false, mapRoot: '', /* force sourcemaps to use relative path */ module: 'CommonJS', + moduleResolution: 1 /* classic */, noEmitOnError: true, rootDir: '.', rootFilePaths: @@ -91,7 +92,7 @@ module.exports = function makeNodeTree(destinationPath) { match: /^/, replacement: function() { return `var parse5Adapter = require('angular2/src/core/dom/parse5_adapter');\n\r - parse5Adapter.Parse5DomAdapter.makeCurrent();` + parse5Adapter.Parse5DomAdapter.makeCurrent();`; } }, {match: /$/, replacement: function(_, relativePath) { return "\r\n main(); \n\r"; }}