Skip to content

Commit 6b66ab0

Browse files
authored
Update dependencies (#44)
1 parent 8079149 commit 6b66ab0

33 files changed

+15965
-12382
lines changed

.github/FUNDING.yml

-1
This file was deleted.

.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
os: [windows-latest, ubuntu-latest, macos-latest]
12+
os: [windows-latest, ubuntu-latest, macos-13]
1313

1414
steps:
1515
- uses: actions/checkout@v2
1616
- uses: actions/setup-node@v2
1717
with:
18-
node-version: '14.x'
18+
node-version: '18.17.1'
1919
registry-url: 'https://registry.npmjs.org'
2020

2121
- name: Get npm cache directory
@@ -44,7 +44,7 @@ jobs:
4444
./app/script/build.sh
4545
4646
- name: macOS build
47-
if: ${{ matrix.os == 'macos-latest' }}
47+
if: ${{ contains(matrix.os, 'macos') }}
4848
shell: bash
4949
run: |
5050
chmod +x ./app/script/build.sh

README.md

+10-19
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,23 @@ Repo: [mishiro-score-viewer](https://github.com/toyobayashi/mishiro-score-viewer
4848
### Windows Require
4949

5050
* __Windows 7+__
51-
* __Node.js 12+__
52-
* __Python 2.7__ ( 3.x is not supported by `node-gyp` yet)
53-
* __Visual Studio 2015/2017/2019 with C++ Desktop workload installed__
54-
* __.NET & Powershell__
51+
* __Node.js 18+__
52+
* __Python 3__
53+
* __Visual Studio 2022 with C++ Desktop workload installed__
54+
* __.NET & Powershell__
5555

5656
### Linux Require
5757

58-
* __Node.js 12+__
59-
* __Python 2.7__
58+
* __Node.js 18+__
59+
* __Python 3__
6060
* __gcc & g++__
6161
* __make__
6262
* __zip & unzip__
6363

6464
### MacOS Require (This part is not tested)
6565

66-
* __Node.js 12+__
67-
* __Python 2.7__
66+
* __Node.js 18+__
67+
* __Python 3__
6868
* __Xcode__ (install Command Line Tools by running ```xcode-select --install``` in your terminal)
6969

7070
### Quick Start
@@ -94,18 +94,10 @@ Repo: [mishiro-score-viewer](https://github.com/toyobayashi/mishiro-score-viewer
9494
``` bat
9595
> cd mishiro/app
9696
97-
REM set global npm config toolset variable
98-
REM if your VC++ toolset is not v140 (VS 2015)
99-
> npm config set toolset v142
100-
101-
REM install node-gyp@5
10297
> npm install -g node-gyp
10398
104-
REM it's important to set the npm_config_node_gyp environment variable to tell npm using global installed node-gyp
105-
> for /f "delims=" %P in ('npm prefix -g') do npm config set node_gyp "%P\node_modules\node-gyp\bin\node-gyp.js"
106-
10799
REM install electron's node C++ header
108-
> for /f "delims=" %P in ('node -p "require('./package.json').devDependencies.electron"') do node-gyp install --target=%P --dist-url=https://atom.io/download/electron
100+
> for /f "delims=" %P in ('node -p "require('./package.json').devDependencies.electron"') do node-gyp install --target=%P --dist-url=https://electronjs.org/headers
109101
110102
REM install dependencies
111103
> npm install
@@ -119,8 +111,7 @@ Repo: [mishiro-score-viewer](https://github.com/toyobayashi/mishiro-score-viewer
119111
$ cd mishiro/app
120112
121113
$ npm install -g node-gyp
122-
$ npm config set node_gyp "`npm prefix -g`/lib/node_modules/node-gyp/bin/node-gyp.js"
123-
$ node-gyp install --target=$(node -p require\(\'./package.json\'\).devDependencies.electron) --dist-url=https://atom.io/download/electron
114+
$ node-gyp install --target=$(node -p require\(\'./package.json\'\).devDependencies.electron) --dist-url=https://electronjs.org/headers
124115
125116
$ npm install
126117
$ npm run get # get external resources

README_CN.md

+13-23
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@
2929
### Windows 需要
3030

3131
* __Windows 7 以上__
32-
* __Node.js 12+__
33-
* __Python 2.7__`node-gyp` 现在不支持 3.x )
34-
* __Visual Studio 2015/2017/2019 并安装`使用 C++ 的桌面开发`工作负载或 `VC++ v140+ 构建工具集`__
35-
* __.NET 和 Powershell__ (Windows 10 有自带)
32+
* __Node.js 18+__
33+
* __Python 3__
34+
* __Visual Studio 2022 并安装`使用 C++ 的桌面开发`工作负载或 `VC++ v140+ 构建工具集`__
35+
* __.NET 和 Powershell__
3636

3737
### Linux 需要
3838

39-
* __Node.js 12+__
40-
* __Python 2.7__
39+
* __Node.js 18+__
40+
* __Python 3__
4141
* __gcc & g++__
4242
* __make__
4343
* __zip & unzip__
4444

4545
### MacOS 需要 (这部分未测试)
4646

47-
* __Node.js 12+__
48-
* __Python 2.7__
47+
* __Node.js 18+__
48+
* __Python 3__
4949
* __Xcode__ (终端运行 ```xcode-select --install``` 安装Command Line Tools)
5050

5151
### 快速开始
@@ -78,22 +78,13 @@
7878
> cd mishiro/app
7979
8080
REM 设置国内镜像
81-
> npm config set registry http://registry.npm.taobao.org/
82-
> npm config set electron_mirror https://npm.taobao.org/mirrors/electron/
81+
> npm config set registry https://registry.npmmirror.com/
82+
> npm config set electron_mirror https://registry.npmmirror.com/-/binary/electron/
8383
84-
REM 特别的,如果安装的 VC++ 构建工具集版本不是 v140 (VS 2015)
85-
REM 需要全局设置一下 toolset 变量让 sqlite3 能够编译通过
86-
> npm config set toolset v142
87-
88-
REM 安装 node-gyp@5
8984
> npm install -g node-gyp
9085
91-
REM 这一步很重要,把 npm 内部使用的 node-gyp 设置成全局安装的 node-gyp
92-
REM 新版 node-gyp 的头文件缓存位置和老版本不一样,没有这一步安装原生模块依赖时可能会报找不到头文件的错
93-
> for /f "delims=" %P in ('npm prefix -g') do npm config set node_gyp "%P\node_modules\node-gyp\bin\node-gyp.js"
94-
9586
REM 根据 package.json 中指定的 electron 版本下载对应的头文件
96-
> for /f "delims=" %P in ('node -p "require('./package.json').devDependencies.electron"') do node-gyp install --target=%P --dist-url=https://npm.taobao.org/mirrors/atom-shell
87+
> for /f "delims=" %P in ('node -p "require('./package.json').devDependencies.electron"') do node-gyp install --target=%P --dist-url=https://electronjs.org/headers
9788
9889
REM 安装依赖
9990
> npm install
@@ -107,11 +98,10 @@
10798
$ cd mishiro/app
10899
109100
$ npm config set registry http://registry.npm.taobao.org/
110-
$ npm config set electron_mirror https://npm.taobao.org/mirrors/electron/
101+
$ npm config set electron_mirror https://registry.npmmirror.com/-/binary/electron/
111102
112103
$ npm install -g node-gyp
113-
$ npm config set node_gyp "`npm prefix -g`/lib/node_modules/node-gyp/bin/node-gyp.js"
114-
$ node-gyp install --target=$(node -p require\(\'./package.json\'\).devDependencies.electron) --dist-url=https://npm.taobao.org/mirrors/atom-shell
104+
$ node-gyp install --target=$(node -p require\(\'./package.json\'\).devDependencies.electron) --dist-url=https://electronjs.org/headers
115105
116106
$ npm install
117107
$ npm run get # 获取开发所需要的额外的资源

app/.npmrc

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +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=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",

0 commit comments

Comments
 (0)