更新electron到9.1.0

build-config/main/webpack.config.dev.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const webpack = require('webpack')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 

build-config/main/webpack.config.prod.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const webpack = require('webpack')
 
 const baseConfig = require('./webpack.config.base')

build-config/renderer-lyric/webpack.config.dev.js

@@ -2,7 +2,7 @@ const path = require('path')
 const webpack = require('webpack')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 
 const baseConfig = require('./webpack.config.base')
 

build-config/renderer-lyric/webpack.config.prod.js

@@ -4,7 +4,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 
 const baseConfig = require('./webpack.config.base')
 

build-config/renderer/webpack.config.dev.js

@@ -2,7 +2,7 @@ const path = require('path')
 const webpack = require('webpack')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 
 const baseConfig = require('./webpack.config.base')
 

build-config/renderer/webpack.config.prod.js

@@ -4,7 +4,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 
 const baseConfig = require('./webpack.config.base')
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "1.0.0-beta2",
+  "version": "1.0.0-beta3",
   "description": "一个免费的音乐下载助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
@@ -61,7 +61,7 @@
     "lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly --fix src"
   },
   "browserslist": [
-    "Electron 9.0.5"
+    "Electron 9.1.0"
   ],
   "engines": {
     "node": ">= 12"
@@ -168,7 +168,7 @@
     "babel-loader": "^8.1.0",
     "babel-minify-webpack-plugin": "^0.3.1",
     "babel-preset-minify": "^0.5.1",
-    "browserslist": "^4.12.2",
+    "browserslist": "^4.13.0",
     "cfonts": "^2.8.5",
     "chalk": "^4.1.0",
     "changelog-parser": "^2.8.0",
@@ -177,7 +177,7 @@
     "cross-env": "^7.0.2",
     "css-loader": "^3.6.0",
     "del": "^5.1.0",
-    "electron": "^9.0.5",
+    "electron": "^9.1.0",
     "electron-builder": "^22.7.0",
     "electron-debug": "^3.1.0",
     "electron-devtools-installer": "^3.1.0",
@@ -217,7 +217,7 @@
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",
     "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^4.2.2"
+    "webpack-merge": "^5.0.8"
   },
   "dependencies": {
     "crypto-js": "^4.0.0",

publish/changeLog.md

@@ -52,4 +52,4 @@
 
 ### 其他
 
-- 更新 Electron 到 9.0.5
+- 更新 Electron 到 9.1.0