Skip to content

Commit

Permalink
Merge branch 'main' into buffer-0.14
Browse files Browse the repository at this point in the history
  • Loading branch information
Hiroshiba committed Mar 31, 2023
2 parents c7a20c1 + 1a0532c commit 0ad57b0
Show file tree
Hide file tree
Showing 70 changed files with 4,740 additions and 2,688 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module.exports = {
"@vue/eslint-config-typescript",
"@vue/eslint-config-prettier",
],
plugins: ["import"],
parser: "vue-eslint-parser",
parserOptions: {
ecmaVersion: 2020,
Expand Down Expand Up @@ -50,6 +51,7 @@ module.exports = {
order: ["template", "script", "style"],
},
],
"import/order": "error",
},
overrides: [
{
Expand Down
610 changes: 162 additions & 448 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

18 changes: 1 addition & 17 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version-file: ".node-version"

- uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ env.cache-version }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ env.cache-version }}-node-
cache: "npm"

- name: Cache Electron
uses: actions/cache@v3
Expand All @@ -44,17 +38,7 @@ jobs:
restore-keys: |
${{ env.cache-version }}-${{ runner.os }}--electron-builder-cache-
- name: Cache node_modules
uses: actions/cache@v3
id: cache-node-modules
with:
path: node_modules
key: ${{ env.cache-version }}-${{ runner.os }}--node-modules-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ env.cache-version }}-${{ runner.os }}--node-modules-
- run: npm ci
if: steps.cache-node-modules.outputs.cache-hit != 'true'

- name: Disallowed licenses check
run: npm run license:generate -- -o voicevox_licenses.json
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/typos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ jobs:

- name: typos-action
uses: crate-ci/[email protected]
with:
files: ". .github"
47 changes: 47 additions & 0 deletions .vscode/launch.template.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Renderer Process",
// NOTE: background.tsで指定しているremote-debugging-port
"port": 9222,
"request": "attach",
"type": "chrome",
"webRoot": "${workspaceFolder}",
"timeout": 20000, // 20 * 1000 ms程度あればビルド時間は間に合うはず
},
{
"name": "Launch Electron Main Process via NPM",
"request": "launch",
"runtimeArgs": [
"run",
"electron:serve"
],
"runtimeExecutable": "npm",
"skipFiles": [
"<node_internals>/**"
],
"type": "node"
},
{
"name": "Attach by Process ID",
// .bin viteを指定するとElectronのMain Processのデバッグが可能
"processId": "${command:PickProcess}",
"request": "attach",
"skipFiles": [
"<node_internals>/**"
],
"type": "node"
},
],
"compounds": [
{
"name": "Launch Electron Main/Renderer",
"configurations": ["Attach to Renderer Process", "Launch Electron Main Process via NPM"],
"stopAll": true
}
]
}
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ npx openapi-generator-cli generate \
npm run fmt
```

## VS Code でのデバッグ実行

npm scripts の `serve``electron:serve` などの開発ビルド下では、ビルドに使用している vite で sourcemap を出力するため、ソースコードと出力されたコードの対応付けが行われます。

`.vscode/launch.template.json` をコピーして `.vscode/launch.json` を作成することで、開発ビルドを VS Code から実行し、デバッグを可能にするタスクが有効になります。

## ライセンス

LGPL v3 と、ソースコードの公開が不要な別ライセンスのデュアルライセンスです。
Expand Down
3 changes: 2 additions & 1 deletion _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
[default.extend-identifiers]

[default.extend-words]
ba="ba" # 7zコマンドの-baオプション
ba = "ba" # 7zコマンドの-baオプション
commitish = "commitish" # softprops/action-gh-releaseのオプションの1つ

[files]
extend-exclude = ["package-lock.json", "src/store/project.ts", "*.svg"]
4 changes: 2 additions & 2 deletions build/generateLicenses.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* eslint-disable @typescript-eslint/no-var-requires */

const process = require("process");
const { execFileSync } = require("child_process");
const fs = require("fs");
const yargs = require("yargs/yargs");
const { hideBin } = require("yargs/helpers");
const argv = yargs(hideBin(process.argv))
Expand All @@ -12,8 +14,6 @@ const argv = yargs(hideBin(process.argv))
.help()
.parse();

const { execFileSync } = require("child_process");
const fs = require("fs");
const tmp = require("tmp");

const isWindows = process.platform === "win32";
Expand Down
4 changes: 2 additions & 2 deletions build/mergeLicenses.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* eslint-disable @typescript-eslint/no-var-requires */

const process = require("process");
const fs = require("fs");
const yargs = require("yargs/yargs");
const { hideBin } = require("yargs/helpers");

const argv = yargs(hideBin(process.argv))
.option("output_path", {
alias: "o",
Expand All @@ -17,8 +19,6 @@ const argv = yargs(hideBin(process.argv))
.help()
.parse();

const fs = require("fs");

const inputPathList =
typeof argv.input_path === "string" ? [argv.input_path] : argv.input_path;

Expand Down
2 changes: 2 additions & 0 deletions docs/UX・UIデザインの方針.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,5 @@
- VOICEVOX API 準拠エンジンのことは「エンジン」
- VOICEVOX のエンジンなのか準拠エンジンなのかわからない場合は「VOICEVOX 準拠エンジン」
- VVPP ファイルはそのまま「VVPP ファイル」、説明が必要なら「VOICEVOX 準拠エンジンパッケージ」
- VOICEVOX エディターと同じ UI を用いたソフトウェアの総称は「VOICEVOX 系ソフトウェア」
- 正式名称は「VOICEVOX 系統 UI ソフトウェア」、長いのでほぼ使わない
Loading

0 comments on commit 0ad57b0

Please sign in to comment.