-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'h17-rework-version-information' into development
# Conflicts: # client/package-lock.json # client/package.json
- Loading branch information
Showing
9 changed files
with
56 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,38 @@ | ||
| import { getFormattedVersion } from "@corteks/gitversion" | ||
| import react from "@vitejs/plugin-react-swc" | ||
| import fs from "fs" | ||
| import toml from "toml" | ||
| import { defineConfig, splitVendorChunkPlugin } from "vite" | ||
| import checker from "vite-plugin-checker" | ||
| import replace from "vite-plugin-filter-replace" | ||
| import viteTsconfigPaths from "vite-tsconfig-paths" | ||
| import pkg from "./package.json" | ||
|
|
||
| let server_version: string = "UNKNOWN" | ||
| // https://vitejs.dev/config/ | ||
| export default defineConfig(async () => { | ||
| let version: string = process.env.HITSTER_VERSION ?? await getFormattedVersion() | ||
|
|
||
| try { | ||
| server_version = toml.parse( | ||
| fs.readFileSync("../server/Cargo.toml", { encoding: "utf-8" }), | ||
| ).package.version | ||
| } catch (e) { | ||
| server_version = toml.parse( | ||
| fs.readFileSync("./Cargo.toml", { encoding: "utf-8" }), | ||
| ).package.version | ||
| } | ||
| if(version === "0.0.0-null") { | ||
| // fallback | ||
| version = "unknown" | ||
| } | ||
|
|
||
| // https://vitejs.dev/config/ | ||
| export default defineConfig({ | ||
| plugins: [ | ||
| react(), | ||
| viteTsconfigPaths(), | ||
| checker({ | ||
| typescript: true, | ||
| }), | ||
| splitVendorChunkPlugin(), | ||
| replace([ | ||
| { | ||
| filter: "src/navigation.tsx", | ||
| replace: [ | ||
| { | ||
| from: /__CLIENT_VERSION__/g, | ||
| to: pkg.version, | ||
| }, | ||
| { | ||
| from: /__SERVER_VERSION__/g, | ||
| to: server_version, | ||
| }, | ||
| ], | ||
| }, | ||
| ]), | ||
| ], | ||
| return { | ||
| plugins: [ | ||
| react(), | ||
| viteTsconfigPaths(), | ||
| checker({ | ||
| typescript: true, | ||
| }), | ||
| splitVendorChunkPlugin(), | ||
| replace([ | ||
| { | ||
| filter: "src/navigation.tsx", | ||
| replace: [ | ||
| { | ||
| from: /__VERSION__/g, | ||
| to: version, | ||
| }, | ||
| ], | ||
| }, | ||
| ]), | ||
| ], | ||
| } | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters