Fix ember-cli#21.

luxzeitlos · May 2, 2016 · 1b28d27 · 1b28d27
1 parent d5281cf
commit 1b28d27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/modules-preprocessor.js b/lib/modules-preprocessor.js
@@ -59,7 +59,7 @@ ModulesPreprocessor.prototype.inputTreeWithStyles = function(inputTree) {
   if (this.owner.belongsToAddon()) { return inputTree; }
 
   var appStyles = new Funnel(this.owner.app.trees.styles, { destDir: this.owner.app.name + '/styles' });
-  return new MergeTrees([inputTree, appStyles]);
+  return new MergeTrees([inputTree, appStyles], { overwrite: true });
 };
 
 /*

diff --git a/tests/dummy/app/styles/.hidden-file b/tests/dummy/app/styles/.hidden-file
@@ -0,0 +1,2 @@
+This file is a placeholder to prevent regression on #21.
+See https://github.com/salsify/ember-css-modules/issues/21
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This file is a placeholder to prevent regression on #21.
		See https://github.com/salsify/ember-css-modules/issues/21