File tree Expand file tree Collapse file tree 2 files changed +42
-35
lines changed Expand file tree Collapse file tree 2 files changed +42
-35
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ module.exports = function (grunt) {
30
30
}
31
31
} ,
32
32
karma : {
33
- unit : {
33
+ dev : {
34
34
options : {
35
35
autoWatch : true ,
36
36
colors : true ,
@@ -40,7 +40,7 @@ module.exports = function (grunt) {
40
40
runnerPort : 9100
41
41
}
42
42
} ,
43
- travis : {
43
+ prod : {
44
44
options : {
45
45
colors : true ,
46
46
configFile : './test/karma.conf.js' ,
@@ -50,7 +50,14 @@ module.exports = function (grunt) {
50
50
}
51
51
} ,
52
52
webpack : {
53
- dist : require ( "./webpack.config.js" )
53
+ options : require ( "./webpack.config.js" ) . config ,
54
+ prod : {
55
+ cache : false ,
56
+ plugins : require ( "./webpack.config.js" ) . prodPlugins
57
+ } ,
58
+ dev : {
59
+ cache : false
60
+ }
54
61
} ,
55
62
copy : {
56
63
sources : {
@@ -60,7 +67,7 @@ module.exports = function (grunt) {
60
67
}
61
68
} ,
62
69
jshint : {
63
- src : {
70
+ sources : {
64
71
files : {
65
72
src : [
66
73
'./src/*.js' ,
@@ -69,7 +76,7 @@ module.exports = function (grunt) {
69
76
} ,
70
77
options : grunt . util . _ . extend ( { } , grunt . file . readJSON ( '.jshintrc' ) , grunt . file . readJSON ( './src/.jshintrc' ) )
71
78
} ,
72
- test : {
79
+ tests : {
73
80
files : {
74
81
src : [ './test/*Spec.js' ]
75
82
} ,
@@ -109,26 +116,25 @@ module.exports = function (grunt) {
109
116
grunt . registerTask ( 'default' , [ 'server' ] ) ;
110
117
111
118
grunt . registerTask ( 'test' , [
112
- 'webpack' ,
113
- 'karma:unit '
119
+ 'webpack:dev ' ,
120
+ 'karma:dev '
114
121
] ) ;
115
122
116
123
grunt . registerTask ( 'buildWatcher' , [
117
- 'jshint:src' ,
118
- 'webpack' ,
119
- 'copy:sources'
124
+ 'jshint:sources' ,
125
+ 'webpack:dev'
120
126
] ) ;
121
127
122
128
grunt . registerTask ( 'build' , [
123
- 'jshint:test ' ,
124
- 'jshint:src ' ,
125
- 'webpack' ,
126
- 'karma:travis ' ,
129
+ 'jshint:tests ' ,
130
+ 'jshint:sources ' ,
131
+ 'webpack:prod ' ,
132
+ 'karma:prod ' ,
127
133
'copy:sources'
128
134
] ) ;
129
135
130
136
grunt . registerTask ( 'travis' , [
131
- 'webpack' ,
132
- 'karma:travis '
137
+ 'webpack:prod ' ,
138
+ 'karma:prod '
133
139
] ) ;
134
140
} ;
Original file line number Diff line number Diff line change @@ -2,13 +2,7 @@ var path = require('path');
2
2
var webpack = require ( 'webpack' ) ;
3
3
var packageJSON = require ( './package.json' ) ;
4
4
5
- var banner =
6
- packageJSON . name + '\n' +
7
- packageJSON . homepage + '\n' +
8
- 'Version: ' + packageJSON . version + ' -- ' + ( new Date ( ) ) . toISOString ( ) + '\n' +
9
- 'License: ' + packageJSON . license ;
10
-
11
- module . exports = {
5
+ module . exports . config = {
12
6
entry : {
13
7
'ui-scroll' : './src/ui-scroll.js' ,
14
8
'ui-scroll-grid' : './src/ui-scroll-grid.js' ,
@@ -30,16 +24,23 @@ module.exports = {
30
24
}
31
25
}
32
26
]
33
- } ,
34
- plugins : [
35
- new webpack . optimize . UglifyJsPlugin ( {
36
- compress : {
37
- warnings : true ,
38
- } ,
39
- output : {
40
- comments : false ,
41
- } ,
42
- } ) ,
43
- new webpack . BannerPlugin ( banner )
44
- ]
27
+ }
45
28
} ;
29
+
30
+ var banner =
31
+ packageJSON . name + '\n' +
32
+ packageJSON . homepage + '\n' +
33
+ 'Version: ' + packageJSON . version + ' -- ' + ( new Date ( ) ) . toISOString ( ) + '\n' +
34
+ 'License: ' + packageJSON . license ;
35
+
36
+ module . exports . prodPlugins = [
37
+ new webpack . optimize . UglifyJsPlugin ( {
38
+ compress : {
39
+ warnings : true ,
40
+ } ,
41
+ output : {
42
+ comments : false ,
43
+ } ,
44
+ } ) ,
45
+ new webpack . BannerPlugin ( banner )
46
+ ] ;
You can’t perform that action at this time.
0 commit comments