Skip to content
Snippets Groups Projects
Commit d2037fb6 authored by Hugo NOUTS's avatar Hugo NOUTS
Browse files

Merge branch 'feature/US172-update_cozy-scripts' into 'dev'

fix webpack config for dev environment

See merge request web-et-numerique/llle_project/ecolyo!78
parents d47a7420 74ab6190
No related branches found
No related tags found
3 merge requests!103Support,!102Dev,!78fix webpack config for dev environment
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
const webpack = require('webpack') const webpack = require('webpack')
const merge = require('webpack-merge') const merge = require('webpack-merge')
const { useHotReload, devtool } = require('./webpack.vars') const { useHotReload, devtool } = require('cozy-scripts/config/webpack.vars')
let plugins = [ let plugins = [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
......
...@@ -33,9 +33,9 @@ const configs = [ ...@@ -33,9 +33,9 @@ const configs = [
] ]
if (environment === 'production') { if (environment === 'production') {
configs.push(require('./app.config.environment.dev'))
} else {
configs.push(require('cozy-scripts/config/webpack.environment.prod')) configs.push(require('cozy-scripts/config/webpack.environment.prod'))
} else {
configs.push(require('./app.config.environment.dev'))
} }
//module.exports = merge.apply(null, configs) //module.exports = merge.apply(null, configs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment