From 752c989152c7fb9e5638a9a809f3dd867339420d Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Wed, 16 Nov 2016 13:50:54 +0000 Subject: [PATCH 1/4] chore(package.json): update to latest dgeni-packages --- npm-shrinkwrap.clean.json | 781 ++++++++++++++++--- npm-shrinkwrap.json | 1537 +++++++++++++++++++++++++++++-------- package.json | 2 +- 3 files changed, 1902 insertions(+), 418 deletions(-) diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 79340246c627..f0284fd78927 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -2460,33 +2460,33 @@ "node-pre-gyp": { "version": "0.6.29" }, - "abbrev": { - "version": "1.0.9" - }, "ansi-regex": { "version": "2.0.0" }, + "abbrev": { + "version": "1.0.9" + }, "ansi-styles": { "version": "2.2.1" }, - "aproba": { - "version": "1.0.4" - }, "are-we-there-yet": { "version": "1.1.2" }, + "aproba": { + "version": "1.0.4" + }, "asn1": { "version": "0.2.3" }, "assert-plus": { "version": "0.2.0" }, - "async": { - "version": "1.5.2" - }, "aws-sign2": { "version": "0.6.0" }, + "async": { + "version": "1.5.2" + }, "aws4": { "version": "1.4.1" }, @@ -2538,10 +2538,10 @@ "deep-extend": { "version": "0.4.1" }, - "delegates": { + "delayed-stream": { "version": "1.0.0" }, - "delayed-stream": { + "delegates": { "version": "1.0.0" }, "ecc-jsbn": { @@ -2559,24 +2559,24 @@ "forever-agent": { "version": "0.6.1" }, - "fs.realpath": { - "version": "1.0.0" - }, "form-data": { "version": "1.0.0-rc4" }, + "fs.realpath": { + "version": "1.0.0" + }, "fstream": { "version": "1.0.10" }, "fstream-ignore": { "version": "1.0.5" }, - "generate-function": { - "version": "2.0.0" - }, "gauge": { "version": "2.6.0" }, + "generate-function": { + "version": "2.0.0" + }, "generate-object-property": { "version": "1.2.0" }, @@ -2598,21 +2598,21 @@ "has-color": { "version": "0.1.7" }, - "hawk": { - "version": "3.1.3" - }, "has-unicode": { "version": "2.0.1" }, + "hawk": { + "version": "3.1.3" + }, "hoek": { "version": "2.16.3" }, - "inflight": { - "version": "1.0.5" - }, "http-signature": { "version": "1.1.1" }, + "inflight": { + "version": "1.0.5" + }, "inherits": { "version": "2.0.1" }, @@ -2634,12 +2634,12 @@ "isarray": { "version": "1.0.0" }, - "jodid25519": { - "version": "1.0.2" - }, "isstream": { "version": "0.1.2" }, + "jodid25519": { + "version": "1.0.2" + }, "jsbn": { "version": "0.1.0" }, @@ -2655,12 +2655,12 @@ "jsprim": { "version": "1.3.0" }, - "mime-types": { - "version": "2.1.11" - }, "mime-db": { "version": "1.23.0" }, + "mime-types": { + "version": "2.1.11" + }, "minimatch": { "version": "3.0.2" }, @@ -2676,24 +2676,24 @@ "node-uuid": { "version": "1.4.7" }, - "number-is-nan": { - "version": "1.0.0" + "nopt": { + "version": "3.0.6" }, "npmlog": { "version": "3.1.2" }, - "nopt": { - "version": "3.0.6" + "number-is-nan": { + "version": "1.0.0" }, "oauth-sign": { "version": "0.8.2" }, - "once": { - "version": "1.3.3" - }, "object-assign": { "version": "4.1.0" }, + "once": { + "version": "1.3.3" + }, "path-is-absolute": { "version": "1.0.0" }, @@ -2730,12 +2730,12 @@ "sntp": { "version": "1.0.9" }, - "string_decoder": { - "version": "0.10.31" - }, "string-width": { "version": "1.0.1" }, + "string_decoder": { + "version": "0.10.31" + }, "stringstream": { "version": "0.0.5" }, @@ -3514,7 +3514,7 @@ } }, "dgeni-packages": { - "version": "0.14.0", + "version": "0.16.0", "dependencies": { "catharsis": { "version": "0.8.8", @@ -3595,13 +3595,13 @@ "version": "4.2.0" }, "glob": { - "version": "7.0.5", + "version": "7.1.1", "dependencies": { "fs.realpath": { "version": "1.0.0" }, "inflight": { - "version": "1.0.5", + "version": "1.0.6", "dependencies": { "wrappy": { "version": "1.0.2" @@ -3609,10 +3609,10 @@ } }, "inherits": { - "version": "2.0.1" + "version": "2.0.3" }, "once": { - "version": "1.3.3", + "version": "1.4.0", "dependencies": { "wrappy": { "version": "1.0.2" @@ -3620,12 +3620,12 @@ } }, "path-is-absolute": { - "version": "1.0.0" + "version": "1.0.1" } } }, "htmlparser2": { - "version": "3.9.1", + "version": "3.9.2", "dependencies": { "domelementtype": { "version": "1.3.0" @@ -3650,10 +3650,10 @@ "version": "1.1.1" }, "inherits": { - "version": "2.0.1" + "version": "2.0.3" }, "readable-stream": { - "version": "2.1.4", + "version": "2.2.2", "dependencies": { "buffer-shims": { "version": "1.0.0" @@ -3678,10 +3678,10 @@ } }, "lodash": { - "version": "4.14.1" + "version": "4.17.1" }, "minimatch": { - "version": "3.0.2", + "version": "3.0.3", "dependencies": { "brace-expansion": { "version": "1.1.6", @@ -3697,87 +3697,656 @@ } }, "nunjucks": { - "version": "1.3.4", + "version": "2.5.2", "dependencies": { - "optimist": { - "version": "0.6.1", - "dependencies": { - "wordwrap": { - "version": "0.0.3" - }, - "minimist": { - "version": "0.0.10" - } - } + "asap": { + "version": "2.0.5" }, "chokidar": { - "version": "0.12.6", + "version": "1.6.1", "dependencies": { - "readdirp": { + "anymatch": { "version": "1.3.0", "dependencies": { - "graceful-fs": { - "version": "2.0.3" + "arrify": { + "version": "1.0.1" }, - "minimatch": { - "version": "0.2.14", + "micromatch": { + "version": "2.3.11", "dependencies": { - "lru-cache": { - "version": "2.7.3" + "arr-diff": { + "version": "2.0.0", + "dependencies": { + "arr-flatten": { + "version": "1.0.1" + } + } }, - "sigmund": { - "version": "1.0.1" - } - } - }, - "readable-stream": { - "version": "1.0.34", - "dependencies": { - "core-util-is": { - "version": "1.0.2" + "array-unique": { + "version": "0.2.1" }, - "isarray": { - "version": "0.0.1" + "braces": { + "version": "1.8.5", + "dependencies": { + "expand-range": { + "version": "1.8.2", + "dependencies": { + "fill-range": { + "version": "2.2.3", + "dependencies": { + "is-number": { + "version": "2.1.0" + }, + "isobject": { + "version": "2.1.0", + "dependencies": { + "isarray": { + "version": "1.0.0" + } + } + }, + "randomatic": { + "version": "1.1.5" + }, + "repeat-string": { + "version": "1.6.1" + } + } + } + } + }, + "preserve": { + "version": "0.2.0" + }, + "repeat-element": { + "version": "1.1.2" + } + } }, - "string_decoder": { - "version": "0.10.31" + "expand-brackets": { + "version": "0.1.5", + "dependencies": { + "is-posix-bracket": { + "version": "0.1.1" + } + } }, - "inherits": { + "extglob": { + "version": "0.3.2" + }, + "filename-regex": { + "version": "2.0.0" + }, + "is-extglob": { + "version": "1.0.0" + }, + "kind-of": { + "version": "3.0.4", + "dependencies": { + "is-buffer": { + "version": "1.1.4" + } + } + }, + "normalize-path": { "version": "2.0.1" + }, + "object.omit": { + "version": "2.0.1", + "dependencies": { + "for-own": { + "version": "0.1.4", + "dependencies": { + "for-in": { + "version": "0.1.6" + } + } + }, + "is-extendable": { + "version": "0.1.1" + } + } + }, + "parse-glob": { + "version": "3.0.4", + "dependencies": { + "glob-base": { + "version": "0.3.0" + }, + "is-dotfile": { + "version": "1.0.2" + } + } + }, + "regex-cache": { + "version": "0.4.3", + "dependencies": { + "is-equal-shallow": { + "version": "0.1.3" + }, + "is-primitive": { + "version": "2.0.0" + } + } } } } } }, "async-each": { - "version": "0.1.6" - } - } - } - } - }, - "q": { - "version": "1.4.1" - }, - "semver": { - "version": "5.3.0" - }, - "shelljs": { - "version": "0.7.3", - "dependencies": { - "interpret": { - "version": "1.0.1" - }, - "rechoir": { - "version": "0.6.2", + "version": "1.0.1" + }, + "glob-parent": { + "version": "2.0.0" + }, + "inherits": { + "version": "2.0.3" + }, + "is-binary-path": { + "version": "1.0.1", + "dependencies": { + "binary-extensions": { + "version": "1.7.0" + } + } + }, + "is-glob": { + "version": "2.0.1", + "dependencies": { + "is-extglob": { + "version": "1.0.0" + } + } + }, + "path-is-absolute": { + "version": "1.0.1" + }, + "readdirp": { + "version": "2.1.0", + "dependencies": { + "graceful-fs": { + "version": "4.1.10" + }, + "readable-stream": { + "version": "2.2.2", + "dependencies": { + "buffer-shims": { + "version": "1.0.0" + }, + "core-util-is": { + "version": "1.0.2" + }, + "isarray": { + "version": "1.0.0" + }, + "process-nextick-args": { + "version": "1.0.7" + }, + "string_decoder": { + "version": "0.10.31" + }, + "util-deprecate": { + "version": "1.0.2" + } + } + }, + "set-immediate-shim": { + "version": "1.0.1" + } + } + }, + "fsevents": { + "version": "1.0.15", + "dependencies": { + "nan": { + "version": "2.4.0" + }, + "node-pre-gyp": { + "version": "0.6.29" + }, + "ansi-regex": { + "version": "2.0.0" + }, + "abbrev": { + "version": "1.0.9" + }, + "ansi-styles": { + "version": "2.2.1" + }, + "aproba": { + "version": "1.0.4" + }, + "asn1": { + "version": "0.2.3" + }, + "assert-plus": { + "version": "0.2.0" + }, + "are-we-there-yet": { + "version": "1.1.2" + }, + "async": { + "version": "1.5.2" + }, + "aws4": { + "version": "1.4.1" + }, + "aws-sign2": { + "version": "0.6.0" + }, + "balanced-match": { + "version": "0.4.2" + }, + "block-stream": { + "version": "0.0.9" + }, + "boom": { + "version": "2.10.1" + }, + "brace-expansion": { + "version": "1.1.5" + }, + "buffer-shims": { + "version": "1.0.0" + }, + "chalk": { + "version": "1.1.3" + }, + "caseless": { + "version": "0.11.0" + }, + "code-point-at": { + "version": "1.0.0" + }, + "combined-stream": { + "version": "1.0.5" + }, + "commander": { + "version": "2.9.0" + }, + "console-control-strings": { + "version": "1.1.0" + }, + "concat-map": { + "version": "0.0.1" + }, + "core-util-is": { + "version": "1.0.2" + }, + "cryptiles": { + "version": "2.0.5" + }, + "deep-extend": { + "version": "0.4.1" + }, + "debug": { + "version": "2.2.0" + }, + "delayed-stream": { + "version": "1.0.0" + }, + "delegates": { + "version": "1.0.0" + }, + "ecc-jsbn": { + "version": "0.1.1" + }, + "extend": { + "version": "3.0.0" + }, + "escape-string-regexp": { + "version": "1.0.5" + }, + "extsprintf": { + "version": "1.0.2" + }, + "forever-agent": { + "version": "0.6.1" + }, + "form-data": { + "version": "1.0.0-rc4" + }, + "fs.realpath": { + "version": "1.0.0" + }, + "fstream": { + "version": "1.0.10" + }, + "fstream-ignore": { + "version": "1.0.5" + }, + "gauge": { + "version": "2.6.0" + }, + "generate-function": { + "version": "2.0.0" + }, + "generate-object-property": { + "version": "1.2.0" + }, + "glob": { + "version": "7.0.5" + }, + "graceful-fs": { + "version": "4.1.4" + }, + "graceful-readlink": { + "version": "1.0.1" + }, + "har-validator": { + "version": "2.0.6" + }, + "has-ansi": { + "version": "2.0.0" + }, + "has-color": { + "version": "0.1.7" + }, + "has-unicode": { + "version": "2.0.1" + }, + "hawk": { + "version": "3.1.3" + }, + "hoek": { + "version": "2.16.3" + }, + "http-signature": { + "version": "1.1.1" + }, + "inflight": { + "version": "1.0.5" + }, + "inherits": { + "version": "2.0.1" + }, + "ini": { + "version": "1.3.4" + }, + "is-fullwidth-code-point": { + "version": "1.0.0" + }, + "is-my-json-valid": { + "version": "2.13.1" + }, + "is-typedarray": { + "version": "1.0.0" + }, + "is-property": { + "version": "1.0.2" + }, + "isarray": { + "version": "1.0.0" + }, + "isstream": { + "version": "0.1.2" + }, + "jodid25519": { + "version": "1.0.2" + }, + "jsbn": { + "version": "0.1.0" + }, + "json-schema": { + "version": "0.2.2" + }, + "json-stringify-safe": { + "version": "5.0.1" + }, + "jsonpointer": { + "version": "2.0.0" + }, + "jsprim": { + "version": "1.3.0" + }, + "mime-types": { + "version": "2.1.11" + }, + "mime-db": { + "version": "1.23.0" + }, + "minimatch": { + "version": "3.0.2" + }, + "minimist": { + "version": "0.0.8" + }, + "mkdirp": { + "version": "0.5.1" + }, + "ms": { + "version": "0.7.1" + }, + "node-uuid": { + "version": "1.4.7" + }, + "nopt": { + "version": "3.0.6" + }, + "npmlog": { + "version": "3.1.2" + }, + "number-is-nan": { + "version": "1.0.0" + }, + "oauth-sign": { + "version": "0.8.2" + }, + "object-assign": { + "version": "4.1.0" + }, + "once": { + "version": "1.3.3" + }, + "path-is-absolute": { + "version": "1.0.0" + }, + "pinkie": { + "version": "2.0.4" + }, + "pinkie-promise": { + "version": "2.0.1" + }, + "process-nextick-args": { + "version": "1.0.7" + }, + "qs": { + "version": "6.2.0" + }, + "request": { + "version": "2.73.0" + }, + "readable-stream": { + "version": "2.1.4" + }, + "rimraf": { + "version": "2.5.3" + }, + "semver": { + "version": "5.2.0" + }, + "set-blocking": { + "version": "2.0.0" + }, + "signal-exit": { + "version": "3.0.0" + }, + "sntp": { + "version": "1.0.9" + }, + "string-width": { + "version": "1.0.1" + }, + "string_decoder": { + "version": "0.10.31" + }, + "strip-ansi": { + "version": "3.0.1" + }, + "stringstream": { + "version": "0.0.5" + }, + "strip-json-comments": { + "version": "1.0.4" + }, + "supports-color": { + "version": "2.0.0" + }, + "tar": { + "version": "2.2.1" + }, + "tough-cookie": { + "version": "2.2.2" + }, + "tar-pack": { + "version": "3.1.4" + }, + "tunnel-agent": { + "version": "0.4.3" + }, + "tweetnacl": { + "version": "0.13.3" + }, + "uid-number": { + "version": "0.0.6" + }, + "util-deprecate": { + "version": "1.0.2" + }, + "verror": { + "version": "1.3.6" + }, + "wide-align": { + "version": "1.1.0" + }, + "wrappy": { + "version": "1.0.2" + }, + "xtend": { + "version": "4.0.1" + }, + "bl": { + "version": "1.1.2", + "dependencies": { + "readable-stream": { + "version": "2.0.6" + } + } + }, + "dashdash": { + "version": "1.14.0", + "dependencies": { + "assert-plus": { + "version": "1.0.0" + } + } + }, + "getpass": { + "version": "0.1.6", + "dependencies": { + "assert-plus": { + "version": "1.0.0" + } + } + }, + "rc": { + "version": "1.1.6", + "dependencies": { + "minimist": { + "version": "1.2.0" + } + } + }, + "sshpk": { + "version": "1.8.3", + "dependencies": { + "assert-plus": { + "version": "1.0.0" + } + } + } + } + } + } + }, + "yargs": { + "version": "3.32.0", "dependencies": { - "resolve": { - "version": "1.1.7" + "camelcase": { + "version": "2.1.1" + }, + "cliui": { + "version": "3.2.0", + "dependencies": { + "strip-ansi": { + "version": "3.0.1", + "dependencies": { + "ansi-regex": { + "version": "2.0.0" + } + } + }, + "wrap-ansi": { + "version": "2.0.0" + } + } + }, + "decamelize": { + "version": "1.2.0" + }, + "os-locale": { + "version": "1.4.0", + "dependencies": { + "lcid": { + "version": "1.0.0", + "dependencies": { + "invert-kv": { + "version": "1.0.0" + } + } + } + } + }, + "string-width": { + "version": "1.0.2", + "dependencies": { + "code-point-at": { + "version": "1.1.0" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "dependencies": { + "number-is-nan": { + "version": "1.0.1" + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "dependencies": { + "ansi-regex": { + "version": "2.0.0" + } + } + } + } + }, + "window-size": { + "version": "0.1.4" + }, + "y18n": { + "version": "3.2.1" } } } } }, + "q": { + "version": "1.4.1" + }, + "semver": { + "version": "5.3.0" + }, "spdx-license-list": { "version": "2.1.0" }, diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1d3a43db41b0..107db949fc98 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3405,6 +3405,7 @@ "changez": { "version": "2.1.1", "from": "changez@2.1.1", + "resolved": "https://registry.npmjs.org/changez/-/changez-2.1.1.tgz", "dependencies": { "commander": { "version": "2.9.0", @@ -3785,31 +3786,31 @@ "from": "node-pre-gyp@>=0.6.29 <0.7.0", "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.29.tgz" }, - "abbrev": { - "version": "1.0.9", - "from": "abbrev@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" - }, "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" }, + "abbrev": { + "version": "1.0.9", + "from": "abbrev@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" + }, "ansi-styles": { "version": "2.2.1", "from": "ansi-styles@>=2.2.1 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" }, - "aproba": { - "version": "1.0.4", - "from": "aproba@>=1.0.3 <2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" - }, "are-we-there-yet": { "version": "1.1.2", "from": "are-we-there-yet@>=1.1.2 <1.2.0", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz" }, + "aproba": { + "version": "1.0.4", + "from": "aproba@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" + }, "asn1": { "version": "0.2.3", "from": "asn1@>=0.2.3 <0.3.0", @@ -3820,16 +3821,16 @@ "from": "assert-plus@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" }, - "async": { - "version": "1.5.2", - "from": "async@>=1.5.2 <2.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" - }, "aws-sign2": { "version": "0.6.0", "from": "aws-sign2@>=0.6.0 <0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, + "async": { + "version": "1.5.2", + "from": "async@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + }, "aws4": { "version": "1.4.1", "from": "aws4@>=1.2.1 <2.0.0", @@ -3915,16 +3916,16 @@ "from": "deep-extend@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz" }, - "delegates": { - "version": "1.0.0", - "from": "delegates@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz" - }, "delayed-stream": { "version": "1.0.0", "from": "delayed-stream@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" }, + "delegates": { + "version": "1.0.0", + "from": "delegates@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz" + }, "ecc-jsbn": { "version": "0.1.1", "from": "ecc-jsbn@>=0.1.1 <0.2.0", @@ -3950,16 +3951,16 @@ "from": "forever-agent@>=0.6.1 <0.7.0", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" }, - "fs.realpath": { - "version": "1.0.0", - "from": "fs.realpath@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" - }, "form-data": { "version": "1.0.0-rc4", "from": "form-data@>=1.0.0-rc4 <1.1.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz" }, + "fs.realpath": { + "version": "1.0.0", + "from": "fs.realpath@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + }, "fstream": { "version": "1.0.10", "from": "fstream@>=1.0.2 <2.0.0", @@ -3970,16 +3971,16 @@ "from": "fstream-ignore@>=1.0.5 <1.1.0", "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz" }, - "generate-function": { - "version": "2.0.0", - "from": "generate-function@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" - }, "gauge": { "version": "2.6.0", "from": "gauge@>=2.6.0 <2.7.0", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz" }, + "generate-function": { + "version": "2.0.0", + "from": "generate-function@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" + }, "generate-object-property": { "version": "1.2.0", "from": "generate-object-property@>=1.1.0 <2.0.0", @@ -4015,31 +4016,31 @@ "from": "has-color@>=0.1.7 <0.2.0", "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" }, - "hawk": { - "version": "3.1.3", - "from": "hawk@>=3.1.3 <3.2.0", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz" - }, "has-unicode": { "version": "2.0.1", "from": "has-unicode@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" }, + "hawk": { + "version": "3.1.3", + "from": "hawk@>=3.1.3 <3.2.0", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz" + }, "hoek": { "version": "2.16.3", "from": "hoek@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" }, - "inflight": { - "version": "1.0.5", - "from": "inflight@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz" - }, "http-signature": { "version": "1.1.1", "from": "http-signature@>=1.1.0 <1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz" }, + "inflight": { + "version": "1.0.5", + "from": "inflight@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz" + }, "inherits": { "version": "2.0.1", "from": "inherits@>=2.0.1 <2.1.0", @@ -4075,16 +4076,16 @@ "from": "isarray@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, - "jodid25519": { - "version": "1.0.2", - "from": "jodid25519@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" - }, "isstream": { "version": "0.1.2", "from": "isstream@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" }, + "jodid25519": { + "version": "1.0.2", + "from": "jodid25519@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" + }, "jsbn": { "version": "0.1.0", "from": "jsbn@>=0.1.0 <0.2.0", @@ -4110,16 +4111,16 @@ "from": "jsprim@>=1.2.2 <2.0.0", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz" }, - "mime-types": { - "version": "2.1.11", - "from": "mime-types@>=2.1.7 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz" - }, "mime-db": { "version": "1.23.0", "from": "mime-db@>=1.23.0 <1.24.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" }, + "mime-types": { + "version": "2.1.11", + "from": "mime-types@>=2.1.7 <2.2.0", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz" + }, "minimatch": { "version": "3.0.2", "from": "minimatch@>=3.0.2 <4.0.0", @@ -4145,36 +4146,36 @@ "from": "node-uuid@>=1.4.7 <1.5.0", "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" }, - "number-is-nan": { - "version": "1.0.0", - "from": "number-is-nan@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" + "nopt": { + "version": "3.0.6", + "from": "nopt@>=3.0.1 <3.1.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" }, "npmlog": { "version": "3.1.2", "from": "npmlog@>=3.1.2 <3.2.0", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz" }, - "nopt": { - "version": "3.0.6", - "from": "nopt@>=3.0.1 <3.1.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" + "number-is-nan": { + "version": "1.0.0", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" }, "oauth-sign": { "version": "0.8.2", "from": "oauth-sign@>=0.8.1 <0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" }, - "once": { - "version": "1.3.3", - "from": "once@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz" - }, "object-assign": { "version": "4.1.0", "from": "object-assign@>=4.1.0 <5.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" }, + "once": { + "version": "1.3.3", + "from": "once@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz" + }, "path-is-absolute": { "version": "1.0.0", "from": "path-is-absolute@>=1.0.0 <2.0.0", @@ -4235,16 +4236,16 @@ "from": "sntp@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.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" - }, "string-width": { "version": "1.0.1", "from": "string-width@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.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" + }, "stringstream": { "version": "0.0.5", "from": "stringstream@>=0.0.4 <0.1.0", @@ -5433,23 +5434,22 @@ } }, "dgeni-packages": { - "version": "0.14.0", - "from": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.14.0.tgz", - "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.14.0.tgz", + "version": "0.16.0", + "from": "dgeni-packages@latest", "dependencies": { "catharsis": { "version": "0.8.8", - "from": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.8.tgz", + "from": "catharsis@>=0.8.1 <0.9.0", "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.8.tgz", "dependencies": { "underscore-contrib": { "version": "0.3.0", - "from": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", + "from": "underscore-contrib@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", "dependencies": { "underscore": { "version": "1.6.0", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "from": "underscore@1.6.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" } } @@ -5458,356 +5458,1295 @@ }, "change-case": { "version": "3.0.0", - "from": "https://registry.npmjs.org/change-case/-/change-case-3.0.0.tgz", + "from": "change-case@3.0.0", "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.0.tgz", "dependencies": { "camel-case": { "version": "3.0.0", - "from": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "from": "camel-case@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz" }, "constant-case": { "version": "2.0.0", - "from": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz", + "from": "constant-case@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz" }, "dot-case": { "version": "2.1.0", - "from": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.0.tgz", + "from": "dot-case@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.0.tgz" }, "header-case": { "version": "1.0.0", - "from": "https://registry.npmjs.org/header-case/-/header-case-1.0.0.tgz", + "from": "header-case@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.0.tgz" }, "is-lower-case": { "version": "1.1.3", - "from": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz", + "from": "is-lower-case@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz" }, "is-upper-case": { "version": "1.1.2", - "from": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz", + "from": "is-upper-case@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz" }, "lower-case": { "version": "1.1.3", - "from": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.3.tgz", + "from": "lower-case@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.3.tgz" }, "lower-case-first": { "version": "1.0.2", - "from": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz", + "from": "lower-case-first@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz" }, "no-case": { "version": "2.3.0", - "from": "https://registry.npmjs.org/no-case/-/no-case-2.3.0.tgz", + "from": "no-case@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.0.tgz" }, "param-case": { "version": "2.1.0", - "from": "https://registry.npmjs.org/param-case/-/param-case-2.1.0.tgz", + "from": "param-case@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.0.tgz" }, "pascal-case": { "version": "2.0.0", - "from": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.0.tgz", + "from": "pascal-case@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.0.tgz" }, "path-case": { "version": "2.1.0", - "from": "https://registry.npmjs.org/path-case/-/path-case-2.1.0.tgz", + "from": "path-case@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.0.tgz" }, "sentence-case": { "version": "2.1.0", - "from": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.0.tgz", + "from": "sentence-case@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.0.tgz" }, "snake-case": { "version": "2.1.0", - "from": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz", + "from": "snake-case@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz" }, "swap-case": { "version": "1.1.2", - "from": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz", + "from": "swap-case@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz" }, "title-case": { "version": "2.1.0", - "from": "https://registry.npmjs.org/title-case/-/title-case-2.1.0.tgz", + "from": "title-case@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.0.tgz" }, "upper-case": { "version": "1.1.3", - "from": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "from": "upper-case@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz" }, "upper-case-first": { "version": "1.1.2", - "from": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz", + "from": "upper-case-first@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz" } } }, "espree": { "version": "2.2.5", - "from": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz", + "from": "espree@>=2.2.3 <3.0.0", "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz" }, "estraverse": { "version": "4.2.0", - "from": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "from": "estraverse@>=4.1.0 <5.0.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz" }, "glob": { - "version": "7.0.5", - "from": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", + "version": "7.1.1", + "from": "glob@>=7.0.5 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "dependencies": { "fs.realpath": { "version": "1.0.0", - "from": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "from": "fs.realpath@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" }, "inflight": { - "version": "1.0.5", - "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz", + "version": "1.0.6", + "from": "inflight@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" } } }, "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "version": "2.0.3", + "from": "inherits@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" }, "once": { - "version": "1.3.3", - "from": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "version": "1.4.0", + "from": "once@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" } } }, "path-is-absolute": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "version": "1.0.1", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } }, "htmlparser2": { - "version": "3.9.1", - "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz", + "version": "3.9.2", + "from": "htmlparser2@>=3.7.3 <4.0.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "dependencies": { "domelementtype": { "version": "1.3.0", - "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "from": "domelementtype@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz" }, "domhandler": { "version": "2.3.0", - "from": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "from": "domhandler@>=2.3.0 <3.0.0", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz" }, "domutils": { "version": "1.5.1", - "from": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "from": "domutils@>=1.5.1 <2.0.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "dependencies": { "dom-serializer": { "version": "0.1.0", - "from": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "from": "dom-serializer@>=0.0.0 <1.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "dependencies": { "domelementtype": { "version": "1.1.3", - "from": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "from": "domelementtype@>=1.1.1 <1.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz" } } } } }, - "entities": { - "version": "1.1.1", - "from": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - }, - "readable-stream": { - "version": "2.1.4", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz", + "entities": { + "version": "1.1.1", + "from": "entities@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + }, + "readable-stream": { + "version": "2.2.2", + "from": "readable-stream@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", + "dependencies": { + "buffer-shims": { + "version": "1.0.0", + "from": "buffer-shims@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.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.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + } + } + } + } + }, + "lodash": { + "version": "4.17.1", + "from": "lodash@>=4.13.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.1.tgz" + }, + "minimatch": { + "version": "3.0.3", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "dependencies": { + "brace-expansion": { + "version": "1.1.6", + "from": "brace-expansion@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + } + } + } + } + }, + "nunjucks": { + "version": "2.5.2", + "from": "nunjucks@>=2.4.2 <3.0.0", + "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-2.5.2.tgz", + "dependencies": { + "asap": { + "version": "2.0.5", + "from": "asap@>=2.0.3 <3.0.0", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz" + }, + "chokidar": { + "version": "1.6.1", + "from": "chokidar@>=1.6.0 <2.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz", + "dependencies": { + "anymatch": { + "version": "1.3.0", + "from": "anymatch@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz", + "dependencies": { + "arrify": { + "version": "1.0.1", + "from": "arrify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz" + }, + "micromatch": { + "version": "2.3.11", + "from": "micromatch@>=2.1.5 <3.0.0", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "dependencies": { + "arr-diff": { + "version": "2.0.0", + "from": "arr-diff@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "dependencies": { + "arr-flatten": { + "version": "1.0.1", + "from": "arr-flatten@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz" + } + } + }, + "array-unique": { + "version": "0.2.1", + "from": "array-unique@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz" + }, + "braces": { + "version": "1.8.5", + "from": "braces@>=1.8.2 <2.0.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "dependencies": { + "expand-range": { + "version": "1.8.2", + "from": "expand-range@>=1.8.1 <2.0.0", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "dependencies": { + "fill-range": { + "version": "2.2.3", + "from": "fill-range@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "dependencies": { + "is-number": { + "version": "2.1.0", + "from": "is-number@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz" + }, + "isobject": { + "version": "2.1.0", + "from": "isobject@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "dependencies": { + "isarray": { + "version": "1.0.0", + "from": "isarray@1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + } + } + }, + "randomatic": { + "version": "1.1.5", + "from": "randomatic@>=1.1.3 <2.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz" + }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + } + } + } + } + }, + "preserve": { + "version": "0.2.0", + "from": "preserve@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz" + }, + "repeat-element": { + "version": "1.1.2", + "from": "repeat-element@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz" + } + } + }, + "expand-brackets": { + "version": "0.1.5", + "from": "expand-brackets@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "dependencies": { + "is-posix-bracket": { + "version": "0.1.1", + "from": "is-posix-bracket@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz" + } + } + }, + "extglob": { + "version": "0.3.2", + "from": "extglob@>=0.3.1 <0.4.0", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz" + }, + "filename-regex": { + "version": "2.0.0", + "from": "filename-regex@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz" + }, + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + }, + "kind-of": { + "version": "3.0.4", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz", + "dependencies": { + "is-buffer": { + "version": "1.1.4", + "from": "is-buffer@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz" + } + } + }, + "normalize-path": { + "version": "2.0.1", + "from": "normalize-path@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz" + }, + "object.omit": { + "version": "2.0.1", + "from": "object.omit@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "dependencies": { + "for-own": { + "version": "0.1.4", + "from": "for-own@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz", + "dependencies": { + "for-in": { + "version": "0.1.6", + "from": "for-in@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz" + } + } + }, + "is-extendable": { + "version": "0.1.1", + "from": "is-extendable@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz" + } + } + }, + "parse-glob": { + "version": "3.0.4", + "from": "parse-glob@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "dependencies": { + "glob-base": { + "version": "0.3.0", + "from": "glob-base@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz" + }, + "is-dotfile": { + "version": "1.0.2", + "from": "is-dotfile@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz" + } + } + }, + "regex-cache": { + "version": "0.4.3", + "from": "regex-cache@>=0.4.2 <0.5.0", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "dependencies": { + "is-equal-shallow": { + "version": "0.1.3", + "from": "is-equal-shallow@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz" + }, + "is-primitive": { + "version": "2.0.0", + "from": "is-primitive@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz" + } + } + } + } + } + } + }, + "async-each": { + "version": "1.0.1", + "from": "async-each@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz" + }, + "glob-parent": { + "version": "2.0.0", + "from": "glob-parent@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz" + }, + "inherits": { + "version": "2.0.3", + "from": "inherits@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" + }, + "is-binary-path": { + "version": "1.0.1", + "from": "is-binary-path@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "dependencies": { + "binary-extensions": { + "version": "1.7.0", + "from": "binary-extensions@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz" + } + } + }, + "is-glob": { + "version": "2.0.1", + "from": "is-glob@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "from": "is-extglob@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz" + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + }, + "readdirp": { + "version": "2.1.0", + "from": "readdirp@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "dependencies": { + "graceful-fs": { + "version": "4.1.10", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz" + }, + "readable-stream": { + "version": "2.2.2", + "from": "readable-stream@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", + "dependencies": { + "buffer-shims": { + "version": "1.0.0", + "from": "buffer-shims@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.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.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + } + } + }, + "set-immediate-shim": { + "version": "1.0.1", + "from": "set-immediate-shim@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz" + } + } + }, + "fsevents": { + "version": "1.0.15", + "from": "fsevents@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.15.tgz", + "dependencies": { + "nan": { + "version": "2.4.0", + "from": "nan@>=2.3.0 <3.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" + }, + "node-pre-gyp": { + "version": "0.6.29", + "from": "node-pre-gyp@>=0.6.29 <0.7.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.29.tgz" + }, + "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" + }, + "abbrev": { + "version": "1.0.9", + "from": "abbrev@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" + }, + "ansi-styles": { + "version": "2.2.1", + "from": "ansi-styles@>=2.2.1 <3.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz" + }, + "aproba": { + "version": "1.0.4", + "from": "aproba@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" + }, + "asn1": { + "version": "0.2.3", + "from": "asn1@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" + }, + "assert-plus": { + "version": "0.2.0", + "from": "assert-plus@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" + }, + "are-we-there-yet": { + "version": "1.1.2", + "from": "are-we-there-yet@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz" + }, + "async": { + "version": "1.5.2", + "from": "async@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + }, + "aws4": { + "version": "1.4.1", + "from": "aws4@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" + }, + "aws-sign2": { + "version": "0.6.0", + "from": "aws-sign2@>=0.6.0 <0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" + }, + "balanced-match": { + "version": "0.4.2", + "from": "balanced-match@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" + }, + "block-stream": { + "version": "0.0.9", + "from": "block-stream@*", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz" + }, + "boom": { + "version": "2.10.1", + "from": "boom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" + }, + "brace-expansion": { + "version": "1.1.5", + "from": "brace-expansion@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz" + }, + "buffer-shims": { + "version": "1.0.0", + "from": "buffer-shims@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" + }, + "chalk": { + "version": "1.1.3", + "from": "chalk@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" + }, + "caseless": { + "version": "0.11.0", + "from": "caseless@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" + }, + "code-point-at": { + "version": "1.0.0", + "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" + }, + "combined-stream": { + "version": "1.0.5", + "from": "combined-stream@>=1.0.5 <1.1.0", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz" + }, + "commander": { + "version": "2.9.0", + "from": "commander@>=2.9.0 <3.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz" + }, + "console-control-strings": { + "version": "1.1.0", + "from": "console-control-strings@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz" + }, + "concat-map": { + "version": "0.0.1", + "from": "concat-map@0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + }, + "core-util-is": { + "version": "1.0.2", + "from": "core-util-is@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + }, + "cryptiles": { + "version": "2.0.5", + "from": "cryptiles@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" + }, + "deep-extend": { + "version": "0.4.1", + "from": "deep-extend@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz" + }, + "debug": { + "version": "2.2.0", + "from": "debug@>=2.2.0 <2.3.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" + }, + "delayed-stream": { + "version": "1.0.0", + "from": "delayed-stream@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" + }, + "delegates": { + "version": "1.0.0", + "from": "delegates@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz" + }, + "ecc-jsbn": { + "version": "0.1.1", + "from": "ecc-jsbn@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" + }, + "extend": { + "version": "3.0.0", + "from": "extend@>=3.0.0 <3.1.0", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" + }, + "escape-string-regexp": { + "version": "1.0.5", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + }, + "extsprintf": { + "version": "1.0.2", + "from": "extsprintf@1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" + }, + "forever-agent": { + "version": "0.6.1", + "from": "forever-agent@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" + }, + "form-data": { + "version": "1.0.0-rc4", + "from": "form-data@>=1.0.0-rc4 <1.1.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz" + }, + "fs.realpath": { + "version": "1.0.0", + "from": "fs.realpath@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" + }, + "fstream": { + "version": "1.0.10", + "from": "fstream@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz" + }, + "fstream-ignore": { + "version": "1.0.5", + "from": "fstream-ignore@>=1.0.5 <1.1.0", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz" + }, + "gauge": { + "version": "2.6.0", + "from": "gauge@>=2.6.0 <2.7.0", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz" + }, + "generate-function": { + "version": "2.0.0", + "from": "generate-function@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" + }, + "generate-object-property": { + "version": "1.2.0", + "from": "generate-object-property@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" + }, + "glob": { + "version": "7.0.5", + "from": "glob@>=7.0.5 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" + }, + "graceful-fs": { + "version": "4.1.4", + "from": "graceful-fs@>=4.1.2 <5.0.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz" + }, + "graceful-readlink": { + "version": "1.0.1", + "from": "graceful-readlink@>=1.0.0", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" + }, + "har-validator": { + "version": "2.0.6", + "from": "har-validator@>=2.0.6 <2.1.0", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.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" + }, + "has-color": { + "version": "0.1.7", + "from": "has-color@>=0.1.7 <0.2.0", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" + }, + "has-unicode": { + "version": "2.0.1", + "from": "has-unicode@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" + }, + "hawk": { + "version": "3.1.3", + "from": "hawk@>=3.1.3 <3.2.0", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz" + }, + "hoek": { + "version": "2.16.3", + "from": "hoek@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" + }, + "http-signature": { + "version": "1.1.1", + "from": "http-signature@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz" + }, + "inflight": { + "version": "1.0.5", + "from": "inflight@>=1.0.4 <2.0.0", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.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" + }, + "ini": { + "version": "1.3.4", + "from": "ini@>=1.3.0 <1.4.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" + }, + "is-my-json-valid": { + "version": "2.13.1", + "from": "is-my-json-valid@>=2.12.4 <3.0.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz" + }, + "is-typedarray": { + "version": "1.0.0", + "from": "is-typedarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + }, + "is-property": { + "version": "1.0.2", + "from": "is-property@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" + }, + "isarray": { + "version": "1.0.0", + "from": "isarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + }, + "isstream": { + "version": "0.1.2", + "from": "isstream@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" + }, + "jodid25519": { + "version": "1.0.2", + "from": "jodid25519@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" + }, + "jsbn": { + "version": "0.1.0", + "from": "jsbn@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" + }, + "json-schema": { + "version": "0.2.2", + "from": "json-schema@0.2.2", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" + }, + "json-stringify-safe": { + "version": "5.0.1", + "from": "json-stringify-safe@>=5.0.1 <5.1.0", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + }, + "jsonpointer": { + "version": "2.0.0", + "from": "jsonpointer@2.0.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" + }, + "jsprim": { + "version": "1.3.0", + "from": "jsprim@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz" + }, + "mime-types": { + "version": "2.1.11", + "from": "mime-types@>=2.1.7 <2.2.0", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz" + }, + "mime-db": { + "version": "1.23.0", + "from": "mime-db@>=1.23.0 <1.24.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + }, + "minimatch": { + "version": "3.0.2", + "from": "minimatch@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz" + }, + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.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" + }, + "ms": { + "version": "0.7.1", + "from": "ms@0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" + }, + "node-uuid": { + "version": "1.4.7", + "from": "node-uuid@>=1.4.7 <1.5.0", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" + }, + "nopt": { + "version": "3.0.6", + "from": "nopt@>=3.0.1 <3.1.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" + }, + "npmlog": { + "version": "3.1.2", + "from": "npmlog@>=3.1.2 <3.2.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz" + }, + "number-is-nan": { + "version": "1.0.0", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz" + }, + "oauth-sign": { + "version": "0.8.2", + "from": "oauth-sign@>=0.8.1 <0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" + }, + "object-assign": { + "version": "4.1.0", + "from": "object-assign@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + }, + "once": { + "version": "1.3.3", + "from": "once@>=1.3.0 <2.0.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz" + }, + "path-is-absolute": { + "version": "1.0.0", + "from": "path-is-absolute@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + }, + "pinkie": { + "version": "2.0.4", + "from": "pinkie@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz" + }, + "pinkie-promise": { + "version": "2.0.1", + "from": "pinkie-promise@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" + }, + "process-nextick-args": { + "version": "1.0.7", + "from": "process-nextick-args@>=1.0.6 <1.1.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + }, + "qs": { + "version": "6.2.0", + "from": "qs@>=6.2.0 <6.3.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz" + }, + "request": { + "version": "2.73.0", + "from": "request@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.73.0.tgz" + }, + "readable-stream": { + "version": "2.1.4", + "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz" + }, + "rimraf": { + "version": "2.5.3", + "from": "rimraf@>=2.5.0 <2.6.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.3.tgz" + }, + "semver": { + "version": "5.2.0", + "from": "semver@>=5.2.0 <5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz" + }, + "set-blocking": { + "version": "2.0.0", + "from": "set-blocking@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz" + }, + "signal-exit": { + "version": "3.0.0", + "from": "signal-exit@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz" + }, + "sntp": { + "version": "1.0.9", + "from": "sntp@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" + }, + "string-width": { + "version": "1.0.1", + "from": "string-width@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.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" + }, + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" + }, + "stringstream": { + "version": "0.0.5", + "from": "stringstream@>=0.0.4 <0.1.0", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.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" + }, + "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" + }, + "tar": { + "version": "2.2.1", + "from": "tar@>=2.2.0 <2.3.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz" + }, + "tough-cookie": { + "version": "2.2.2", + "from": "tough-cookie@>=2.2.0 <2.3.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz" + }, + "tar-pack": { + "version": "3.1.4", + "from": "tar-pack@>=3.1.0 <3.2.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz" + }, + "tunnel-agent": { + "version": "0.4.3", + "from": "tunnel-agent@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" + }, + "tweetnacl": { + "version": "0.13.3", + "from": "tweetnacl@>=0.13.0 <0.14.0", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" + }, + "uid-number": { + "version": "0.0.6", + "from": "uid-number@>=0.0.6 <0.1.0", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz" + }, + "util-deprecate": { + "version": "1.0.2", + "from": "util-deprecate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + }, + "verror": { + "version": "1.3.6", + "from": "verror@1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" + }, + "wide-align": { + "version": "1.1.0", + "from": "wide-align@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz" + }, + "wrappy": { + "version": "1.0.2", + "from": "wrappy@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + }, + "xtend": { + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" + }, + "bl": { + "version": "1.1.2", + "from": "bl@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", + "dependencies": { + "readable-stream": { + "version": "2.0.6", + "from": "readable-stream@>=2.0.5 <2.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz" + } + } + }, + "dashdash": { + "version": "1.14.0", + "from": "dashdash@>=1.12.0 <2.0.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, + "getpass": { + "version": "0.1.6", + "from": "getpass@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, + "rc": { + "version": "1.1.6", + "from": "rc@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz", + "dependencies": { + "minimist": { + "version": "1.2.0", + "from": "minimist@>=1.2.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + } + } + }, + "sshpk": { + "version": "1.8.3", + "from": "sshpk@>=1.7.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + } + } + } + } + }, + "yargs": { + "version": "3.32.0", + "from": "yargs@>=3.32.0 <4.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", "dependencies": { - "buffer-shims": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" - }, - "core-util-is": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" + "camelcase": { + "version": "2.1.1", + "from": "camelcase@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" }, - "isarray": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" + "cliui": { + "version": "3.2.0", + "from": "cliui@>=3.0.3 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "dependencies": { + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.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" + } + } + }, + "wrap-ansi": { + "version": "2.0.0", + "from": "wrap-ansi@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz" + } + } }, - "process-nextick-args": { - "version": "1.0.7", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" + "decamelize": { + "version": "1.2.0", + "from": "decamelize@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" }, - "string_decoder": { - "version": "0.10.31", - "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" + "os-locale": { + "version": "1.4.0", + "from": "os-locale@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "dependencies": { + "lcid": { + "version": "1.0.0", + "from": "lcid@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "dependencies": { + "invert-kv": { + "version": "1.0.0", + "from": "invert-kv@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz" + } + } + } + } }, - "util-deprecate": { + "string-width": { "version": "1.0.2", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" - } - } - } - } - }, - "lodash": { - "version": "4.14.1", - "from": "https://registry.npmjs.org/lodash/-/lodash-4.14.1.tgz", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.14.1.tgz" - }, - "minimatch": { - "version": "3.0.2", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz", - "dependencies": { - "brace-expansion": { - "version": "1.1.6", - "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" - }, - "concat-map": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" - } - } - } - } - }, - "nunjucks": { - "version": "1.3.4", - "from": "https://registry.npmjs.org/nunjucks/-/nunjucks-1.3.4.tgz", - "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-1.3.4.tgz", - "dependencies": { - "optimist": { - "version": "0.6.1", - "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "dependencies": { - "wordwrap": { - "version": "0.0.3", - "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" - }, - "minimist": { - "version": "0.0.10", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" - } - } - }, - "chokidar": { - "version": "0.12.6", - "from": "https://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz", - "dependencies": { - "readdirp": { - "version": "1.3.0", - "from": "https://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz", + "from": "string-width@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "dependencies": { - "graceful-fs": { - "version": "2.0.3", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" + "code-point-at": { + "version": "1.1.0", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" }, - "minimatch": { - "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "dependencies": { - "lru-cache": { - "version": "2.7.3", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" - }, - "sigmund": { + "number-is-nan": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" } } }, - "readable-stream": { - "version": "1.0.34", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "strip-ansi": { + "version": "3.0.1", + "from": "strip-ansi@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "dependencies": { - "core-util-is": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "isarray": { - "version": "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": "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": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "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" } } } } }, - "async-each": { - "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" + "window-size": { + "version": "0.1.4", + "from": "window-size@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz" + }, + "y18n": { + "version": "3.2.1", + "from": "y18n@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz" } } } @@ -5815,46 +6754,22 @@ }, "q": { "version": "1.4.1", - "from": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", + "from": "q@>=1.4.1 <1.5.0", "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz" }, "semver": { "version": "5.3.0", - "from": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "from": "semver@>=5.2.0 <6.0.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz" }, - "shelljs": { - "version": "0.7.3", - "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.3.tgz", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.3.tgz", - "dependencies": { - "interpret": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz" - }, - "rechoir": { - "version": "0.6.2", - "from": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "dependencies": { - "resolve": { - "version": "1.1.7", - "from": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz" - } - } - } - } - }, "spdx-license-list": { "version": "2.1.0", - "from": "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-2.1.0.tgz", + "from": "spdx-license-list@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-2.1.0.tgz" }, "typescript": { "version": "1.8.10", - "from": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz", + "from": "typescript@>=1.7.5 <2.0.0", "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz" } } @@ -14790,54 +15705,54 @@ }, "shelljs": { "version": "0.7.5", - "from": "shelljs@latest", + "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz", "dependencies": { "glob": { "version": "7.1.1", - "from": "glob@>=7.0.0 <8.0.0", + "from": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "dependencies": { "fs.realpath": { "version": "1.0.0", - "from": "fs.realpath@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" }, "inflight": { "version": "1.0.6", - "from": "inflight@>=1.0.4 <2.0.0", + "from": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "wrappy@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" } } }, "inherits": { "version": "2.0.3", - "from": "inherits@>=2.0.0 <3.0.0", + "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" }, "minimatch": { "version": "3.0.3", - "from": "minimatch@>=3.0.2 <4.0.0", + "from": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", "dependencies": { "brace-expansion": { "version": "1.1.6", - "from": "brace-expansion@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz", "dependencies": { "balanced-match": { "version": "0.4.2", - "from": "balanced-match@>=0.4.1 <0.5.0", + "from": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" }, "concat-map": { "version": "0.0.1", - "from": "concat-map@0.0.1", + "from": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" } } @@ -14846,36 +15761,36 @@ }, "once": { "version": "1.4.0", - "from": "once@>=1.3.0 <2.0.0", + "from": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "dependencies": { "wrappy": { "version": "1.0.2", - "from": "wrappy@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" } } }, "path-is-absolute": { "version": "1.0.1", - "from": "path-is-absolute@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" } } }, "interpret": { "version": "1.0.1", - "from": "interpret@>=1.0.0 <2.0.0", + "from": "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz" }, "rechoir": { "version": "0.6.2", - "from": "rechoir@>=0.6.2 <0.7.0", + "from": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "dependencies": { "resolve": { "version": "1.1.7", - "from": "resolve@>=1.1.6 <2.0.0", + "from": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz" } } diff --git a/package.json b/package.json index a45489b52d78..61a635ed7ed8 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "cross-spawn": "^4.0.0", "cz-conventional-changelog": "1.1.4", "dgeni": "^0.4.0", - "dgeni-packages": "^0.14.0", + "dgeni-packages": "^0.16.0", "event-stream": "~3.1.0", "glob": "^6.0.1", "grunt": "^1.0.1", From 17e98ace4816b13048a7af567d1f2a2b69251a01 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Fri, 18 Nov 2016 10:41:21 +0000 Subject: [PATCH 2/4] chore(docs): bring in all templates from dgeni-packages --- docs/config/index.js | 7 +- .../{ => app}/angular-service.template.js | 0 .../templates/{ => app}/error.template.html | 0 .../{ => app}/errorNamespace.template.html | 0 .../{ => app}/indexPage.template.html | 0 .../{ => app}/json-doc.template.json | 0 .../templates/{ => app}/nav-data.template.js | 0 .../{ => app}/pages-data.template.js | 0 .../{ => app}/runnableExample.template.html | 0 .../{ => app}/tutorial.template.html | 0 .../templates/examples/index.template.html | 21 ++++++ .../templates/examples/manifest.template.json | 8 +++ .../examples/protractorTests.template.js | 10 +++ .../examples/runnableExample.template.html | 24 +++++++ docs/config/templates/examples/template.css | 1 + docs/config/templates/examples/template.html | 1 + docs/config/templates/examples/template.js | 4 ++ docs/config/templates/examples/template.json | 1 + .../templates/examples/template.protractor | 1 + .../templates/examples/template.scenario | 1 + docs/config/templates/examples/template.spec | 1 + .../templates/{ => git}/api/api.template.html | 2 +- docs/config/templates/git/base.template.html | 4 ++ .../templates/ngdoc/api/api.template.html | 62 ++++++++++++++++ .../ngdoc/api/componentGroup.template.html | 31 ++++++++ .../ngdoc/api/directive.template.html | 72 +++++++++++++++++++ .../templates/ngdoc/api/filter.template.html | 26 +++++++ .../ngdoc/api/function.template.html | 1 + .../templates/ngdoc/api/input.template.html | 12 ++++ .../{ => ngdoc}/api/module.template.html | 46 +++++------- .../templates/ngdoc/api/object.template.html | 23 ++++++ .../ngdoc/api/provider.template.html | 9 +++ .../templates/ngdoc/api/service.template.html | 9 +++ .../templates/ngdoc/api/type.template.html | 1 + .../config/templates/ngdoc/base.template.html | 2 + .../templates/ngdoc/lib/events.template.html | 32 +++++++++ .../templates/{ => ngdoc}/lib/macros.html | 2 +- .../templates/ngdoc/lib/methods.template.html | 28 ++++++++ .../templates/ngdoc/lib/params.template.html | 7 ++ .../ngdoc/lib/properties.template.html | 12 ++++ .../templates/ngdoc/lib/returns.template.html | 5 ++ .../templates/ngdoc/lib/this.template.html | 4 ++ .../templates/ngdoc/overview.template.html | 5 ++ 43 files changed, 444 insertions(+), 31 deletions(-) rename docs/config/templates/{ => app}/angular-service.template.js (100%) rename docs/config/templates/{ => app}/error.template.html (100%) rename docs/config/templates/{ => app}/errorNamespace.template.html (100%) rename docs/config/templates/{ => app}/indexPage.template.html (100%) rename docs/config/templates/{ => app}/json-doc.template.json (100%) rename docs/config/templates/{ => app}/nav-data.template.js (100%) rename docs/config/templates/{ => app}/pages-data.template.js (100%) rename docs/config/templates/{ => app}/runnableExample.template.html (100%) rename docs/config/templates/{ => app}/tutorial.template.html (100%) create mode 100644 docs/config/templates/examples/index.template.html create mode 100644 docs/config/templates/examples/manifest.template.json create mode 100644 docs/config/templates/examples/protractorTests.template.js create mode 100644 docs/config/templates/examples/runnableExample.template.html create mode 100644 docs/config/templates/examples/template.css create mode 100644 docs/config/templates/examples/template.html create mode 100644 docs/config/templates/examples/template.js create mode 100644 docs/config/templates/examples/template.json create mode 100644 docs/config/templates/examples/template.protractor create mode 100644 docs/config/templates/examples/template.scenario create mode 100644 docs/config/templates/examples/template.spec rename docs/config/templates/{ => git}/api/api.template.html (96%) create mode 100644 docs/config/templates/git/base.template.html create mode 100644 docs/config/templates/ngdoc/api/api.template.html create mode 100644 docs/config/templates/ngdoc/api/componentGroup.template.html create mode 100644 docs/config/templates/ngdoc/api/directive.template.html create mode 100644 docs/config/templates/ngdoc/api/filter.template.html create mode 100644 docs/config/templates/ngdoc/api/function.template.html create mode 100644 docs/config/templates/ngdoc/api/input.template.html rename docs/config/templates/{ => ngdoc}/api/module.template.html (60%) create mode 100644 docs/config/templates/ngdoc/api/object.template.html create mode 100644 docs/config/templates/ngdoc/api/provider.template.html create mode 100644 docs/config/templates/ngdoc/api/service.template.html create mode 100644 docs/config/templates/ngdoc/api/type.template.html create mode 100644 docs/config/templates/ngdoc/base.template.html create mode 100644 docs/config/templates/ngdoc/lib/events.template.html rename docs/config/templates/{ => ngdoc}/lib/macros.html (97%) create mode 100644 docs/config/templates/ngdoc/lib/methods.template.html create mode 100644 docs/config/templates/ngdoc/lib/params.template.html create mode 100644 docs/config/templates/ngdoc/lib/properties.template.html create mode 100644 docs/config/templates/ngdoc/lib/returns.template.html create mode 100644 docs/config/templates/ngdoc/lib/this.template.html create mode 100644 docs/config/templates/ngdoc/overview.template.html diff --git a/docs/config/index.js b/docs/config/index.js index 4ec1423c65a0..b8847e29bc1c 100644 --- a/docs/config/index.js +++ b/docs/config/index.js @@ -65,7 +65,12 @@ module.exports = new Package('angularjs', [ .config(function(templateFinder, renderDocsProcessor, gitData) { - templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates')); + // We are completely overwriting the folders + templateFinder.templateFolders.length = 0; + templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates/examples')); + templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates/ngdoc')); + templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates/git')); + templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates/app')); renderDocsProcessor.extraData.git = gitData; }) diff --git a/docs/config/templates/angular-service.template.js b/docs/config/templates/app/angular-service.template.js similarity index 100% rename from docs/config/templates/angular-service.template.js rename to docs/config/templates/app/angular-service.template.js diff --git a/docs/config/templates/error.template.html b/docs/config/templates/app/error.template.html similarity index 100% rename from docs/config/templates/error.template.html rename to docs/config/templates/app/error.template.html diff --git a/docs/config/templates/errorNamespace.template.html b/docs/config/templates/app/errorNamespace.template.html similarity index 100% rename from docs/config/templates/errorNamespace.template.html rename to docs/config/templates/app/errorNamespace.template.html diff --git a/docs/config/templates/indexPage.template.html b/docs/config/templates/app/indexPage.template.html similarity index 100% rename from docs/config/templates/indexPage.template.html rename to docs/config/templates/app/indexPage.template.html diff --git a/docs/config/templates/json-doc.template.json b/docs/config/templates/app/json-doc.template.json similarity index 100% rename from docs/config/templates/json-doc.template.json rename to docs/config/templates/app/json-doc.template.json diff --git a/docs/config/templates/nav-data.template.js b/docs/config/templates/app/nav-data.template.js similarity index 100% rename from docs/config/templates/nav-data.template.js rename to docs/config/templates/app/nav-data.template.js diff --git a/docs/config/templates/pages-data.template.js b/docs/config/templates/app/pages-data.template.js similarity index 100% rename from docs/config/templates/pages-data.template.js rename to docs/config/templates/app/pages-data.template.js diff --git a/docs/config/templates/runnableExample.template.html b/docs/config/templates/app/runnableExample.template.html similarity index 100% rename from docs/config/templates/runnableExample.template.html rename to docs/config/templates/app/runnableExample.template.html diff --git a/docs/config/templates/tutorial.template.html b/docs/config/templates/app/tutorial.template.html similarity index 100% rename from docs/config/templates/tutorial.template.html rename to docs/config/templates/app/tutorial.template.html diff --git a/docs/config/templates/examples/index.template.html b/docs/config/templates/examples/index.template.html new file mode 100644 index 000000000000..986b3766e97c --- /dev/null +++ b/docs/config/templates/examples/index.template.html @@ -0,0 +1,21 @@ + + + + + Example - {$ doc.id $} + {% for stylesheet in doc.stylesheets %} + {% endfor %} + + {% for script in doc.scripts %} + {% endfor %} + + {% if doc.example.fixBase -%} + + {%- endif %} + + + {$ doc.fileContents $} + + \ No newline at end of file diff --git a/docs/config/templates/examples/manifest.template.json b/docs/config/templates/examples/manifest.template.json new file mode 100644 index 000000000000..e4520e4dec6c --- /dev/null +++ b/docs/config/templates/examples/manifest.template.json @@ -0,0 +1,8 @@ +{ + "name": "{$ doc.example.id $}", + "files": [ + "index-production.html" + {%- for file in doc.files %}, + "{$ file $}"{% endfor %} + ] +} \ No newline at end of file diff --git a/docs/config/templates/examples/protractorTests.template.js b/docs/config/templates/examples/protractorTests.template.js new file mode 100644 index 000000000000..1319d6e6639c --- /dev/null +++ b/docs/config/templates/examples/protractorTests.template.js @@ -0,0 +1,10 @@ +describe("{$ doc.description $}", function() { + var rootEl; + beforeEach(function() { + rootEl = browser.rootEl;{% if doc['ng-app-included'] %} + browser.rootEl = '[ng-app]';{% endif %} + browser.get("{$ doc.basePath $}{$ doc.example.deployments[doc.deployment.name].outputPath $}"); + }); + {% if doc['ng-app-included'] %}afterEach(function() { browser.rootEl = rootEl; });{% endif %} +{$ doc.innerTest $} +}); \ No newline at end of file diff --git a/docs/config/templates/examples/runnableExample.template.html b/docs/config/templates/examples/runnableExample.template.html new file mode 100644 index 000000000000..08a49930c5aa --- /dev/null +++ b/docs/config/templates/examples/runnableExample.template.html @@ -0,0 +1,24 @@ +{# Be aware that we need these extra new lines here or marked will not realise that the
+ is HTML and wrap each line in a

- thus breaking the HTML #} + + +

+ + {% for fileName, file in doc.example.files %} +
+ {% code -%} + {$ file.fileContents $} + {%- endcode %} +
+{% endfor %} + + +
+ + +{# Be aware that we need these extra new lines here or marked will not realise that the
+ above is HTML and wrap each line in a

- thus breaking the HTML #} \ No newline at end of file diff --git a/docs/config/templates/examples/template.css b/docs/config/templates/examples/template.css new file mode 100644 index 000000000000..82cb1e38ad5d --- /dev/null +++ b/docs/config/templates/examples/template.css @@ -0,0 +1 @@ +{$ doc.fileContents $} \ No newline at end of file diff --git a/docs/config/templates/examples/template.html b/docs/config/templates/examples/template.html new file mode 100644 index 000000000000..82cb1e38ad5d --- /dev/null +++ b/docs/config/templates/examples/template.html @@ -0,0 +1 @@ +{$ doc.fileContents $} \ No newline at end of file diff --git a/docs/config/templates/examples/template.js b/docs/config/templates/examples/template.js new file mode 100644 index 000000000000..7cc69668f9ae --- /dev/null +++ b/docs/config/templates/examples/template.js @@ -0,0 +1,4 @@ +(function(angular) { + 'use strict'; +{$ doc.fileContents $} +})(window.angular); \ No newline at end of file diff --git a/docs/config/templates/examples/template.json b/docs/config/templates/examples/template.json new file mode 100644 index 000000000000..82cb1e38ad5d --- /dev/null +++ b/docs/config/templates/examples/template.json @@ -0,0 +1 @@ +{$ doc.fileContents $} \ No newline at end of file diff --git a/docs/config/templates/examples/template.protractor b/docs/config/templates/examples/template.protractor new file mode 100644 index 000000000000..82cb1e38ad5d --- /dev/null +++ b/docs/config/templates/examples/template.protractor @@ -0,0 +1 @@ +{$ doc.fileContents $} \ No newline at end of file diff --git a/docs/config/templates/examples/template.scenario b/docs/config/templates/examples/template.scenario new file mode 100644 index 000000000000..82cb1e38ad5d --- /dev/null +++ b/docs/config/templates/examples/template.scenario @@ -0,0 +1 @@ +{$ doc.fileContents $} \ No newline at end of file diff --git a/docs/config/templates/examples/template.spec b/docs/config/templates/examples/template.spec new file mode 100644 index 000000000000..82cb1e38ad5d --- /dev/null +++ b/docs/config/templates/examples/template.spec @@ -0,0 +1 @@ +{$ doc.fileContents $} \ No newline at end of file diff --git a/docs/config/templates/api/api.template.html b/docs/config/templates/git/api/api.template.html similarity index 96% rename from docs/config/templates/api/api.template.html rename to docs/config/templates/git/api/api.template.html index f6b7360a3c4b..51064f221d43 100644 --- a/docs/config/templates/api/api.template.html +++ b/docs/config/templates/git/api/api.template.html @@ -28,7 +28,7 @@

{$ doc.name $}

Known Issues

{% for issue in doc.knownIssues -%}
- {$ issue | marked $} {% if not loop.last %}
{% endif %} + {$ issue | marked $}
{% endfor -%} {% endif %} diff --git a/docs/config/templates/git/base.template.html b/docs/config/templates/git/base.template.html new file mode 100644 index 000000000000..63851d82e636 --- /dev/null +++ b/docs/config/templates/git/base.template.html @@ -0,0 +1,4 @@ + Improve this Doc + +{% block content %} +{% endblock %} diff --git a/docs/config/templates/ngdoc/api/api.template.html b/docs/config/templates/ngdoc/api/api.template.html new file mode 100644 index 000000000000..6955978acdd4 --- /dev/null +++ b/docs/config/templates/ngdoc/api/api.template.html @@ -0,0 +1,62 @@ +{% extends "base.template.html" %} + +{% block content %} + +{% block header %} +
+

{$ doc.name $}

+
    + {% block related_components %}{% endblock %} +
  1. + - {$ doc.docType $} in module {$ doc.moduleDoc.id | link(doc.moduleDoc.name, doc.moduleDoc) $} +
    2. +
+
+{% endblock %} + +{% block description %} +
+ {$ doc.description | marked $} +
+{% endblock %} + +{% if doc.knownIssues %} +

Known Issues

+{% for issue in doc.knownIssues -%} +
+ {$ issue | marked $} +
+{% endfor -%} +{% endif %} + +{% if doc.deprecated %} +
+ Deprecated API + {$ doc.deprecated| marked $} +
+{% endif %} + +
+ {% block dependencies %} + {%- if doc.requires %} +

Dependencies

+
    + {% for require in doc.requires %}
  • {$ require | link $}
    • {% endfor %} +
+ {% endif -%} + {% endblock %} + + {% block additional %} + {% endblock %} + + {% block examples %} + {%- if doc.examples %} +

Example

+ {%- for example in doc.examples -%} + {$ example | marked $} + {%- endfor -%} + {% endif -%} + {% endblock %} +
+ +{% endblock %} diff --git a/docs/config/templates/ngdoc/api/componentGroup.template.html b/docs/config/templates/ngdoc/api/componentGroup.template.html new file mode 100644 index 000000000000..b3780f718a92 --- /dev/null +++ b/docs/config/templates/ngdoc/api/componentGroup.template.html @@ -0,0 +1,31 @@ +{% block content %} +

+ {%- if doc.title -%} + {$ doc.title $} + {%- elif doc.moduleName -%} + {$ doc.groupType | title $} components in {$ doc.moduleName | code $} + {%- else -%} + Pages + {%- endif -%} +

+ +{$ doc.description | marked $} + +
+
+ + + + + + {% for page in doc.components %} + + + + + {% endfor %} +
NameDescription
{$ page.id | link(page.name, page) $}{$ page.description | firstParagraph | marked $}
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/docs/config/templates/ngdoc/api/directive.template.html b/docs/config/templates/ngdoc/api/directive.template.html new file mode 100644 index 000000000000..0855acf49bbe --- /dev/null +++ b/docs/config/templates/ngdoc/api/directive.template.html @@ -0,0 +1,72 @@ +{% import "lib/macros.html" as lib -%} +{% extends "api/api.template.html" %} + +{% block additional %} +

Directive Info

+
    + {% if doc.scope %}
  • This directive creates new scope.
    • {% endif %} +
  • This directive executes at priority level {$ doc.priority $}.
    • + {% if doc.multiElement %}
  • This directive can be used as {@link $compile#-multielement- multiElement}
    • {% endif %} +
+ + {% block usage %} +

Usage

+
+ {% if doc.usage %} + {$ doc.usage | marked $} + {% else %} +
    + {% if doc.restrict.element %} +
  • as element: + {% if doc.name.indexOf('ng') == 0 -%} + (This directive can be used as custom element, but be aware of IE restrictions). + {%- endif %} + {% code %} + <{$ doc.name | dashCase $} + {%- for param in doc.params %} + {$ lib.directiveParam(param.alias or param.name, param.type, '="', '"') $} + {%- endfor %}> + ... + + {% endcode %} +
    • + {% endif -%} + + {%- if doc.restrict.attribute -%} +
  • as attribute: + {% code %} + <{$ doc.element $} + {%- for param in doc.params %} + {$ lib.directiveParam(param.name, param.type, '="', '"') $} + {%- endfor %}> + ... + + {% endcode %} +
    • + {% endif -%} + + {%- if doc.restrict.cssClass -%} +
  • as CSS class: + {% code %} + {% set sep = joiner(' ') %} + <{$ doc.element $} class=" + {%- for param in doc.params -%} + {$ sep() $}{$ lib.directiveParam(param.name, param.type, ': ', ';') $} + {%- endfor %}"> ... + {% endcode %} +
    • + {% endif -%} + + {%- endif %} +
+ {% endblock -%} + + {%- if doc.animations %} +

Animations

+ {$ doc.animations | marked $} + {$ 'module:ngAnimate.$animate' | link('Click here', doc) $} to learn more about the steps involved in the animation. + {%- endif -%} + + {% include "lib/params.template.html" %} + {% include "lib/events.template.html" %} +{% endblock %} diff --git a/docs/config/templates/ngdoc/api/filter.template.html b/docs/config/templates/ngdoc/api/filter.template.html new file mode 100644 index 000000000000..bd002dc9a398 --- /dev/null +++ b/docs/config/templates/ngdoc/api/filter.template.html @@ -0,0 +1,26 @@ +{% import "lib/macros.html" as lib -%} +{% extends "api/api.template.html" %} + +{% block additional %} +

Usage

+

In HTML Template Binding

+ {% if doc.usage %} + {$ doc.usage | code $} + {% else %} + {% code -%} + {{ {$ doc.name $}_expression | {$ doc.name $} + {%- for param in doc.params %}{% if not loop.first %} : {$ param.name $}{% endif %}{% endfor -%} + }} + {%- endcode %} + {% endif %} + +

In JavaScript

+ {% code -%} + {%- set sep = joiner(', ') -%} + $filter('{$ doc.name $}')({% for param in doc.params %}{$ sep() $}{$ param.name $}{% endfor -%}) + {%- endcode %} + + {% include "lib/params.template.html" %} + {% include "lib/this.template.html" %} + {% include "lib/returns.template.html" %} +{% endblock %} diff --git a/docs/config/templates/ngdoc/api/function.template.html b/docs/config/templates/ngdoc/api/function.template.html new file mode 100644 index 000000000000..dcf3778ca8a6 --- /dev/null +++ b/docs/config/templates/ngdoc/api/function.template.html @@ -0,0 +1 @@ +{% extends "api/object.template.html" %} diff --git a/docs/config/templates/ngdoc/api/input.template.html b/docs/config/templates/ngdoc/api/input.template.html new file mode 100644 index 000000000000..4fd03b97e799 --- /dev/null +++ b/docs/config/templates/ngdoc/api/input.template.html @@ -0,0 +1,12 @@ +{% import "lib/macros.html" as lib -%} +{% extends "api/directive.template.html" %} + +{% block usage %} +

Usage

+ {% code %} + + {% endcode %} +{% endblock %} \ No newline at end of file diff --git a/docs/config/templates/api/module.template.html b/docs/config/templates/ngdoc/api/module.template.html similarity index 60% rename from docs/config/templates/api/module.template.html rename to docs/config/templates/ngdoc/api/module.template.html index 6233e2672b83..4eb4b167c544 100644 --- a/docs/config/templates/api/module.template.html +++ b/docs/config/templates/ngdoc/api/module.template.html @@ -5,41 +5,33 @@

{% if doc.title %}{$ doc.title | marked $}{% else %}{$ doc.name | code $}{% endif %}

-

Installation

-{% if doc.installation or doc.installation == '' %} - {$ doc.installation | marked $} -{% else %} +{% if doc.name != 'ng' and doc.name != 'auto' %} +

Installation

-

First, get the file:

+

First include {$ doc.packageFile | code $} in your HTML:

+ + {% code %} + - - {% endcode %} - -

Finally, load the module in your application by adding it as a dependent module:

+

Then load the module in your application by adding it as a dependent module:

{% code %} angular.module('app', ['{$ doc.name $}']); {% endcode %} @@ -59,7 +51,7 @@

Known Issues

{$ issueDoc.id | link(issueDoc.name, issueDoc) $} {% for issue in issueDoc.knownIssues -%} - {$ issue | marked $} {% if not loop.last %}
{% endif %} + {$ issue | marked $} {% endfor -%} @@ -69,7 +61,6 @@

Known Issues

{% endif %} -{% if doc.componentGroups.length %}

Module Components

{% for componentGroup in doc.componentGroups %} @@ -90,7 +81,6 @@

{$

{% endfor %}
-{% endif %} {% if doc.usage %}

Usage

diff --git a/docs/config/templates/ngdoc/api/object.template.html b/docs/config/templates/ngdoc/api/object.template.html new file mode 100644 index 000000000000..ca5311446cc6 --- /dev/null +++ b/docs/config/templates/ngdoc/api/object.template.html @@ -0,0 +1,23 @@ +{% import "lib/macros.html" as lib %} +{% extends "api/api.template.html" %} + +{% block additional %} + + {% if doc.params or doc.returns or doc.this or doc.kind == 'function' -%} +

Usage

+ {% if doc.usage %} + {$ doc.usage | code $} + {% else %} + {$ lib.functionSyntax(doc) $} + {% endif %} + + {% include "lib/params.template.html" %} + {% include "lib/this.template.html" %} + {% include "lib/returns.template.html" %} + {%- endif %} + + {% include "lib/methods.template.html" %} + {% include "lib/events.template.html" %} + {% include "lib/properties.template.html" %} + +{% endblock %} diff --git a/docs/config/templates/ngdoc/api/provider.template.html b/docs/config/templates/ngdoc/api/provider.template.html new file mode 100644 index 000000000000..f0a1a976a42c --- /dev/null +++ b/docs/config/templates/ngdoc/api/provider.template.html @@ -0,0 +1,9 @@ +{% extends "api/object.template.html" %} + +{% block related_components %} + {% if doc.serviceDoc -%} +
  • + - {$ doc.serviceDoc.name $} +
    • + {%- endif %} +{% endblock %} diff --git a/docs/config/templates/ngdoc/api/service.template.html b/docs/config/templates/ngdoc/api/service.template.html new file mode 100644 index 000000000000..dce54fe4a4ba --- /dev/null +++ b/docs/config/templates/ngdoc/api/service.template.html @@ -0,0 +1,9 @@ +{% extends "api/object.template.html" %} + +{% block related_components %} + {% if doc.providerDoc -%} +
  • + - {$ doc.providerDoc.name $} +
    • + {%- endif %} +{% endblock %} diff --git a/docs/config/templates/ngdoc/api/type.template.html b/docs/config/templates/ngdoc/api/type.template.html new file mode 100644 index 000000000000..dcf3778ca8a6 --- /dev/null +++ b/docs/config/templates/ngdoc/api/type.template.html @@ -0,0 +1 @@ +{% extends "api/object.template.html" %} diff --git a/docs/config/templates/ngdoc/base.template.html b/docs/config/templates/ngdoc/base.template.html new file mode 100644 index 000000000000..4275f8050375 --- /dev/null +++ b/docs/config/templates/ngdoc/base.template.html @@ -0,0 +1,2 @@ +{% block content %} +{% endblock %} diff --git a/docs/config/templates/ngdoc/lib/events.template.html b/docs/config/templates/ngdoc/lib/events.template.html new file mode 100644 index 000000000000..479abeb1b538 --- /dev/null +++ b/docs/config/templates/ngdoc/lib/events.template.html @@ -0,0 +1,32 @@ +{% import "lib/macros.html" as lib -%} +{%- if doc.events %} +

    Events

    +
      + {%- for event in doc.events %} +
    • +

      {$ event.name $}

      +
      {$ event.description | marked $}
      + {%- if event.eventType == 'listen' %} +
      +

      Listen on: {$ event.eventTarget $}

      +
      + {%- else %} +
      +

      Type:

      +
      {$ event.eventType $}
      +
      +
      +

      Target:

      +
      {$ event.eventTarget $}
      +
      + {% endif -%} + {%- if event.params %} +
      +

      Parameters

      + {$ lib.paramTable(event.params) $} +
      + {%- endif -%} +
      • + {% endfor -%} +
    +{% endif -%} diff --git a/docs/config/templates/lib/macros.html b/docs/config/templates/ngdoc/lib/macros.html similarity index 97% rename from docs/config/templates/lib/macros.html rename to docs/config/templates/ngdoc/lib/macros.html index 8fbd577d4008..31c20852a4fd 100644 --- a/docs/config/templates/lib/macros.html +++ b/docs/config/templates/ngdoc/lib/macros.html @@ -36,7 +36,7 @@ {%- macro directiveParam(name, type, join, sep) %} {%- if type.optional %}[{% endif -%} {$ name | dashCase $}{$ join $}{$ type.name $}{$ sep $} - {%- if type.optional %}]{% endif -%} +{%- if type.optional %}]{% endif -%} {% endmacro -%} {%- macro functionSyntax(fn) %} diff --git a/docs/config/templates/ngdoc/lib/methods.template.html b/docs/config/templates/ngdoc/lib/methods.template.html new file mode 100644 index 000000000000..4d77fdea85a6 --- /dev/null +++ b/docs/config/templates/ngdoc/lib/methods.template.html @@ -0,0 +1,28 @@ +{% import "lib/macros.html" as lib -%} +{%- if doc.methods %} +

    Methods

    +
      + {%- for method in doc.methods %} +
    • +

      {$ lib.functionSyntax(method) $}

      +
      {$ method.description | marked $}
      + + {% if method.params %} +

      Parameters

      + {$ lib.paramTable(method.params) $} + {% endif %} + + {% if method.this %} +

      Method's {% code %}this{% endcode %}

      + {$ method.this | marked $} + {% endif %} + + {% if method.returns %} +

      Returns

      + {$ lib.typeInfo(method.returns) $} + {% endif %} + +
      • + {% endfor -%} +
    +{%- endif -%} diff --git a/docs/config/templates/ngdoc/lib/params.template.html b/docs/config/templates/ngdoc/lib/params.template.html new file mode 100644 index 000000000000..55cd7d5ba9cf --- /dev/null +++ b/docs/config/templates/ngdoc/lib/params.template.html @@ -0,0 +1,7 @@ +{% import "lib/macros.html" as lib -%} +{%- if doc.params %} +
    +

    Arguments

    +{$ lib.paramTable(doc.params) $} +
    +{%- endif -%} diff --git a/docs/config/templates/ngdoc/lib/properties.template.html b/docs/config/templates/ngdoc/lib/properties.template.html new file mode 100644 index 000000000000..a11ff87f5863 --- /dev/null +++ b/docs/config/templates/ngdoc/lib/properties.template.html @@ -0,0 +1,12 @@ +{% import "lib/macros.html" as lib -%} +{%- if doc.properties %} +

    Properties

    +
      + {%- for property in doc.properties %} +
    • +

      {$ property.name | code $}

      + {$ lib.typeInfo(property) $} +
      • + {% endfor -%} +
    +{%- endif -%} diff --git a/docs/config/templates/ngdoc/lib/returns.template.html b/docs/config/templates/ngdoc/lib/returns.template.html new file mode 100644 index 000000000000..1eb048ca6c07 --- /dev/null +++ b/docs/config/templates/ngdoc/lib/returns.template.html @@ -0,0 +1,5 @@ +{% import "lib/macros.html" as lib -%} +{% if doc.returns -%} +

    Returns

    +{$ lib.typeInfo(doc.returns) $} +{%- endif %} \ No newline at end of file diff --git a/docs/config/templates/ngdoc/lib/this.template.html b/docs/config/templates/ngdoc/lib/this.template.html new file mode 100644 index 000000000000..24881972b561 --- /dev/null +++ b/docs/config/templates/ngdoc/lib/this.template.html @@ -0,0 +1,4 @@ +{% if doc.this %} +

    Method's {% code %}this{% endcode %}

    +{$ doc.this | marked $} +{% endif %} \ No newline at end of file diff --git a/docs/config/templates/ngdoc/overview.template.html b/docs/config/templates/ngdoc/overview.template.html new file mode 100644 index 000000000000..6b805a9ef35d --- /dev/null +++ b/docs/config/templates/ngdoc/overview.template.html @@ -0,0 +1,5 @@ +{% extends "base.template.html" %} + +{% block content %} +{$ doc.description | marked $} +{% endblock %} \ No newline at end of file From 35191fbf5afe319bd5c7ed4ff55fb6641a43c48a Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Wed, 16 Nov 2016 14:14:48 +0000 Subject: [PATCH 3/4] chore(docs): deprecation notices for methods and properties Closes #15351 --- docs/app/assets/css/docs.css | 5 ++ docs/config/index.js | 3 +- docs/config/tag-defs/deprecated.js | 42 ++++++++++++ docs/config/tag-defs/deprecated.spec.js | 33 ++++++++++ .../app/runnableExample.template.html | 26 -------- .../examples/runnableExample.template.html | 36 +++++----- .../templates/git/api/api.template.html | 66 ------------------- docs/config/templates/git/base.template.html | 4 -- .../templates/ngdoc/api/api.template.html | 16 ++--- .../templates/ngdoc/api/module.template.html | 47 ++++++++----- .../config/templates/ngdoc/base.template.html | 2 + .../templates/ngdoc/lib/deprecated.html | 9 +++ .../templates/ngdoc/lib/events.template.html | 5 ++ docs/config/templates/ngdoc/lib/macros.html | 2 +- .../templates/ngdoc/lib/methods.template.html | 4 ++ .../ngdoc/lib/properties.template.html | 3 + 16 files changed, 163 insertions(+), 140 deletions(-) create mode 100644 docs/config/tag-defs/deprecated.js create mode 100644 docs/config/tag-defs/deprecated.spec.js delete mode 100644 docs/config/templates/app/runnableExample.template.html delete mode 100644 docs/config/templates/git/api/api.template.html delete mode 100644 docs/config/templates/git/base.template.html create mode 100644 docs/config/templates/ngdoc/lib/deprecated.html diff --git a/docs/app/assets/css/docs.css b/docs/app/assets/css/docs.css index 6c8ce38387f5..839f6863741c 100644 --- a/docs/app/assets/css/docs.css +++ b/docs/app/assets/css/docs.css @@ -662,6 +662,11 @@ ul.events > li { max-width: 100%; } +.deprecation .title { + float: left; + margin-right: 5px; +} + @media only screen and (min-width: 769px) { [ng-include="partialPath"].ng-hide { display: block !important; diff --git a/docs/config/index.js b/docs/config/index.js index b8847e29bc1c..03d02d702e33 100644 --- a/docs/config/index.js +++ b/docs/config/index.js @@ -52,10 +52,12 @@ module.exports = new Package('angularjs', [ .config(function(parseTagsProcessor) { + parseTagsProcessor.tagDefinitions.push(require('./tag-defs/deprecated')); // this will override the jsdoc version parseTagsProcessor.tagDefinitions.push(require('./tag-defs/tutorial-step')); parseTagsProcessor.tagDefinitions.push(require('./tag-defs/sortOrder')); parseTagsProcessor.tagDefinitions.push(require('./tag-defs/installation')); parseTagsProcessor.tagDefinitions.push(require('./tag-defs/this')); + }) @@ -69,7 +71,6 @@ module.exports = new Package('angularjs', [ templateFinder.templateFolders.length = 0; templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates/examples')); templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates/ngdoc')); - templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates/git')); templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates/app')); renderDocsProcessor.extraData.git = gitData; }) diff --git a/docs/config/tag-defs/deprecated.js b/docs/config/tag-defs/deprecated.js new file mode 100644 index 000000000000..68545146fff3 --- /dev/null +++ b/docs/config/tag-defs/deprecated.js @@ -0,0 +1,42 @@ +'use strict'; + +var OPTION_MATCHER = /^\s*([\w-]+)="([^"]+)"\s+([\s\S]*)/; +var VALID_OPTIONS = ['sinceVersion', 'removeVersion']; + +module.exports = { + name: 'deprecated', + transforms: function(doc, tag, value) { + var result = {}; + var invalidOptions = []; + value = value.trim(); + while (OPTION_MATCHER.test(value)) { + value = value.replace(OPTION_MATCHER, function(_, key, value, rest) { + if (VALID_OPTIONS.indexOf(key) !== -1) { + result[key] = value; + } else { + invalidOptions.push(key); + } + return rest; + }); + } + if (invalidOptions.length > 0) { + throw new Error('Invalid options: ' + humanList(invalidOptions) + '. Value options are: ' + humanList(VALID_OPTIONS)); + } + result.description = value; + return result; + } +}; + +function humanList(values, sep, lastSep) { + if (sep === undefined) sep = ', '; + if (lastSep === undefined) lastSep = ' and '; + + return values.reduce(function(output, value, index, list) { + output += '"' + value + '"'; + switch (list.length - index) { + case 1: return output; + case 2: return output + lastSep; + default: return output + sep; + } + }, ''); +} diff --git a/docs/config/tag-defs/deprecated.spec.js b/docs/config/tag-defs/deprecated.spec.js new file mode 100644 index 000000000000..f95b2ea9e3bf --- /dev/null +++ b/docs/config/tag-defs/deprecated.spec.js @@ -0,0 +1,33 @@ +'use strict'; + +/* globals describe, it, expect */ +var tagDef = require('./deprecated'); + +describe('deprecated tag', function() { + describe('transforms', function() { + it('should return the trimmed value if no options', function() { + var tag = tagDef.transforms({}, {}, 'This is the description'); + expect(tag.description).toEqual('This is the description'); + }); + + it('should read options', function() { + var tag = tagDef.transforms({}, {}, ' sinceVersion="v1.3.4" removeVersion="v1.4.5" what is left is description'); + expect(tag.description).toEqual('what is left is description'); + expect(tag.sinceVersion).toEqual('v1.3.4'); + expect(tag.removeVersion).toEqual('v1.4.5'); + }); + + it('should cope with carriage returns', function() { + var tag = tagDef.transforms({}, {}, '\nsinceVersion="v1.3.4"\nremoveVersion="v1.4.5"\nwhat is left is description'); + expect(tag.description).toEqual('what is left is description'); + expect(tag.sinceVersion).toEqual('v1.3.4'); + expect(tag.removeVersion).toEqual('v1.4.5'); + }); + + it('should error if there is an invalid option', function() { + expect(function() { + tagDef.transforms({}, {}, ' fromVersion="v1.3.4" toVersion="v1.4.5" what is left is description'); + }).toThrowError('Invalid options: "fromVersion" and "toVersion". Value options are: "sinceVersion" and "removeVersion"'); + }); + }); +}); diff --git a/docs/config/templates/app/runnableExample.template.html b/docs/config/templates/app/runnableExample.template.html deleted file mode 100644 index 26d689c10ad5..000000000000 --- a/docs/config/templates/app/runnableExample.template.html +++ /dev/null @@ -1,26 +0,0 @@ -{# Be aware that we need these extra new lines here or marked will not realize that the
    - is HTML and wrap each line in a

    - thus breaking the HTML #} - -

    - - -
    - - {% for fileName, file in doc.example.files %} -
    - {% code -%} - {$ file.fileContents $} - {%- endcode %} -
    - {% endfor %} - - -
    -
    - -{# Be aware that we need these extra new lines here or marked will not realize that the
    - above is HTML and wrap each line in a

    - thus breaking the HTML #} diff --git a/docs/config/templates/examples/runnableExample.template.html b/docs/config/templates/examples/runnableExample.template.html index 08a49930c5aa..26d689c10ad5 100644 --- a/docs/config/templates/examples/runnableExample.template.html +++ b/docs/config/templates/examples/runnableExample.template.html @@ -1,24 +1,26 @@ -{# Be aware that we need these extra new lines here or marked will not realise that the

    +{# Be aware that we need these extra new lines here or marked will not realize that the
    is HTML and wrap each line in a

    - thus breaking the HTML #} +

    + -
    +
    - {% for fileName, file in doc.example.files %} -
    - {% code -%} - {$ file.fileContents $} - {%- endcode %} -
    -{% endfor %} + {% for fileName, file in doc.example.files %} +
    + {% code -%} + {$ file.fileContents $} + {%- endcode %} +
    + {% endfor %} - + +
    - -{# Be aware that we need these extra new lines here or marked will not realise that the
    - above is HTML and wrap each line in a

    - thus breaking the HTML #} \ No newline at end of file +{# Be aware that we need these extra new lines here or marked will not realize that the

    + above is HTML and wrap each line in a

    - thus breaking the HTML #} diff --git a/docs/config/templates/git/api/api.template.html b/docs/config/templates/git/api/api.template.html deleted file mode 100644 index 51064f221d43..000000000000 --- a/docs/config/templates/git/api/api.template.html +++ /dev/null @@ -1,66 +0,0 @@ -{% extends "base.template.html" %} - -{% block content %} - - -  View Source - - -{% block header %} -

    -

    {$ doc.name $}

    -
      - {% block related_components %}{% endblock %} -
    1. - - {$ doc.docType $} in module {$ doc.moduleDoc.name $} -
      2. -
    -
    -{% endblock %} - -{% block description %} -
    - {$ doc.description | marked $} -
    -{% endblock %} - -{% if doc.knownIssues %} -

    Known Issues

    -{% for issue in doc.knownIssues -%} -
    - {$ issue | marked $} -
    -{% endfor -%} -{% endif %} - -{% if doc.deprecated %} -
    - Deprecated API - {$ doc.deprecated| marked $} -
    -{% endif %} - -
    - {% block dependencies %} - {%- if doc.requires %} -

    Dependencies

    -
      - {% for require in doc.requires %}
    • {$ require | link $}
      • {% endfor %} -
    - {% endif -%} - {% endblock %} - - {% block additional %} - {% endblock %} - - {% block examples %} - {%- if doc.examples %} -

    Example

    - {%- for example in doc.examples -%} - {$ example | marked $} - {%- endfor -%} - {% endif -%} - {% endblock %} -
    - -{% endblock %} diff --git a/docs/config/templates/git/base.template.html b/docs/config/templates/git/base.template.html deleted file mode 100644 index 63851d82e636..000000000000 --- a/docs/config/templates/git/base.template.html +++ /dev/null @@ -1,4 +0,0 @@ - Improve this Doc - -{% block content %} -{% endblock %} diff --git a/docs/config/templates/ngdoc/api/api.template.html b/docs/config/templates/ngdoc/api/api.template.html index 6955978acdd4..97119640411e 100644 --- a/docs/config/templates/ngdoc/api/api.template.html +++ b/docs/config/templates/ngdoc/api/api.template.html @@ -1,19 +1,26 @@ {% extends "base.template.html" %} +{% import "lib/deprecated.html" as x -%} {% block content %} + +  View Source + + {% block header %}

    {$ doc.name $}

      {% block related_components %}{% endblock %}
    1. - - {$ doc.docType $} in module {$ doc.moduleDoc.id | link(doc.moduleDoc.name, doc.moduleDoc) $} + - {$ doc.docType $} in module {$ doc.moduleDoc.name $}
    {% endblock %} +{$ x.deprecatedBlock(doc) $} + {% block description %}
    {$ doc.description | marked $} @@ -29,13 +36,6 @@

    Known Issues

    {% endfor -%} {% endif %} -{% if doc.deprecated %} -
    - Deprecated API - {$ doc.deprecated| marked $} -
    -{% endif %} -
    {% block dependencies %} {%- if doc.requires %} diff --git a/docs/config/templates/ngdoc/api/module.template.html b/docs/config/templates/ngdoc/api/module.template.html index 4eb4b167c544..f126f1d2f47c 100644 --- a/docs/config/templates/ngdoc/api/module.template.html +++ b/docs/config/templates/ngdoc/api/module.template.html @@ -1,37 +1,48 @@ {% extends "base.template.html" %} +{% import "lib/deprecated.html" as x %} {% block content %}

    {% if doc.title %}{$ doc.title | marked $}{% else %}{$ doc.name | code $}{% endif %}

    -{% if doc.name != 'ng' and doc.name != 'auto' %} -

    Installation

    +{$ x.deprecatedBlock(doc) $} -

    First include {$ doc.packageFile | code $} in your HTML:

    +

    Installation

    +{% if doc.installation or doc.installation == '' %} + {$ doc.installation | marked $} +{% else %} - {% code %} - + + {% endcode %} + +

    Finally, load the module in your application by adding it as a dependent module:

    {% code %} angular.module('app', ['{$ doc.name $}']); {% endcode %} @@ -51,7 +62,7 @@

    Known Issues

    {$ issueDoc.id | link(issueDoc.name, issueDoc) $} {% for issue in issueDoc.knownIssues -%} - {$ issue | marked $} + {$ issue | marked $} {% if not loop.last %}
    {% endif %} {% endfor -%} @@ -61,6 +72,7 @@

    Known Issues

    {% endif %} +{% if doc.componentGroups.length %}

    Module Components

    {% for componentGroup in doc.componentGroups %} @@ -81,6 +93,7 @@

    {$

    {% endfor %}
    +{% endif %} {% if doc.usage %}

    Usage

    diff --git a/docs/config/templates/ngdoc/base.template.html b/docs/config/templates/ngdoc/base.template.html index 4275f8050375..63851d82e636 100644 --- a/docs/config/templates/ngdoc/base.template.html +++ b/docs/config/templates/ngdoc/base.template.html @@ -1,2 +1,4 @@ + Improve this Doc + {% block content %} {% endblock %} diff --git a/docs/config/templates/ngdoc/lib/deprecated.html b/docs/config/templates/ngdoc/lib/deprecated.html new file mode 100644 index 000000000000..d1521e69ce83 --- /dev/null +++ b/docs/config/templates/ngdoc/lib/deprecated.html @@ -0,0 +1,9 @@ +{% macro deprecatedBlock(doc) %}{% if doc.deprecated %} +
    +
    Deprecated: + {% if doc.deprecated.sinceVersion %}(since {$ doc.deprecated.sinceVersion $}) {% endif %} + {% if doc.deprecated.removeVersion %}(to be removed in {$ doc.deprecated.removeVersion $}) {% endif %} +
    + {$ doc.deprecated.description | marked $} +
    +{% endif %}{% endmacro %} \ No newline at end of file diff --git a/docs/config/templates/ngdoc/lib/events.template.html b/docs/config/templates/ngdoc/lib/events.template.html index 479abeb1b538..962c315dc888 100644 --- a/docs/config/templates/ngdoc/lib/events.template.html +++ b/docs/config/templates/ngdoc/lib/events.template.html @@ -1,4 +1,6 @@ {% import "lib/macros.html" as lib -%} +{% import "lib/deprecated.html" as x -%} + {%- if doc.events %}

    Events

      @@ -6,6 +8,9 @@

      Events

    • {$ event.name $}

      {$ event.description | marked $}
      + + {$ x.deprecatedBlock(event) $} + {%- if event.eventType == 'listen' %}

      Listen on: {$ event.eventTarget $}

      diff --git a/docs/config/templates/ngdoc/lib/macros.html b/docs/config/templates/ngdoc/lib/macros.html index 31c20852a4fd..8fbd577d4008 100644 --- a/docs/config/templates/ngdoc/lib/macros.html +++ b/docs/config/templates/ngdoc/lib/macros.html @@ -36,7 +36,7 @@ {%- macro directiveParam(name, type, join, sep) %} {%- if type.optional %}[{% endif -%} {$ name | dashCase $}{$ join $}{$ type.name $}{$ sep $} -{%- if type.optional %}]{% endif -%} + {%- if type.optional %}]{% endif -%} {% endmacro -%} {%- macro functionSyntax(fn) %} diff --git a/docs/config/templates/ngdoc/lib/methods.template.html b/docs/config/templates/ngdoc/lib/methods.template.html index 4d77fdea85a6..49977b3eca6e 100644 --- a/docs/config/templates/ngdoc/lib/methods.template.html +++ b/docs/config/templates/ngdoc/lib/methods.template.html @@ -1,4 +1,6 @@ {% import "lib/macros.html" as lib -%} +{% import "lib/deprecated.html" as x -%} + {%- if doc.methods %}

      Methods

        @@ -7,6 +9,8 @@

        Methods

        {$ lib.functionSyntax(method) $}

        {$ method.description | marked $}
        + {$ x.deprecatedBlock(method) $} + {% if method.params %}

        Parameters

        {$ lib.paramTable(method.params) $} diff --git a/docs/config/templates/ngdoc/lib/properties.template.html b/docs/config/templates/ngdoc/lib/properties.template.html index a11ff87f5863..eb3ba39bcba1 100644 --- a/docs/config/templates/ngdoc/lib/properties.template.html +++ b/docs/config/templates/ngdoc/lib/properties.template.html @@ -1,4 +1,6 @@ {% import "lib/macros.html" as lib -%} +{% import "lib/deprecated.html" as x -%} + {%- if doc.properties %}

        Properties

          @@ -6,6 +8,7 @@

          Properties

        • {$ property.name | code $}

          {$ lib.typeInfo(property) $} + {$ x.deprecatedBlock(property) $}
          • {% endfor -%}
        From 00ad1ec49c09d3211ae47515e8781e050b1c5cc0 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Fri, 18 Nov 2016 11:24:39 +0000 Subject: [PATCH 4/4] docs(*): fix up deprecation notices --- src/ng/controller.js | 3 ++- src/ngComponentRouter/Router.js | 12 +++++++----- src/ngCookies/cookieStore.js | 7 ++----- src/ngTouch/directive/ngClick.js | 8 +++----- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/ng/controller.js b/src/ng/controller.js index 14b6c17beac0..c27e0d6775fe 100644 --- a/src/ng/controller.js +++ b/src/ng/controller.js @@ -61,7 +61,8 @@ function $ControllerProvider() { * @description If called, allows `$controller` to find controller constructors on `window` * * @deprecated - * This method of finding controllers has been deprecated. This will be removed in 1.7. + * removeVersion="v1.7" + * This method of finding controllers has been deprecated. */ this.allowGlobals = function() { globals = true; diff --git a/src/ngComponentRouter/Router.js b/src/ngComponentRouter/Router.js index d7f75396f614..4d3e5752bbfa 100644 --- a/src/ngComponentRouter/Router.js +++ b/src/ngComponentRouter/Router.js @@ -1,12 +1,14 @@ /** * @ngdoc module * @name ngComponentRouter - * @installation + * @deprecated + * In an effort to keep synchronized with router changes in Angular 2, this implementation of the + * Component Router (ngComponentRouter module) has been deprecated and will not receive further updates. * - *
        - * **Deprecation Notice:** In an effort to keep synchronized with router changes in Angular 2, this implementation of the Component Router (ngComponentRouter module) has been deprecated and will not receive further updates. - * We are investigating backporting the Angular 2 Router to Angular 1, but alternatively, use the {@link ngRoute} module or community developed projects (e.g. [ui-router](https://github.com/angular-ui/ui-router)). - *
        + * We are investigating backporting the Angular 2 Router to Angular 1, but alternatively, use the + * {@link ngRoute} module or community developed projects (e.g. [ui-router](https://github.com/angular-ui/ui-router)). + * + * @installation * * Currently, the **Component Router** module must be installed via `npm`, it is not yet available * on Bower or the Google CDN. diff --git a/src/ngCookies/cookieStore.js b/src/ngCookies/cookieStore.js index c1f922cfc302..b0f9688dd3d8 100644 --- a/src/ngCookies/cookieStore.js +++ b/src/ngCookies/cookieStore.js @@ -5,6 +5,8 @@ angular.module('ngCookies'). * @ngdoc service * @name $cookieStore * @deprecated + * Please use the {@link ngCookies.$cookies `$cookies`} service instead. + * * @requires $cookies * * @description @@ -14,11 +16,6 @@ angular.module('ngCookies'). * * Requires the {@link ngCookies `ngCookies`} module to be installed. * - *
        - * **Note:** The $cookieStore service is **deprecated**. - * Please use the {@link ngCookies.$cookies `$cookies`} service instead. - *
        - * * @example * * ```js diff --git a/src/ngTouch/directive/ngClick.js b/src/ngTouch/directive/ngClick.js index 81f628486afb..26d3b3f0e11d 100644 --- a/src/ngTouch/directive/ngClick.js +++ b/src/ngTouch/directive/ngClick.js @@ -8,16 +8,14 @@ * @ngdoc directive * @name ngClick * @deprecated - * - * @description - *
        - * **DEPRECATION NOTICE**: Beginning with Angular 1.5, this directive is deprecated and by default **disabled**. + * Beginning with Angular 1.5, this directive is deprecated and by default **disabled**. * The directive will receive no further support and might be removed from future releases. * If you need the directive, you can enable it with the {@link ngTouch.$touchProvider $touchProvider#ngClickOverrideEnabled} * function. We also recommend that you migrate to [FastClick](https://github.com/ftlabs/fastclick). * To learn more about the 300ms delay, this [Telerik article](http://developer.telerik.com/featured/300-ms-click-delay-ios-8/) * gives a good overview. - *
        + * + * @description * A more powerful replacement for the default ngClick designed to be used on touchscreen * devices. Most mobile browsers wait about 300ms after a tap-and-release before sending * the click event. This version handles them immediately, and then prevents the