WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content
This repository was archived by the owner on Mar 26, 2018. It is now read-only.

Commit 1102e60

Browse files
committed
Merge pull request #382 from mteodori/issue-381
fixes #381 new requirejs build with almond does not compile with coff…
2 parents 087ff1a + be4d3fb commit 1102e60

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

generators/app/templates/Gruntfile.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,17 @@ module.exports = function (grunt) {
237237
}],
238238

239239
modules: [{name: 'main'}],
240+
baseUrl: '<%%= yeoman.app %>/scripts',
240241
<% if (hasCoffee) { %>
241-
baseUrl: '.tmp/scripts',
242+
paths: {
243+
'main': '../../.tmp/scripts/main'
244+
},
245+
keepBuildDir: true,
246+
allowSourceOverwrites: true,
247+
mainConfigFile: '.tmp/scripts/main.js', // contains path specifications and nothing else important with respect to config
242248
<% } else { %>
243-
baseUrl: '<%%= yeoman.app %>/scripts',
244-
<% } %>
245249
mainConfigFile: '<%%= yeoman.app %>/scripts/main.js', // contains path specifications and nothing else important with respect to config
250+
<% } %>
246251
dir: '.tmp/scripts',
247252

248253
optimize: 'none', // optimize by uglify task

0 commit comments

Comments
 (0)