diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 11362e6194..a5950f0922 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -104,6 +104,9 @@ "array-differ": { "version": "1.0.0" }, + "array-equal": { + "version": "1.0.0" + }, "array-ify": { "version": "1.0.0" }, @@ -249,6 +252,9 @@ } } }, + "blank-object": { + "version": "1.0.1" + }, "blob": { "version": "0.0.4" }, @@ -1432,8 +1438,12 @@ } }, "broccoli-funnel": { - "version": "0.2.3", - "resolved": "git://github.com/igorminar/broccoli-funnel.git#6bfb53c4ca8dd3fa16416b9f85dc923a227e30ee" + "version": "1.0.1", + "dependencies": { + "walk-sync": { + "version": "0.2.6" + } + } }, "broccoli-kitchen-sink-helpers": { "version": "0.2.9", @@ -1449,9 +1459,6 @@ "broccoli-plugin": { "version": "1.2.1" }, - "broccoli-read-compat": { - "version": "0.1.3" - }, "broccoli-slow-trees": { "version": "1.1.0" }, @@ -2174,6 +2181,9 @@ } } }, + "fast-ordered-set": { + "version": "1.0.2" + }, "faye-websocket": { "version": "0.7.3" }, @@ -2269,6 +2279,9 @@ "fs-promise": { "version": "0.3.1" }, + "fs-tree-diff": { + "version": "0.3.1" + }, "fsevents": { "version": "1.0.6", "dependencies": { @@ -4068,6 +4081,9 @@ } } }, + "matcher-collection": { + "version": "1.0.1" + }, "media-typer": { "version": "0.3.0" }, @@ -4475,6 +4491,9 @@ "path-platform": { "version": "0.11.15" }, + "path-posix": { + "version": "1.0.0" + }, "path-type": { "version": "1.1.0", "dependencies": { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d86f998c9e..60c4bfc9a5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -170,6 +170,11 @@ "from": "array-differ@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz" }, + "array-equal": { + "version": "1.0.0", + "from": "array-equal@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz" + }, "array-ify": { "version": "1.0.0", "from": "array-ify@>=1.0.0 <2.0.0", @@ -409,6 +414,11 @@ } } }, + "blank-object": { + "version": "1.0.1", + "from": "blank-object@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/blank-object/-/blank-object-1.0.1.tgz" + }, "blob": { "version": "0.0.4", "from": "blob@0.0.4", @@ -2232,9 +2242,16 @@ } }, "broccoli-funnel": { - "version": "0.2.3", - "from": "igorminar/broccoli-funnel#perf-files", - "resolved": "git://github.com/igorminar/broccoli-funnel.git#6bfb53c4ca8dd3fa16416b9f85dc923a227e30ee" + "version": "1.0.1", + "from": "broccoli-funnel@1.0.1", + "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.0.1.tgz", + "dependencies": { + "walk-sync": { + "version": "0.2.6", + "from": "walk-sync@>=0.2.6 <0.3.0", + "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.2.6.tgz" + } + } }, "broccoli-kitchen-sink-helpers": { "version": "0.2.9", @@ -2258,11 +2275,6 @@ "from": "broccoli-plugin@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-1.2.1.tgz" }, - "broccoli-read-compat": { - "version": "0.1.3", - "from": "broccoli-read-compat@>=0.1.2 <0.2.0", - "resolved": "https://registry.npmjs.org/broccoli-read-compat/-/broccoli-read-compat-0.1.3.tgz" - }, "broccoli-slow-trees": { "version": "1.1.0", "from": "broccoli-slow-trees@>=1.1.0 <2.0.0", @@ -3425,6 +3437,11 @@ } } }, + "fast-ordered-set": { + "version": "1.0.2", + "from": "fast-ordered-set@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/fast-ordered-set/-/fast-ordered-set-1.0.2.tgz" + }, "faye-websocket": { "version": "0.7.3", "from": "faye-websocket@>=0.7.2 <0.8.0", @@ -3578,6 +3595,11 @@ "from": "fs-promise@0.3.1", "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz" }, + "fs-tree-diff": { + "version": "0.3.1", + "from": "fs-tree-diff@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-0.3.1.tgz" + }, "fsevents": { "version": "1.0.6", "from": "fsevents@>=1.0.0 <2.0.0", @@ -6471,6 +6493,11 @@ } } }, + "matcher-collection": { + "version": "1.0.1", + "from": "matcher-collection@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.1.tgz" + }, "media-typer": { "version": "0.3.0", "from": "media-typer@0.3.0", @@ -7132,6 +7159,11 @@ "from": "path-platform@>=0.11.15 <0.12.0", "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz" }, + "path-posix": { + "version": "1.0.0", + "from": "path-posix@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz" + }, "path-type": { "version": "1.1.0", "from": "path-type@>=1.0.0 <2.0.0", diff --git a/package.json b/package.json index 9ecd031f82..f1a51c815e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "base64-js": "^0.0.8", "bower": "^1.3.12", "broccoli": "^0.15.3", - "broccoli-funnel": "igorminar/broccoli-funnel#perf-files", + "broccoli-funnel": "^1.0.1", "broccoli-slow-trees": "^1.1.0", "broccoli-stew": "^0.2.1", "broccoli-writer": "^0.1.1",