wireit を導入 Bun のスクリプトランナーがダメダメなので。具体的には、 * 依存関係を考慮せずにコマンドを実行する（ドキュメントに反する）。 <https://github.com/oven-sh/bun/issues/13239> * `--filter` を使って実行した際のログが超見づらい。 このせいで proto をビルドせずに pwa で `bun check` してしまったり、 依存先が古いままビルドしてしまったり、という状況が発生していた。

Changes

8 changed files (+157/-17)

• .gitignore
  • @@ -32,3 +32,6 @@
    # What: 環境変数。 # Why: シークレットや環境依存の値が含まれるため。 .env + + # What: wireit のキャッシュディレクトリ。 + .wireit
• bun.lockb
• package.json
  • @@ -3,13 +3,28 @@ "name": "@yamori/workspace",
    "private": true, "workspaces": ["packages/*"], "scripts": { - "lint": "bun run --filter '*' lint", - "check": "bun run --filter '*' check", + "check": "wireit", + "make": "wireit", "dev": "bun run --filter '*' dev", - "build": "bun run --filter '*' build", "clean": "bun run --filter '*' clean" }, + "wireit": { + "make": { + "dependencies": ["./packages/pwa:make"], + "packageLocks": ["bun.lockb"] + }, + "check": { + "dependencies": [ + "./packages/proto:check", + "./packages/idb_backend:check", + "./packages/react_ui:check", + "./packages/pwa:check" + ], + "packageLocks": ["bun.lockb"] + } + }, "devDependencies": { - "@bufbuild/buf": "^1.47.2" + "@bufbuild/buf": "^1.47.2", + "wireit": "^0.14.9" } }
• packages/idb_backend/package.json
  • @@ -3,9 +3,45 @@ "name": "@yamori/idb_backend",
    "private": true, "type": "module", "scripts": { - "check": "tsc", - "build": "tsc -p tsconfig.build.jsonc", + "check": "wireit", + "make": "wireit", "clean": "rm -rf lib" + }, + "wireit": { + "tsconfig": { + "files": ["tsconfig.json", "../../tsconfig.jsonc"] + }, + "make": { + "command": "tsc -p tsconfig.build.jsonc", + "files": ["src/**/*.ts", "!src/**/*.test.ts"], + "output": ["lib/**"], + "dependencies": ["tsconfig", "../proto:js", "../proto:dts"], + "packageLocks": ["bun.lockb"] + }, + "js": { + "files": ["lib/**/*.js"], + "dependencies": [ + { + "script": "make", + "cascade": false + } + ] + }, + "dts": { + "files": ["lib/**/*.d.ts"], + "dependencies": [ + { + "script": "make", + "cascade": false + } + ] + }, + "check": { + "command": "tsc", + "files": ["src/**/*.ts", "package.json"], + "dependencies": ["../proto:dts", "tsconfig"], + "packageLocks": ["bun.lockb"] + } }, "exports": { ".": {
• packages/proto/README.md
  • @@ -48,7 +48,7 @@
    このプロジェクトでは [Buf CLI](https://buf.build/docs/cli/) を使って Protobuf ファイルの品質をチェックしている。以下のコマンドでチェックを実行できる。 ``` - $ bun lint + $ bun check ``` ### コード生成
  • @@ -56,5 +56,5 @@
    Protobuf データのデコード・エンコードを行うコードを生成するには以下のコマンドを実行する。 ``` - $ bun run build + $ bun make ```
• packages/proto/package.json
  • @@ -2,11 +2,39 @@ {
    "name": "@yamori/proto", "private": true, "scripts": { - "lint": "buf lint", - "build": "buf generate", - "check": "bun run lint", - "clean": "rm -rf es", - "prepare": "bun run build" + "make": "wireit", + "check": "wireit", + "clean": "rm -rf es" + }, + "wireit": { + "make": { + "command": "buf generate", + "files": ["yamori/**/*.proto", "buf.gen.yaml"], + "output": ["es/**"], + "packageLocks": ["bun.lockb"] + }, + "js": { + "files": ["es/**/*.js"], + "dependencies": [ + { + "script": "make", + "cascade": false + } + ] + }, + "dts": { + "files": ["es/**/*.d.ts"], + "dependencies": [ + { + "script": "make", + "cascade": false + } + ] + }, + "check": { + "command": "buf lint", + "files": ["yamori/**/*.proto"] + } }, "type": "module", "exports": {
• packages/pwa/package.json
  • @@ -3,10 +3,28 @@ "name": "@yamori/pwa",
    "private": true, "type": "module", "scripts": { - "check": "tsc", + "check": "wireit", "dev": "vite", - "build": "vite build", + "make": "wireit", "clean": "rm -rf dist" + }, + "wireit": { + "make": { + "command": "vite build", + "files": ["src/**/*.{ts,tsx,css,html,json}", "package.json", "vite.config.ts"], + "output": ["dist/**"], + "dependencies": ["../idb_backend:js", "../react_ui:js"], + "packageLocks": ["bun.lockb"] + }, + "check": { + "command": "tsc", + "files": ["src/**/*.{ts,tsx,css,html,json}", "package.json"], + "dependencies": ["tsconfig", "../idb_backend:dts", "../react_ui:dts"], + "packageLocks": ["bun.lockb"] + }, + "tsconfig": { + "files": ["tsconfig.json", "../../tsconfig.jsonc"] + } }, "dependencies": { "@yamori/idb_backend": "workspace:*",
• packages/react_ui/package.json
  • @@ -4,9 +4,49 @@ "private": true,
    "type": "module", "scripts": { "dev": "storybook dev --port ${PORT:-6006}", - "build": "vite build && tsc -p tsconfig.build.jsonc", + "make": "wireit", "clean": "rm -rf dist types", - "check": "tsc" + "check": "wireit" + }, + "wireit": { + "tsconfig": { + "files": ["tsconfig.json", "../../tsconfig.jsonc"] + }, + "js": { + "command": "vite build", + "files": [ + "src/**/*.{css,ts,tsx}", + "!src/mocks/**", + "!src/**/*.stories.{ts,tsx}", + "vite.config.ts", + "package.json" + ], + "output": ["dist/**"], + "dependencies": ["../proto:js", "../idb_backend:js"], + "packageLocks": ["bun.lockb"] + }, + "dts": { + "command": "tsc -p tsconfig.build.jsonc", + "files": [ + "src/**/*.{css,ts,tsx}", + "!src/mocks/**", + "!src/**/*.stories.{ts,tsx}", + "tsconfig.build.jsonc", + "package.json" + ], + "output": ["types/**"], + "dependencies": ["tsconfig", "../proto:dts", "../idb_backend:dts"], + "packageLocks": ["bun.lockb"] + }, + "make": { + "dependencies": ["js", "dts"] + }, + "check": { + "command": "tsc", + "files": ["src/**/*.{ts,tsx}"], + "dependencies": ["../proto:dts", "../idb_backend:dts"], + "packageLocks": ["bun.lockb"] + } }, "exports": { ".": {