From 2b7f438862da1c166d990a14dd8d94e68184ba60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Fri, 24 May 2024 21:39:40 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20pnpm=20dev=E3=81=8C=E5=8B=95?=
 =?UTF-8?q?=E4=BD=9C=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(MisskeyIO#641)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/package.json    |  2 +-
 packages/backend/scripts/dev.mjs | 61 --------------------------------
 2 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 packages/backend/scripts/dev.mjs

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 8514e738e..2ba124347 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -18,7 +18,7 @@
 		"build:tsc": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
 		"watch": "node ./scripts/watch.mjs",
 		"restart": "pnpm build && pnpm start",
-		"dev": "node ./scripts/dev.mjs",
+		"dev": "nodemon -w src -e ts,js,mjs,cjs,json --exec \"cross-env NODE_ENV=development pnpm run restart\"",
 		"typecheck": "tsc --noEmit && tsc -p test --noEmit",
 		"eslint": "eslint --quiet \"src/**/*.ts\"",
 		"lint": "pnpm typecheck && pnpm eslint",
diff --git a/packages/backend/scripts/dev.mjs b/packages/backend/scripts/dev.mjs
deleted file mode 100644
index 2d0de0f91..000000000
--- a/packages/backend/scripts/dev.mjs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { execa, execaNode } from 'execa';
-
-/** @type {import('execa').ExecaChildProcess | undefined} */
-let backendProcess;
-
-async function execBuildAssets() {
-	await execa('pnpm', ['run', 'build-assets'], {
-		cwd: '../../',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	})
-}
-
-function execStart() {
-	// pnpm run start を呼び出したいが、windowsだとプロセスグループ単位でのkillが出来ずゾンビプロセス化するので
-	// 上記と同等の動きをするコマンドで子・孫プロセスを作らないようにしたい
-	backendProcess = execaNode('./built/boot/entry.js', [], {
-		stdout: process.stdout,
-		stderr: process.stderr,
-		env: {
-			'NODE_ENV': 'development',
-		},
-	});
-}
-
-async function killProc() {
-	if (backendProcess) {
-		backendProcess.kill();
-		await new Promise(resolve => backendProcess.on('exit', resolve));
-		backendProcess = undefined;
-	}
-}
-
-(async () => {
-	execaNode(
-		'./node_modules/nodemon/bin/nodemon.js',
-		[
-			'-w', 'src',
-			'-e', 'ts,js,mjs,cjs,json',
-			'--exec', 'pnpm', 'run', 'build',
-		],
-		{
-			stdio: [process.stdin, process.stdout, process.stderr, 'ipc'],
-		})
-		.on('message', async (message) => {
-			if (message.type === 'exit') {
-				// かならずbuild->build-assetsの順番で呼び出したいので、
-				// 少々トリッキーだがnodemonからのexitイベントを利用してbuild-assets->startを行う。
-				// pnpm restartをbuildが終わる前にbuild-assetsが動いてしまうので、バラバラに呼び出す必要がある
-
-				await killProc();
-				await execBuildAssets();
-				execStart();
-			}
-		})
-})();