Compare commits

..

No commits in common. "df420783ebc1bdd809737a7bd2c6aa6fb2e35d5c" and "332487d7113155e004ccbaf9b75f1c50ae15d322" have entirely different histories.

6 changed files with 6 additions and 4 deletions

1
.gitignore vendored
View File

@ -15,7 +15,6 @@ frigate/version.py
web/build
web/node_modules
web/coverage
web/.env
core
!/web/**/*.ts
.idea/*

View File

@ -14,7 +14,6 @@ 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 . \

View File

@ -319,6 +319,9 @@ FROM --platform=$BUILDPLATFORM node:20 AS web-build
WORKDIR /work
COPY web/package.json web/package-lock.json ./
ARG GIT_COMMIT_HASH
ENV GIT_COMMIT_HASH=$GIT_COMMIT_HASH
RUN npm install
COPY web/ ./

1
web/.gitignore vendored
View File

@ -22,4 +22,3 @@ dist-ssr
*.njsproj
*.sln
*.sw?
.env

View File

@ -33,7 +33,7 @@ i18n
fallbackLng: "en", // use en if detected lng is not available
backend: {
loadPath: `locales/{{lng}}/{{ns}}.json?v=${import.meta.env.VITE_GIT_COMMIT_HASH || "unknown"}`,
loadPath: `locales/{{lng}}/{{ns}}.json?v=${import.meta.env.GIT_COMMIT_HASH || "unknown"}`,
},
ns: [

View File

@ -5,10 +5,12 @@ import react from "@vitejs/plugin-react-swc";
import monacoEditorPlugin from "vite-plugin-monaco-editor";
const proxyHost = process.env.PROXY_HOST || "localhost:5000";
const gitCommitHash = process.env.GIT_COMMIT_HASH || "unknown";
// https://vitejs.dev/config/
export default defineConfig({
define: {
"import.meta.vitest": "undefined",
"import.meta.env.GIT_COMMIT_HASH": JSON.stringify(gitCommitHash),
},
server: {
proxy: {