chore: migrate adev serve implementation

Author: lacolaco

package.json

@@ -32,7 +32,6 @@
     "textlint-rule-preset-ja-spacing": "2.4.3",
     "textlint-rule-preset-ja-technical-writing": "10.0.1",
     "textlint-rule-prh": "^6.0.0",
-    "tree-kill": "^1.2.2",
     "tsx": "^4.16.2"
   }
 }

tools/lib/adev.ts

@@ -1,6 +1,5 @@
 import { consola } from 'consola';
 import { $ } from 'execa';
-import kill from 'tree-kill';
 import { buildDir } from './workspace';
 
 const $$ = $({
@@ -18,10 +17,10 @@ export async function buildAdev() {
 
 export function serveAdev() {
   const sh = $$({ cwd: buildDir, reject: false });
-  const p = sh`npx bazel run //adev:serve --fast_adev`;
+  const p = sh`yarn ibazel run //adev:serve`;
   const pid = p.pid!;
   consola.log(`adev process started: ${pid}`);
-  const abort = () => kill(pid!);
+  const abort = () => process.kill(pid!);
   p.finally(() => {
     consola.log(`adev process exited: ${pid}`);
   });

tools/lib/localize.ts

@@ -40,7 +40,7 @@ export async function copyLocalizedFiles() {
 }
 
 export function watchLocalizedFiles() {
-  return new Observable<string>((subscriber) => {
+  const sub = new Observable<string>((subscriber) => {
     const watcher = watch(localizedFilePatterns, {
       cwd: adevJaDir,
       awaitWriteFinish: true,
@@ -53,12 +53,17 @@ export function watchLocalizedFiles() {
     return async () => {
       await watcher.close();
     };
-  }).pipe(
-    // 変更があったファイルをビルドディレクトリにコピーする
-    mergeMap((file) => from(copyLocalizedFile(file))),
-    // 1秒間の変更をまとめる
-    debounceTime(1000)
-  );
+  })
+    .pipe(
+      // 変更があったファイルをビルドディレクトリにコピーする
+      mergeMap((file) => from(copyLocalizedFile(file))),
+      // 1秒間の変更をまとめる
+      debounceTime(1000)
+    )
+    .subscribe();
+  return {
+    cancel: () => sub.unsubscribe(),
+  };
 }
 
 /**

tools/watch.ts

@@ -1,6 +1,5 @@
 import { consola } from 'consola';
 import { parseArgs } from 'node:util';
-import { Observable, startWith, switchMap } from 'rxjs';
 import { serveAdev } from './lib/adev';
 import { watchLocalizedFiles } from './lib/localize';
 import setup from './lib/setup';
@@ -33,28 +32,19 @@ async function main() {
 
 async function watch() {
   consola.start('Start watching adev-ja files...');
+  const fileWatcher = watchLocalizedFiles();
 
-  const watcher = watchLocalizedFiles()
-    .pipe(
-      // 初回実行時に adev を起動する
-      startWith(void 0),
-      switchMap(
-        () =>
-          new Observable((subscriber) => {
-            consola.start('Restarting adev...');
-            const adevProcess = serveAdev();
-            subscriber.next();
-
-            return async () => {
-              await adevProcess.cancel();
-            };
-          })
-      )
-    )
-    .subscribe();
-
-  process.on('SIGINT', watcher.unsubscribe);
-  process.on('SIGTERM', watcher.unsubscribe);
+  consola.start('Start adev server...');
+  const adevServer = serveAdev();
+
+  const shutdown = () => {
+    consola.info('Shutting down...');
+    fileWatcher.cancel();
+    adevServer.cancel();
+  };
+
+  process.on('SIGINT', shutdown);
+  process.on('SIGTERM', shutdown);
 }
 
 main().catch((error) => {

yarn.lock

@@ -3064,11 +3064,6 @@ traverse@^0.6.7, traverse@^0.6.8:
     typedarray.prototype.slice "^1.0.3"
     which-typed-array "^1.1.15"
 
-tree-kill@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
 trough@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz#e29bd1614c6458d44869fc28b255ab7857ef7c24"
@@ -3078,9 +3073,9 @@ try-resolve@^1.0.1:
   resolved "https://registry.yarnpkg.com/try-resolve/-/try-resolve-1.0.1.tgz#cfde6fabd72d63e5797cfaab873abbe8e700e912"
 
 tslib@^2.1.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
-  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
+  integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
 
 tsx@^4.16.2:
   version "4.16.2"