Permalink
Browse files

Adding changes needed to build and serve correctly.

  • Loading branch information...
1 parent 2130368 commit a7192e564d36ec04da1a11fd15c9904ddedbb1e9 @addyosmani addyosmani committed Aug 24, 2012
Showing with 5 additions and 1 deletion.
  1. +1 −1 cli/lib/generators/yeoman/app/index.js
  2. +3 −0 cli/tasks/rjs.js
  3. +1 −0 cli/tasks/yeoman.js
@@ -259,7 +259,7 @@ AppGenerator.prototype.requirejs = function requirejs(){
// Wire RequireJS/AMD (usemin: js/amd-app.js)
var body = self.read(path.resolve('app/index.html'));
body = self.appendScripts(body, 'scripts/amd-app.js', ['scripts/vendor/require.js'], {
- 'data-main': 'main'
+ 'data-main': 'scripts/main'
});
self.write('app/index.html', body);
View
@@ -21,10 +21,13 @@ module.exports = function(grunt) {
// automatic configuration via mainConfigFile, assumed to be the app entry
// point
+
if(options.name) {
options.mainConfigFile = options.mainConfigFile || path.join(options.baseUrl, options.name + '.js');
}
+ options.baseUrl = './scripts';
+
grunt.log.subhead('Options:')
.writeln(grunt.helper('inspect', options));
View
@@ -33,6 +33,7 @@ module.exports = function(grunt) {
// maintained (todo: inline script/style minified)
// - basics - same as buildkit plus minor html optimizations
// - minify - same as build plus full html minification
+ //"default" : 'coffee compass rjs concat css min img rev usemin manifest',
var targets = {
"default" : 'coffee compass rjs concat css min img rev usemin manifest',
usemin : 'coffee compass usemin-handler rjs concat css img rev usemin manifest',

0 comments on commit a7192e5

Please sign in to comment.