From 14d9e90a033b2b03ff58113c304f9d8ab1104b63 Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Mon, 11 May 2026 16:19:28 -0400 Subject: [PATCH] refactor: move i18n formatting to workspace root (#28360) refactor: move i18n formatting to project root --- .github/workflows/test.yml | 4 ++-- .github/workflows/weblate-lock.yml | 2 +- i18n/.prettierrc => .prettierrc | 0 i18n/package.json | 13 ------------- misc/release/pump-version.sh | 1 - package.json | 8 ++++++++ pnpm-lock.yaml | 18 ++++++++---------- 7 files changed, 19 insertions(+), 27 deletions(-) rename i18n/.prettierrc => .prettierrc (100%) delete mode 100644 i18n/package.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0988097c64..078722cb7c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -256,10 +256,10 @@ jobs: github_token: ${{ steps.token.outputs.token }} - name: Install dependencies - run: pnpm --filter=immich-i18n install --frozen-lockfile + run: pnpm -w install --frozen-lockfile - name: Format - run: pnpm --filter=immich-i18n format:fix + run: pnpm format:fix - name: Find file changes uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4 diff --git a/.github/workflows/weblate-lock.yml b/.github/workflows/weblate-lock.yml index b05a20360c..7063820839 100644 --- a/.github/workflows/weblate-lock.yml +++ b/.github/workflows/weblate-lock.yml @@ -36,7 +36,7 @@ jobs: github-token: ${{ steps.token.outputs.token }} filters: | i18n: - - modified: 'i18n/!(en|package)**\.json' + - modified: 'i18n/!(en)**\.json' skip-force-logic: 'true' enforce-lock: diff --git a/i18n/.prettierrc b/.prettierrc similarity index 100% rename from i18n/.prettierrc rename to .prettierrc diff --git a/i18n/package.json b/i18n/package.json deleted file mode 100644 index 2b9548ed8b..0000000000 --- a/i18n/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "immich-i18n", - "version": "2.7.5", - "private": true, - "scripts": { - "format": "prettier --cache --check .", - "format:fix": "prettier --cache --write --list-different ." - }, - "devDependencies": { - "prettier": "^3.7.4", - "prettier-plugin-sort-json": "^4.1.1" - } -} diff --git a/misc/release/pump-version.sh b/misc/release/pump-version.sh index 9c118f04d8..8b06c3a23b 100755 --- a/misc/release/pump-version.sh +++ b/misc/release/pump-version.sh @@ -64,7 +64,6 @@ if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then pnpm version "$NEXT_SERVER" --no-git-tag-version pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix server - pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix i18n pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix packages/cli pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix web pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix e2e diff --git a/package.json b/package.json index abe9e6b44f..4d361b329d 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,16 @@ "version": "2.7.5", "description": "Monorepo for Immich", "private": true, + "scripts": { + "format": "prettier --cache --check i18n/", + "format:fix": "prettier --cache --write --list-different i18n" + }, "packageManager": "pnpm@10.33.1+sha512.05ba3c1d5d1c18f68df06470d74055e62d41fc110a0c660db1b2dfb2785327f04cf0f68345d4609bc52089e7fa0343c31593b2f9594e2c5d5da426230acc9820", "engines": { "pnpm": ">=10.0.0" + }, + "devDependencies": { + "prettier": "^3.8.3", + "prettier-plugin-sort-json": "^4.2.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d9adafe9b5..5a45ed9e9f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,14 @@ pnpmfileChecksum: sha256-un98do36L0wZyqsjcLozQ3YUadCAn2yz5bXcBbOuyDA= importers: - .: {} + .: + devDependencies: + prettier: + specifier: ^3.8.3 + version: 3.8.3 + prettier-plugin-sort-json: + specifier: ^4.2.0 + version: 4.2.0(prettier@3.8.3) .github: devDependencies: @@ -193,15 +200,6 @@ importers: specifier: ^4.0.0 version: 4.1.5(@opentelemetry/api@1.9.1)(@types/node@24.12.2)(@vitest/coverage-v8@4.1.5)(happy-dom@20.9.0)(jsdom@26.1.0(canvas@2.11.2(encoding@0.1.13)))(vite@8.0.10(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(sass@1.99.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.3)) - i18n: - devDependencies: - prettier: - specifier: ^3.7.4 - version: 3.8.3 - prettier-plugin-sort-json: - specifier: ^4.1.1 - version: 4.2.0(prettier@3.8.3) - packages/cli: dependencies: chokidar: