github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-01-05 19:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #895 from hedgedoc/renovate/master-webpack-merge-5.x

Browse source
This commit is contained in:
David Mehren 2021-02-12 22:53:05 +01:00 committed by GitHub
commit fbac2d7ef8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -202,7 +202,7 @@
"url-loader": "4.1.1",
"webpack": "4.46.0",
"webpack-cli": "4.5.0",
"webpack-merge": "4.2.2"
"webpack-merge": "5.7.3"
},
"optionalDependencies": {
"bufferutil": "^4.0.0",

2
webpack.dev.js
View file

@ -1,6 +1,6 @@
const common = require('./webpack.common.js')
const htmlexport = require('./webpack.htmlexport')
const merge = require('webpack-merge')
const { merge } = require('webpack-merge');
module.exports = [
// merge common config

2
webpack.prod.js
View file

@ -1,6 +1,6 @@
const common = require('./webpack.common.js')
const htmlexport = require('./webpack.htmlexport')
const merge = require('webpack-merge')
const { merge } = require('webpack-merge');
const path = require('path')
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')

9
yarn.lock
View file

@ -11506,14 +11506,7 @@ webpack-cli@4.5.0:
v8-compile-cache "^2.2.0"
webpack-merge "^5.7.3"
webpack-merge@4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
dependencies:
lodash "^4.17.15"
webpack-merge@^5.7.3:
webpack-merge@5.7.3, webpack-merge@^5.7.3:
version "5.7.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==