From 5d03efa1bb230bf1f22cf4a86a20157cd8aca7c4 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Wed, 3 Jul 2024 06:40:31 +0900
Subject: dev: fix pnpm dev is broken (#14123)

* dev: pnpm dev is broken

* dev: fix crash pnpm dev because of unhandled promise
---
 packages/backend/scripts/dev.mjs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages/backend/scripts')

diff --git a/packages/backend/scripts/dev.mjs b/packages/backend/scripts/dev.mjs
index 2d0de0f916..a3e0558abd 100644
--- a/packages/backend/scripts/dev.mjs
+++ b/packages/backend/scripts/dev.mjs
@@ -30,6 +30,7 @@ function execStart() {
 
 async function killProc() {
 	if (backendProcess) {
+		backendProcess.catch(() => {}); // backendProcess.kill()によって発生する例外を無視するためにcatch()を呼び出す
 		backendProcess.kill();
 		await new Promise(resolve => backendProcess.on('exit', resolve));
 		backendProcess = undefined;
@@ -46,6 +47,7 @@ async function killProc() {
 		],
 		{
 			stdio: [process.stdin, process.stdout, process.stderr, 'ipc'],
+			serialization: "json",
 		})
 		.on('message', async (message) => {
 			if (message.type === 'exit') {
-- 
cgit v1.2.3-freya


From 46d96c7412f85990d01006fbb548178c8cfdf827 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:09:15 +0900
Subject: fix(build): autogen生成時にbackendを2度buildしているのを修正 (#14309)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(build): autogen生成時にbackendを2度buildしているのを修正

* fix

* fix
---
 package.json                                  |  2 +-
 packages/backend/package.json                 |  2 +-
 packages/backend/scripts/generate_api_json.js | 35 ++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'packages/backend/scripts')

diff --git a/package.json b/package.json
index 510b96aa01..ecf2de39d3 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
 		"build-assets": "node ./scripts/build-assets.mjs",
 		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
 		"build-storybook": "pnpm --filter frontend build-storybook",
-		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
+		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
 		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"init": "pnpm migrate",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 22fdc5cf16..b99717d15c 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -31,7 +31,7 @@
 		"test:e2e": "pnpm build && pnpm build:test && pnpm jest:e2e",
 		"test-and-coverage": "pnpm jest-and-coverage",
 		"test-and-coverage:e2e": "pnpm build && pnpm build:test && pnpm jest-and-coverage:e2e",
-		"generate-api-json": "pnpm build && node ./scripts/generate_api_json.js"
+		"generate-api-json": "node ./scripts/generate_api_json.js"
 	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
diff --git a/packages/backend/scripts/generate_api_json.js b/packages/backend/scripts/generate_api_json.js
index b4769ef801..798e243004 100644
--- a/packages/backend/scripts/generate_api_json.js
+++ b/packages/backend/scripts/generate_api_json.js
@@ -3,11 +3,34 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { loadConfig } from '../built/config.js'
-import { genOpenapiSpec } from '../built/server/api/openapi/gen-spec.js'
-import { writeFileSync } from "node:fs";
+import { execa } from 'execa';
+import { writeFileSync, existsSync } from "node:fs";
 
-const config = loadConfig();
-const spec = genOpenapiSpec(config, true);
+async function main() {
+	if (!process.argv.includes('--no-build')) {
+		await execa('pnpm', ['run', 'build'], {
+			stdout: process.stdout,
+			stderr: process.stderr,
+		});
+	}
 
-writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
+	if (!existsSync('./built')) {
+		throw new Error('`built` directory does not exist.');
+	}
+
+	/** @type {import('../src/config.js')} */
+	const { loadConfig } = await import('../built/config.js');
+
+	/** @type {import('../src/server/api/openapi/gen-spec.js')} */
+	const { genOpenapiSpec } = await import('../built/server/api/openapi/gen-spec.js');
+
+	const config = loadConfig();
+	const spec = genOpenapiSpec(config, true);
+
+	writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
+}
+
+main().catch(e => {
+	console.error(e);
+	process.exit(1);
+});
-- 
cgit v1.2.3-freya