Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base", ":timezone(Asia/Tokyo)"],
"reviewers": ["MikuroXina"],
"ignoreTests": false,
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base", ":timezone(Asia/Tokyo)"],
"reviewers": ["MikuroXina"],
"ignoreTests": false,
"automerge": true,
"major": {
"automerge": false
},
"platformAutomerge": true,
"prConcurrentLimit": 5,
"dependencyDashboard": true,
"semanticCommits": "enabled",
"fetchReleaseNotes": "pr",
"enabledManagers": ["npm", "github-actions"],
"npm": {
"stabilityDays": 3
},
"vulnerabilityAlerts": {
"enabled": true,
"automerge": true,
"major": {
"automerge": false
},
"platformAutomerge": true,
"prConcurrentLimit": 5,
"dependencyDashboard": true,
"semanticCommits": "enabled",
"fetchReleaseNotes": "pr",
"enabledManagers": ["bun", "github-actions"],
"npm": {
"stabilityDays": 3
},
"vulnerabilityAlerts": {
"enabled": true,
"automerge": true,
"assignees": ["MikuroXina"]
},
"schedule": ["on the first day of the week"]
"assignees": ["MikuroXina"]
},
"schedule": ["on the first day of the week"]
}
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:

steps:
- uses: actions/checkout@v6
- uses: oven-sh/setup-bun@v2
- uses: pnpm/action-setup@v4
- name: Install dependencies
run: bun install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Run lint
run: bun run lint
run: pnpm run lint
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:

steps:
- uses: actions/checkout@v6
- uses: oven-sh/setup-bun@v2
- uses: pnpm/action-setup@v4
- name: Install dependencies
run: bun install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Run test
run: bun run test
run: pnpm run test
1,955 changes: 0 additions & 1,955 deletions bun.lock

This file was deleted.

22 changes: 15 additions & 7 deletions docker/bot.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
FROM oven/bun:1-slim as BUILD
FROM node:24-slim as BUILD

ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable

WORKDIR /work

COPY package.json bun.lockb ./
RUN bun install --save-lockfile
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
RUN pnpm install --save-lockfile

COPY tsconfig.json .
COPY src/ ./src
RUN bun run build:bot
RUN pnpm run build:bot

# ---

FROM oven/bun:1-alpine
FROM node:24-alpine

RUN addgroup -g 1993 -S bot \
&& adduser -u 1993 -S bot -G bot

ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable

WORKDIR /app

COPY package.json bun.lockb ./
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
COPY --from=BUILD work/node_modules/ ./node_modules/
COPY --from=BUILD work/dist/bundle.js ./dist/bundle.js
COPY analecta/ ./analecta/
Expand All @@ -27,4 +35,4 @@ VOLUME [ "/app/.cache" ]

USER bot

ENTRYPOINT [ "bun", "run", "start:bot" ]
ENTRYPOINT [ "pnpm", "run", "start:bot" ]
16 changes: 9 additions & 7 deletions docker/web.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
FROM oven/bun:1-alpine as BUILD
FROM node:24-alpine as BUILD

RUN addgroup -g 1994 -S web \
&& adduser -u 1994 -S web -G web

WORKDIR /app

COPY package.json bun.lockb /app/
RUN bun install --frozen-lockfile
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml /app/
RUN pnpm install --frozen-lockfile

COPY tsconfig.json /app/
COPY src/web/ /app/
RUN bunx next build
RUN pnpm dlx next build

FROM oven/bun:1-slim
# ---

FROM node:24-slim

EXPOSE 3000

WORKDIR /app

COPY --from=BUILD /app/node_modules/ .
COPY package.json bun.lockb ./
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
COPY --from=BUILD /app/.next/ .

USER web

HEALTHCHECK --interval=5m --timeout=3s \
CMD curl -f http://localhost:3000/ || exit 1

ENTRYPOINT [ "bunx", "next", "start" ]
ENTRYPOINT [ "pnpm", "dlx", "next", "start" ]
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"toml": "^3.0.0"
},
"devDependencies": {
"@eslint/js": "^9.39.2",
"@next/eslint-plugin-next": "^16.0.0",
"@types/node": "^24.0.0",
"@types/node-fetch": "^2.6.4",
Expand All @@ -44,9 +45,11 @@
"eslint-plugin-jsdoc": "^61.0.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.0",
"globals": "^16.5.0",
"prettier": "^3.0.0",
"typescript": "^5.1.6",
"typescript-eslint": "^8.0.0",
"vitest": "^4.0.0"
}
},
"packageManager": "pnpm@10.25.0+sha512.5e82639027af37cf832061bcc6d639c219634488e0f2baebe785028a793de7b525ffcd3f7ff574f5e9860654e098fe852ba8ac5dd5cefe1767d23a020a92f501"
}
Loading