Skip to content

Commit

Permalink
Trying do rebuild after changes in ./src
Browse files Browse the repository at this point in the history
  • Loading branch information
dyuvzhenko committed Nov 14, 2017
1 parent f5ceb4b commit b535ac1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"prod-build": "webpack --config webpack/config.js",
"prod-test": "karma start test/config/karma.conf.js",
"dev-build": "webpack --config webpack/config.js",
"dev-test": "karma start test/config/karma.conf.js",
"dev-test": "npm run dev-build && karma start test/config/karma.conf.js",
"test": "concurrently --kill-others --raw \"npm run dev-build\" \"npm run dev-test\"",
"build": "npm run prod-build && npm run prod-test"
},
Expand Down
5 changes: 4 additions & 1 deletion test/config/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ const firefox = 'Firefox';
const ie = 'IE';

const ENV = (process.env.npm_lifecycle_event.indexOf('dev') === 0) ? 'development' : 'production';
let webpackConfig = require('../../webpack/config.js');
// webpackConfig.entry = null;
webpackConfig.plugins = [];

module.exports = function (config) {
config.set({
Expand All @@ -24,7 +27,7 @@ module.exports = function (config) {
'../../src/*.js': ['webpack']
},

webpack: {},
webpack: webpackConfig,

exclude: [],

Expand Down
5 changes: 3 additions & 2 deletions webpack/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ module.exports = {
options: {
presets: ['es2015']
}
},
},
{
enforce: 'pre',
test: /\.js$/,
Expand All @@ -106,5 +106,6 @@ module.exports = {
new webpack.BannerPlugin(getBanner(configEnv.compressing))
],

watch: configEnv.watch
// watch: configEnv.watch
watch: false
};

0 comments on commit b535ac1

Please sign in to comment.