Migrate from npm to pnpm across entire project
• Update all GitHub workflow files to use pnpm instead of npm • Replace npm commands with pnpm equivalents in devcontainer scripts • Remove package-lock.json files and update to use pnpm-lock.yaml • Consolidate node version references to use server/.nvmrc
This commit is contained in:
+8
-8
@@ -1,17 +1,17 @@
|
||||
FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e
|
||||
|
||||
RUN apk add --no-cache tini bash
|
||||
ENV CHOKIDAR_USEPOLLING=true \
|
||||
PATH="${PATH}:/usr/src/app/web/bin" \
|
||||
COREPACK_HOME=/tmp
|
||||
|
||||
USER node
|
||||
WORKDIR /usr/src/app
|
||||
|
||||
COPY --chown=node:node ./web/package* ./web/
|
||||
RUN npm install --global corepack@latest && \
|
||||
corepack enable && corepack install -g pnpm && \
|
||||
apk add --no-cache tini make bash&& \
|
||||
mkdir -p /buildcache/pnpm-store && \
|
||||
pnpm config set store-dir /buildcache/pnpm-store
|
||||
|
||||
WORKDIR /usr/src/app/web
|
||||
RUN npm ci
|
||||
|
||||
ENV CHOKIDAR_USEPOLLING=true \
|
||||
PATH="${PATH}:/usr/src/app/web/bin"
|
||||
EXPOSE 24678
|
||||
EXPOSE 3000
|
||||
ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]
|
||||
|
||||
+6
-10
@@ -1,14 +1,11 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
TYPESCRIPT_SDK=/usr/src/app/open-api/typescript-sdk
|
||||
|
||||
npm --prefix "$TYPESCRIPT_SDK" install
|
||||
npm --prefix "$TYPESCRIPT_SDK" run build
|
||||
|
||||
cd /usr/src/app/web || exit 1
|
||||
echo "Build dependencies for Immich Web"
|
||||
cd /usr/src/app || exit
|
||||
|
||||
COUNT=0
|
||||
UPSTREAM="${IMMICH_SERVER_URL:-http://immich-server:2283/}"
|
||||
UPSTREAM="${UPSTREAM%/}"
|
||||
until wget --spider --quiet "${UPSTREAM}/api/server/config" > /dev/null 2>&1; do
|
||||
if [ $((COUNT % 10)) -eq 0 ]; then
|
||||
echo "Waiting for $UPSTREAM to start..."
|
||||
@@ -16,7 +13,6 @@ until wget --spider --quiet "${UPSTREAM}/api/server/config" > /dev/null 2>&1; do
|
||||
COUNT=$((COUNT + 1))
|
||||
sleep 1
|
||||
done
|
||||
|
||||
echo "Connected to $UPSTREAM"
|
||||
|
||||
npx vite dev --host 0.0.0.0 --port 3000
|
||||
echo "Connected to $UPSTREAM, starting Immich Web..."
|
||||
pnpm --filter @immich/sdk build
|
||||
pnpm --filter immich-web exec vite dev --host 0.0.0.0 --port 3000
|
||||
|
||||
Generated
-10514
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -50,13 +50,13 @@
|
||||
"justified-layout": "^4.1.0",
|
||||
"lodash-es": "^4.17.21",
|
||||
"luxon": "^3.4.4",
|
||||
"maplibre-gl": "^5.3.0",
|
||||
"maplibre-gl": "^5.6.2",
|
||||
"pmtiles": "^4.3.0",
|
||||
"qrcode": "^1.5.4",
|
||||
"socket.io-client": "~4.8.0",
|
||||
"svelte-gestures": "^5.1.3",
|
||||
"svelte-i18n": "^4.0.1",
|
||||
"svelte-maplibre": "^1.0.0",
|
||||
"svelte-maplibre": "^1.2.0",
|
||||
"svelte-persisted-store": "^0.12.0",
|
||||
"tabbable": "^6.2.0",
|
||||
"thumbhash": "^0.1.1"
|
||||
|
||||
@@ -69,8 +69,11 @@ function isIgnoredFileType(pathname: string): boolean {
|
||||
}
|
||||
|
||||
function isIgnoredPath(pathname: string): boolean {
|
||||
return /^\/(src|api)(\/.*)?$/.test(pathname) || /^\/(node_modules|@vite|@id)(\/.*)?$/.test(pathname);
|
||||
return (
|
||||
/^\/(src|api)(\/.*)?$/.test(pathname) || /node_modules/.test(pathname) || /^\/@(vite|id)(\/.*)?$/.test(pathname)
|
||||
);
|
||||
}
|
||||
|
||||
function isAssetRequest(pathname: string): boolean {
|
||||
return /^\/api\/assets\/[a-f0-9-]+\/(original|thumbnail)/.test(pathname);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,9 @@ import tailwindcss from '@tailwindcss/vite';
|
||||
import { svelteTesting } from '@testing-library/svelte/vite';
|
||||
import path from 'node:path';
|
||||
import { visualizer } from 'rollup-plugin-visualizer';
|
||||
import { defineConfig } from 'vite';
|
||||
|
||||
import { defineConfig as defineViteConfig, mergeConfig } from 'vite';
|
||||
import { defineConfig as defineVitestConfig } from 'vitest/config';
|
||||
|
||||
const upstream = {
|
||||
target: process.env.IMMICH_SERVER_URL || 'http://immich-server:2283/',
|
||||
@@ -14,7 +16,7 @@ const upstream = {
|
||||
ws: true,
|
||||
};
|
||||
|
||||
export default defineConfig({
|
||||
const viteConfig = defineViteConfig({
|
||||
build: {
|
||||
target: 'es2022',
|
||||
},
|
||||
@@ -50,6 +52,9 @@ export default defineConfig({
|
||||
optimizeDeps: {
|
||||
entries: ['src/**/*.{svelte,ts,html}'],
|
||||
},
|
||||
});
|
||||
|
||||
const vitestConfig = defineVitestConfig({
|
||||
test: {
|
||||
include: ['src/**/*.{test,spec}.{js,ts}'],
|
||||
globals: true,
|
||||
@@ -60,3 +65,5 @@ export default defineConfig({
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
export default mergeConfig(viteConfig, vitestConfig);
|
||||
Reference in New Issue
Block a user