Skip to content

Conversation

@legnaleurc
Copy link
Contributor

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/sveltekit

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests:

  • stories
  • unit tests
  • integration tests
  • end-to-end tests

Manual testing

This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!

Documentation

  • Add or update documentation reflecting your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Checklist for Maintainers

  • When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/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>

@kasperpeulen
Copy link
Contributor

I have too little knowledge about this, maybe @ndelangen or @JReinhold?

@ndelangen ndelangen self-assigned this Sep 6, 2023
@ndelangen ndelangen added bug svelte yarn / npm Yarn / npm acting weird monorepos Monorepo support pnpm ci:normal labels Sep 6, 2023
]);

if (hasSvelteKitPlugins && framework !== '@storybook/sveltekit') {
if (hasSvelteKitPlugins && !framework.endsWith('@storybook/sveltekit')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be a regex or .includes instead, to be on the safer side

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I suspect both will work, but better to be cautious indeed 👍

@ndelangen ndelangen changed the title fix svelte-vite detection for NPM workspaces Monorepo: Fix svelte-vite detection Sep 6, 2023
@legnaleurc legnaleurc force-pushed the fix/monorepo branch 2 times, most recently from 5219bfb to fd3cce9 Compare September 7, 2023 17:55
@legnaleurc
Copy link
Contributor Author

Updated for regex.

Copy link
Contributor

@JReinhold JReinhold left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 💪

@JReinhold
Copy link
Contributor

Currently the tests are failing, because it's not detecting SvelteKit correctly, I'm not sure why. I think .includes('sveltekit') would be the safest solution, could you try that and see if it still works and makes the tests pass?

@legnaleurc
Copy link
Contributor Author

At least the test passed now.

In monorepo, the framework name will be an absolute path.

A follow up for storybookjs#23458.
@JReinhold JReinhold merged commit d8c5bba into storybookjs:next Sep 8, 2023
@github-actions github-actions bot mentioned this pull request Sep 8, 2023
25 tasks
@legnaleurc legnaleurc deleted the fix/monorepo branch September 14, 2023 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug ci:normal monorepos Monorepo support pnpm svelte yarn / npm Yarn / npm acting weird

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants