Merge branch 'develop' into mahjong

2024-02-14 21:03:58 +09:00
parent af9ebf7034 b8800b8b95
commit 4ae591a2c7
51 changed files with 1549 additions and 2354 deletions
--- a/scripts/dev.mjs
+++ b/scripts/dev.mjs
@@ -70,7 +70,7 @@ execa('pnpm', ['--filter', 'backend', 'dev'], {
 	stderr: process.stderr,
 });

-execa('pnpm', ['--filter', 'frontend', 'dev'], {
+execa('pnpm', ['--filter', 'frontend', process.env.MK_DEV_PREFER === 'backend' ? 'dev' : 'watch'], {
 	cwd: _dirname + '/../',
 	stdout: process.stdout,
 	stderr: process.stderr,