diff --git a/packages/compat/package.json b/packages/compat/package.json index 4e069231a..acbd33ad0 100644 --- a/packages/compat/package.json +++ b/packages/compat/package.json @@ -40,7 +40,7 @@ "broccoli": "^3.4.2", "broccoli-concat": "^3.7.3", "broccoli-file-creator": "^2.1.1", - "broccoli-funnel": "^2.0.1", + "broccoli-funnel": "ef4/broccoli-funnel#c70d060076e14793e8495571f304a976afc754ac", "broccoli-merge-trees": "^3.0.0", "broccoli-persistent-filter": "^3.1.2", "broccoli-plugin": "^4.0.0", diff --git a/packages/util/package.json b/packages/util/package.json index ef096e268..ced4ee66c 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@embroider/macros": "0.37.0", - "broccoli-funnel": "^2.0.1", + "broccoli-funnel": "ef4/broccoli-funnel#c70d060076e14793e8495571f304a976afc754ac", "ember-cli-babel": "^7.23.1" }, "devDependencies": { diff --git a/test-packages/funky-sample-addon/package.json b/test-packages/funky-sample-addon/package.json index a45b7a296..58d5aa699 100644 --- a/test-packages/funky-sample-addon/package.json +++ b/test-packages/funky-sample-addon/package.json @@ -21,7 +21,7 @@ "dependencies": { "@embroider/macros": "0.37.0", "broccoli-babel-transpiler": "^5.5.0", - "broccoli-funnel": "^2.0.2", + "broccoli-funnel": "ef4/broccoli-funnel#c70d060076e14793e8495571f304a976afc754ac", "broccoli-merge-trees": "^3.0.2", "ember-cli-babel": "^7.20.5", "ember-cli-htmlbars": "^4.3.1" diff --git a/yarn.lock b/yarn.lock index c2388e9f9..537f4ef64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4521,6 +4521,24 @@ broccoli-funnel@^3.0.3: path-posix "^1.0.0" walk-sync "^2.0.2" +broccoli-funnel@ef4/broccoli-funnel#c70d060076e14793e8495571f304a976afc754ac: + version "2.0.2-ef4.0" + resolved "https://codeload.github.com/ef4/broccoli-funnel/tar.gz/c70d060076e14793e8495571f304a976afc754ac" + dependencies: + array-equal "^1.0.0" + blank-object "^1.0.1" + broccoli-plugin "^1.3.0" + debug "^2.2.0" + fast-ordered-set "^1.0.0" + fs-tree-diff "^0.5.3" + heimdalljs "^0.2.0" + minimatch "^3.0.0" + mkdirp "^0.5.0" + path-posix "^1.0.0" + rimraf "^2.4.3" + symlink-or-copy "^1.0.0" + walk-sync "^2.2.0" + broccoli-kitchen-sink-helpers@^0.2.5: version "0.2.9" resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc" @@ -17222,12 +17240,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript-memoize@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.0.tgz#ad3b0e7e5a411ca234be123f913a2a31302b7eb6" - integrity sha512-B1eufjs/mGzHqoGeI1VT/dnSBoZr2v3i3/Wm8NmdxlZflyVdleE8wO0QwUuj4NfundD7T5nU3I7HSKp/5BD9og== - -typescript-memoize@^1.0.0-alpha.3: +typescript-memoize@^1.0.0, typescript-memoize@^1.0.0-alpha.3: version "1.0.0" resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.0.tgz#ad3b0e7e5a411ca234be123f913a2a31302b7eb6" integrity sha512-B1eufjs/mGzHqoGeI1VT/dnSBoZr2v3i3/Wm8NmdxlZflyVdleE8wO0QwUuj4NfundD7T5nU3I7HSKp/5BD9og==