mirror of
https://github.com/webslides/WebSlides.git
synced 2025-08-17 18:37:00 +02:00
merge configs
This commit is contained in:
@@ -41,13 +41,14 @@
|
|||||||
"sass-loader": "^6.0.2",
|
"sass-loader": "^6.0.2",
|
||||||
"style-loader": "^0.13.2",
|
"style-loader": "^0.13.2",
|
||||||
"webpack": "^2.2.1",
|
"webpack": "^2.2.1",
|
||||||
"webpack-dev-server": "^2.4.1"
|
"webpack-dev-server": "^2.4.1",
|
||||||
|
"webpack-merge": "^4.0.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"prebuild": "rimraf static/js/webslide*",
|
"prebuild": "rimraf static/js/webslide*",
|
||||||
"build": "npm-run-all --parallel build:*",
|
"build": "npm-run-all --parallel build:*",
|
||||||
"build:main": "webpack",
|
"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"
|
"dev": "webpack-dev-server"
|
||||||
},
|
},
|
||||||
"babel": {
|
"babel": {
|
||||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
3
static/js/webslides.min.js
vendored
3
static/js/webslides.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -17,6 +17,7 @@ module.exports = {
|
|||||||
contentBase: __dirname,
|
contentBase: __dirname,
|
||||||
host: '0.0.0.0'
|
host: '0.0.0.0'
|
||||||
},
|
},
|
||||||
|
devtool: 'inline-source-map',
|
||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
@@ -28,7 +29,7 @@ module.exports = {
|
|||||||
test: /\.scss$/,
|
test: /\.scss$/,
|
||||||
use: ExtractTextPlugin.extract({
|
use: ExtractTextPlugin.extract({
|
||||||
fallback: 'style-loader',
|
fallback: 'style-loader',
|
||||||
use: 'css-loader?url=false!postcss-loader!sass-loader'
|
use: 'css-loader?url=false!postcss-loader!sass-loader?sourceMap'
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
24
webpack.config.prod.babel.js
Normal file
24
webpack.config.prod.babel.js
Normal 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);
|
Reference in New Issue
Block a user