-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New ReleaseVersion
component into HelpButton
#310
Changes from 6 commits
b400891
6fdbbdd
343e01d
f9dc614
eaf40bd
924806a
56217fa
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
"@liam-hq/erd-core": patch | ||
"@liam-hq/cli": patch | ||
--- | ||
|
||
New `ReleaseVersion` component into `HelpButton` |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export * from './set-env.js' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
import { execSync } from 'node:child_process' | ||
import { type Plugin, loadEnv } from 'vite' | ||
|
||
/** | ||
* This Vite plugin initializes and sets the following environment variables for the client-side environment: | ||
* - VITE_CLI_VERSION_VERSION: The current version of the package from package.json. | ||
* - VITE_CLI_VERSION_IS_RELEASED_GIT_HASH: A flag indicating whether the current GIT hash corresponds to a released tag. | ||
* - VITE_CLI_VERSION_GIT_HASH: The current GIT commit hash. | ||
* - VITE_CLI_VERSION_DATE: The commit date of the latest commit. | ||
* | ||
* These variables are essential for maintaining version consistency and tracking within the deployment environment. | ||
*/ | ||
export function setEnvPlugin(): Plugin { | ||
const fetchGitHash = () => { | ||
try { | ||
return execSync('git rev-parse HEAD').toString().trim() | ||
} catch (error) { | ||
console.error('Failed to get git hash:', error) | ||
return '' | ||
} | ||
} | ||
|
||
const date = () => { | ||
try { | ||
const gitDate = execSync('git log -1 --format=%ci').toString().trim() | ||
return gitDate.split(' ')[0] | ||
} catch (error) { | ||
console.error('Failed to get git date:', error) | ||
return new Date().toISOString().split('T')[0] // fallback to current date | ||
} | ||
} | ||
|
||
const versionPrefix = '@liam-hq/cli@' | ||
|
||
const isReleasedGitHash = (gitHash: string, packageJsonVersion: string) => { | ||
const latestTagName = `${versionPrefix}${packageJsonVersion}` | ||
try { | ||
execSync('git fetch --tags') | ||
const tagCommit = execSync(`git rev-parse ${latestTagName}`) | ||
.toString() | ||
.trim() | ||
if (gitHash === tagCommit) { | ||
return 1 | ||
} | ||
return 0 | ||
} catch (error) { | ||
console.error('Failed to get git tag:', error) | ||
return 0 | ||
} | ||
} | ||
|
||
return { | ||
name: 'set-env', | ||
config(_, { mode }) { | ||
const env = loadEnv(mode, process.cwd(), '') | ||
|
||
const packageJsonVersion = env.npm_package_version | ||
const gitHash = fetchGitHash() | ||
|
||
process.env.VITE_CLI_VERSION_VERSION = packageJsonVersion | ||
process.env.VITE_CLI_VERSION_IS_RELEASED_GIT_HASH = JSON.stringify( | ||
isReleasedGitHash(gitHash, packageJsonVersion), | ||
) | ||
process.env.VITE_CLI_VERSION_GIT_HASH = gitHash | ||
process.env.VITE_CLI_VERSION_DATE = date() | ||
}, | ||
} | ||
} | ||
|
||
export default setEnvPlugin |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,12 @@ | ||||||||||||||||||||||||||||||||||||||||||||
.cliVersion { | ||||||||||||||||||||||||||||||||||||||||||||
padding: var(--spacing-2); | ||||||||||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||
.cliVersionInner { | ||||||||||||||||||||||||||||||||||||||||||||
border-radius: var(--border-radius-full); | ||||||||||||||||||||||||||||||||||||||||||||
background: var(--pane-muted-background); | ||||||||||||||||||||||||||||||||||||||||||||
padding: var(--spacing-1) var(--spacing-2); | ||||||||||||||||||||||||||||||||||||||||||||
color: var(--global-mute-text); | ||||||||||||||||||||||||||||||||||||||||||||
font-family: var(--code-font); | ||||||||||||||||||||||||||||||||||||||||||||
font-size: var(--font-size-1); | ||||||||||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nits: If we use margin, it would be simple to implement without nesting divs.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I see! |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,30 @@ | ||||||||||||||||||||||||||||||||||
import { useCliVersion } from '@/providers' | ||||||||||||||||||||||||||||||||||
import type { FC } from 'react' | ||||||||||||||||||||||||||||||||||
import styles from './ReleaseVersion.module.css' | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
export const ReleaseVersion: FC = () => { | ||||||||||||||||||||||||||||||||||
const { cliVersion } = useCliVersion() | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
// Example output for cliVersion: | ||||||||||||||||||||||||||||||||||
// - Released version: | ||||||||||||||||||||||||||||||||||
// v0.0.11 (2024-12-19) | ||||||||||||||||||||||||||||||||||
// - Unreleased version: | ||||||||||||||||||||||||||||||||||
// v0.0.11 + 0d6169a (2024-12-19) | ||||||||||||||||||||||||||||||||||
// | ||||||||||||||||||||||||||||||||||
// Explanation: | ||||||||||||||||||||||||||||||||||
// - "Released version" means the current Git hash matches a tagged release. | ||||||||||||||||||||||||||||||||||
// - "Unreleased version" includes a short Git hash prefix to indicate changes since the last release. | ||||||||||||||||||||||||||||||||||
return ( | ||||||||||||||||||||||||||||||||||
<div className={styles.cliVersion}> | ||||||||||||||||||||||||||||||||||
<div className={styles.cliVersionInner}> | ||||||||||||||||||||||||||||||||||
<span>{`v${cliVersion.version}`}</span> | ||||||||||||||||||||||||||||||||||
<span> | ||||||||||||||||||||||||||||||||||
{' '} | ||||||||||||||||||||||||||||||||||
{cliVersion.isReleasedGitHash || | ||||||||||||||||||||||||||||||||||
`+ ${cliVersion.gitHash.slice(0, 7)} `} | ||||||||||||||||||||||||||||||||||
</span> | ||||||||||||||||||||||||||||||||||
<span>{cliVersion.date.length > 0 && ` (${cliVersion.date})`}</span> | ||||||||||||||||||||||||||||||||||
</div> | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||||||||||
</div> | ||||||||||||||||||||||||||||||||||
) | ||||||||||||||||||||||||||||||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,4 @@ | ||
export * from './components' | ||
export * from './providers' | ||
export * from './schemas' | ||
export * from './stores' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import type { CliVersion } from '@/schemas/cliVersion' | ||
import { type FC, type ReactNode, createContext, useContext } from 'react' | ||
|
||
interface CliVersionContextProps { | ||
cliVersion: CliVersion | ||
} | ||
|
||
const CliVersionContext = createContext<CliVersionContextProps | undefined>( | ||
undefined, | ||
) | ||
|
||
export const useCliVersion = (): CliVersionContextProps => { | ||
const context = useContext(CliVersionContext) | ||
if (!context) { | ||
throw new Error('useCliVersion must be used within a CliVersionProvider') | ||
} | ||
return context | ||
} | ||
|
||
export const CliVersionProvider: FC<{ | ||
cliVersion: CliVersion | ||
children: ReactNode | ||
}> = ({ cliVersion, children }) => { | ||
return ( | ||
<CliVersionContext.Provider value={{ cliVersion }}> | ||
{children} | ||
</CliVersionContext.Provider> | ||
) | ||
} |
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I created a new directory, but is it appropriate? 💭 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export * from './CliVersionProvider' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
export * from './schemas' | ||
export * from './types' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import * as v from 'valibot' | ||
|
||
export const cliVersionSchema = v.object({ | ||
version: v.string(), | ||
gitHash: v.string(), | ||
isReleasedGitHash: v.boolean(), | ||
date: v.string(), | ||
}) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import type { InferOutput } from 'valibot' | ||
import type { cliVersionSchema } from './schemas' | ||
|
||
export type CliVersion = InferOutput<typeof cliVersionSchema> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
export * from './cliVersion' | ||
export * from './queryParam' | ||
export * from './showMode' | ||
Comment on lines
+1
to
+3
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I only wanted the cliVersion here, but I'm also exporting the others for consistency |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cool 🚀