Skip to content

Commit e538655

Browse files
Merge branch 'main' into connection-string-mode
2 parents 9ad8a4b + 3daeb51 commit e538655

30 files changed

Lines changed: 12517 additions & 15220 deletions

.github/workflows/code-quality.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,17 @@ jobs:
1414
with:
1515
persist-credentials: false
1616
fetch-depth: 0
17+
- name: Setup pnpm
18+
uses: pnpm/action-setup@v4
19+
with:
20+
version: 10
1721
- name: Setup Node.js
1822
uses: actions/setup-node@v4
1923
with:
2024
node-version: 24
21-
cache: "yarn"
25+
cache: "pnpm"
2226
- name: Install dependencies
23-
run: yarn install --frozen-lockfile
27+
run: pnpm install --frozen-lockfile
2428
- name: Setup Biome
2529
uses: biomejs/setup-biome@v2
2630
with:

.gitignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,5 @@ testem.log
4747
.DS_Store
4848
Thumbs.db
4949

50-
# Yarn Integrity file
51-
.pnp.*
52-
.yarn/*
53-
!.yarn/patches
54-
!.yarn/plugins
55-
!.yarn/releases
56-
!.yarn/sdks
57-
!.yarn/versions
58-
5950
# PGLite storage
6051
pglite-storage

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node-linker=hoisted

.yarn/releases/yarn-3.4.1.cjs

Lines changed: 0 additions & 873 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

CLAUDE.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ RocketAdmin is a database administration panel that allows users to manage datab
1818

1919
```bash
2020
cd backend
21-
yarn start:dev # Start dev server with hot reload
22-
yarn build # Build for production
23-
yarn lint # ESLint with auto-fix
24-
yarn test # Run non-saas AVA tests (serial)
25-
yarn test-all # Run all AVA tests (5min timeout, serial)
26-
yarn test-saas # Run SaaS-specific tests
21+
pnpm start:dev # Start dev server with hot reload
22+
pnpm build # Build for production
23+
pnpm lint # ESLint with auto-fix
24+
pnpm test # Run non-saas AVA tests (serial)
25+
pnpm test-all # Run all AVA tests (5min timeout, serial)
26+
pnpm test-saas # Run SaaS-specific tests
2727
```
2828

2929
### Frontend
@@ -52,17 +52,17 @@ This spins up test databases (MySQL, PostgreSQL, MSSQL, Oracle, IBM DB2, MongoDB
5252

5353
```bash
5454
cd backend
55-
yarn build # Must build first
56-
yarn migration:generate src/migrations/MigrationName # Generate migration
57-
yarn migration:run # Run pending migrations
58-
yarn migration:revert # Revert last migration
55+
pnpm build # Must build first
56+
pnpm migration:generate src/migrations/MigrationName # Generate migration
57+
pnpm migration:run # Run pending migrations
58+
pnpm migration:revert # Revert last migration
5959
```
6060

6161
## Architecture
6262

6363
### Monorepo Structure
6464

65-
- Uses Yarn workspaces with packages: `backend`, `rocketadmin-agent`, `shared-code`
65+
- Uses pnpm workspaces with packages: `backend`, `rocketadmin-agent`, `shared-code`
6666
- `shared-code` is imported as `@rocketadmin/shared-code` workspace dependency
6767
- Frontend is a separate Angular project (not a workspace member)
6868

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ RUN apt-get update && apt-get install -y \
3535
&& rm -rf /var/lib/apt/lists/*
3636

3737
WORKDIR /app
38-
COPY package.json .yarnrc.yml yarn.lock /app/
38+
RUN npm install -g pnpm@10.33.0
39+
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc /app/
3940
COPY backend /app/backend
4041
COPY shared-code /app/shared-code
4142
COPY rocketadmin-agent /app/rocketadmin-agent
42-
COPY .yarn /app/.yarn
43-
RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --network-timeout 1000000 --immutable --silent
43+
RUN --mount=type=cache,target=/root/.local/share/pnpm/store pnpm install --frozen-lockfile
4444
RUN cd shared-code && ../node_modules/.bin/tsc
45-
RUN cd backend && ../node_modules/.bin/tsc && yarn run nest build
45+
RUN cd backend && ../node_modules/.bin/tsc && pnpm exec nest build
4646
COPY --from=front_builder /app/frontend/dist/rocketadmin/browser /var/www/html
4747
COPY frontend/nginx/default.conf /etc/nginx/sites-enabled/default
4848
RUN mkdir -p /app/backend/node_modules/.cache && chown -R appuser:appuser /app/backend/node_modules/.cache

Dockerfile.rocketadmin-agent

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ RUN groupadd -r -g 1001 appuser && useradd -r -u 1001 -g appuser -d /app -s /sbi
55
WORKDIR /app
66
RUN apt-get update && apt-get install -y netcat-openbsd make gcc g++ python3 libxml2
77

8-
COPY package.json .yarnrc.yml yarn.lock /app/
8+
RUN npm install -g pnpm@10.33.0
9+
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc /app/
910
COPY shared-code /app/shared-code
1011
COPY rocketadmin-agent /app/rocketadmin-agent
11-
COPY .yarn /app/.yarn
12-
RUN yarn install --network-timeout 1000000
12+
RUN pnpm install --frozen-lockfile
1313
RUN cd shared-code && ../node_modules/.bin/tsc
14-
RUN cd rocketadmin-agent && yarn run build
14+
RUN cd rocketadmin-agent && pnpm run build
1515

1616
RUN chown -R appuser:appuser /app
1717

autoadmin-ws-server/.gitignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,3 @@ dist/
33
.env
44
*.log
55
.DS_Store
6-
7-
# Yarn
8-
.yarn/*
9-
!.yarn/patches
10-
!.yarn/plugins
11-
!.yarn/releases
12-
!.yarn/sdks
13-
!.yarn/versions
14-
.pnp.*

autoadmin-ws-server/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ FROM node:24-alpine AS builder
22

33
WORKDIR /app
44

5-
COPY package.json yarn.lock ./
6-
RUN yarn install
5+
RUN npm install -g pnpm@10.33.0
6+
7+
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
8+
RUN pnpm install --frozen-lockfile
79

810
COPY tsconfig.json ./
911
COPY src ./src
1012

11-
RUN yarn build
13+
RUN pnpm build
1214

1315
FROM node:24-alpine
1416

@@ -17,8 +19,10 @@ WORKDIR /app
1719
RUN addgroup -g 1001 -S nodejs && \
1820
adduser -S nodejs -u 1001
1921

20-
COPY package.json yarn.lock ./
21-
RUN yarn install --production && yarn cache clean
22+
RUN npm install -g pnpm@10.33.0
23+
24+
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
25+
RUN pnpm install --prod --frozen-lockfile
2226

2327
COPY --from=builder /app/dist ./dist
2428

0 commit comments

Comments
 (0)