-
-
Notifications
You must be signed in to change notification settings - Fork 9.4k
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: Merge assetsInclude property with Storybook default values #26860
Merged
ndelangen
merged 3 commits into
storybookjs:next
from
yuemori:fix-vite-builder-override-assetsinclude
Apr 29, 2024
Merged
Vite: Merge assetsInclude property with Storybook default values #26860
ndelangen
merged 3 commits into
storybookjs:next
from
yuemori:fix-vite-builder-override-assetsinclude
Apr 29, 2024
Conversation
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
yannbf
added
bug
patch:yes
Bugfix & documentation PR that need to be picked to main branch
builder-vite
ci:normal
labels
Apr 29, 2024
yannbf
changed the title
Fix vite-builder prevent override of assetsInclude field by default value
Vite: Merge assetsInclude property with Storybook default values
Apr 29, 2024
ndelangen
approved these changes
Apr 29, 2024
☁️ Nx Cloud ReportCI is running/has finished running commands for commit 435407d. 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. |
storybook-bot
pushed a commit
that referenced
this pull request
Apr 29, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
Merged
9 tasks
storybook-bot
pushed a commit
that referenced
this pull request
Apr 29, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
Apr 29, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
Apr 29, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
Apr 30, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 1, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 1, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 1, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 1, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 2, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 2, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 2, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 3, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
44 tasks
storybook-bot
pushed a commit
that referenced
this pull request
May 4, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 4, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
storybook-bot
pushed a commit
that referenced
this pull request
May 5, 2024
…tsinclude Vite: Merge assetsInclude property with Storybook default values (cherry picked from commit f6ecc28)
github-actions
bot
added
the
patch:done
Patch/release PRs already cherry-picked to main/release branch
label
May 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
bug
builder-vite
ci:normal
patch:done
Patch/release PRs already cherry-picked to main/release branch
patch:yes
Bugfix & documentation PR that need to be picked to main branch
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.
What I did
In this PR, I address a configuration issue in builder-vite where the
assetsInclude
field was being statically set to['/sb-preview/**']
, which could potentially overwrite any user-defined configurations. The updated implementation now merges any existing entries with these required defaults, ensuring both are preserved.Details of Changes
assetsInclude
is initialized, ensuring it now merges['/sb-preview/**']
with any existing patterns set by the user.Checklist for Contributors
Testing
The changes in this PR are covered in the following automated tests:
Documentation
MIGRATION.MD
Workaround
You can avoid this issue by using viteFinal to further override the settings.
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/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 PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the
@storybookjs/core
team here.core team members can create a canary release here or locally with
gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<PR_NUMBER>