File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change 22
22
"prod-build" : " webpack --config webpack/config.js" ,
23
23
"prod-test" : " karma start test/config/karma.conf.js" ,
24
24
"dev-build" : " webpack --config webpack/config.js" ,
25
- "dev-test" : " karma start test/config/karma.conf.js" ,
25
+ "dev-test" : " npm run dev-build && karma start test/config/karma.conf.js" ,
26
26
"test" : " concurrently --kill-others --raw \" npm run dev-build\" \" npm run dev-test\" " ,
27
27
"build" : " npm run prod-build && npm run prod-test"
28
28
},
Original file line number Diff line number Diff line change @@ -3,6 +3,9 @@ const firefox = 'Firefox';
3
3
const ie = 'IE' ;
4
4
5
5
const ENV = ( process . env . npm_lifecycle_event . indexOf ( 'dev' ) === 0 ) ? 'development' : 'production' ;
6
+ let webpackConfig = require ( '../../webpack/config.js' ) ;
7
+ // webpackConfig.entry = null;
8
+ webpackConfig . plugins = [ ] ;
6
9
7
10
module . exports = function ( config ) {
8
11
config . set ( {
@@ -24,7 +27,7 @@ module.exports = function (config) {
24
27
'../../src/*.js' : [ 'webpack' ]
25
28
} ,
26
29
27
- webpack : { } ,
30
+ webpack : webpackConfig ,
28
31
29
32
exclude : [ ] ,
30
33
Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ module.exports = {
86
86
options : {
87
87
presets : [ 'es2015' ]
88
88
}
89
- } ,
89
+ } ,
90
90
{
91
91
enforce : 'pre' ,
92
92
test : / \. j s $ / ,
@@ -106,5 +106,6 @@ module.exports = {
106
106
new webpack . BannerPlugin ( getBanner ( configEnv . compressing ) )
107
107
] ,
108
108
109
- watch : configEnv . watch
109
+ // watch: configEnv.watch
110
+ watch : false
110
111
} ;
You can’t perform that action at this time.
0 commit comments