Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vite: Fix Vite 5 CJS warnings #25005

Merged
merged 6 commits into from
Jan 3, 2024
Merged

Vite: Fix Vite 5 CJS warnings #25005

merged 6 commits into from
Jan 3, 2024

Conversation

JReinhold
Copy link
Contributor

@JReinhold JReinhold commented Nov 28, 2023

Continues work on #24333

What I did

Converted a number of 'vite' imports to be dynamic imports, to force the use of Vite's ESM bundle.
Also added an ESLint rule to enforce this behavior going forward.

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>

# Conflicts:
#	code/frameworks/vue-vite/src/plugins/vue-docgen.ts
#	code/frameworks/vue-vite/src/preset.ts
@kasperpeulen kasperpeulen merged commit 0aa50e9 into next Jan 3, 2024
57 of 58 checks passed
@kasperpeulen kasperpeulen deleted the fix-vite5-cjs-warnings branch January 3, 2024 12:48
@github-actions github-actions bot mentioned this pull request Jan 3, 2024
15 tasks
@@ -39,6 +39,18 @@ module.exports = {
allowIndexSignaturePropertyAccess: true,
},
],
'@typescript-eslint/no-restricted-imports': [
Copy link
Member

Choose a reason for hiding this comment

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

Good idea!

@@ -140,11 +140,12 @@ export function getOptions<TOptions extends OptionSpecifier>(

const checkStringValue = (raw: string) => {
if (option.values && !option.values.includes(raw)) {
const possibleOptions = chalk.cyan(option.values.join(', '));
const possibleOptions = chalk.cyan(option.values.join('\n'));
Copy link
Member

Choose a reason for hiding this comment

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

This change seems unrelated to this PR, was it intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unrelated, but intentional. The message was pretty unreadable, so I just quickly improved it slightly

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants