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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core: Implement file formatter #26809

Merged
merged 4 commits into from
Apr 15, 2024
Merged

Core: Implement file formatter #26809

merged 4 commits into from
Apr 15, 2024

Conversation

valentinpalkovic
Copy link
Contributor

@valentinpalkovic valentinpalkovic commented Apr 11, 2024

Closes #26804

What I did

I have implemented a file formatter which is based on the user's prettier version (supported version 2 and 3). If prettier is not installed by the user, we will use a fallback prettier version to format files if we can find a .editorconfig. Otherwise, the file is returned as is.

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>

Copy link

nx-cloud bot commented Apr 11, 2024

☁️ Nx Cloud Report

CI is running/has finished running commands for commit a2ce71b. 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 2 targets

Sent with 💌 from NxCloud.

@valentinpalkovic valentinpalkovic changed the title Implement file formatter Core: Implement file formatter Apr 11, 2024
@valentinpalkovic valentinpalkovic marked this pull request as ready for review April 11, 2024 11:08
code/lib/core-common/package.json Show resolved Hide resolved
code/lib/core-common/src/utils/formatter.ts Outdated Show resolved Hide resolved
code/lib/core-common/src/utils/formatter.ts Show resolved Hide resolved
code/lib/core-common/src/utils/formatter.ts Show resolved Hide resolved
@valentinpalkovic valentinpalkovic merged commit cfb552c into next Apr 15, 2024
35 checks passed
@valentinpalkovic valentinpalkovic deleted the valentin/formatter branch April 15, 2024 09:12
@github-actions github-actions bot mentioned this pull request Apr 15, 2024
44 tasks
@QuintonC
Copy link

@valentinpalkovic There might have been a regression in this for folks using Yarn.

After running yarn install, node_modules does not include a prettier directory. Instead, it only includes prettier-fallback.

As a result, any other tooling which utilizes prettier will fail to locate prettier as it does not exist (such as eslint).

Result after clearing node_modules and running yarn install

image

@valentinpalkovic
Copy link
Contributor Author

valentinpalkovic commented May 30, 2024

@QuintonC This is the expected behaviour. Prettier is only defined as an optional peer dependency. If you haven’t installed it, we will fallback to the prettier-fallback, which is essentially the latest version of prettier. With that said, prettier-fallback is always installed. That’s the reason why you can find it in your node_modules. It doesn’t mean, though, that it is used for file formatting. It will only be used if we couldn’t load prettier. If your other tooling (like eslint) requires to have prettier installed, then you have to install it. In this case, our file formatter will pick it up instead and will not fallback to the prettier-fallback.

@QuintonC
Copy link

@QuintonC This is the expected behaviour. Prettier is only defined as an optional peer dependency. If you haven’t installed it, we will fallback to the prettier-fallback, which is essentially the latest version of prettier.

That's just the problem. We do have prettier installed + listed in our devDependencies. However, when we run a clean install (yarn install) with no lockfile, we do not end up with prettier installed. Instead, we have prettier-fallback installed and listed in our lockfile.

This only happened when upgrading from 8.0.x to 8.1.x where this change was included.

@valentinpalkovic
Copy link
Contributor Author

I see! For me it sounds like a yarn bug then instead of a bug in Storybook. A package's dependencies shouldn’t influence whether your own declared dependencies gets installed or not. Could you open a GitHub issue in yarns repo? Also, which version of yarn are you using?

@QuintonC
Copy link

Here's a quick screengrab from our lockfile after running yarn install and doing an upgrade to Storybook 8.1.x

image

I don't believe that this is a yarn bug. I think this is more of an issue with "automagically" defaulting to a package when one isn't installed. While it seems to be good-intentioned, I don't believe this is the correct implementation / use case of a peer dependency. It should just be marked as a peerDependency as you've done.

@QuintonC
Copy link

Current fix for us is to add a resolution for prettier-fallback in our package.json.

  "resolutions": {
    "prettier-fallback": "npm:empty-npm-package"
  },

@sheuertz
Copy link

This also causes yarn outdated to fail: error Error: https://registry.yarnpkg.com/prettier-fallback: Not found

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.

[Project SfC]: Implement a formatter to format new/edited files
4 participants