diff options
| author | Marie <marie@kaifa.ch> | 2024-02-19 19:06:30 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-19 19:06:30 +0000 |
| commit | e248e412872dc76ec13f4e0258f4af91dc09cafa (patch) | |
| tree | b7a7ef817b62215352cf895aad87c758af833008 /scripts/dev.mjs | |
| parent | rename to get it applied after upstream changes (diff) | |
| parent | merge: Merge upstream from 19th Feburary (!428) (diff) | |
| download | sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.tar.gz sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.tar.bz2 sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.zip | |
fix: merge conflict
Diffstat (limited to 'scripts/dev.mjs')
| -rw-r--r-- | scripts/dev.mjs | 4 |
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, |