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] Flatten grid packages folder #11946

Merged
merged 11 commits into from
Feb 7, 2024

Conversation

cherniavskii
Copy link
Member

Closes #10114

@cherniavskii cherniavskii added core Infrastructure work going on behind the scenes component: data grid This is the name of the generic UI component, not the React module! labels Feb 5, 2024
@mui-bot
Copy link

mui-bot commented Feb 5, 2024

Localization writing tips ✍️

Seems you are updating localization 🌍 files.

Thank you for contributing to the localization! 🎉 To make your PR perfect, here is a list of elements to check: ✔️

  • Verify if the PR title respects the release format. Here are two examples (depending if you update or add a locale file)

    [l10n] Improve Swedish (sv-SE) locale
    [l10n] Add Danish (da-DK) locale

  • Update the documentation of supported locales by running yarn l10n
  • Clean files with yarn prettier.

Deploy preview: https://deploy-preview-11946--material-ui-x.netlify.app/

Updated pages:

Generated by 🚫 dangerJS against 1555a3e

@github-actions github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Feb 6, 2024
Copy link

github-actions bot commented Feb 6, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Member

@flaviendelangle flaviendelangle left a comment

Choose a reason for hiding this comment

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

You should be able to remove a ternary in the copyFiles.mjs file that was due to this nested folder structure

@github-actions github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Feb 6, 2024
@cherniavskii cherniavskii marked this pull request as ready for review February 6, 2024 12:03
// TODO: Remove `grid` folder to flatten the structure
packageData.name.includes('grid') ? '../../../CHANGELOG.md' : '../../CHANGELOG.md',
];
const filesToCopy = ['./README.md', '../../CHANGELOG.md'];
Copy link
Member

Choose a reason for hiding this comment

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

When I migrated to use the same bundling strategy as the core, this code you just removed was the only diff with the core file
So maybe you could just remove everything from this file and import the core one, like we are doing for buildTypes.mjs

But this need to be double checked of course

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll look into this and submit a follow-up PR if necessary

Copy link
Member Author

Choose a reason for hiding this comment

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

Unfortunately, there are other non-trivial differences between our script and the one from the core repo.
Making the copyFiles script generic would be a significant effort and I think it's not worth it.
But I think it makes sense to at least reuse some functions from that script.
I'll submit a PR to the core repo.

Copy link
Member Author

Choose a reason for hiding this comment

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

@github-actions github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Feb 6, 2024
Copy link

github-actions bot commented Feb 6, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added PR: out-of-date The pull request has merge conflicts and can't be merged and removed PR: out-of-date The pull request has merge conflicts and can't be merged labels Feb 6, 2024
Copy link

github-actions bot commented Feb 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Feb 7, 2024
@cherniavskii cherniavskii merged commit 30fe549 into mui:next Feb 7, 2024
17 checks passed
@cherniavskii cherniavskii deleted the flatten-grid-packages branch February 7, 2024 10:51
thomasmoon pushed a commit to thomasmoon/mui-x that referenced this pull request Sep 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: data grid This is the name of the generic UI component, not the React module! core Infrastructure work going on behind the scenes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[DataGrid] Missing eslint import/no-cycle in MUI X / flatten grid folder
5 participants