@@ -5,30 +5,13 @@ module.exports = function(grunt)
5
5
6
6
// Combine the game builder and current project
7
7
// configs into one object
8
- var config = _ . extend (
9
-
10
- // Setup the default game tasks
11
- require ( 'grunt-game-builder' ) ( grunt , { autoInit : false } ) ,
12
-
13
- // Setup the current project tasks
14
- require ( 'load-grunt-config' ) ( grunt , {
15
- // The path for the tasks
16
- configPath : path . join ( process . cwd ( ) , 'tasks' ) ,
17
- autoInit : false ,
18
-
19
- // We don't want to reload builder
20
- loadGruntTasks : { pattern : [
21
- 'grunt-*' ,
22
- '!grunt-game-builder'
23
- ] } ,
24
-
25
- // Share the deploy folder with the tasks
26
- data : {
27
- buildDir : './build' ,
28
- installerDir : './installer' ,
29
- }
30
- } )
31
- ) ;
8
+ var config = require ( 'project-grunt' ) ( grunt , {
9
+ autoInit : false ,
10
+ data : {
11
+ buildDir : './build' ,
12
+ installerDir : './installer' ,
13
+ }
14
+ } ) ;
32
15
33
16
// Add the modules to config
34
17
var build = grunt . file . readJSON ( 'build.json' ) ;
@@ -84,8 +67,9 @@ module.exports = function(grunt)
84
67
config . jshint . main . push ( js ) ;
85
68
86
69
// Add to source maps
87
- config . concat_sourcemap [ name ] = {
88
- files : output
70
+ config . concat [ name ] = {
71
+ src : js ,
72
+ dest : '<%= jsFolder %>/' + name + '.js'
89
73
} ;
90
74
91
75
// add files to clean
@@ -96,13 +80,13 @@ module.exports = function(grunt)
96
80
97
81
config . watch . main . files . push ( js ) ;
98
82
config . watch . main . tasks . push (
99
- 'concat_sourcemap :' + name ,
83
+ 'concat :' + name ,
100
84
'replace:' + name
101
85
) ;
102
86
103
87
moduleTasks . push ( 'uglify:' + name ) ;
104
88
moduleTasksDebug . push (
105
- 'concat_sourcemap :' + name ,
89
+ 'concat :' + name ,
106
90
'replace:' + name + 'App'
107
91
) ;
108
92
}
0 commit comments