From 49b939e4f602974284ae4b21a2e4a5e27cf26ddd Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 13 Aug 2022 13:37:12 +0900
Subject: [PATCH] Fix build version for 4.6.3
---
.electron-vue/webpack.web.config.js | 11 -----------
package.json | 6 +++---
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/.electron-vue/webpack.web.config.js b/.electron-vue/webpack.web.config.js
index 33bee6cc..9f273f6e 100644
--- a/.electron-vue/webpack.web.config.js
+++ b/.electron-vue/webpack.web.config.js
@@ -16,17 +16,6 @@ let webConfig = {
},
module: {
rules: [
- {
- test: /\.(js|vue)$/,
- enforce: 'pre',
- exclude: /node_modules/,
- use: {
- loader: 'eslint-loader',
- options: {
- formatter: require('eslint-friendly-formatter')
- }
- }
- },
{
test: /\.vue$/,
use: {
diff --git a/package.json b/package.json
index 6ef3d43f..4dd2f075 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
"url": "https://github.com/h3poteto/whalebird-desktop.git"
},
"config": {
- "buildVersion": "127",
- "appVersion": "4.6.2"
+ "buildVersion": "128",
+ "appVersion": "4.6.3"
},
"main": "./dist/electron/main.js",
"scripts": {
@@ -28,7 +28,7 @@
"build": "node .electron-vue/build.js",
"build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
"build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
- "build:mas": "yarn run build:clean && yarn run pack && electron-packager ./ 'Whalebird' --platform=mas --arch=x64 --arch=arm64 --electron-version=17.3.0 --asar.unpackDir='build/sounds' --out=packages --ignore='^/src' --ignore='^/.electron-vue' --ignore='^/.envrc' --ignore='^/packages' --ignore='^/plist' --ignore='^/static' --ignore='^/whalebird.db' --ignore='^/screenshot.png' --prune=true --icon=./build/icons/icon.icns --overwrite --app-bundle-id=org.whalebird.desktop --app-version=$npm_package_config_appVersion --build-version=$npm_package_config_buildVersion --extend-info='./plist/team.plist' --app-category-type=public.app-category.social-networking && node ./packages/universal.js",
+ "build:mas": "yarn run build:clean && yarn run pack && electron-packager ./ 'Whalebird' --platform=mas --arch=x64 --arch=arm64 --electron-version=18.3.8 --asar.unpackDir='build/sounds' --out=packages --ignore='^/src' --ignore='^/.electron-vue' --ignore='^/.envrc' --ignore='^/packages' --ignore='^/plist' --ignore='^/static' --ignore='^/whalebird.db' --ignore='^/screenshot.png' --prune=true --icon=./build/icons/icon.icns --overwrite --app-bundle-id=org.whalebird.desktop --app-version=$npm_package_config_appVersion --build-version=$npm_package_config_buildVersion --extend-info='./plist/team.plist' --app-category-type=public.app-category.social-networking && node ./packages/universal.js",
"package:mac": "electron-builder --mac --publish never --config electron-builder.json",
"package:linux": "electron-builder --linux --publish never --config electron-builder.json",
"package:win32": "electron-builder --win --ia32 --publish never --config electron-builder.json",