scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-22 21:42:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #425 from mzgoddard/webpack-4

Browse source 
Update to Webpack 4
This commit is contained in:
Ray Schamp 2018-05-08 16:07:58 -04:00 committed by GitHub
commit cf5c39ecf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
package.json
View file

@ -32,14 +32,14 @@
"babel-core": "^6.23.1",
"babel-eslint": "^8.2.1",
"babel-jest": "^22.2.2",
"babel-loader": "^7.1.0",
"babel-loader": "^7.1.4",
"babel-plugin-react-intl": "2.4.0",
"babel-plugin-transform-object-rest-spread": "^6.22.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.22.0",
"canvas-prebuilt": "^1.6.5-prerelease.1",
"classnames": "2.2.5",
"css-loader": "0.28.10",
"css-loader": "0.28.11",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.1",
"eslint": "^4.4.1",
@ -48,7 +48,7 @@
"eslint-plugin-import": "^2.9.0",
"eslint-plugin-react": "^7.2.1",
"gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",
"html-webpack-plugin": "3.0.6",
"html-webpack-plugin": "3.2.0",
"jest": "^22.2.2",
"keymirror": "0.1.1",
"lodash.bindall": "4.4.0",
@ -58,7 +58,7 @@
"paper": "0.11.5",
"parse-color": "1.0.0",
"postcss-import": "^11.0.0",
"postcss-loader": "^2.0.5",
"postcss-loader": "^2.1.4",
"postcss-simple-vars": "^4.0.0",
"prop-types": "^15.5.10",
"raf": "^3.4.0",
@ -78,12 +78,14 @@
"regenerator-runtime": "^0.11.1",
"rimraf": "^2.6.1",
"scratch-l10n": "^2.0.0",
"style-loader": "^0.20.1",
"svg-url-loader": "^2.2.0",
"style-loader": "^0.21.0",
"svg-url-loader": "^2.3.2",
"tap": "^11.1.0",
"url-loader": "^0.6.2",
"webpack": "^3.5.4",
"webpack-dev-server": "^2.7.0"
"uglifyjs-webpack-plugin": "^1.2.5",
"url-loader": "^1.0.1",
"webpack": "^4.8.0",
"webpack-cli": "^2.0.15",
"webpack-dev-server": "^3.1.4"
},
"jest": {
"setupFiles": [

16
webpack.config.js
View file

@ -1,9 +1,9 @@
const defaultsDeep = require('lodash.defaultsdeep');
const path = require('path');
const webpack = require('webpack');
// Plugins
const HtmlWebpackPlugin = require('html-webpack-plugin');
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
// PostCss
const autoprefixer = require('autoprefixer');
@ -11,6 +11,7 @@ const postcssVars = require('postcss-simple-vars');
const postcssImport = require('postcss-import');
const base = {
mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
devtool: 'cheap-module-source-map',
module: {
rules: [{
@ -59,13 +60,14 @@ const base = {
loader: 'svg-url-loader?noquotes'
}]
},
plugins: []
.concat(process.env.NODE_ENV === 'production' ? [
new webpack.optimize.UglifyJsPlugin({
include: /\.min\.js$/,
minimize: true
optimization: {
minimizer: [
new UglifyJsPlugin({
include: /\.min\.js$/
})
] : [])
]
},
plugins: []
};
module.exports = [