diff --git a/.gitignore b/.gitignore index 93ebd33c2a..c8cfa0210d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,10 +26,6 @@ tmp **/*.css.ts **/*.css.shim.ts -# Or type definitions we mirror from github -# (NB: these lines are removed in publish-build-artifacts.sh) -/typings/ - # Include when developing application packages. pubspec.lock .c9 diff --git a/modules/@angular/compiler_cli/integrationtest/typings.d.ts b/modules/@angular/compiler_cli/integrationtest/typings.d.ts index 76c2259d50..daf5e83655 100644 --- a/modules/@angular/compiler_cli/integrationtest/typings.d.ts +++ b/modules/@angular/compiler_cli/integrationtest/typings.d.ts @@ -1,2 +1,2 @@ -/// -/// +/// +/// diff --git a/modules/@angular/compiler_cli/tsconfig-es5.json b/modules/@angular/compiler_cli/tsconfig-es5.json index bcf04ae81c..d583fe7433 100644 --- a/modules/@angular/compiler_cli/tsconfig-es5.json +++ b/modules/@angular/compiler_cli/tsconfig-es5.json @@ -27,8 +27,8 @@ "files": [ "index.ts", "src/main.ts", - "../../../typings/node/node.d.ts", - "../../../typings/jasmine/jasmine.d.ts", + "../../../node_modules/@types/node/index.d.ts", + "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/modules/@angular/core/tsconfig-es5.json b/modules/@angular/core/tsconfig-es5.json index 005d4fb26c..b9855c2c9c 100644 --- a/modules/@angular/core/tsconfig-es5.json +++ b/modules/@angular/core/tsconfig-es5.json @@ -23,7 +23,6 @@ "files": [ "index.ts", "testing.ts", - "../../../typings/jasmine/jasmine.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/modules/@angular/platform-browser/tsconfig-es2015.json b/modules/@angular/platform-browser/tsconfig-es2015.json index a7a951bc10..febd2300de 100644 --- a/modules/@angular/platform-browser/tsconfig-es2015.json +++ b/modules/@angular/platform-browser/tsconfig-es2015.json @@ -12,7 +12,6 @@ "moduleResolution": "node", "outDir": "../../../dist/packages-dist/platform-browser/esm", "paths": { - "selenium-webdriver": ["./typings/selenium-webdriver/selenium-webdriver.d.ts"], "@angular/core": ["../../../dist/packages-dist/core"], "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], "@angular/common": ["../../../dist/packages-dist/common"], @@ -28,9 +27,9 @@ "files": [ "index.ts", "testing.ts", - "../../../typings/jasmine/jasmine.d.ts", - "../../../typings/hammerjs/hammerjs.d.ts", - "../../../typings/angular-protractor/angular-protractor.d.ts", + "../../../node_modules/@types/hammerjs/index.d.ts", + "../../../node_modules/@types/protractor/index.d.ts", + "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/modules/@angular/platform-browser/tsconfig-es5.json b/modules/@angular/platform-browser/tsconfig-es5.json index a6a09b6c0a..8160dcab37 100644 --- a/modules/@angular/platform-browser/tsconfig-es5.json +++ b/modules/@angular/platform-browser/tsconfig-es5.json @@ -12,7 +12,6 @@ "moduleResolution": "node", "outDir": "../../../dist/packages-dist/platform-browser/", "paths": { - "selenium-webdriver": ["./typings/selenium-webdriver/selenium-webdriver.d.ts"], "@angular/core": ["../../../dist/packages-dist/core"], "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], "@angular/common": ["../../../dist/packages-dist/common"], @@ -29,9 +28,9 @@ "files": [ "index.ts", "testing.ts", - "../../../typings/hammerjs/hammerjs.d.ts", - "../../../typings/angular-protractor/angular-protractor.d.ts", - "../../../typings/jasmine/jasmine.d.ts", + "../../../node_modules/@types/hammerjs/index.d.ts", + "../../../node_modules/@types/protractor/index.d.ts", + "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/modules/@angular/platform-server/tsconfig-es2015.json b/modules/@angular/platform-server/tsconfig-es2015.json index ef47a14264..60ce85739b 100644 --- a/modules/@angular/platform-server/tsconfig-es2015.json +++ b/modules/@angular/platform-server/tsconfig-es2015.json @@ -24,7 +24,7 @@ }, "files": [ "index.ts", - "../../../typings/node/node.d.ts", + "../../../node_modules/@types/node/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/modules/@angular/platform-server/tsconfig-es5.json b/modules/@angular/platform-server/tsconfig-es5.json index 6caa4112ae..2d7fef3dee 100644 --- a/modules/@angular/platform-server/tsconfig-es5.json +++ b/modules/@angular/platform-server/tsconfig-es5.json @@ -25,7 +25,7 @@ }, "files": [ "index.ts", - "../../../typings/node/node.d.ts", + "../../../node_modules/@types/node/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] } diff --git a/modules/rollup-test/tsconfig.json b/modules/rollup-test/tsconfig.json index b38f44df06..e89d4dff0b 100644 --- a/modules/rollup-test/tsconfig.json +++ b/modules/rollup-test/tsconfig.json @@ -14,7 +14,5 @@ }, "files": [ "hello_world.ts" - //"../typings/es6-collections/es6-collections.d.ts", - //"../typings/es6-promise/es6-promise.d.ts" ] } diff --git a/modules/tsconfig.json b/modules/tsconfig.json index 27930f9a39..df257d0d47 100644 --- a/modules/tsconfig.json +++ b/modules/tsconfig.json @@ -11,7 +11,7 @@ "moduleResolution": "node", "outDir": "../dist/all/", "paths": { - "selenium-webdriver": ["./@angular/typings/selenium-webdriver/selenium-webdriver.d.ts"], + "selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"], "rxjs/*": ["../node_modules/rxjs/*"], "@angular/*": ["./@angular/*"], "tsc-wrapped": ["../dist/tools/tsc-wrapped"] diff --git a/modules/types.d.ts b/modules/types.d.ts index bab9088b4d..25ce8bb19b 100644 --- a/modules/types.d.ts +++ b/modules/types.d.ts @@ -1,8 +1,8 @@ // This file contains all ambient imports needed to compile the modules/ source code -/// -/// -/// -/// -/// /// +/// +/// +/// +/// +/// diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index f18592314e..83a530a154 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -1,5 +1,29 @@ { "dependencies": { + "@types/angularjs": { + "version": "1.5.13-alpha" + }, + "@types/fs-extra": { + "version": "0.0.22-alpha" + }, + "@types/hammerjs": { + "version": "2.0.22-alpha" + }, + "@types/jasmine": { + "version": "2.2.22-alpha" + }, + "@types/jquery": { + "version": "1.10.21-alpha" + }, + "@types/node": { + "version": "4.0.22-alpha" + }, + "@types/protractor": { + "version": "1.5.11-alpha" + }, + "@types/selenium-webdriver": { + "version": "2.44.20-alpha" + }, "abbrev": { "version": "1.0.7" }, @@ -162,9 +186,6 @@ "assert-plus": { "version": "0.1.5" }, - "assertion-error": { - "version": "1.0.0" - }, "astw": { "version": "2.0.0" }, @@ -1659,9 +1680,6 @@ "code-point-at": { "version": "1.0.0" }, - "collections": { - "version": "0.2.2" - }, "colors": { "version": "1.1.2" }, @@ -1730,14 +1748,6 @@ "config-chain": { "version": "1.1.9" }, - "configstore": { - "version": "0.3.2", - "dependencies": { - "object-assign": { - "version": "2.1.1" - } - } - }, "connect": { "version": "3.4.0" }, @@ -1892,17 +1902,6 @@ "dart-style": { "version": "0.2.7" }, - "dart2jsaas": { - "version": "0.0.16", - "dependencies": { - "mkdirp": { - "version": "0.3.5" - }, - "q": { - "version": "0.9.7" - } - } - }, "dashdash": { "version": "1.11.0" }, @@ -1921,21 +1920,12 @@ "decamelize": { "version": "1.1.2" }, - "deep-extend": { - "version": "0.4.0" - }, - "deep-freeze": { - "version": "0.0.1" - }, "defaults": { "version": "1.0.3" }, "defined": { "version": "1.0.0" }, - "definition-header": { - "version": "0.1.0" - }, "delayed-stream": { "version": "1.0.0" }, @@ -1962,17 +1952,6 @@ "destroy": { "version": "1.0.3" }, - "detect-indent": { - "version": "0.2.0", - "dependencies": { - "get-stdin": { - "version": "0.1.0" - }, - "minimist": { - "version": "0.1.0" - } - } - }, "detective": { "version": "4.3.1" }, @@ -2270,9 +2249,6 @@ "for-own": { "version": "0.1.3" }, - "foreach": { - "version": "2.0.5" - }, "forever-agent": { "version": "0.6.1" }, @@ -2843,14 +2819,6 @@ "glogg": { "version": "1.0.0" }, - "got": { - "version": "3.3.1", - "dependencies": { - "object-assign": { - "version": "3.0.0" - } - } - }, "graceful-fs": { "version": "3.0.8" }, @@ -3270,9 +3238,6 @@ "indexof": { "version": "0.0.1" }, - "infinity-agent": { - "version": "2.0.3" - }, "inflight": { "version": "1.0.4" }, @@ -3346,9 +3311,6 @@ "is-my-json-valid": { "version": "2.12.3" }, - "is-npm": { - "version": "1.0.0" - }, "is-number": { "version": "2.1.0" }, @@ -3358,9 +3320,6 @@ "is-property": { "version": "1.0.2" }, - "is-redirect": { - "version": "1.0.0" - }, "is-relative": { "version": "0.1.3" }, @@ -3385,9 +3344,6 @@ "isarray": { "version": "0.0.1" }, - "isemail": { - "version": "1.2.0" - }, "isobject": { "version": "2.0.0" }, @@ -3434,12 +3390,6 @@ "jodid25519": { "version": "1.0.2" }, - "joi": { - "version": "4.9.0" - }, - "joi-assert": { - "version": "0.0.3" - }, "jpm": { "version": "1.0.0", "dependencies": { @@ -3489,12 +3439,6 @@ "jsbn": { "version": "0.1.0" }, - "jsesc": { - "version": "0.5.0" - }, - "json-pointer": { - "version": "0.2.2" - }, "json-schema": { "version": "0.2.2" }, @@ -3568,9 +3512,6 @@ "karma-chrome-launcher": { "version": "0.2.2" }, - "karma-dart": { - "version": "0.3.0" - }, "karma-jasmine": { "version": "0.3.6" }, @@ -3589,15 +3530,9 @@ "labeled-stream-splicer": { "version": "1.0.2" }, - "latest-version": { - "version": "1.0.1" - }, "lazy-cache": { "version": "0.2.7" }, - "lazy.js": { - "version": "0.3.2" - }, "lazystream": { "version": "0.1.0", "dependencies": { @@ -3777,9 +3712,6 @@ "loud-rejection": { "version": "1.2.0" }, - "lowercase-keys": { - "version": "1.0.0" - }, "lru-cache": { "version": "2.7.3" }, @@ -4017,12 +3949,6 @@ "mime-types": { "version": "2.0.14" }, - "mimeparse": { - "version": "0.1.4" - }, - "minichain": { - "version": "0.0.1" - }, "minimalistic-assert": { "version": "1.0.0" }, @@ -4032,20 +3958,6 @@ "minimist": { "version": "1.2.0" }, - "ministyle": { - "version": "0.1.4" - }, - "minitable": { - "version": "0.0.4" - }, - "miniwrite": { - "version": "0.1.4", - "dependencies": { - "mkdirp": { - "version": "0.3.5" - } - } - }, "mkdirp": { "version": "0.5.1", "dependencies": { @@ -4076,9 +3988,6 @@ } } }, - "moment": { - "version": "2.10.6" - }, "morgan": { "version": "1.6.1" }, @@ -4117,9 +4026,6 @@ "negotiator": { "version": "0.5.3" }, - "nested-error-stacks": { - "version": "1.0.2" - }, "next-tick": { "version": "0.2.2" }, @@ -4312,9 +4218,6 @@ "over": { "version": "0.0.5" }, - "package-json": { - "version": "1.2.0" - }, "pako": { "version": "0.2.8" }, @@ -4345,9 +4248,6 @@ "parseurl": { "version": "1.3.0" }, - "parsimmon": { - "version": "0.5.1" - }, "path-array": { "version": "1.0.0" }, @@ -4395,9 +4295,6 @@ "pinkie-promise": { "version": "2.0.0" }, - "pjs": { - "version": "5.1.1" - }, "pkginfo": { "version": "0.3.1" }, @@ -4415,9 +4312,6 @@ "postcss-value-parser": { "version": "3.2.3" }, - "prepend-http": { - "version": "1.0.3" - }, "preserve": { "version": "0.2.0" }, @@ -4553,20 +4447,6 @@ "q": { "version": "1.4.1" }, - "q-io": { - "version": "1.10.9", - "dependencies": { - "mime": { - "version": "1.2.11" - }, - "q": { - "version": "0.9.7" - }, - "qs": { - "version": "0.1.0" - } - } - }, "qs": { "version": "4.0.0" }, @@ -4604,9 +4484,6 @@ } } }, - "rc": { - "version": "1.1.6" - }, "rcfinder": { "version": "0.1.8", "dependencies": { @@ -4624,20 +4501,6 @@ "read": { "version": "1.0.5" }, - "read-all-stream": { - "version": "3.0.1", - "dependencies": { - "pinkie": { - "version": "1.0.0" - }, - "pinkie-promise": { - "version": "1.0.0" - }, - "readable-stream": { - "version": "2.0.5" - } - } - }, "read-files": { "version": "0.1.0" }, @@ -4682,9 +4545,6 @@ "regex-cache": { "version": "0.4.2" }, - "registry-url": { - "version": "3.0.3" - }, "repeat-element": { "version": "1.1.2" }, @@ -4896,9 +4756,6 @@ "semver": { "version": "5.1.0" }, - "semver-diff": { - "version": "2.1.0" - }, "semver-utils": { "version": "1.1.1" }, @@ -5123,17 +4980,6 @@ "string_decoder": { "version": "0.10.31" }, - "string-length": { - "version": "1.0.1", - "dependencies": { - "ansi-regex": { - "version": "2.0.0" - }, - "strip-ansi": { - "version": "3.0.0" - } - } - }, "string-width": { "version": "1.0.1", "dependencies": { @@ -5165,9 +5011,6 @@ "strip-indent": { "version": "1.0.1" }, - "strip-json-comments": { - "version": "1.0.4" - }, "subarg": { "version": "1.0.0" }, @@ -5282,9 +5125,6 @@ "tildify": { "version": "1.1.2" }, - "timed-out": { - "version": "2.0.0" - }, "timers-browserify": { "version": "1.4.2" }, @@ -5325,9 +5165,6 @@ "to-array": { "version": "0.1.3" }, - "topo": { - "version": "1.1.0" - }, "tough-cookie": { "version": "2.2.1" }, @@ -5380,62 +5217,6 @@ } } }, - "tsd": { - "version": "0.6.5", - "dependencies": { - "ansi-regex": { - "version": "2.0.0" - }, - "ansi-styles": { - "version": "2.1.0" - }, - "bluebird": { - "version": "1.2.4" - }, - "chalk": { - "version": "1.1.1" - }, - "diff": { - "version": "1.4.0" - }, - "event-stream": { - "version": "3.1.7" - }, - "extsprintf": { - "version": "1.0.3" - }, - "has-ansi": { - "version": "2.0.0" - }, - "lru-cache": { - "version": "2.5.2" - }, - "minimatch": { - "version": "1.0.0" - }, - "open": { - "version": "0.0.5" - }, - "rimraf": { - "version": "2.2.8" - }, - "semver": { - "version": "4.3.6" - }, - "split": { - "version": "0.2.10" - }, - "strip-ansi": { - "version": "3.0.0" - }, - "supports-color": { - "version": "2.0.0" - }, - "verror": { - "version": "1.4.0" - } - } - }, "tsickle": { "version": "0.1.2", "dependencies": { @@ -5472,9 +5253,6 @@ "tweetnacl": { "version": "0.13.2" }, - "type-detect": { - "version": "0.1.2" - }, "type-is": { "version": "1.6.10", "dependencies": { @@ -5547,12 +5325,6 @@ } } }, - "update-notifier": { - "version": "0.2.2" - }, - "uri-templates": { - "version": "0.1.9" - }, "url": { "version": "0.10.3", "dependencies": { @@ -5561,9 +5333,6 @@ } } }, - "url2": { - "version": "0.0.0" - }, "user-home": { "version": "1.1.1" }, @@ -5729,9 +5498,6 @@ } } }, - "weak-map": { - "version": "1.0.0" - }, "webpack": { "version": "1.12.9", "dependencies": { @@ -5813,9 +5579,6 @@ "ws": { "version": "0.8.0" }, - "xdg-basedir": { - "version": "1.0.1" - }, "xml2js": { "version": "0.4.15" }, @@ -5830,9 +5593,6 @@ "xmlhttprequest": { "version": "1.5.0" }, - "xregexp": { - "version": "2.0.0" - }, "xtend": { "version": "4.0.1" }, diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6748101fbd..c1991ef538 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2,6 +2,46 @@ "name": "angular-srcs", "version": "2.0.0-rc.1", "dependencies": { + "@types/angularjs": { + "version": "1.5.13-alpha", + "from": "@types/angularjs@latest", + "resolved": "https://registry.npmjs.org/@types/angularjs/-/angularjs-1.5.13-alpha.tgz" + }, + "@types/fs-extra": { + "version": "0.0.22-alpha", + "from": "@types/fs-extra@latest", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-0.0.22-alpha.tgz" + }, + "@types/hammerjs": { + "version": "2.0.22-alpha", + "from": "@types/hammerjs@latest", + "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.22-alpha.tgz" + }, + "@types/jasmine": { + "version": "2.2.22-alpha", + "from": "@types/jasmine@latest", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.2.22-alpha.tgz" + }, + "@types/jquery": { + "version": "1.10.21-alpha", + "from": "@types/jquery@*", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-1.10.21-alpha.tgz" + }, + "@types/node": { + "version": "4.0.22-alpha", + "from": "@types/node@latest", + "resolved": "https://registry.npmjs.org/@types/node/-/node-4.0.22-alpha.tgz" + }, + "@types/protractor": { + "version": "1.5.11-alpha", + "from": "@types/protractor@latest", + "resolved": "https://registry.npmjs.org/@types/protractor/-/protractor-1.5.11-alpha.tgz" + }, + "@types/selenium-webdriver": { + "version": "2.44.20-alpha", + "from": "@types/selenium-webdriver@latest", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.44.20-alpha.tgz" + }, "abbrev": { "version": "1.0.7", "from": "abbrev@>=1.0.0 <2.0.0", @@ -264,11 +304,6 @@ "from": "assert-plus@>=0.1.5 <0.2.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" }, - "assertion-error": { - "version": "1.0.0", - "from": "assertion-error@1.0.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz" - }, "astw": { "version": "2.0.0", "from": "astw@>=2.0.0 <3.0.0", @@ -2595,11 +2630,6 @@ "from": "code-point-at@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz" }, - "collections": { - "version": "0.2.2", - "from": "collections@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/collections/-/collections-0.2.2.tgz" - }, "colors": { "version": "1.1.2", "from": "colors@>=1.1.0 <2.0.0", @@ -2708,18 +2738,6 @@ "from": "config-chain@>=1.1.8 <1.2.0", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz" }, - "configstore": { - "version": "0.3.2", - "from": "configstore@>=0.3.1 <0.4.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz", - "dependencies": { - "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" - } - } - }, "connect": { "version": "3.4.0", "from": "connect@>=3.2.0 <4.0.0", @@ -2970,23 +2988,6 @@ "from": "dart-style@>=0.2.6 <0.3.0", "resolved": "https://registry.npmjs.org/dart-style/-/dart-style-0.2.7.tgz" }, - "dart2jsaas": { - "version": "0.0.16", - "from": "dart2jsaas@>=0.0.16 <0.0.17", - "resolved": "https://registry.npmjs.org/dart2jsaas/-/dart2jsaas-0.0.16.tgz", - "dependencies": { - "mkdirp": { - "version": "0.3.5", - "from": "mkdirp@>=0.3.5 <0.4.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" - }, - "q": { - "version": "0.9.7", - "from": "q@>=0.9.7 <0.10.0", - "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz" - } - } - }, "dashdash": { "version": "1.11.0", "from": "dashdash@>=1.10.1 <2.0.0", @@ -3017,16 +3018,6 @@ "from": "decamelize@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.2.tgz" }, - "deep-extend": { - "version": "0.4.0", - "from": "deep-extend@>=0.4.0 <0.5.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.0.tgz" - }, - "deep-freeze": { - "version": "0.0.1", - "from": "deep-freeze@0.0.1", - "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz" - }, "defaults": { "version": "1.0.3", "from": "defaults@>=1.0.0 <2.0.0", @@ -3037,11 +3028,6 @@ "from": "defined@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz" }, - "definition-header": { - "version": "0.1.0", - "from": "definition-header@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/definition-header/-/definition-header-0.1.0.tgz" - }, "delayed-stream": { "version": "1.0.0", "from": "delayed-stream@>=1.0.0 <1.1.0", @@ -3084,23 +3070,6 @@ "from": "destroy@1.0.3", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz" }, - "detect-indent": { - "version": "0.2.0", - "from": "detect-indent@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-0.2.0.tgz", - "dependencies": { - "get-stdin": { - "version": "0.1.0", - "from": "get-stdin@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz" - }, - "minimist": { - "version": "0.1.0", - "from": "minimist@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz" - } - } - }, "detective": { "version": "4.3.1", "from": "detective@>=4.0.0 <5.0.0", @@ -3580,11 +3549,6 @@ "from": "for-own@>=0.1.3 <0.2.0", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz" }, - "foreach": { - "version": "2.0.5", - "from": "foreach@>=2.0.4 <3.0.0", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz" - }, "forever-agent": { "version": "0.6.1", "from": "forever-agent@>=0.6.1 <0.7.0", @@ -4499,18 +4463,6 @@ "from": "glogg@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz" }, - "got": { - "version": "3.3.1", - "from": "got@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz", - "dependencies": { - "object-assign": { - "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" - } - } - }, "graceful-fs": { "version": "3.0.8", "from": "graceful-fs@>=3.0.2 <3.1.0", @@ -5184,11 +5136,6 @@ "from": "indexof@0.0.1", "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz" }, - "infinity-agent": { - "version": "2.0.3", - "from": "infinity-agent@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz" - }, "inflight": { "version": "1.0.4", "from": "inflight@>=1.0.4 <2.0.0", @@ -5308,11 +5255,6 @@ "from": "is-my-json-valid@>=2.12.3 <3.0.0", "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz" }, - "is-npm": { - "version": "1.0.0", - "from": "is-npm@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz" - }, "is-number": { "version": "2.1.0", "from": "is-number@>=2.1.0 <3.0.0", @@ -5328,11 +5270,6 @@ "from": "is-property@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" }, - "is-redirect": { - "version": "1.0.0", - "from": "is-redirect@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz" - }, "is-relative": { "version": "0.1.3", "from": "is-relative@>=0.1.0 <0.2.0", @@ -5373,11 +5310,6 @@ "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, - "isemail": { - "version": "1.2.0", - "from": "isemail@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz" - }, "isobject": { "version": "2.0.0", "from": "isobject@>=2.0.0 <3.0.0", @@ -5452,16 +5384,6 @@ "from": "jodid25519@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" }, - "joi": { - "version": "4.9.0", - "from": "joi@>=4.7.0 <5.0.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz" - }, - "joi-assert": { - "version": "0.0.3", - "from": "joi-assert@0.0.3", - "resolved": "https://registry.npmjs.org/joi-assert/-/joi-assert-0.0.3.tgz" - }, "jpm": { "version": "1.0.0", "from": "jpm@1.0.0", @@ -5541,16 +5463,6 @@ "from": "jsbn@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" }, - "jsesc": { - "version": "0.5.0", - "from": "jsesc@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" - }, - "json-pointer": { - "version": "0.2.2", - "from": "json-pointer@>=0.2.2 <0.3.0", - "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.2.2.tgz" - }, "json-schema": { "version": "0.2.2", "from": "json-schema@0.2.2", @@ -5670,11 +5582,6 @@ "from": "karma-chrome-launcher@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.2.2.tgz" }, - "karma-dart": { - "version": "0.3.0", - "from": "karma-dart@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/karma-dart/-/karma-dart-0.3.0.tgz" - }, "karma-jasmine": { "version": "0.3.6", "from": "karma-jasmine@>=0.3.6 <0.4.0", @@ -5705,21 +5612,11 @@ "from": "labeled-stream-splicer@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz" }, - "latest-version": { - "version": "1.0.1", - "from": "latest-version@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz" - }, "lazy-cache": { "version": "0.2.7", "from": "lazy-cache@>=0.2.4 <0.3.0", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz" }, - "lazy.js": { - "version": "0.3.2", - "from": "lazy.js@>=0.3.2 <0.4.0", - "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.3.2.tgz" - }, "lazystream": { "version": "0.1.0", "from": "lazystream@>=0.1.0 <0.2.0", @@ -6009,11 +5906,6 @@ "from": "loud-rejection@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz" }, - "lowercase-keys": { - "version": "1.0.0", - "from": "lowercase-keys@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz" - }, "lru-cache": { "version": "2.7.3", "from": "lru-cache@>=2.0.0 <3.0.0", @@ -6385,16 +6277,6 @@ "from": "mime-types@>=2.0.9 <2.1.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz" }, - "mimeparse": { - "version": "0.1.4", - "from": "mimeparse@>=0.1.4 <0.2.0", - "resolved": "https://registry.npmjs.org/mimeparse/-/mimeparse-0.1.4.tgz" - }, - "minichain": { - "version": "0.0.1", - "from": "minichain@>=0.0.1 <0.1.0", - "resolved": "https://registry.npmjs.org/minichain/-/minichain-0.0.1.tgz" - }, "minimalistic-assert": { "version": "1.0.0", "from": "minimalistic-assert@>=1.0.0 <2.0.0", @@ -6410,28 +6292,6 @@ "from": "minimist@1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" }, - "ministyle": { - "version": "0.1.4", - "from": "ministyle@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz" - }, - "minitable": { - "version": "0.0.4", - "from": "minitable@0.0.4", - "resolved": "https://registry.npmjs.org/minitable/-/minitable-0.0.4.tgz" - }, - "miniwrite": { - "version": "0.1.4", - "from": "miniwrite@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz", - "dependencies": { - "mkdirp": { - "version": "0.3.5", - "from": "mkdirp@>=0.3.5 <0.4.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" - } - } - }, "mkdirp": { "version": "0.5.1", "from": "mkdirp@>=0.5.1 <0.6.0", @@ -6478,11 +6338,6 @@ } } }, - "moment": { - "version": "2.10.6", - "from": "moment@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz" - }, "morgan": { "version": "1.6.1", "from": "morgan@>=1.6.1 <1.7.0", @@ -6545,11 +6400,6 @@ "from": "negotiator@0.5.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz" }, - "nested-error-stacks": { - "version": "1.0.2", - "from": "nested-error-stacks@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz" - }, "next-tick": { "version": "0.2.2", "from": "next-tick@>=0.2.2 <0.3.0", @@ -6862,11 +6712,6 @@ "from": "over@>=0.0.5 <1.0.0", "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz" }, - "package-json": { - "version": "1.2.0", - "from": "package-json@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz" - }, "pako": { "version": "0.2.8", "from": "pako@>=0.2.0 <0.3.0", @@ -6917,11 +6762,6 @@ "from": "parseurl@>=1.3.0 <1.4.0", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz" }, - "parsimmon": { - "version": "0.5.1", - "from": "parsimmon@>=0.5.0 <0.6.0", - "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.tgz" - }, "path-array": { "version": "1.0.0", "from": "path-array@>=1.0.0 <2.0.0", @@ -6999,11 +6839,6 @@ "from": "pinkie-promise@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz" }, - "pjs": { - "version": "5.1.1", - "from": "pjs@>=5.0.0 <6.0.0", - "resolved": "https://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz" - }, "pkginfo": { "version": "0.3.1", "from": "pkginfo@>=0.3.0 <0.4.0", @@ -7031,11 +6866,6 @@ "from": "postcss-value-parser@>=3.2.3 <4.0.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.2.3.tgz" }, - "prepend-http": { - "version": "1.0.3", - "from": "prepend-http@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.3.tgz" - }, "preserve": { "version": "0.2.0", "from": "preserve@>=0.2.0 <0.3.0", @@ -7257,28 +7087,6 @@ "from": "q@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz" }, - "q-io": { - "version": "1.10.9", - "from": "q-io@>=1.10.8 <1.11.0", - "resolved": "https://registry.npmjs.org/q-io/-/q-io-1.10.9.tgz", - "dependencies": { - "mime": { - "version": "1.2.11", - "from": "mime@>=1.2.11 <1.3.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" - }, - "q": { - "version": "0.9.7", - "from": "q@>=0.9.7 <0.10.0", - "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz" - }, - "qs": { - "version": "0.1.0", - "from": "qs@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-0.1.0.tgz" - } - } - }, "qs": { "version": "4.0.0", "from": "qs@4.0.0", @@ -7338,11 +7146,6 @@ } } }, - "rc": { - "version": "1.1.6", - "from": "rc@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz" - }, "rcfinder": { "version": "0.1.8", "from": "rcfinder@>=0.1.6 <0.2.0", @@ -7370,28 +7173,6 @@ "from": "read@1.0.5", "resolved": "https://registry.npmjs.org/read/-/read-1.0.5.tgz" }, - "read-all-stream": { - "version": "3.0.1", - "from": "read-all-stream@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.0.1.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" - }, - "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" - }, - "readable-stream": { - "version": "2.0.5", - "from": "readable-stream@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz" - } - } - }, "read-files": { "version": "0.1.0", "from": "read-files@>=0.0.0 <1.0.0", @@ -7464,11 +7245,6 @@ "from": "regex-cache@>=0.4.2 <0.5.0", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz" }, - "registry-url": { - "version": "3.0.3", - "from": "registry-url@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.0.3.tgz" - }, "repeat-element": { "version": "1.1.2", "from": "repeat-element@>=1.1.2 <2.0.0", @@ -7810,11 +7586,6 @@ "from": "semver@5.1.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz" }, - "semver-diff": { - "version": "2.1.0", - "from": "semver-diff@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz" - }, "semver-utils": { "version": "1.1.1", "from": "semver-utils@>=1.1.1 <2.0.0", @@ -8171,23 +7942,6 @@ "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, - "string-length": { - "version": "1.0.1", - "from": "string-length@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.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" - }, - "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" - } - } - }, "string-width": { "version": "1.0.1", "from": "string-width@>=1.0.1 <2.0.0", @@ -8237,11 +7991,6 @@ "from": "strip-indent@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" }, - "strip-json-comments": { - "version": "1.0.4", - "from": "strip-json-comments@>=1.0.4 <1.1.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" - }, "subarg": { "version": "1.0.0", "from": "subarg@>=1.0.0 <2.0.0", @@ -8424,11 +8173,6 @@ "from": "tildify@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz" }, - "timed-out": { - "version": "2.0.0", - "from": "timed-out@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz" - }, "timers-browserify": { "version": "1.4.2", "from": "timers-browserify@>=1.0.1 <2.0.0", @@ -8493,11 +8237,6 @@ "from": "to-array@0.1.3", "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz" }, - "topo": { - "version": "1.1.0", - "from": "topo@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz" - }, "tough-cookie": { "version": "2.2.1", "from": "tough-cookie@>=2.2.0 <2.3.0", @@ -8578,98 +8317,6 @@ } } }, - "tsd": { - "version": "0.6.5", - "from": "tsd@>=0.6.5-beta <0.7.0", - "resolved": "https://registry.npmjs.org/tsd/-/tsd-0.6.5.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" - }, - "ansi-styles": { - "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" - }, - "bluebird": { - "version": "1.2.4", - "from": "bluebird@>=1.2.4 <1.3.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-1.2.4.tgz" - }, - "chalk": { - "version": "1.1.1", - "from": "chalk@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz" - }, - "diff": { - "version": "1.4.0", - "from": "diff@>=1.4.0 <2.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz" - }, - "event-stream": { - "version": "3.1.7", - "from": "event-stream@>=3.1.5 <3.2.0", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz" - }, - "extsprintf": { - "version": "1.0.3", - "from": "extsprintf@1.0.3", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.3.tgz" - }, - "has-ansi": { - "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" - }, - "lru-cache": { - "version": "2.5.2", - "from": "lru-cache@>=2.5.0 <2.6.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz" - }, - "minimatch": { - "version": "1.0.0", - "from": "minimatch@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz" - }, - "open": { - "version": "0.0.5", - "from": "open@>=0.0.5 <0.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz" - }, - "rimraf": { - "version": "2.2.8", - "from": "rimraf@>=2.2.8 <2.3.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" - }, - "semver": { - "version": "4.3.6", - "from": "semver@>=4.3.1 <5.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz" - }, - "split": { - "version": "0.2.10", - "from": "split@>=0.2.0 <0.3.0", - "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.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" - }, - "supports-color": { - "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" - }, - "verror": { - "version": "1.4.0", - "from": "verror@>=1.4.0 <1.5.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.4.0.tgz" - } - } - }, "tsickle": { "version": "0.1.2", "from": "tsickle@>=0.1.0 <0.2.0", @@ -8726,11 +8373,6 @@ "from": "tweetnacl@>=0.13.0 <1.0.0", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.2.tgz" }, - "type-detect": { - "version": "0.1.2", - "from": "type-detect@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz" - }, "type-is": { "version": "1.6.10", "from": "type-is@>=1.6.6 <1.7.0", @@ -8847,16 +8489,6 @@ } } }, - "update-notifier": { - "version": "0.2.2", - "from": "update-notifier@>=0.2.2 <0.3.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz" - }, - "uri-templates": { - "version": "0.1.9", - "from": "uri-templates@>=0.1.5 <0.2.0", - "resolved": "https://registry.npmjs.org/uri-templates/-/uri-templates-0.1.9.tgz" - }, "url": { "version": "0.10.3", "from": "url@>=0.10.1 <0.11.0", @@ -8869,11 +8501,6 @@ } } }, - "url2": { - "version": "0.0.0", - "from": "url2@>=0.0.0 <0.1.0", - "resolved": "https://registry.npmjs.org/url2/-/url2-0.0.0.tgz" - }, "user-home": { "version": "1.1.1", "from": "user-home@>=1.1.1 <2.0.0", @@ -9141,11 +8768,6 @@ } } }, - "weak-map": { - "version": "1.0.0", - "from": "weak-map@1.0.0", - "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.0.tgz" - }, "webpack": { "version": "1.12.9", "from": "webpack@>=1.12.6 <2.0.0", @@ -9277,11 +8899,6 @@ "from": "ws@0.8.0", "resolved": "https://registry.npmjs.org/ws/-/ws-0.8.0.tgz" }, - "xdg-basedir": { - "version": "1.0.1", - "from": "xdg-basedir@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz" - }, "xml2js": { "version": "0.4.15", "from": "xml2js@>=0.4.4 <0.5.0", @@ -9304,11 +8921,6 @@ "from": "https://github.com/rase-/node-XMLHttpRequest/archive/a6b6f2.tar.gz", "resolved": "https://github.com/rase-/node-XMLHttpRequest/archive/a6b6f2.tar.gz" }, - "xregexp": { - "version": "2.0.0", - "from": "xregexp@>=2.0.0 <2.1.0", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz" - }, "xtend": { "version": "4.0.1", "from": "xtend@>=4.0.0 <5.0.0", diff --git a/package.json b/package.json index 2bf5163bb1..9be02ad655 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "url": "https://github.com/angular/angular.git" }, "scripts": { - "postinstall": "node tools/npm/copy-npm-shrinkwrap; tsd reinstall --overwrite --clean --config ./tsd.json" + "postinstall": "node tools/npm/copy-npm-shrinkwrap" }, "dependencies": { "es6-shim": "^0.35.0", @@ -24,6 +24,13 @@ "zone.js": "^0.6.12" }, "devDependencies": { + "@types/angularjs": "^1.5.13-alpha", + "@types/fs-extra": "0.0.22-alpha", + "@types/hammerjs": "^2.0.22-alpha", + "@types/jasmine": "^2.2.22-alpha", + "@types/node": "^4.0.22-alpha", + "@types/protractor": "^1.5.11-alpha", + "@types/selenium-webdriver": "^2.44.20-alpha", "angular": "^1.5.0", "angular-animate": "^1.5.0", "angular-mocks": "^1.5.0", @@ -100,7 +107,6 @@ "through2": "^0.6.5", "ts-api-guardian": "0.0.2", "ts2dart": "^0.9.10", - "tsd": "^0.6.5-beta", "tsickle": "^0.1.2", "tslint": "^3.7.0-dev.2", "typescript": "^1.9.0-dev.20160409", diff --git a/scripts/ci-lite/install.sh b/scripts/ci-lite/install.sh index eaf15759b2..a1b85c4f31 100755 --- a/scripts/ci-lite/install.sh +++ b/scripts/ci-lite/install.sh @@ -55,16 +55,6 @@ fi echo 'travis_fold:end:install.browserstack' -# Install external typings via tsd -echo 'travis_fold:start:install.typings' -if [[ ${TRAVIS} ]]; then - echo ${TSDRC} > ~/.tsdrc -fi - -$(npm bin)/tsd reinstall --overwrite --clean --config ./tsd.json -echo 'travis_fold:end:install.typings' - - # node tools/chromedriverpatch.js $(npm bin)/webdriver-manager update diff --git a/scripts/publish/publish-build-artifacts.sh b/scripts/publish/publish-build-artifacts.sh index 8962732cd2..40c3b8c4ba 100755 --- a/scripts/publish/publish-build-artifacts.sh +++ b/scripts/publish/publish-build-artifacts.sh @@ -26,8 +26,7 @@ function publishRepo { # copy over build artifacts into the repo directory rm -rf $REPO_DIR/* cp -R $ARTIFACTS_DIR/* $REPO_DIR/ - grep -v /typings/ .gitignore > $REPO_DIR/.gitignore - + # Replace $$ANGULAR_VESION$$ with the build version. BUILD_VER="2.0.0-${SHORT_SHA}" if [[ ${TRAVIS} ]]; then diff --git a/tools/cjs-jasmine/tsconfig-output_emitter_codegen.json b/tools/cjs-jasmine/tsconfig-output_emitter_codegen.json index 12264c6b2c..6ed263a98f 100644 --- a/tools/cjs-jasmine/tsconfig-output_emitter_codegen.json +++ b/tools/cjs-jasmine/tsconfig-output_emitter_codegen.json @@ -19,7 +19,7 @@ "target": "es5" }, "files": [ - "../../typings/node/node.d.ts", + "../../node_modules/@types/node/index.d.ts", "../../dist/all/@angular/compiler/test/output/output_emitter_codegen_typed.ts", "../../dist/all/@angular/compiler/test/output/output_emitter_codegen_untyped.ts", "../../dist/all/@angular/compiler/test/offline_compiler_codegen_untyped.ts", diff --git a/tools/types.d.ts b/tools/types.d.ts index 411875d6d4..f0d4642286 100644 --- a/tools/types.d.ts +++ b/tools/types.d.ts @@ -1,5 +1,4 @@ // This file contains all ambient imports needed to compile the tools source code -/// -/// -/// +/// +/// diff --git a/tsd.json b/tsd.json deleted file mode 100644 index 70514d0f45..0000000000 --- a/tsd.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "v4", - "repo": "DefinitelyTyped/DefinitelyTyped", - "ref": "master", - "path": "typings", - "bundle": "typings/tsd.d.ts", - "installed": { - "fs-extra/fs-extra.d.ts": { - "commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3" - }, - "node/node.d.ts": { - "commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3" - }, - "jasmine/jasmine.d.ts": { - "commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3" - }, - "hammerjs/hammerjs.d.ts": { - "commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3" - }, - "selenium-webdriver/selenium-webdriver.d.ts": { - "commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3" - }, - "angular-protractor/angular-protractor.d.ts": { - "commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3" - }, - "angularjs/angular.d.ts": { - "commit": "6eebd5e90a1cbd6b47b0705ba72dbcd5baf846f3" - } - } -}