-
Notifications
You must be signed in to change notification settings - Fork 1.4k
fix(ui): Make feast UI load in Vite without process.env and arrow_down imports #6724
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
Open
kchawlani19
wants to merge
2
commits into
feast-dev:master
Choose a base branch
from
kchawlani19:fix/ui-vite-arrowdown-5429
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { getProcessEnv } from "./environment"; | ||
|
|
||
| test("returns undefined when process env map is unavailable", () => { | ||
| expect(getProcessEnv("PUBLIC_URL", {}, undefined)).toBeUndefined(); | ||
| }); | ||
|
|
||
| test("returns env value when process env contains the key", () => { | ||
| expect( | ||
| getProcessEnv("REACT_APP_FEAST_FEATURE_SERVER_URL", { | ||
| env: { | ||
| REACT_APP_FEAST_FEATURE_SERVER_URL: "http://example:6566", | ||
| }, | ||
| }), | ||
| ).toBe("http://example:6566"); | ||
| }); | ||
|
|
||
| test("returns value from Vite-prefixed env when available", () => { | ||
| expect( | ||
| getProcessEnv( | ||
| "REACT_APP_FEAST_FEATURE_SERVER_URL", | ||
| { env: {} }, | ||
| { VITE_REACT_APP_FEAST_FEATURE_SERVER_URL: "http://vite:6566" }, | ||
| ), | ||
| ).toBe("http://vite:6566"); | ||
| }); | ||
|
|
||
| test("returns Vite BASE_URL for PUBLIC_URL", () => { | ||
| expect(getProcessEnv("PUBLIC_URL", { env: {} }, { BASE_URL: "/ui/" })).toBe( | ||
| "/ui/", | ||
| ); | ||
| }); | ||
|
|
||
| test("returns undefined when env key does not exist", () => { | ||
| expect(getProcessEnv("PUBLIC_URL", { env: {} }, {})).toBeUndefined(); | ||
| }); |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| type ProcessLike = { | ||
| env?: Record<string, string | undefined>; | ||
| }; | ||
|
|
||
| type ViteEnvLike = Record<string, string | boolean | undefined>; | ||
|
|
||
| const getDefaultProcess = (): ProcessLike | undefined => { | ||
| if (typeof process === "undefined") { | ||
| return undefined; | ||
| } | ||
| return process; | ||
| }; | ||
|
|
||
| const getDefaultViteEnv = (): ViteEnvLike | undefined => { | ||
| if (typeof import.meta === "undefined" || !import.meta.env) { | ||
| return undefined; | ||
| } | ||
|
|
||
| return import.meta.env as ViteEnvLike; | ||
| }; | ||
|
|
||
| const getStringEnvValue = ( | ||
| envValue: string | boolean | undefined, | ||
| ): string | undefined => { | ||
| if (typeof envValue !== "string") { | ||
| return undefined; | ||
| } | ||
|
|
||
| return envValue; | ||
| }; | ||
|
|
||
| const getViteEnvValue = ( | ||
| envVarName: string, | ||
| viteEnv: ViteEnvLike | undefined, | ||
| ): string | undefined => { | ||
| if (!viteEnv) { | ||
| return undefined; | ||
| } | ||
|
|
||
| if (envVarName === "PUBLIC_URL") { | ||
| return ( | ||
| getStringEnvValue(viteEnv.BASE_URL) ?? | ||
| getStringEnvValue(viteEnv.VITE_PUBLIC_URL) | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| getStringEnvValue(viteEnv[`VITE_${envVarName}`]) ?? | ||
| getStringEnvValue(viteEnv[envVarName]) | ||
| ); | ||
| }; | ||
|
|
||
| export const getProcessEnv = ( | ||
| envVarName: string, | ||
| processLike: ProcessLike | undefined = getDefaultProcess(), | ||
| viteEnv: ViteEnvLike | undefined = getDefaultViteEnv(), | ||
| ): string | undefined => { | ||
| const viteEnvValue = getViteEnvValue(envVarName, viteEnv); | ||
| if (viteEnvValue !== undefined) { | ||
| return viteEnvValue; | ||
| } | ||
|
|
||
| if (!processLike?.env) { | ||
| return undefined; | ||
| } | ||
|
|
||
| return getStringEnvValue(processLike.env[envVarName]); | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
The whole point of this PR is Vite compatibility, but the new helper only wraps process.env. In Vite, environment variables are accessed via import.meta.env, not process.env.