summaryrefslogtreecommitdiff
path: root/scripts/dev.mjs
diff options
context:
space:
mode:
authorMarie <marie@kaifa.ch>2024-02-19 19:05:15 +0000
committerMarie <marie@kaifa.ch>2024-02-19 19:05:15 +0000
commit4246b6434dd1daf4e16a873bee211ce5d43fc4fd (patch)
treee5c680875320237716f8b77381fb14a06f3c9e98 /scripts/dev.mjs
parentmerge: Bridged error message for when you try search for a post and it fails ... (diff)
parentfix: icons and update urls (diff)
downloadsharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.tar.gz
sharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.tar.bz2
sharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.zip
merge: Merge upstream from 19th Feburary (!428)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/428 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Diffstat (limited to 'scripts/dev.mjs')
-rw-r--r--scripts/dev.mjs4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/dev.mjs b/scripts/dev.mjs
index c5c56ce739..e00b2e254d 100644
--- a/scripts/dev.mjs
+++ b/scripts/dev.mjs
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
@@ -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' ? 'watch' : 'dev'], {
cwd: _dirname + '/../',
stdout: process.stdout,
stderr: process.stderr,