Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use pnpm catalog feature for shared dependencies #1072

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Use pnpm catalog feature for shared dependencies #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b72ddbf
Use pnpm catalog feature for shared dependencies
myieye Sep 25, 2024
8f4da2c
Include pnpm workspace file when installing and building
myieye Sep 27, 2024
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
6 changes: 4 additions & 2 deletions frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ WORKDIR /app
RUN corepack enable

FROM builder-base AS builder-viewer
COPY pnpm-lock.yaml pnpm-workspace.yaml /app/
WORKDIR /app/viewer
COPY viewer/package.json viewer/pnpm-lock.yaml viewer/.npmrc /app/viewer/
COPY viewer/package.json viewer/.npmrc /app/viewer/
RUN --mount=type=cache,target=/root/.local/share/pnpm/store pnpm install

COPY ./viewer /app/viewer
RUN --mount=type=cache,target=/root/.local/share/pnpm/store pnpm run build

FROM builder-base AS builder

COPY package.json pnpm-lock.yaml /app/
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml /app/
COPY viewer/package.json /app/viewer/
myieye marked this conversation as resolved.
Show resolved Hide resolved
RUN --mount=type=cache,target=/root/.local/share/pnpm/store pnpm install

COPY . /app/
Expand Down
4 changes: 2 additions & 2 deletions frontend/https-proxy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"dev": "vite"
},
"devDependencies": {
"typescript": "^5.2.2",
"vite": "^5.2.0",
"typescript": "catalog:",
"vite": "catalog:",
"@vitejs/plugin-basic-ssl": "^1.1.0"
}
}
16 changes: 8 additions & 8 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@
"graphql": "^16.8.1",
"json5": "^2.2.3",
"jwt-decode": "^4.0.0",
"postcss": "^8.4.38",
"postcss": "catalog:",
"rimraf": "^5.0.7",
"svelte": "^4.2.19",
"svelte-check": "^3.7.1",
"svelte": "catalog:",
"svelte-check": "catalog:",
"svelte-eslint-parser": "^0.33.1",
"svelte-preprocess": "^5.1.4",
"svelte-preprocess": "catalog:",
"svelte-turnstile": "^0.5.0",
"sveltekit-superforms": "^1.13.4",
"tailwindcss": "^3.4.3",
"tslib": "^2.6.2",
"tailwindcss": "catalog:",
"tslib": "catalog:",
"type-fest": "^4.18.2",
"typescript": "^5.3.3",
"vite": "^5.2.13",
"typescript": "catalog:",
"vite": "catalog:",
"vite-plugin-graphql-codegen": "^3.3.6",
"vitest": "^1.6.0",
"zod": "^3.23.8",
Expand Down
Loading
Loading