Skip to content

Commit 19ccebf

Browse files
committed
enhanc(assets) move asset definition out of grunt package.json and into dancer config.yml
1 parent cdab1a7 commit 19ccebf

File tree

3 files changed

+27
-29
lines changed

3 files changed

+27
-29
lines changed

Gruntfile.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,28 @@ module.exports = function(grunt) {
99
grunt.loadNpmTasks('grunt-contrib-cssmin');
1010

1111
var pkg = grunt.file.readJSON('package.json');
12-
var js_build_path = pkg.assets.js['build-folder'] + '/' + pkg.assets.js['build-file'];
13-
var js_build_min_path = pkg.assets.js['build-folder'] + '/' + pkg.assets.js['build-file-min'];
14-
var css_build_path = pkg.assets.css['build-folder'] + '/' + pkg.assets.css['build-file'];
15-
var css_build_min_path = pkg.assets.css['build-folder'] + '/' + pkg.assets.css['build-file-min'];
12+
var dancer = grunt.file.readYAML('config.yml');
13+
14+
var js_build_path = dancer.assets.js['build-folder'] + '/' + dancer.assets.js['build-file'];
15+
var js_build_min_path = dancer.assets.js['build-folder'] + '/' + dancer.assets.js['build-file-min'];
16+
var css_build_path = dancer.assets.css['build-folder'] + '/' + dancer.assets.css['build-file'];
17+
var css_build_min_path = dancer.assets.css['build-folder'] + '/' + dancer.assets.css['build-file-min'];
1618

1719
grunt.initConfig({
1820

1921
pkg: pkg,
2022

2123
clean: {
22-
build: [pkg.assets.js['build-folder'], pkg.assets.css['build-folder']],
24+
build: [dancer.assets.js['build-folder'], dancer.assets.css['build-folder']],
2325
},
2426

2527
concat: {
2628
js: {
27-
src: pkg.assets.js.files,
29+
src: dancer.assets.js.files,
2830
dest: js_build_path
2931
},
3032
css: {
31-
src: pkg.assets.css.files,
33+
src: dancer.assets.css.files,
3234
dest: css_build_path
3335
}
3436
},

config.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,24 @@ engines:
1717

1818
serializer: "JSON"
1919

20+
assets:
21+
js:
22+
build-folder: "public/app/build"
23+
build-file: "app.js"
24+
build-file-min: "app.min.js"
25+
files:
26+
- "public/app/app.js"
27+
- "public/app/directives/MyDirective.js"
28+
- "public/app/services/MyService.js"
29+
- "public/app/filters/MyFilter.js"
30+
- "public/app/controllers/MyController.js"
31+
css:
32+
build-folder: "public/css/build"
33+
build-file: "style.css"
34+
build-file-min: "style.min.css"
35+
files:
36+
- "public/css/style.css"
37+
2038
# we run our dancer app using starman. we use a http server as a proxy so we left
2139
# this below to use
2240

package.json

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,5 @@
99
"grunt-contrib-cssmin": "~0.7.0",
1010
"grunt-contrib-concat": "~0.3.0",
1111
"grunt-contrib-clean": "~0.5.0"
12-
},
13-
"assets": {
14-
"js": {
15-
"build-folder": "public/app/build",
16-
"build-file": "app.js",
17-
"build-file-min": "app.min.js",
18-
"files": [
19-
"public/app/app.js",
20-
"public/app/directives/MyDirective.js",
21-
"public/app/services/MyService.js",
22-
"public/app/filters/MyFilter.js",
23-
"public/app/controllers/MyController.js"
24-
]
25-
},
26-
"css": {
27-
"build-folder": "public/css/build",
28-
"build-file": "style.css",
29-
"build-file-min": "style.min.css",
30-
"files": [
31-
"public/css/style.css"
32-
]
33-
}
3412
}
3513
}

0 commit comments

Comments
 (0)