diff --git a/.env b/.env deleted file mode 100644 index 5e01b0f..0000000 --- a/.env +++ /dev/null @@ -1 +0,0 @@ -VITE_APP_VERSION=$npm_package_version \ No newline at end of file diff --git a/bun.lockb b/bun.lockb index 768daf0..e5cda09 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index c6fd398..f9caaf1 100644 --- a/package.json +++ b/package.json @@ -14,63 +14,63 @@ "serve": "vite preview" }, "dependencies": { - "@commitlint/config-conventional": "^18.6.0", + "@commitlint/config-conventional": "^19.0.3", "@felte/solid": "^1.2.13", "@felte/validator-zod": "^1.0.17", - "@fontsource/fira-sans": "^5.0.18", - "@solid-primitives/clipboard": "^1.5.8", - "@solid-primitives/context": "^0.2.2", - "@solid-primitives/event-listener": "^2.3.1", - "@solid-primitives/i18n": "^2.0.1", - "@solid-primitives/keyed": "^1.2.1", - "@solid-primitives/media": "^2.2.6", - "@solid-primitives/resize-observer": "^2.0.23", - "@solid-primitives/storage": "^2.1.2", - "@solid-primitives/timer": "^1.3.8", - "@solid-primitives/websocket": "^1.2.1", + "@fontsource/fira-sans": "^5.0.19", + "@solid-primitives/clipboard": "^1.5.10", + "@solid-primitives/context": "^0.2.3", + "@solid-primitives/event-listener": "^2.3.3", + "@solid-primitives/i18n": "^2.1.1", + "@solid-primitives/keyed": "^1.2.2", + "@solid-primitives/media": "^2.2.8", + "@solid-primitives/resize-observer": "^2.0.25", + "@solid-primitives/storage": "^2.1.4", + "@solid-primitives/timer": "^1.3.9", + "@solid-primitives/websocket": "^1.2.2", "@solidjs/router": "^0.9.1", - "@tabler/icons-solidjs": "^2.46.0", - "@tanstack/match-sorter-utils": "^8.11.7", - "@tanstack/solid-table": "^8.11.7", + "@tabler/icons-solidjs": "^2.47.0", + "@tanstack/match-sorter-utils": "^8.11.8", + "@tanstack/solid-table": "^8.13.2", "@tanstack/solid-virtual": "3.0.2", "@tanstack/virtual-core": "3.0.2", "@thisbeyond/solid-dnd": "^0.7.5", "@types/byte-size": "^8.1.2", "@types/lodash": "^4.14.202", - "@types/node": "^20.11.15", + "@types/node": "^20.11.25", "@types/uuid": "^9.0.8", - "@typescript-eslint/eslint-plugin": "^6.20.0", - "@typescript-eslint/parser": "^6.20.0", - "@vite-pwa/assets-generator": "^0.2.3", - "apexcharts": "^3.45.2", - "autoprefixer": "^10.4.17", + "@typescript-eslint/eslint-plugin": "^7.1.1", + "@typescript-eslint/parser": "^7.1.1", + "@vite-pwa/assets-generator": "^0.2.4", + "apexcharts": "^3.47.0", + "autoprefixer": "^10.4.18", "byte-size": "^8.1.1", - "commitlint": "^18.6.0", - "daisyui": "^4.6.1", + "commitlint": "^19.0.3", + "daisyui": "^4.7.3", "dayjs": "^1.11.10", - "eslint": "^8.56.0", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", - "husky": "^9.0.7", + "husky": "^9.0.11", "is-ip": "^5.0.1", - "ky": "^1.2.0", - "lint-staged": "^15.2.1", + "ky": "^1.2.2", + "lint-staged": "^15.2.2", "lodash": "^4.17.21", - "match-sorter": "^6.3.3", - "prettier": "^3.2.4", + "match-sorter": "^6.3.4", + "prettier": "^3.2.5", "prettier-plugin-organize-imports": "^3.2.4", - "prettier-plugin-tailwindcss": "^0.5.11", - "solid-apexcharts": "^0.3.3", - "solid-js": "^1.8.12", + "prettier-plugin-tailwindcss": "^0.5.12", + "solid-apexcharts": "^0.3.4", + "solid-js": "^1.8.15", "solid-toast": "^0.5.0", - "sort-package-json": "^2.7.0", + "sort-package-json": "^2.8.0", "tailwind-merge": "^2.2.1", "tailwindcss": "^3.4.1", - "typescript": "^5.3.3", + "typescript": "^5.4.2", "uuid": "^9.0.1", - "vite": "^5.0.12", - "vite-plugin-pwa": "^0.17.5", - "vite-plugin-solid": "^2.9.1", + "vite": "^5.1.5", + "vite-plugin-pwa": "^0.19.2", + "vite-plugin-solid": "^2.10.1", "zod": "^3.22.4" } } diff --git a/src/pages/Config.tsx b/src/pages/Config.tsx index 99f7777..e879043 100644 --- a/src/pages/Config.tsx +++ b/src/pages/Config.tsx @@ -497,7 +497,7 @@ const Versions: Component<{ backendVersion: Accessor }> = ({ return (
- {import.meta.env.VITE_APP_VERSION} + {import.meta.env.APP_VERSION}
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts index a9fd9c4..e3d8665 100644 --- a/src/vite-env.d.ts +++ b/src/vite-env.d.ts @@ -1,5 +1,5 @@ interface ImportMetaEnv { - readonly VITE_APP_VERSION: string + readonly APP_VERSION: string } interface ImportMeta { diff --git a/vite.config.ts b/vite.config.ts index c8a00e1..42fd0db 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -6,6 +6,11 @@ export default defineConfig({ base: './', build: { chunkSizeWarningLimit: 1000 }, resolve: { alias: { '~': '/src' } }, + define: { + 'import.meta.env.APP_VERSION': JSON.stringify( + process.env.npm_package_version, + ), + }, plugins: [ solidPlugin(), splitVendorChunkPlugin(),