Skip to content

Commit a7a0b3b

Browse files
committed
temp [ci skip]
1 parent 130c02d commit a7a0b3b

7 files changed

Lines changed: 21 additions & 16 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,4 @@ vscode_settings:
181181

182182
vscode-generate-openapi:
183183
python3 web/server/openapi.py --output vscode/extension/openapi.json
184-
cd vscode/react && npm run generate:api
184+
cd vscode/react && pnpm run generate:api

pnpm-workspace.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
packages:
2-
- 'vscode/bus'
3-
- 'vscode/extension'
4-
- 'vscode/react'
5-
- 'web/client'
2+
- vscode/bus
3+
- vscode/extension
4+
- vscode/react
5+
- web/client
6+
onlyBuiltDependencies:
7+
- '@swc/core'
8+
- '@tailwindcss/oxide'
9+
- '@vscode/vsce-sign'
10+
- esbuild
11+
- keytar

web/Dockerfile.app

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ RUN apt-get update && apt-get -y install libnss3 libatk-bridge2.0-0 libdrm-dev l
88

99
# Copy package files for workspaces
1010
COPY package.json /app/package.json
11-
COPY package-lock.json /app/package-lock.json
11+
COPY pnpm-lock.yaml /app/pnpm-lock.yaml
1212
COPY web/client/package.json /app/web/client/package.json
13-
COPY vscode/extension/package.json /app/vscode/extension/package.json
1413

15-
RUN npm install -g npm@latest && \
16-
npm install --no-audit --no-fund
14+
RUN npm install -g pnpm@latest && \
15+
pnpm install --frozen-lockfile
1716

1817
# Copy the rest of the application
1918
COPY web/client/ /app/web/client/
2019

2120
# Install dependencies
22-
RUN npm install --no-audit --no-fund
21+
RUN pnpm install --frozen-lockfile

web/client/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"name": "tobiko",
33
"version": "0.0.0",
44
"scripts": {
5-
"dev": "npm run generate:api && vite",
6-
"build": "npm run generate:api && tsc && vite build",
5+
"dev": "pnpm run generate:api && vite",
6+
"build": "pnpm run generate:api && tsc && vite build",
77
"preview": "vite preview --no-open",
88
"lint": "eslint",
99
"lint:fix": "eslint --fix",
10-
"test": "npm run generate:api && npm run test:unit && npm run test:e2e",
10+
"test": "pnpm run generate:api && pnpm run test:unit && pnpm run test:e2e",
1111
"test:unit:watch": "NODE_ENV=development vitest --watch=true",
1212
"test:unit": "NODE_ENV=testing vitest --watch=false",
1313
"test:e2e": "NODE_ENV=testing playwright test",

web/client/src/library/components/table/Table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import Input from '@components/input/Input'
2121
import { EnumSize } from '~/types/enum'
2222
import { isArrayNotEmpty, isNotNil } from '@utils/index'
2323

24-
declare module '@tanstack/table-core' {
24+
declare module '@tanstack/react-table' {
2525
interface ColumnMeta<TData extends RowData, TValue> {
2626
type: string
2727
}

web/docker-compose.build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
services:
22
app:
33
command:
4-
bash -c "cd ../.. && npm ci && npm --prefix /app/web/client run build"
4+
bash -c "cd ../.. && npm install -g pnpm && pnpm install --frozen-lockfile && pnpm --prefix /app/web/client run build"
55
networks: []

web/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
build:
1717
context: ..
1818
dockerfile: web/Dockerfile.app
19-
command: npm run dev -- --host 0.0.0.0 --port 8001
19+
command: pnpm run dev -- --host 0.0.0.0 --port 8001
2020
working_dir: /app/web/client
2121
ports:
2222
- 8001:8001

0 commit comments

Comments
 (0)