Merge pull request #382 from mteodori/issue-381

fixes #381 new requirejs build with almond does not compile with coff…
yeoman · Jan 24, 2016 · 1102e60 · 1102e60
2 parents 087ff1a + be4d3fb
commit 1102e60
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/generators/app/templates/Gruntfile.js b/generators/app/templates/Gruntfile.js
@@ -237,12 +237,17 @@ module.exports = function (grunt) {
           }],
 
           modules: [{name: 'main'}],
+          baseUrl: '<%%= yeoman.app %>/scripts',
 <% if (hasCoffee) { %>
-          baseUrl: '.tmp/scripts',
+          paths: {
+            'main': '../../.tmp/scripts/main'
+          },
+          keepBuildDir: true,
+          allowSourceOverwrites: true,
+          mainConfigFile: '.tmp/scripts/main.js', // contains path specifications and nothing else important with respect to config
 <% } else { %>
-          baseUrl: '<%%= yeoman.app %>/scripts',
-<% } %>
           mainConfigFile: '<%%= yeoman.app %>/scripts/main.js', // contains path specifications and nothing else important with respect to config
+<% } %>
           dir: '.tmp/scripts',
 
           optimize: 'none', // optimize by uglify task