From 72736a1b09afb8fb1a29a99d8b1eb3a504862a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matias=20Niemel=C3=A4?= Date: Sat, 6 Jun 2015 00:58:57 -0700 Subject: [PATCH] revert: refactor: use a custom replacement build step instead of broccoli-replace This reverts commit d5c528ac2befe99cad203b80eaea6927a17679f4. --- npm-shrinkwrap.clean.json | 81 +++++ npm-shrinkwrap.json | 520 ++++++++++++++++----------- package.json | 1 + tools/broccoli/broccoli-replace.ts | 56 --- tools/broccoli/trees/browser_tree.ts | 31 +- tools/broccoli/trees/dart_tree.ts | 2 +- tools/broccoli/trees/node_tree.ts | 23 +- 7 files changed, 426 insertions(+), 288 deletions(-) delete mode 100644 tools/broccoli/broccoli-replace.ts diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index a7e8114d1a..7953003c00 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -1374,6 +1374,87 @@ } } }, + "broccoli-replace": { + "version": "0.2.0", + "resolved": "git://github.com/alexeagle/broccoli-replace.git#cd39a543b17b40db765a07762f099fbc85518290", + "dependencies": { + "minimatch": { + "version": "1.0.0", + "dependencies": { + "lru-cache": { + "version": "2.6.2" + }, + "sigmund": { + "version": "1.0.0" + } + } + }, + "applause": { + "version": "0.3.4", + "dependencies": { + "cson": { + "version": "1.6.2", + "dependencies": { + "ambi": { + "version": "2.2.0", + "dependencies": { + "typechecker": { + "version": "2.0.8" + } + } + }, + "coffee-script": { + "version": "1.8.0", + "dependencies": { + "mkdirp": { + "version": "0.3.5" + } + } + }, + "extract-opts": { + "version": "2.2.0", + "dependencies": { + "typechecker": { + "version": "2.0.8" + } + } + }, + "js2coffee": { + "version": "0.3.5", + "dependencies": { + "coffee-script": { + "version": "1.7.1", + "dependencies": { + "mkdirp": { + "version": "0.3.5" + } + } + }, + "file": { + "version": "0.2.2" + }, + "nopt": { + "version": "3.0.1", + "dependencies": { + "abbrev": { + "version": "1.0.5" + } + } + }, + "underscore": { + "version": "1.6.0" + } + } + }, + "requirefresh": { + "version": "1.1.2" + } + } + } + } + } + } + }, "broccoli-slow-trees": { "version": "1.1.0" }, diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index da3c2a305d..d906ae2b89 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2121,6 +2121,126 @@ } } }, + "broccoli-replace": { + "version": "0.2.0", + "from": "git://github.com/alexeagle/broccoli-replace.git#cd39a543b17b40db765a07762f099fbc85518290", + "resolved": "git://github.com/alexeagle/broccoli-replace.git#cd39a543b17b40db765a07762f099fbc85518290", + "dependencies": { + "minimatch": { + "version": "1.0.0", + "from": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", + "dependencies": { + "lru-cache": { + "version": "2.6.2", + "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz" + }, + "sigmund": { + "version": "1.0.0", + "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" + } + } + }, + "applause": { + "version": "0.3.4", + "from": "https://registry.npmjs.org/applause/-/applause-0.3.4.tgz", + "resolved": "https://registry.npmjs.org/applause/-/applause-0.3.4.tgz", + "dependencies": { + "cson": { + "version": "1.6.2", + "from": "https://registry.npmjs.org/cson/-/cson-1.6.2.tgz", + "resolved": "https://registry.npmjs.org/cson/-/cson-1.6.2.tgz", + "dependencies": { + "ambi": { + "version": "2.2.0", + "from": "https://registry.npmjs.org/ambi/-/ambi-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/ambi/-/ambi-2.2.0.tgz", + "dependencies": { + "typechecker": { + "version": "2.0.8", + "from": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz", + "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz" + } + } + }, + "coffee-script": { + "version": "1.8.0", + "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz", + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz", + "dependencies": { + "mkdirp": { + "version": "0.3.5", + "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + } + } + }, + "extract-opts": { + "version": "2.2.0", + "from": "https://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz", + "dependencies": { + "typechecker": { + "version": "2.0.8", + "from": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz", + "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz" + } + } + }, + "js2coffee": { + "version": "0.3.5", + "from": "https://registry.npmjs.org/js2coffee/-/js2coffee-0.3.5.tgz", + "resolved": "https://registry.npmjs.org/js2coffee/-/js2coffee-0.3.5.tgz", + "dependencies": { + "coffee-script": { + "version": "1.7.1", + "from": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.7.1.tgz", + "dependencies": { + "mkdirp": { + "version": "0.3.5", + "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" + } + } + }, + "file": { + "version": "0.2.2", + "from": "https://registry.npmjs.org/file/-/file-0.2.2.tgz", + "resolved": "https://registry.npmjs.org/file/-/file-0.2.2.tgz" + }, + "nopt": { + "version": "3.0.1", + "from": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz", + "dependencies": { + "abbrev": { + "version": "1.0.5", + "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz" + } + } + }, + "underscore": { + "version": "1.6.0", + "from": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" + } + } + }, + "requirefresh": { + "version": "1.1.2", + "from": "https://registry.npmjs.org/requirefresh/-/requirefresh-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/requirefresh/-/requirefresh-1.1.2.tgz" + } + } + } + } + } + } + }, "broccoli-slow-trees": { "version": "1.1.0", "from": "https://registry.npmjs.org/broccoli-slow-trees/-/broccoli-slow-trees-1.1.0.tgz", @@ -6103,101 +6223,101 @@ }, "gulp-clang-format": { "version": "1.0.19", - "from": "https://registry.npmjs.org/gulp-clang-format/-/gulp-clang-format-1.0.19.tgz", + "from": "gulp-clang-format@1.0.19", "resolved": "https://registry.npmjs.org/gulp-clang-format/-/gulp-clang-format-1.0.19.tgz", "dependencies": { "clang-format": { "version": "1.0.17", - "from": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.17.tgz", + "from": "clang-format@>=1.0.17 <2.0.0", "resolved": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.17.tgz" }, "gulp-util": { "version": "3.0.5", - "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.5.tgz", + "from": "gulp-util@>=3.0.4 <4.0.0", "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.5.tgz", "dependencies": { "array-differ": { "version": "1.0.0", - "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "from": "array-differ@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz" }, "array-uniq": { "version": "1.0.2", - "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz", + "from": "array-uniq@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz" }, "beeper": { "version": "1.1.0", - "from": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz", + "from": "beeper@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz" }, "chalk": { "version": "1.0.0", - "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", + "from": "chalk@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", "dependencies": { "ansi-styles": { "version": "2.0.1", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz", + "from": "ansi-styles@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz" }, "escape-string-regexp": { "version": "1.0.3", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, "has-ansi": { "version": "1.0.3", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", + "from": "has-ansi@>=1.0.3 <2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", "dependencies": { "ansi-regex": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz", + "from": "ansi-regex@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" }, "get-stdin": { "version": "4.0.1", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "from": "get-stdin@>=4.0.1 <5.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" } } }, "supports-color": { "version": "1.3.1", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz", + "from": "supports-color@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz" } } }, "dateformat": { "version": "1.0.11", - "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz", + "from": "dateformat@>=1.0.11 <2.0.0", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz", "dependencies": { "get-stdin": { "version": "4.0.1", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "from": "get-stdin@*", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" }, "meow": { "version": "3.1.0", - "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz", + "from": "meow@*", "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz", "dependencies": { "camelcase-keys": { "version": "1.0.0", - "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", + "from": "camelcase-keys@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", "dependencies": { "camelcase": { "version": "1.1.0", - "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz", + "from": "camelcase@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz" }, "map-obj": { "version": "1.0.1", - "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "from": "map-obj@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz" } } @@ -6208,116 +6328,116 @@ }, "lodash._reescape": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "from": "lodash._reescape@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz" }, "lodash._reevaluate": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "from": "lodash._reevaluate@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz" }, "lodash._reinterpolate": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "from": "lodash._reinterpolate@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz" }, "lodash.template": { "version": "3.6.1", - "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.1.tgz", + "from": "lodash.template@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.1.tgz", "dependencies": { "lodash._basecopy": { "version": "3.0.1", - "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "from": "lodash._basecopy@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz" }, "lodash._basetostring": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz", + "from": "lodash._basetostring@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz" }, "lodash._basevalues": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "from": "lodash._basevalues@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz" }, "lodash._isiterateecall": { "version": "3.0.9", - "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "from": "lodash._isiterateecall@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz" }, "lodash.escape": { "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz", + "from": "lodash.escape@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz" }, "lodash.keys": { "version": "3.1.1", - "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.1.tgz", + "from": "lodash.keys@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.1.tgz", "dependencies": { "lodash._getnative": { "version": "3.9.0", - "from": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.0.tgz", + "from": "lodash._getnative@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.0.tgz" }, "lodash.isarguments": { "version": "3.0.3", - "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.3.tgz", + "from": "lodash.isarguments@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.3.tgz" }, "lodash.isarray": { "version": "3.0.3", - "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.3.tgz", + "from": "lodash.isarray@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.3.tgz" } } }, "lodash.restparam": { "version": "3.6.1", - "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "from": "lodash.restparam@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz" }, "lodash.templatesettings": { "version": "3.1.0", - "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz", + "from": "lodash.templatesettings@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz" } } }, "multipipe": { "version": "0.1.2", - "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "from": "multipipe@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", "dependencies": { "duplexer2": { "version": "0.0.2", - "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "from": "duplexer2@0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", "dependencies": { "readable-stream": { "version": "1.1.13", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", + "from": "readable-stream@>=1.1.9 <1.2.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -6328,49 +6448,49 @@ }, "object-assign": { "version": "2.0.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz", + "from": "object-assign@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz" }, "replace-ext": { "version": "0.0.1", - "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "from": "replace-ext@0.0.1", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz" } } }, "pkginfo": { "version": "0.3.0", - "from": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz", + "from": "pkginfo@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz" }, "stream-equal": { "version": "0.1.5", - "from": "https://registry.npmjs.org/stream-equal/-/stream-equal-0.1.5.tgz", + "from": "stream-equal@>=0.1.5 <0.2.0", "resolved": "https://registry.npmjs.org/stream-equal/-/stream-equal-0.1.5.tgz", "dependencies": { "readable-stream": { "version": "1.0.33", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", + "from": "readable-stream@>=1.0.2 <1.1.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -13906,42 +14026,42 @@ }, "tsd": { "version": "0.6.1", - "from": "https://registry.npmjs.org/tsd/-/tsd-0.6.1.tgz", + "from": "tsd@0.6.1", "resolved": "https://registry.npmjs.org/tsd/-/tsd-0.6.1.tgz", "dependencies": { "assertion-error": { "version": "1.0.0", - "from": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz", + "from": "assertion-error@1.0.0", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz" }, "bl": { "version": "0.9.4", - "from": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz", + "from": "bl@>=0.9.3 <0.10.0", "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz", "dependencies": { "readable-stream": { "version": "1.0.33", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", + "from": "readable-stream@>=1.0.26 <1.1.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -13950,252 +14070,252 @@ }, "bluebird": { "version": "1.2.4", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-1.2.4.tgz", + "from": "bluebird@>=1.2.4 <1.3.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-1.2.4.tgz" }, "deep-freeze": { "version": "0.0.1", - "from": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz", + "from": "deep-freeze@0.0.1", "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz" }, "definition-header": { "version": "0.1.0", - "from": "https://registry.npmjs.org/definition-header/-/definition-header-0.1.0.tgz", + "from": "definition-header@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/definition-header/-/definition-header-0.1.0.tgz", "dependencies": { "parsimmon": { "version": "0.5.1", - "from": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.tgz", + "from": "parsimmon@>=0.5.0 <0.6.0", "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.tgz", "dependencies": { "pjs": { "version": "5.1.1", - "from": "https://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz", + "from": "pjs@>=5.0.0 <6.0.0", "resolved": "https://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz" } } }, "xregexp": { "version": "2.0.0", - "from": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", + "from": "xregexp@>=2.0.0 <2.1.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz" } } }, "detect-indent": { "version": "0.2.0", - "from": "https://registry.npmjs.org/detect-indent/-/detect-indent-0.2.0.tgz", + "from": "detect-indent@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-0.2.0.tgz", "dependencies": { "get-stdin": { "version": "0.1.0", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz", + "from": "get-stdin@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz" }, "minimist": { "version": "0.1.0", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz", + "from": "minimist@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz" } } }, "event-stream": { "version": "3.1.7", - "from": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz", + "from": "event-stream@>=3.1.5 <3.2.0", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz", "dependencies": { "through": { "version": "2.3.7", - "from": "https://registry.npmjs.org/through/-/through-2.3.7.tgz", + "from": "through@>=2.3.1 <2.4.0", "resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz" }, "duplexer": { "version": "0.1.1", - "from": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "from": "duplexer@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz" }, "from": { "version": "0.1.3", - "from": "https://registry.npmjs.org/from/-/from-0.1.3.tgz", + "from": "from@>=0.0.0 <1.0.0", "resolved": "https://registry.npmjs.org/from/-/from-0.1.3.tgz" }, "map-stream": { "version": "0.1.0", - "from": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "from": "map-stream@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz" }, "pause-stream": { "version": "0.0.11", - "from": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "from": "pause-stream@0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz" }, "split": { "version": "0.2.10", - "from": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", + "from": "split@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz" }, "stream-combiner": { "version": "0.0.4", - "from": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "from": "stream-combiner@>=0.0.4 <0.1.0", "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz" } } }, "exit": { "version": "0.1.2", - "from": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "from": "exit@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" }, "joi": { "version": "4.9.0", - "from": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz", + "from": "joi@>=4.7.0 <5.0.0", "resolved": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz", "dependencies": { "hoek": { "version": "2.14.0", - "from": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz", + "from": "hoek@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz" }, "topo": { "version": "1.0.2", - "from": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz", + "from": "topo@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/topo/-/topo-1.0.2.tgz" }, "isemail": { "version": "1.1.1", - "from": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz", + "from": "isemail@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz" }, "moment": { "version": "2.10.3", - "from": "https://registry.npmjs.org/moment/-/moment-2.10.3.tgz", + "from": "moment@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.3.tgz" } } }, "joi-assert": { "version": "0.0.3", - "from": "https://registry.npmjs.org/joi-assert/-/joi-assert-0.0.3.tgz", + "from": "joi-assert@0.0.3", "resolved": "https://registry.npmjs.org/joi-assert/-/joi-assert-0.0.3.tgz" }, "jsesc": { "version": "0.5.0", - "from": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "from": "jsesc@>=0.5.0 <0.6.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz" }, "json-pointer": { "version": "0.2.2", - "from": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.2.2.tgz", + "from": "json-pointer@>=0.2.2 <0.3.0", "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.2.2.tgz", "dependencies": { "foreach": { "version": "2.0.5", - "from": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "from": "foreach@>=2.0.4 <3.0.0", "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz" } } }, "lazy.js": { "version": "0.3.2", - "from": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.3.2.tgz", + "from": "lazy.js@>=0.3.2 <0.4.0", "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.3.2.tgz" }, "lru-cache": { "version": "2.5.2", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz", + "from": "lru-cache@>=2.5.0 <2.6.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz" }, "minimatch": { "version": "1.0.0", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", + "from": "minimatch@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", "dependencies": { "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "from": "sigmund@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" } } }, "ministyle": { "version": "0.1.4", - "from": "https://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz", + "from": "ministyle@>=0.1.3 <0.2.0", "resolved": "https://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz" }, "minitable": { "version": "0.0.4", - "from": "https://registry.npmjs.org/minitable/-/minitable-0.0.4.tgz", + "from": "minitable@0.0.4", "resolved": "https://registry.npmjs.org/minitable/-/minitable-0.0.4.tgz", "dependencies": { "minichain": { "version": "0.0.1", - "from": "https://registry.npmjs.org/minichain/-/minichain-0.0.1.tgz", + "from": "minichain@>=0.0.1 <0.1.0", "resolved": "https://registry.npmjs.org/minichain/-/minichain-0.0.1.tgz" } } }, "miniwrite": { "version": "0.1.4", - "from": "https://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz", + "from": "miniwrite@>=0.1.3 <0.2.0", "resolved": "https://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz", "dependencies": { "mkdirp": { "version": "0.3.5", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "from": "mkdirp@>=0.3.5 <0.4.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" } } }, "mkdirp": { "version": "0.5.1", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "from": "mkdirp@>=0.5.0 <0.6.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "open": { "version": "0.0.5", - "from": "https://registry.npmjs.org/open/-/open-0.0.5.tgz", + "from": "open@>=0.0.5 <0.1.0", "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz" }, "request": { "version": "2.57.0", - "from": "https://registry.npmjs.org/request/-/request-2.57.0.tgz", + "from": "request@>=2.45.0 <3.0.0", "resolved": "https://registry.npmjs.org/request/-/request-2.57.0.tgz", "dependencies": { "caseless": { "version": "0.10.0", - "from": "https://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz", + "from": "caseless@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz" }, "forever-agent": { "version": "0.6.1", - "from": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "from": "forever-agent@>=0.6.0 <0.7.0", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" }, "form-data": { "version": "0.2.0", - "from": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz", + "from": "form-data@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz", "dependencies": { "async": { "version": "0.9.2", - "from": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "from": "async@>=0.9.0 <0.10.0", "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz" }, "combined-stream": { "version": "0.0.7", - "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", + "from": "combined-stream@>=0.0.4 <0.1.0", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", "dependencies": { "delayed-stream": { "version": "0.0.5", - "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz", + "from": "delayed-stream@0.0.5", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" } } @@ -14204,203 +14324,203 @@ }, "json-stringify-safe": { "version": "5.0.1", - "from": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "from": "json-stringify-safe@>=5.0.0 <5.1.0", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, "mime-types": { "version": "2.0.13", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.13.tgz", + "from": "mime-types@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.13.tgz", "dependencies": { "mime-db": { "version": "1.11.0", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.11.0.tgz", + "from": "mime-db@>=1.11.0 <1.12.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.11.0.tgz" } } }, "qs": { "version": "3.1.0", - "from": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz", + "from": "qs@>=3.1.0 <3.2.0", "resolved": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz" }, "tunnel-agent": { "version": "0.4.0", - "from": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz", + "from": "tunnel-agent@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" }, "tough-cookie": { "version": "1.2.0", - "from": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz", + "from": "tough-cookie@>=0.12.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz" }, "http-signature": { "version": "0.11.0", - "from": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz", + "from": "http-signature@>=0.11.0 <0.12.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz", "dependencies": { "assert-plus": { "version": "0.1.5", - "from": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", + "from": "assert-plus@>=0.1.5 <0.2.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" }, "asn1": { "version": "0.1.11", - "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz", + "from": "asn1@0.1.11", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz" }, "ctype": { "version": "0.5.3", - "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz", + "from": "ctype@0.5.3", "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz" } } }, "oauth-sign": { "version": "0.8.0", - "from": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz", + "from": "oauth-sign@>=0.8.0 <0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz" }, "hawk": { "version": "2.3.1", - "from": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz", + "from": "hawk@>=2.3.0 <2.4.0", "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz", "dependencies": { "hoek": { "version": "2.14.0", - "from": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz", + "from": "hoek@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz" }, "boom": { "version": "2.7.2", - "from": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz", + "from": "boom@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz" }, "cryptiles": { "version": "2.0.4", - "from": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz", + "from": "cryptiles@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz" }, "sntp": { "version": "1.0.9", - "from": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "from": "sntp@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" } } }, "aws-sign2": { "version": "0.5.0", - "from": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz", + "from": "aws-sign2@>=0.5.0 <0.6.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" }, "stringstream": { "version": "0.0.4", - "from": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz", + "from": "stringstream@>=0.0.4 <0.1.0", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz" }, "combined-stream": { "version": "1.0.3", - "from": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.3.tgz", + "from": "combined-stream@>=1.0.1 <1.1.0", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.3.tgz", "dependencies": { "delayed-stream": { "version": "1.0.0", - "from": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "from": "delayed-stream@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" } } }, "isstream": { "version": "0.1.2", - "from": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "from": "isstream@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" }, "har-validator": { "version": "1.7.1", - "from": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz", + "from": "har-validator@>=1.6.1 <2.0.0", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz", "dependencies": { "bluebird": { "version": "2.9.27", - "from": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.27.tgz", + "from": "bluebird@>=2.9.26 <3.0.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.27.tgz" }, "chalk": { "version": "1.0.0", - "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", + "from": "chalk@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", "dependencies": { "ansi-styles": { "version": "2.0.1", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz", + "from": "ansi-styles@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz" }, "escape-string-regexp": { "version": "1.0.3", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, "has-ansi": { "version": "1.0.3", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", + "from": "has-ansi@>=1.0.3 <2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", "dependencies": { "ansi-regex": { "version": "1.1.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz", + "from": "ansi-regex@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" }, "get-stdin": { "version": "4.0.1", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "from": "get-stdin@>=4.0.1 <5.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" } } }, "supports-color": { "version": "1.3.1", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz", + "from": "supports-color@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz" } } }, "commander": { "version": "2.8.1", - "from": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "from": "commander@>=2.8.1 <3.0.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "dependencies": { "graceful-readlink": { "version": "1.0.1", - "from": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "from": "graceful-readlink@>=1.0.0", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" } } }, "is-my-json-valid": { "version": "2.12.0", - "from": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz", + "from": "is-my-json-valid@>=2.12.0 <3.0.0", "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", - "from": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", + "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": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "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", "dependencies": { "is-property": { "version": "1.0.2", - "from": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "from": "is-property@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" } } }, "jsonpointer": { "version": "1.1.0", - "from": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz", + "from": "jsonpointer@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz" } } @@ -14411,152 +14531,152 @@ }, "rimraf": { "version": "2.2.8", - "from": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz", + "from": "rimraf@>=2.2.8 <2.3.0", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" }, "type-detect": { "version": "0.1.2", - "from": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz", + "from": "type-detect@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz" }, "universal-analytics": { "version": "0.3.8", - "from": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.3.8.tgz", + "from": "universal-analytics@>=0.3.4 <0.4.0", "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.3.8.tgz", "dependencies": { "underscore": { "version": "1.8.3", - "from": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "from": "underscore@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz" }, "async": { "version": "0.2.10", - "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "from": "async@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" } } }, "update-notifier": { "version": "0.2.2", - "from": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz", + "from": "update-notifier@>=0.2.2 <0.3.0", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz", "dependencies": { "chalk": { "version": "0.5.1", - "from": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "from": "chalk@>=0.5.1 <0.6.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", "dependencies": { "ansi-styles": { "version": "1.1.0", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "from": "ansi-styles@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" }, "escape-string-regexp": { "version": "1.0.3", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz", + "from": "escape-string-regexp@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, "has-ansi": { "version": "0.1.0", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "from": "has-ansi@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "from": "ansi-regex@>=0.2.1 <0.3.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" } } }, "strip-ansi": { "version": "0.3.0", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "from": "strip-ansi@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", "dependencies": { "ansi-regex": { "version": "0.2.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "from": "ansi-regex@>=0.2.1 <0.3.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" } } }, "supports-color": { "version": "0.2.0", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "from": "supports-color@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" } } }, "configstore": { "version": "0.3.2", - "from": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz", + "from": "configstore@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz", "dependencies": { "graceful-fs": { "version": "3.0.8", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz", + "from": "graceful-fs@>=3.0.1 <4.0.0", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz" }, "object-assign": { "version": "2.0.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz", + "from": "object-assign@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz" }, "osenv": { "version": "0.1.1", - "from": "https://registry.npmjs.org/osenv/-/osenv-0.1.1.tgz", + "from": "osenv@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.1.tgz" }, "user-home": { "version": "1.1.1", - "from": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "from": "user-home@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz" }, "xdg-basedir": { "version": "1.0.1", - "from": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz", + "from": "xdg-basedir@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz" } } }, "is-npm": { "version": "1.0.0", - "from": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", + "from": "is-npm@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz" }, "latest-version": { "version": "1.0.0", - "from": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz", + "from": "latest-version@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz", "dependencies": { "package-json": { "version": "1.2.0", - "from": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz", + "from": "package-json@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz", "dependencies": { "got": { "version": "3.2.0", - "from": "https://registry.npmjs.org/got/-/got-3.2.0.tgz", + "from": "got@>=3.2.0 <4.0.0", "resolved": "https://registry.npmjs.org/got/-/got-3.2.0.tgz", "dependencies": { "duplexify": { "version": "3.4.1", - "from": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.1.tgz", + "from": "duplexify@>=3.2.0 <4.0.0", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.1.tgz", "dependencies": { "end-of-stream": { "version": "1.0.0", - "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz", + "from": "end-of-stream@1.0.0", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz", "dependencies": { "once": { "version": "1.3.2", - "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", + "from": "once@>=1.3.0 <1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", "dependencies": { "wrappy": { "version": "1.0.1", - "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" } } @@ -14565,27 +14685,27 @@ }, "readable-stream": { "version": "1.1.13", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", + "from": "readable-stream@>=1.1.13 <2.0.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -14594,62 +14714,62 @@ }, "infinity-agent": { "version": "2.0.3", - "from": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz", + "from": "infinity-agent@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz" }, "is-stream": { "version": "1.0.1", - "from": "https://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz", + "from": "is-stream@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz" }, "lowercase-keys": { "version": "1.0.0", - "from": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "from": "lowercase-keys@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz" }, "nested-error-stacks": { "version": "1.0.0", - "from": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.0.tgz", + "from": "nested-error-stacks@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.0.tgz" }, "object-assign": { "version": "2.0.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz", + "from": "object-assign@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz" }, "prepend-http": { "version": "1.0.1", - "from": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.1.tgz", + "from": "prepend-http@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.1.tgz" }, "read-all-stream": { "version": "2.1.2", - "from": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-2.1.2.tgz", + "from": "read-all-stream@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-2.1.2.tgz", "dependencies": { "readable-stream": { "version": "1.1.13", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", + "from": "readable-stream@>=1.1.13 <1.2.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -14658,44 +14778,44 @@ }, "statuses": { "version": "1.2.1", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", + "from": "statuses@>=1.2.1 <2.0.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" }, "timed-out": { "version": "2.0.0", - "from": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz", + "from": "timed-out@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz" } } }, "registry-url": { "version": "3.0.3", - "from": "https://registry.npmjs.org/registry-url/-/registry-url-3.0.3.tgz", + "from": "registry-url@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.0.3.tgz", "dependencies": { "rc": { "version": "1.0.3", - "from": "https://registry.npmjs.org/rc/-/rc-1.0.3.tgz", + "from": "rc@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/rc/-/rc-1.0.3.tgz", "dependencies": { "minimist": { "version": "0.0.10", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "from": "minimist@>=0.0.7 <0.1.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" }, "deep-extend": { "version": "0.2.11", - "from": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz", + "from": "deep-extend@>=0.2.5 <0.3.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz" }, "strip-json-comments": { "version": "0.1.3", - "from": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz", + "from": "strip-json-comments@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz" }, "ini": { "version": "1.3.3", - "from": "https://registry.npmjs.org/ini/-/ini-1.3.3.tgz", + "from": "ini@>=1.3.0 <1.4.0", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.3.tgz" } } @@ -14708,34 +14828,34 @@ }, "semver-diff": { "version": "2.0.0", - "from": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz", + "from": "semver-diff@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz" }, "string-length": { "version": "1.0.0", - "from": "https://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz", + "from": "string-length@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz" } } }, "uri-templates": { "version": "0.1.7", - "from": "https://registry.npmjs.org/uri-templates/-/uri-templates-0.1.7.tgz", + "from": "uri-templates@>=0.1.5 <0.2.0", "resolved": "https://registry.npmjs.org/uri-templates/-/uri-templates-0.1.7.tgz" }, "uuid": { "version": "2.0.1", - "from": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz", + "from": "uuid@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz" }, "verror": { "version": "1.4.0", - "from": "https://registry.npmjs.org/verror/-/verror-1.4.0.tgz", + "from": "verror@>=1.4.0 <1.5.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.4.0.tgz", "dependencies": { "extsprintf": { "version": "1.0.3", - "from": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.3.tgz", + "from": "extsprintf@1.0.3", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.3.tgz" } } diff --git a/package.json b/package.json index b272db0aba..b2b0b73047 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "broccoli-funnel": "igorminar/broccoli-funnel#perf-files", "broccoli-lodash": "^0.1.1", "broccoli-merge-trees": "^0.2.1", + "broccoli-replace": "alexeagle/broccoli-replace#angular_patch", "broccoli-slow-trees": "^1.1.0", "broccoli-stew": "^0.2.1", "broccoli-writer": "^0.1.1", diff --git a/tools/broccoli/broccoli-replace.ts b/tools/broccoli/broccoli-replace.ts deleted file mode 100644 index 998970571d..0000000000 --- a/tools/broccoli/broccoli-replace.ts +++ /dev/null @@ -1,56 +0,0 @@ -import fs = require('fs'); -import fse = require('fs-extra'); -import path = require('path'); -import {wrapDiffingPlugin, DiffingBroccoliPlugin, DiffResult} from './diffing-broccoli-plugin'; - -var minimatch = require('minimatch'); -var exec = require('child_process').exec; - -var FILE_ENCODING = {encoding: 'utf-8'}; - -/** - * Intercepts each changed file and replaces its contents with - * the associated changes. - */ -class DiffingReplace implements DiffingBroccoliPlugin { - constructor(private inputPath, private cachePath, private options) {} - - rebuild(treeDiff: DiffResult) { - var patterns = this.options.patterns; - var files = this.options.files; - - treeDiff.changedPaths.forEach((changedFilePath) => { - var sourceFilePath = path.join(this.inputPath, changedFilePath) - var destFilePath = path.join(this.cachePath, changedFilePath); - var destDirPath = path.dirname(destFilePath); - - if (!fs.existsSync(destDirPath)) { - fse.mkdirpSync(destDirPath); - } - - var fileMatches = files.some((filePath) => minimatch(changedFilePath, filePath)); - if (fileMatches) { - var content = fs.readFileSync(sourceFilePath, FILE_ENCODING); - patterns.forEach((pattern) => { - var replacement = pattern.replacement; - if (typeof replacement === 'function') { - replacement = function(content) { - return pattern.replacement(content, changedFilePath); - }; - } - content = content.replace(pattern.match, replacement); - }); - fs.writeFileSync(destFilePath, content, FILE_ENCODING); - } else { - fs.symlinkSync(sourceFilePath, destFilePath); - } - }); - - treeDiff.removedPaths.forEach((removedFilePath) => { - var destFilePath = path.join(this.cachePath, removedFilePath); - fs.unlinkSync(destFilePath); - }); - } -} - -export default wrapDiffingPlugin(DiffingReplace); diff --git a/tools/broccoli/trees/browser_tree.ts b/tools/broccoli/trees/browser_tree.ts index 89eac0ad89..8d957b116c 100644 --- a/tools/broccoli/trees/browser_tree.ts +++ b/tools/broccoli/trees/browser_tree.ts @@ -5,12 +5,12 @@ var flatten = require('broccoli-flatten'); var htmlReplace = require('../html-replace'); import mergeTrees from '../broccoli-merge-trees'; var path = require('path'); +var replace = require('broccoli-replace'); var stew = require('broccoli-stew'); import compileWithTypescript from '../broccoli-typescript'; import destCopy from '../broccoli-dest-copy'; import {default as transpileWithTraceur, TRACEUR_RUNTIME_PATH} from '../traceur/index'; -import replace from '../broccoli-replace'; var projectRootDir = path.normalize(path.join(__dirname, '..', '..', '..', '..')); @@ -146,36 +146,25 @@ module.exports = function makeBrowserTree(options, destinationPath) { return funnels; } - var scriptPathPatternReplacement = { - match: '@@FILENAME_NO_EXT', - replacement: function(replacement, relativePath) { - return relativePath.replace(/\.\w+$/, ''); - } - }; + function writeScriptsForPath(relativePath, result) { + return result.replace('@@FILENAME_NO_EXT', relativePath.replace(/\.\w+$/, '')); + } var htmlTree = new Funnel(modulesTree, {include: ['*/src/**/*.html'], destDir: '/'}); htmlTree = replace(htmlTree, { files: ['examples*/**'], - patterns: [ - {match: /\$SCRIPTS\$/, replacement: htmlReplace('SCRIPTS')}, - scriptPathPatternReplacement - ] + patterns: [{match: /\$SCRIPTS\$/, replacement: htmlReplace('SCRIPTS')}], + replaceWithPath: writeScriptsForPath }); - htmlTree = replace(htmlTree, { files: ['benchmarks/**'], - patterns: [ - {match: /\$SCRIPTS\$/, replacement: htmlReplace('SCRIPTS_benchmarks')}, - scriptPathPatternReplacement - ] + patterns: [{match: /\$SCRIPTS\$/, replacement: htmlReplace('SCRIPTS_benchmarks')}], + replaceWithPath: writeScriptsForPath }); - htmlTree = replace(htmlTree, { files: ['benchmarks_external/**'], - patterns: [ - {match: /\$SCRIPTS\$/, replacement: htmlReplace('SCRIPTS_benchmarks_external')}, - scriptPathPatternReplacement - ] + patterns: [{match: /\$SCRIPTS\$/, replacement: htmlReplace('SCRIPTS_benchmarks_external')}], + replaceWithPath: writeScriptsForPath }); var scripts = mergeTrees(servingTrees); diff --git a/tools/broccoli/trees/dart_tree.ts b/tools/broccoli/trees/dart_tree.ts index 6bc556678e..b2c9b263e6 100644 --- a/tools/broccoli/trees/dart_tree.ts +++ b/tools/broccoli/trees/dart_tree.ts @@ -9,10 +9,10 @@ var glob = require('glob'); import mergeTrees from '../broccoli-merge-trees'; var path = require('path'); var renderLodashTemplate = require('broccoli-lodash'); +var replace = require('broccoli-replace'); var stew = require('broccoli-stew'); import ts2dart from '../broccoli-ts2dart'; import dartfmt from '../broccoli-dartfmt'; -import replace from '../broccoli-replace'; /** * A funnel starting at modules, including the given filters, and moving into the root. diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index 4b1f577e68..d2f7a660ea 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -7,7 +7,7 @@ var Funnel = require('broccoli-funnel'); import mergeTrees from '../broccoli-merge-trees'; var path = require('path'); var renderLodashTemplate = require('broccoli-lodash'); -import replace from '../broccoli-replace'; +var replace = require('broccoli-replace'); var stew = require('broccoli-stew'); var projectRootDir = path.normalize(path.join(__dirname, '..', '..', '..', '..')); @@ -84,16 +84,19 @@ module.exports = function makeNodeTree(destinationPath) { // TODO: remove this when we no longer use traceur var traceurCompatibleTsModulesTree = replace(modulesTree, { files: ['**/*.ts'], - patterns: [{ - match: /$/, - replacement: function(_, relativePath) { - var content = ""; //we're matching an empty line - if (!relativePath.endsWith('.d.ts')) { - content += '\r\nexport var __esModule = true;\n'; - } - return content; + patterns: [ + { + // Empty replacement needed so that replaceWithPath gets triggered... + match: /$/g, + replacement: "" } - }] + ], + replaceWithPath: function(path, content) { + if (!path.endsWith('.d.ts')) { + content += '\r\nexport var __esModule = true;\n'; + } + return content; + } }); var typescriptTree = compileWithTypescript(traceurCompatibleTsModulesTree, {