-
Notifications
You must be signed in to change notification settings - Fork 186
chore(js): Remove misleading top-level Vitest configuration #20234
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
SyntaxColoring
wants to merge
12
commits into
edge
Choose a base branch
from
what_happens_if_we_delete_the_test_viteconfigs
base: edge
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.
+184
−118
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
d324e11
Merge top-level vite.config.mts with vitest.config.mts.
SyntaxColoring 70c1d4d
Add Vitest config to JS test workflows.
SyntaxColoring 57d5f27
Type-safe Storybook config.
SyntaxColoring e691fe4
Preserve the old top-level vite.config.mjs for Storybook.
SyntaxColoring 485bbe2
Merge branch 'edge' into what_happens_if_we_delete_the_test_viteconfigs
SyntaxColoring 1bd0574
Delete viteFinal alias that was doing the same thing as vite.config.mts.
SyntaxColoring 69ae9ae
Fix staticDirs?
SyntaxColoring e3ce391
Leave a todo comment for staticDirs.
SyntaxColoring d1d6f94
Merge remote-tracking branch 'origin/edge' into what_happens_if_we_de…
SyntaxColoring b6c27db
Remove staticDirs.
SyntaxColoring 7a2f9e6
Fix accidental change from .mts to .mjs.
SyntaxColoring aebc8cc
Add .cjs, .cts, and .mts to GitHub Actions globs.
SyntaxColoring 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
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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| const path = require('path') | ||
| import type { StorybookConfig } from '@storybook/react-vite' | ||
|
|
||
| module.exports = { | ||
| const config: StorybookConfig = { | ||
| stories: [ | ||
| '../components/**/*.stories.@(js|jsx|ts|tsx)', | ||
| '../app/**/*.stories.@(js|jsx|ts|tsx)', | ||
|
|
@@ -19,24 +19,22 @@ module.exports = { | |
| 'storybook-addon-pseudo-states', | ||
| ], | ||
|
|
||
| staticDirs: ['../app/src/assets'], | ||
|
|
||
| framework: { | ||
| name: '@storybook/react-vite', | ||
| options: {}, | ||
| options: { | ||
| builder: { | ||
| // Storybook would normally find the Vite config automatically. | ||
| // That doesn't work for us because we have one monorepo-wide Storybook | ||
| // installation, while each project has its own local Vite config. | ||
| // So we treat Storybook as its own Vite project with its own config. | ||
| viteConfigPath: '.storybook/vite.config.mjs', | ||
| }, | ||
| }, | ||
| }, | ||
|
|
||
| docs: { | ||
| autodocs: true, | ||
| }, | ||
|
|
||
| async viteFinal(config) { | ||
| config.resolve = config.resolve || {} | ||
| config.resolve.alias = config.resolve.alias || {} | ||
|
|
||
| // Add the same alias as in app/vite.config.mts to support /app/ imports | ||
| config.resolve.alias['/app/'] = path.resolve(__dirname, '../app/src/') + '/' | ||
|
|
||
| return config | ||
| }, | ||
|
Comment on lines
-32
to
-41
Contributor
Author
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.
Contributor
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. this is used to overwrite the path to image in my pr. |
||
| } | ||
|
|
||
| export default config | ||
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
Oops, something went wrong.
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.
is there any reason to use
.*instead.mts?there is only one vitest.config.mts in the monorepo.
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.
Since Vite and Vitest support multiple extensions (
.js, .mjs, .cjs,.ts,.mts,.cts), I was just thinking this would be one less thing that we'd need to update in case we ever wanted to changevitest.config.mtstovitest.config.tsor something like that.