From 090d87f82e58094c3cf4ed770033080e425f6fb2 Mon Sep 17 00:00:00 2001 From: Min Idzelis Date: Tue, 1 Jul 2025 22:47:59 -0400 Subject: [PATCH] chore: dev environment improvements and dependency updates (#19676) --- .devcontainer/server/container-common.sh | 6 ++---- .../server/container-compose-overrides.yml | 4 ++-- .github/.prettierignore | 4 ++++ e2e/src/utils.ts | 5 +++-- web/package-lock.json | 13 ++++++++++++- web/package.json | 2 ++ 6 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 .github/.prettierignore diff --git a/.devcontainer/server/container-common.sh b/.devcontainer/server/container-common.sh index 7dff4a0894..e1e81a9b52 100755 --- a/.devcontainer/server/container-common.sh +++ b/.devcontainer/server/container-common.sh @@ -73,10 +73,8 @@ install_dependencies() { log "Installing dependencies" ( cd "${IMMICH_WORKSPACE}" || exit 1 - run_cmd make ci-server - run_cmd make ci-sdk - run_cmd make build-sdk - run_cmd make ci-web + export CI=1 FROZEN=1 OFFLINE=1 + run_cmd make setup-dev ) log "" } diff --git a/.devcontainer/server/container-compose-overrides.yml b/.devcontainer/server/container-compose-overrides.yml index 4e340ae5bd..d7efc92cb1 100644 --- a/.devcontainer/server/container-compose-overrides.yml +++ b/.devcontainer/server/container-compose-overrides.yml @@ -22,7 +22,7 @@ services: immich-machine-learning: env_file: !reset [] - + database: env_file: !reset [] environment: !override @@ -31,7 +31,7 @@ services: POSTGRES_DB: ${DB_DATABASE_NAME-immich} POSTGRES_INITDB_ARGS: '--data-checksums' POSTGRES_HOST_AUTH_METHOD: md5 - volumes: + volumes: - ${UPLOAD_LOCATION:-postgres-devcontainer-volume}${UPLOAD_LOCATION:+/postgres}:/var/lib/postgresql/data redis: diff --git a/.github/.prettierignore b/.github/.prettierignore new file mode 100644 index 0000000000..cc41cea9b2 --- /dev/null +++ b/.github/.prettierignore @@ -0,0 +1,4 @@ +# Ignore files for PNPM, NPM and YARN +pnpm-lock.yaml +package-lock.json +yarn.lock diff --git a/e2e/src/utils.ts b/e2e/src/utils.ts index 1d5004d385..cf9eafbf23 100644 --- a/e2e/src/utils.ts +++ b/e2e/src/utils.ts @@ -60,6 +60,7 @@ import { io, type Socket } from 'socket.io-client'; import { loginDto, signupDto } from 'src/fixtures'; import { makeRandomImage } from 'src/generators'; import request from 'supertest'; +export type { Emitter } from '@socket.io/component-emitter'; type CommandResponse = { stdout: string; stderr: string; exitCode: number | null }; type EventType = 'assetUpload' | 'assetUpdate' | 'assetDelete' | 'userDelete' | 'assetHidden'; @@ -84,10 +85,10 @@ export const immichAdmin = (args: string[]) => export const specialCharStrings = ["'", '"', ',', '{', '}', '*']; export const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; -const executeCommand = (command: string, args: string[]) => { +const executeCommand = (command: string, args: string[], options?: { cwd?: string }) => { let _resolve: (value: CommandResponse) => void; const promise = new Promise((resolve) => (_resolve = resolve)); - const child = spawn(command, args, { stdio: 'pipe' }); + const child = spawn(command, args, { stdio: 'pipe', cwd: options?.cwd }); let stdout = ''; let stderr = ''; diff --git a/web/package-lock.json b/web/package-lock.json index 770e4edd6d..e998a46a10 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -22,7 +22,9 @@ "@zoom-image/svelte": "^0.3.0", "dom-to-image": "^2.6.0", "fabric": "^6.5.4", + "geojson": "^0.5.0", "handlebars": "^4.7.8", + "happy-dom": "^18.0.1", "intl-messageformat": "^10.7.11", "justified-layout": "^4.1.0", "lodash-es": "^4.17.21", @@ -94,7 +96,7 @@ "@oazapfts/runtime": "^1.0.2" }, "devDependencies": { - "@types/node": "^22.15.32", + "@types/node": "^22.15.33", "typescript": "^5.3.3" } }, @@ -5838,6 +5840,15 @@ "node": ">=10" } }, + "node_modules/geojson": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/geojson/-/geojson-0.5.0.tgz", + "integrity": "sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/geojson-vt": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", diff --git a/web/package.json b/web/package.json index 72df25a195..08afe31762 100644 --- a/web/package.json +++ b/web/package.json @@ -39,7 +39,9 @@ "@zoom-image/svelte": "^0.3.0", "dom-to-image": "^2.6.0", "fabric": "^6.5.4", + "geojson": "^0.5.0", "handlebars": "^4.7.8", + "happy-dom": "^18.0.1", "intl-messageformat": "^10.7.11", "justified-layout": "^4.1.0", "lodash-es": "^4.17.21",