Merge ad3c8f3f25 into 097673b845

chore: i18n use cache key (#20885 )
* chore: i18n use cache key * Fix indentation in Dockerfile for pip command * Add build argument for GIT_COMMIT_HASH in CI workflow * Add short-sha output to action.yml * Update build args to use short SHA output * build: use vite .env * Remove unnecessary newline in Dockerfile * Define proxy host variable in vite.config.ts Add a new line to define the proxy host variable.
2025-12-20 12:06:43 +03:00 · 2025-11-14 23:42:08 +01:00 · 2025-11-14 09:36:46 -06:00 · 2025-11-14 09:23:43 -06:00 · 2025-10-21 01:51:11 +00:00
7 changed files with 93 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,6 +15,7 @@ frigate/version.py
 web/build
 web/node_modules
 web/coverage
+web/.env
 core
 !/web/**/*.ts
 .idea/*
--- a/1
+++ b/1
@ -14,6 +14,7 @@ push-boards: $(BOARDS:%=push-%)

 version:
 	echo 'VERSION = "$(VERSION)-$(COMMIT_HASH)"' > frigate/version.py
+	echo 'VITE_GIT_COMMIT_HASH=$(COMMIT_HASH)' > web/.env

 local: version
 	docker buildx build --target=frigate --file docker/main/Dockerfile . \
--- a/web/.gitignore
+++ b/web/.gitignore
@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.env
--- a/web/package-lock.json
+++ b/web/package-lock.json
@ -116,7 +116,7 @@
        "prettier-plugin-tailwindcss": "^0.6.5",
        "tailwindcss": "^3.4.9",
        "typescript": "^5.8.2",
-        "vite": "^6.2.0",
+        "vite": "^6.4.1",
        "vitest": "^3.0.7"
      }
    },
@ -9502,6 +9502,54 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinyglobby/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tinyglobby/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
    "node_modules/tinypool": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
@ -9868,15 +9916,18 @@
      }
    },
    "node_modules/vite": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.0.tgz",
-      "integrity": "sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
+      "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
        "postcss": "^8.5.3",
-        "rollup": "^4.30.1"
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
      },
      "bin": {
        "vite": "bin/vite.js"
@ -9970,6 +10021,37 @@
        "monaco-editor": ">=0.33.0"
      }
    },
+    "node_modules/vite/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
    "node_modules/vitest": {
      "version": "3.0.7",
      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.7.tgz",
--- a/web/package.json
+++ b/web/package.json
@ -122,7 +122,7 @@
    "prettier-plugin-tailwindcss": "^0.6.5",
    "tailwindcss": "^3.4.9",
    "typescript": "^5.8.2",
-    "vite": "^6.2.0",
+    "vite": "^6.4.1",
    "vitest": "^3.0.7"
  }
 }
--- a/web/src/utils/i18n.ts
+++ b/web/src/utils/i18n.ts
@ -33,7 +33,7 @@ i18n
    fallbackLng: "en", // use en if detected lng is not available

    backend: {
-      loadPath: "locales/{{lng}}/{{ns}}.json",
+      loadPath: `locales/{{lng}}/{{ns}}.json?v=${import.meta.env.VITE_GIT_COMMIT_HASH || "unknown"}`,
    },

    ns: [
--- a/web/src/views/settings/UiSettingsView.tsx
+++ b/web/src/views/settings/UiSettingsView.tsx
@ -157,7 +157,7 @@ export default function UiSettingsView() {
                  checked={cameraNames}
                  onCheckedChange={setCameraName}
                />
-                <Label className="cursor-pointer" htmlFor="auto-live">
+                <Label className="cursor-pointer" htmlFor="camera-names">
                  {t("general.liveDashboard.displayCameraNames.label")}
                </Label>
              </div>
Author	SHA1	Message	Date
dependabot[bot]	d7de519a13	Merge `ad3c8f3f25` into `097673b845`	2025-11-14 23:42:08 +01:00
GuoQing Liu	097673b845	chore: i18n use cache key (#20885 ) Some checks failed CI / AMD64 Build (push) Has been cancelled Details CI / ARM Build (push) Has been cancelled Details CI / Jetson Jetpack 6 (push) Has been cancelled Details CI / AMD64 Extra Build (push) Has been cancelled Details CI / ARM Extra Build (push) Has been cancelled Details CI / Synaptics Build (push) Has been cancelled Details CI / Assemble and push default build (push) Has been cancelled Details * chore: i18n use cache key * Fix indentation in Dockerfile for pip command * Add build argument for GIT_COMMIT_HASH in CI workflow * Add short-sha output to action.yml * Update build args to use short SHA output * build: use vite .env * Remove unnecessary newline in Dockerfile * Define proxy host variable in vite.config.ts Add a new line to define the proxy host variable.	2025-11-14 09:36:46 -06:00
GuoQing Liu	d56cf59b9a	fix: fix "Always Show Camera Names" label switch id wrong (#20922 )	2025-11-14 09:23:43 -06:00
dependabot[bot]	ad3c8f3f25	Bump vite from 6.2.0 to 6.4.1 in /web Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.0 to 6.4.1. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/create-vite@6.4.1/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 6.4.1 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-21 01:51:11 +00:00