Merge remote-tracking branch 'parent/main' into upstream-20240310

This commit is contained in:
KMY 2025-03-10 19:58:05 +09:00
commit 5979c0ea1d
345 changed files with 4304 additions and 2540 deletions

View file

@ -48,7 +48,7 @@ module.exports = merge(sharedConfig, {
logLevel: 'silent', // do not bother Webpacker, who runs with --json and parses stdout
}),
new InjectManifest({
additionalManifestEntries: ['1f602.svg', 'sheet_13.png'].map((filename) => {
additionalManifestEntries: ['1f602.svg', 'sheet_15.png'].map((filename) => {
const path = resolve(root, 'public', 'emoji', filename);
const body = readFileSync(path);
const md5 = createHash('md5');