-
-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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
Vite: Remove @fs
prefix from import paths
#29687
base: next
Are you sure you want to change the base?
Conversation
☁️ Nx Cloud ReportCI is running/has finished running commands for commit 58c798e. As they complete they will appear below. Click to see the status, the terminal output, and the build insights. 📂 See all runs for this CI Pipeline Execution ✅ Successfully ran 1 targetSent with 💌 from NxCloud. |
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.
1 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings | Greptile
@@ -31,7 +31,7 @@ async function toImportFn(stories: string[]) { | |||
const objectEntries = stories.map((file) => { | |||
const relativePath = normalizePath(relative(process.cwd(), file)); | |||
|
|||
return ` '${toImportPath(relativePath)}': async () => import('/@fs/${file}')`; | |||
return ` '${toImportPath(relativePath)}': async () => import('${file}')`; |
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.
logic: Removing /@fs/ prefix may cause issues with files outside project root. Consider adding a check to ensure file paths are within Vite's root directory.
Package BenchmarksCommit: No significant changes detected, all good. 👏 |
Failed to publish canary version of this pull request, triggered by @JReinhold. See the failed workflow run at: https://github.com/storybookjs/storybook/actions/runs/11973399334 |
Failed to publish canary version of this pull request, triggered by @JReinhold. See the failed workflow run at: https://github.com/storybookjs/storybook/actions/runs/11980149152 |
This of course works if the indexer returns a path that you can directly feed into Some scenarios that would need to be tested:
And perhaps a few more edge cases that I forgot now. |
Thanks, that's great context. I don't think that was evident from your original PR.
Makes sense. It's unclear to me whether any of this needs to be handled because of the removal of the Either way, here's a test matrix that we need to fill out, @kasperpeulen for us to have total confidence in this change:
|
If you add the Without the For the testing, you might want to reuse/extend https://github.com/storybookjs/storybook/pull/28941/files#diff-e4588b05a0bf4b863207316cc509a72cb4a07738b59ba7090c7312c10b81b090 |
Another attempt at #28941, direct response to https://github.com/storybookjs/storybook/pull/28941/files#r1787391658.
What I did
Removed the
/@fs/
prefix from import paths in the Vite builder, as it was causing some issues:I haven't experienced any problems with this change in my light testing, but I need to test it on Windows as well to be sure.
@tobiasdiez does this solve the original problem that you had? Or am I missing something crucial? I've created a canary release that you can try out at your end to see if it fixes it.
Checklist for Contributors
Testing
The changes in this PR are covered in the following automated tests:
Manual testing
This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!
Documentation
MIGRATION.MD
Checklist for Maintainers
When this PR is ready for testing, make sure to add
ci:normal
,ci:merged
orci:daily
GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found incode/lib/cli-storybook/src/sandbox-templates.ts
Make sure this PR contains one of the labels below:
Available labels
bug
: Internal changes that fixes incorrect behavior.maintenance
: User-facing maintenance tasks.dependencies
: Upgrading (sometimes downgrading) dependencies.build
: Internal-facing build tooling & test updates. Will not show up in release changelog.cleanup
: Minor cleanup style change. Will not show up in release changelog.documentation
: Documentation only changes. Will not show up in release changelog.feature request
: Introducing a new feature.BREAKING CHANGE
: Changes that break compatibility in some way with current major version.other
: Changes that don't fit in the above categories.🦋 Canary release
This pull request has been released as version
0.0.0-pr-29687-sha-d977033a
. Try it out in a new sandbox by runningnpx storybook@0.0.0-pr-29687-sha-d977033a sandbox
or in an existing project withnpx storybook@0.0.0-pr-29687-sha-d977033a upgrade
.More information
0.0.0-pr-29687-sha-d977033a
jeppe/remove-@fs
d977033a
1732312226
)To request a new release of this pull request, mention the
@storybookjs/core
team.core team members can create a new canary release here or locally with
gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=29687
Greptile Summary
Removed the '/@fs/' prefix from import paths in the Vite builder to fix issues with plugin-based story import resolution, particularly affecting Vue plugins.
code/builders/builder-vite/src/codegen-importfn-script.ts
to remove '/@fs/' prefix from dynamic imports