bump funnel, and prefer globs for includes.

ember-cli · Aug 8, 2015 · f06c144 · f06c144
1 parent c06a7ac
commit f06c144
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -974,7 +974,7 @@ EmberApp.prototype.javascript = function() {
 
   var appJs = new ES6Modules(
     new Funnel(applicationJs, {
-      include: [new RegExp('^' + escapeRegExp(this.name + '/') + '.*\\.js$')],
+      include: [escapeRegExp(this.name + '/') + '**/*.js'],
       description: 'Funnel: App JS Files'
     }),
 

diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "broccoli-es3-safe-recast": "^2.0.0",
     "broccoli-es6modules": "^1.0.1",
     "broccoli-filter": "0.1.14",
-    "broccoli-funnel": "0.2.3",
+    "broccoli-funnel": "0.2.4",
     "broccoli-kitchen-sink-helpers": "0.2.7",
     "broccoli-merge-trees": "0.2.1",
     "broccoli-sane-watcher": "^1.1.1",