File tree 5 files changed +4
-57
lines changed
5 files changed +4
-57
lines changed Original file line number Diff line number Diff line change @@ -2,43 +2,6 @@ module.exports = function(grunt) {
2
2
grunt . initConfig ( {
3
3
pkg : grunt . file . readJSON ( 'package.json' ) ,
4
4
5
- concat : {
6
- options : {
7
- seperator : ';'
8
- } ,
9
- dist : {
10
- src : [
11
- 'client/**/*.js'
12
- ] ,
13
- dest : 'build/production.js'
14
- }
15
- } ,
16
-
17
- uglify : {
18
- my_target : {
19
- files : {
20
- 'build/production.min.js' : [ 'public/production.js' ]
21
- }
22
- }
23
- } ,
24
-
25
- sass : {
26
- dist : {
27
- files : {
28
- // destination: source
29
- 'client/styles/styles.css' : 'client/styles/styles.scss'
30
- }
31
- }
32
- } ,
33
-
34
- cssmin : {
35
- my_target : {
36
- files : {
37
- 'build/styles.min.css' : 'client/styles/styles.css'
38
- }
39
- }
40
- } ,
41
-
42
5
mochaTest : {
43
6
test : {
44
7
options : {
@@ -53,6 +16,7 @@ module.exports = function(grunt) {
53
16
54
17
} ) ;
55
18
19
+ grunt . loadNpmTasks ( 'grunt-babel' ) ;
56
20
grunt . loadNpmTasks ( 'grunt-contrib-concat' ) ;
57
21
grunt . loadNpmTasks ( 'grunt-contrib-uglify' ) ;
58
22
grunt . loadNpmTasks ( 'grunt-contrib-sass' ) ;
@@ -61,6 +25,7 @@ module.exports = function(grunt) {
61
25
grunt . loadNpmTasks ( 'grunt-istanbul' ) ;
62
26
63
27
grunt . registerTask ( 'build' , [
28
+ 'babel' ,
64
29
'concat' ,
65
30
'uglify' ,
66
31
'sass' ,
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 42
42
"sass-loader" : " ^4.0.0" ,
43
43
"sinon" : " ^1.17.5" ,
44
44
"sinon-as-promised" : " ^4.0.2" ,
45
- "style-loader" : " ^0.13.1" ,
46
45
"supertest" : " ^2.0.0" ,
47
46
"webpack" : " ^1.13.1" ,
48
47
"webpack-dev-server" : " ^1.14.1"
Original file line number Diff line number Diff line change @@ -28,13 +28,10 @@ module.exports = {
28
28
} ,
29
29
{
30
30
test : / \. s c s s $ / ,
31
- loaders : [ 'style' , ' css' , ' sass' ]
31
+ loaders : " css-loader! sass-loader
32
32
}
33
33
]
34
- } ,
35
- sassLoader : {
36
- includePaths : [ path . resolve ( __dirname , "./client/styles" ) ]
37
- } ,
34
+ }
38
35
devServer : {
39
36
contentBase : '. / build '
40
37
}
You can’t perform that action at this time.
0 commit comments