mirror of
https://github.com/minio/minio.git
synced 2024-12-24 22:25:54 -05:00
Upgrade webpack from v1 to v3 (#5448)
- Changed webpack.config.js and webpack.production.config.js according to the migration guidelines - Updated packages that had unmet peer dependencies after the webpack update Fixes #5398
This commit is contained in:
parent
9cc77e51f5
commit
0da377f3e9
@ -23,7 +23,7 @@
|
|||||||
"async": "^1.5.2",
|
"async": "^1.5.2",
|
||||||
"babel-cli": "^6.14.0",
|
"babel-cli": "^6.14.0",
|
||||||
"babel-core": "^6.14.0",
|
"babel-core": "^6.14.0",
|
||||||
"babel-loader": "^6.2.5",
|
"babel-loader": "^7.1.2",
|
||||||
"babel-plugin-syntax-object-rest-spread": "^6.13.0",
|
"babel-plugin-syntax-object-rest-spread": "^6.13.0",
|
||||||
"babel-plugin-transform-object-rest-spread": "^6.8.0",
|
"babel-plugin-transform-object-rest-spread": "^6.8.0",
|
||||||
"babel-polyfill": "^6.23.0",
|
"babel-polyfill": "^6.23.0",
|
||||||
@ -35,21 +35,21 @@
|
|||||||
"esformatter": "^0.10.0",
|
"esformatter": "^0.10.0",
|
||||||
"esformatter-jsx": "^7.4.1",
|
"esformatter-jsx": "^7.4.1",
|
||||||
"esformatter-jsx-ignore": "^1.0.6",
|
"esformatter-jsx-ignore": "^1.0.6",
|
||||||
"html-webpack-plugin": "^2.22.0",
|
"html-webpack-plugin": "^2.30.1",
|
||||||
"json-loader": "^0.5.4",
|
"json-loader": "^0.5.4",
|
||||||
"karma": "^0.13.22",
|
"karma": "^0.13.22",
|
||||||
"karma-chrome-launcher": "^0.2.3",
|
"karma-chrome-launcher": "^0.2.3",
|
||||||
"karma-cli": "^0.1.2",
|
"karma-cli": "^0.1.2",
|
||||||
"karma-firefox-launcher": "^0.1.7",
|
"karma-firefox-launcher": "^0.1.7",
|
||||||
"karma-mocha": "^0.2.2",
|
"karma-mocha": "^0.2.2",
|
||||||
"karma-webpack": "^1.7.0",
|
"karma-webpack": "^2.0.9",
|
||||||
"less": "^2.7.1",
|
"less": "^2.7.1",
|
||||||
"less-loader": "^2.2.3",
|
"less-loader": "^2.2.3",
|
||||||
"mocha": "^2.5.3",
|
"mocha": "^2.5.3",
|
||||||
"purifycss-webpack-plugin": "^2.0.3",
|
"purifycss-webpack-plugin": "^2.0.3",
|
||||||
"style-loader": "^0.13.1",
|
"style-loader": "^0.13.1",
|
||||||
"url-loader": "^0.5.7",
|
"url-loader": "^0.5.7",
|
||||||
"webpack-dev-server": "^1.14.1"
|
"webpack-dev-server": "^2.11.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bootstrap": "^3.3.6",
|
"bootstrap": "^3.3.6",
|
||||||
@ -79,6 +79,6 @@
|
|||||||
"redux-thunk": "^1.0.3",
|
"redux-thunk": "^1.0.3",
|
||||||
"superagent": "^1.8.4",
|
"superagent": "^1.8.4",
|
||||||
"superagent-es6-promise": "^1.0.0",
|
"superagent-es6-promise": "^1.0.0",
|
||||||
"webpack": "^1.12.11"
|
"webpack": "^3.10.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,25 +30,36 @@ var exports = {
|
|||||||
publicPath: '/minio/'
|
publicPath: '/minio/'
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [{
|
rules: [{
|
||||||
test: /\.js$/,
|
test: /\.js$/,
|
||||||
exclude: /(node_modules|bower_components)/,
|
exclude: /(node_modules|bower_components)/,
|
||||||
loader: 'babel',
|
use: [{
|
||||||
query: {
|
loader: 'babel-loader',
|
||||||
presets: ['react', 'es2015']
|
options: {
|
||||||
}
|
presets: ['react', 'es2015']
|
||||||
|
}
|
||||||
|
}]
|
||||||
}, {
|
}, {
|
||||||
test: /\.less$/,
|
test: /\.less$/,
|
||||||
loader: 'style!css!less'
|
use: [{
|
||||||
|
loader: 'style-loader'
|
||||||
|
}, {
|
||||||
|
loader: 'css-loader'
|
||||||
|
}, {
|
||||||
|
loader: 'less-loader'
|
||||||
|
}]
|
||||||
}, {
|
}, {
|
||||||
test: /\.json$/,
|
|
||||||
loader: 'json-loader'
|
|
||||||
},{
|
|
||||||
test: /\.css$/,
|
test: /\.css$/,
|
||||||
loader: 'style!css'
|
use: [{
|
||||||
|
loader: 'style-loader'
|
||||||
|
}, {
|
||||||
|
loader: 'css-loader'
|
||||||
|
}]
|
||||||
}, {
|
}, {
|
||||||
test: /\.(eot|woff|woff2|ttf|svg|png)/,
|
test: /\.(eot|woff|woff2|ttf|svg|png)/,
|
||||||
loader: 'url'
|
use: [{
|
||||||
|
loader: 'url-loader'
|
||||||
|
}]
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
node:{
|
node:{
|
||||||
@ -100,7 +111,6 @@ var exports = {
|
|||||||
|
|
||||||
if (process.env.NODE_ENV === 'dev') {
|
if (process.env.NODE_ENV === 'dev') {
|
||||||
exports.entry = [
|
exports.entry = [
|
||||||
'webpack/hot/dev-server',
|
|
||||||
'webpack-dev-server/client?http://localhost:8080',
|
'webpack-dev-server/client?http://localhost:8080',
|
||||||
path.resolve(__dirname, 'app/index.js')
|
path.resolve(__dirname, 'app/index.js')
|
||||||
]
|
]
|
||||||
|
@ -29,25 +29,36 @@ var exports = {
|
|||||||
filename: 'index_bundle.js'
|
filename: 'index_bundle.js'
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [{
|
rules: [{
|
||||||
test: /\.js$/,
|
test: /\.js$/,
|
||||||
exclude: /(node_modules|bower_components)/,
|
exclude: /(node_modules|bower_components)/,
|
||||||
loader: 'babel',
|
use: [{
|
||||||
query: {
|
loader: 'babel-loader',
|
||||||
presets: ['react', 'es2015']
|
options: {
|
||||||
}
|
presets: ['react', 'es2015']
|
||||||
|
}
|
||||||
|
}]
|
||||||
}, {
|
}, {
|
||||||
test: /\.less$/,
|
test: /\.less$/,
|
||||||
loader: 'style!css!less'
|
use: [{
|
||||||
}, {
|
loader: 'style-loader'
|
||||||
test: /\.json$/,
|
}, {
|
||||||
loader: 'json-loader'
|
loader: 'css-loader'
|
||||||
|
}, {
|
||||||
|
loader: 'less-loader'
|
||||||
|
}]
|
||||||
}, {
|
}, {
|
||||||
test: /\.css$/,
|
test: /\.css$/,
|
||||||
loader: 'style!css'
|
use: [{
|
||||||
|
loader: 'style-loader'
|
||||||
|
}, {
|
||||||
|
loader: 'css-loader'
|
||||||
|
}]
|
||||||
}, {
|
}, {
|
||||||
test: /\.(eot|woff|woff2|ttf|svg|png)/,
|
test: /\.(eot|woff|woff2|ttf|svg|png)/,
|
||||||
loader: 'url'
|
use: [{
|
||||||
|
loader: 'url-loader'
|
||||||
|
}]
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
node:{
|
node:{
|
||||||
@ -79,7 +90,6 @@ var exports = {
|
|||||||
|
|
||||||
if (process.env.NODE_ENV === 'dev') {
|
if (process.env.NODE_ENV === 'dev') {
|
||||||
exports.entry = [
|
exports.entry = [
|
||||||
'webpack/hot/dev-server',
|
|
||||||
'webpack-dev-server/client?http://localhost:8080',
|
'webpack-dev-server/client?http://localhost:8080',
|
||||||
path.resolve(__dirname, 'app/index.js')
|
path.resolve(__dirname, 'app/index.js')
|
||||||
]
|
]
|
||||||
|
1988
browser/yarn.lock
1988
browser/yarn.lock
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user