[project-s] mainブランチマージのコンフリクト解消、及び追従 #1583
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hiroshiba
requested review from
romot-co and
sigprogramming
and removed request for
y-chan
Hiroshiba
commented
Sep 24, 2023
Comment on lines
17
to
21
| <q-btn | ||
| v-close-popup | ||
| flat | ||
| no-caps | ||
| v-close-popup | ||
| class="col-grow" |
There was a problem hiding this comment.
このあたりの順序が入れ替わっているのは新しく導入されたformatterの影響です
Comment on lines
-172
to
+173
| const changeStyleId = (speakerUuid: string, styleId: number) => { | ||
| const changeStyleId = (speakerUuid: SpeakerId, styleId: StyleId) => { |
There was a problem hiding this comment.
speakerIdやstyleIdやengineIdに型が導入されました
Comment on lines
-1241
to
+1244
| const midiData = await window.electron.readFile({ filePath }); | ||
| const midiData = getValueOrThrow( | ||
| await window.electron.readFile({ filePath }) | ||
| ); |
Comment on lines
-221
to
-240
| <<<<<<< HEAD | ||
| components: { | ||
| draggable, | ||
| MenuBar, | ||
| HeaderBar, | ||
| AudioCell, | ||
| AudioDetail, | ||
| AudioInfo, | ||
| HelpDialog, | ||
| SettingDialog, | ||
| HotkeySettingDialog, | ||
| HeaderBarCustomDialog, | ||
| CharacterPortrait, | ||
| DefaultStyleSelectDialog, | ||
| CharacterOrderDialog, | ||
| AcceptRetrieveTelemetryDialog, | ||
| AcceptTermsDialog, | ||
| DictionaryManageDialog, | ||
| SingerTab, | ||
| ======= |
There was a problem hiding this comment.
TTS側のVueファイルはComposition APIに変えた影響でこれらのimportが不要になりました。
あとreturnでいっぱい状態変数や関数を返すのも不要になっています。
sigprogramming
approved these changes
Sep 26, 2023
|
レビューありがとうございます！！ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
内容
mainブランチのマージのコンフリクトを解消し、フォーマッターを動作させ、エラーが起こる箇所を変更・追従しました。
実行するにはおそらく
Nodeのバージョン更新と、npmパッケージの更新（npm run ci）と、.envファイルの更新が必要です。主な仕様変更点
PROCESS_BEFORE_QUITアクションを解体して元のCHECK_EDITED_AND_NOT_SAVEを改造する形にしたCHECK_EDITED_AND_NOT_SAVE内に組み込みました関連 Issue
その他
あとTTS側のVueファイルがComposition形式になってとても楽になったのですが、全範囲にコンフリクトが発生してしまうので、そこはとりあえず追従していません。