todo: Recursive builds, fix megalodon?

Author: korewaChino

.dockerignore

@@ -3,6 +3,7 @@
 .travis
 .vscode
 .config
+.cache
 Dockerfile
 build/
 built/

Dockerfile

@@ -14,8 +14,8 @@ RUN apk add --update python3 && ln -sf python3 /usr/bin/python
 # RUN apt install -y python3 python3-pip
 RUN python3 -m ensurepip
 RUN pip3 install --no-cache --upgrade pip setuptools
-
-# RUN corepack enable
+# TODO: Recursive build script https://github.com/oven-sh/bun/issues/5350
+RUN corepack enable
 
 WORKDIR /sharkey
 
@@ -25,7 +25,7 @@ RUN git submodule update --init --recursive
 # RUN pnpm config set fetch-retries 5
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
 	bun i --aggregate-output --frozen-lockfile --cache-dir=.cache
-RUN bun run --bun build
+RUN bun run build
 RUN bun scripts/trim-deps.mjs
 RUN mv packages/frontend/assets sharkey-assets
 # RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \

package.json

@@ -14,7 +14,7 @@
   "scripts": {
     "build-pre": "node ./scripts/build-pre.js",
     "build-assets": "node ./scripts/build-assets.mjs",
-    "build": "bun run --bun build-pre && bun run --bun -r build && bun run --bun build-assets",
+    "build": "bun run --bun build-pre && pnpm -r build && bun run --bun build-assets",
     "build-storybook": "bun run --bun --filter frontend build-storybook",
     "build-misskey-js-with-types": "bun run --bun build-pre && bun run --bun --filter backend... --filter=!misskey-js build && bun run --bun --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && bun run --bun --filter misskey-js update-autogen-code && bun run --bun --filter misskey-js build && bun run --bun --filter misskey-js api",
     "start": "cd packages/backend && node ./built/boot/entry.js",
@@ -48,7 +48,6 @@
     "ignore-walk": "6.0.4",
     "js-yaml": "4.1.0",
     "postcss": "^8.4.38",
-    "re2": "^1.21.3",
     "tar": "6.2.0",
     "terser": "^5.31.1",
     "yaml": "^2.4.5"