fix(export): fix --bundle breaks games including audio #1506
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
xnv
commented
Feb 14, 2025
| @@ -183,7 +183,7 @@ describe("exportHTML", function () { | |||
| expect(fsx.statSync(path.join(dest, "audio", "dummyse.ogg"))).toBeTruthy(); | |||
| expect(fsx.statSync(path.join(dest, "audio", "dummyse.aac"))).toBeTruthy(); | |||
| expect(fsx.statSync(path.join(dest, "audio", "dummyse.m4a"))).toBeTruthy(); | |||
| expect(() => void fsx.statSync(path.join(dest, "audio", "dummyse.invalidext"))).toThrow(); | |||
| expect(() => fsx.statSync(path.join(dest, "audio", "dummyse.invalidext"))).toThrow(); | |||
There was a problem hiding this comment.
別件。こうなっている経緯がよくわかっていません (およそうっかり書くような演算子ではない) が、エディタ上で implicit any として怒られるので削っています。
xnv
commented
Feb 14, 2025
| @@ -12,8 +12,7 @@ import { rollup } from "rollup"; | |||
| import type { MinifyOptions } from "terser"; | |||
| import { minify_sync } from "terser"; | |||
| import * as liceneUtil from "../licenseUtil.js"; | |||
| import * as utils from "../utils.js"; | |||
| import { validateGameJson } from "../utils.js"; | |||
| import { validateGameJson, warnLackOfAudioFile } from "../utils.js"; | |||
xnv
commented
Feb 14, 2025
| gcu.removeAssets(gamejson, (asset) => preservingFilePathSet.has(asset.path)); | ||
| // preservingFilePathSet (維持するファイル一覧) にないものは game.json から削除する。 | ||
| // 暫定措置: audio は常に残す。(path に拡張子がないので preservingFilePathSet と比較できない。今後 audio を bundle しない限り動作上の悪影響はない) | ||
| gcu.removeAssets(gamejson, (asset) => (asset.type === "audio") || preservingFilePathSet.has(asset.path)); |
ShinobuTakahashi
approved these changes
Feb 17, 2025
yu-ogi
approved these changes
Feb 17, 2025
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.
掲題どおり。
--bundle時、不要ファイルを削除する際に音声アセットが全て消される問題を解消します。「不要ファイル」の判定は
preservingFilePathSetとasset.pathで行われていますが、音声アセットの場合に限りasset.pathが拡張子を含まないため、間違って全部不要と判定されていました。( #1486 の最後でつけたコメント #1486 (comment) が誤りでした。) 元々現状では音声アセットが減ることはない＝全て残るだけなので、暫定的に type: "audio" のアセットは常に残すように変更します。#1465 同様に、ミニマムコンテンツのほか、ニコニコスネーク と リリアと魔女 [LILIEA - Act1] で動作を確認しています。ユニットテストでは扱えていない範囲で、prerelease 後に reftest で動作確認を行います。