Skip to content

Commit 010f7c1

Browse files
committed
use electron 27
1 parent 8a6ea32 commit 010f7c1

18 files changed

+153
-119
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v2
1616
- uses: actions/setup-node@v2
1717
with:
18-
node-version: '20.x'
18+
node-version: '18.17.1'
1919
registry-url: 'https://registry.npmjs.org'
2020

2121
- name: Get npm cache directory

app/.npmrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
build_from_source=true
22
runtime=electron
3-
target=13.1.7
3+
target=27.3.2
44
disturl=https://electronjs.org/headers
5-
openssl_fips=
6-
napi_build_version=7
5+
# openssl_fips=
6+
# napi_build_version=9

app/.vscode/settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"[vue]": {
1212
"editor.defaultFormatter": "octref.vetur"
1313
},
14+
"typescript.tsdk": "./node_modules/typescript/lib",
1415
"eslint.validate": [
1516
"javascript",
1617
"typescript",

app/package-lock.json

+113-90
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"chromium-pickle-js": "^0.2.0",
4646
"cross-env": "^7.0.3",
4747
"cuint": "^0.2.2",
48-
"electron": "13.1.7",
48+
"electron": "27.3.2",
4949
"eslint": "^8.6.0",
5050
"eslint-config-standard-with-typescript": "^21.0.1",
5151
"eslint-plugin-html": "^6.2.0",
@@ -74,9 +74,9 @@
7474
"acb": "2.1.0",
7575
"electron-github-asar-updater": "4.0.0",
7676
"fs-extra": "10.0.0",
77-
"hca-decoder": "1.5.1",
77+
"hca-decoder": "1.6.0",
7878
"iconv-lite": "0.6.3",
79-
"mishiro-core": "6.3.5",
79+
"mishiro-core": "6.3.6",
8080
"spdlog": "0.13.7",
8181
"sqlite3": "5.1.7"
8282
},

app/script/build.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
@echo off
22

3-
call npm.cmd config set toolset v144
4-
call npm.cmd config set msvs_version 2022
3+
@REM call npm.cmd config set toolset v144
4+
@REM call npm.cmd config set msvs_version 2022
55

66
call npm.cmd install -g node-gyp@10
77

88
@REM for /f "delims=" %%P in ('npm prefix -g') do call npm.cmd config set node_gyp "%%P\node_modules\node-gyp\bin\node-gyp.js"
99
for /f "delims=" %%P in ('node -p "require('./app/package.json').devDependencies.electron"') do call node-gyp.cmd install --target=%%P --disturl=https://electronjs.org/headers
1010

1111
cd .\app
12-
call npm.cmd ci --legacy-peer-deps --ignore-scripts
12+
call npm.cmd install --legacy-peer-deps
1313
call npm.cmd run build
1414
cd ..

app/script/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ npm install -g node-gyp@10
55
node-gyp install --target=$(node -p require\(\'./app/package.json\'\).devDependencies.electron) --disturl=https://electronjs.org/headers
66

77
cd ./app
8-
npm ci --legacy-peer-deps --ignore-scripts
8+
npm install --legacy-peer-deps
99
npm run build
1010
cd ..

app/src/ts/i18n/en-US.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export default {
2929
cName: 'name',
3030
cHash: 'hash',
3131
cSize: 'size',
32-
usmbtn: 'SELECT USM'
32+
usmbtn: 'SELECT USM',
33+
accountBannedMessage: 'The built-in account has been banned. Please open OPTION and set another account to update game database.'
3334
},
3435
event: {
3536
atapon: 'ATAPOM',

0 commit comments

Comments
 (0)