Monorepo: Fix svelte-vite detection
#24085
Merged
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
|
I have too little knowledge about this, maybe @ndelangen or @JReinhold? |
ndelangen
approved these changes
Sep 6, 2023
ndelangen
added
bug
svelte
yarn / npm
legnaleurc
force-pushed
the
fix/monorepo
branch
from
2d33f90
to
2c88dc0
Compare
yannbf
reviewed
Sep 6, 2023
| @@ -23,7 +23,7 @@ export async function handleSvelteKit(plugins: PluginOption[], options: Options) | |||
| 'vite-plugin-sveltekit-compile', | |||
| ]); | |||
|
|
|||
| if (hasSvelteKitPlugins && framework !== '@storybook/sveltekit') { | |||
| if (hasSvelteKitPlugins && !framework.endsWith('@storybook/sveltekit')) { | |||
There was a problem hiding this comment.
This should probably be a regex or .includes instead, to be on the safer side
There was a problem hiding this comment.
Sure, I suspect both will work, but better to be cautious indeed 馃憤
ndelangen
changed the title
svelte-vite detection
legnaleurc
force-pushed
the
fix/monorepo
branch
2 times, most recently
from
5219bfb
to
fd3cce9
Compare
|
Updated for regex. |
|
Currently the tests are failing, because it's not detecting SvelteKit correctly, I'm not sure why. I think |
legnaleurc
force-pushed
the
fix/monorepo
branch
from
18d890c
to
a50b1b6
Compare
|
At least the test passed now. |
In monorepo, the framework name will be an absolute path. A follow up for storybookjs#23458.
legnaleurc
force-pushed
the
fix/monorepo
branch
from
a50b1b6
to
faeabfa
Compare
25 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In monorepo, the framework name will be an absolute path.
A follow up for #23458.
What I did
Change the framework name matching to match both
@storybook/sveltekit.../node_modules/@storybook/sveltekitChecklist 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:mergedorci:dailyGH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found incode/lib/cli/src/sandbox-templates.tsMake 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/coreteam 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>