1
0
mirror of https://github.com/webslides/WebSlides.git synced 2025-08-16 10:04:45 +02:00

merge configs

This commit is contained in:
Quique Fdez Guerra
2017-03-06 19:34:31 +01:00
parent 95ce3b9e36
commit 229cdcf6a5
6 changed files with 48 additions and 21 deletions

View File

@@ -41,13 +41,14 @@
"sass-loader": "^6.0.2",
"style-loader": "^0.13.2",
"webpack": "^2.2.1",
"webpack-dev-server": "^2.4.1"
"webpack-dev-server": "^2.4.1",
"webpack-merge": "^4.0.0"
},
"scripts": {
"prebuild": "rimraf static/js/webslide*",
"build": "npm-run-all --parallel build:*",
"build:main": "webpack",
"build:main.min": "webpack --output-filename [name].min.js -p",
"build:main.min": "webpack --output-filename [name].min.js -p --config ./webpack.config.prod.babel.js",
"dev": "webpack-dev-server"
},
"babel": {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -17,6 +17,7 @@ module.exports = {
contentBase: __dirname,
host: '0.0.0.0'
},
devtool: 'inline-source-map',
module: {
rules: [
{
@@ -28,7 +29,7 @@ module.exports = {
test: /\.scss$/,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: 'css-loader?url=false!postcss-loader!sass-loader'
use: 'css-loader?url=false!postcss-loader!sass-loader?sourceMap'
}),
}
]

View File

@@ -0,0 +1,24 @@
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const merge = require('webpack-merge');
const path = require('path');
const src = path.join(__dirname, 'src');
let config = {
module: {
rules: [
{
test: /\.scss$/,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: 'css-loader?url=false!postcss-loader!sass-loader'
}),
}
]
},
plugins: [
new ExtractTextPlugin("../css/webslides.min.css")
]
};
module.exports = merge(require('./webpack.config.babel'), config);