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

Unify js files #7098

Merged

Conversation

jordisala1991
Copy link
Member

@jordisala1991 jordisala1991 commented Apr 21, 2021

Subject

I am targeting this branch, because this only applies to master.

Part of #7049

Requires #7089

Changelog

### Changed
- Unify vendor js files into a single `app.js` file

@jordisala1991
Copy link
Member Author

I will just leave this open, to notice that I am working on this part of the integration. It is not ready because I am having problems exposing jquery (and its plugins) to the outside world. Any help there would be welcome. @sonata-project/contributors

@jordisala1991 jordisala1991 force-pushed the feature/unify-js-files branch 9 times, most recently from b1728b4 to 0880884 Compare April 22, 2021 07:23
@jordisala1991 jordisala1991 mentioned this pull request Apr 22, 2021
31 tasks
@SonataCI
Copy link
Collaborator

Could you please rebase your PR and fix merge conflicts?

@jordisala1991 jordisala1991 marked this pull request as ready for review April 23, 2021 06:56
@jordisala1991
Copy link
Member Author

Fixed the build, and the problems I had before with the utilisation of multiple jQuery versions. Now all node_modules uses the same ^2.x version of jQuery (still pending the upgrade to 3) and all plugins get added correctly and usable from the outside.

VincentLanglet
VincentLanglet previously approved these changes Apr 23, 2021
@VincentLanglet VincentLanglet requested a review from a team April 23, 2021 12:28
VincentLanglet
VincentLanglet previously approved these changes Apr 23, 2021
@jordisala1991 jordisala1991 requested a review from a team April 23, 2021 16:29
UPGRADE-4.0.md Outdated Show resolved Hide resolved
Co-authored-by: Javier Spagnoletti <phansys@gmail.com>
phansys
phansys previously approved these changes Apr 24, 2021
UPGRADE-4.0.md Outdated Show resolved Hide resolved
assets/js/app.js Outdated Show resolved Hide resolved
assets/scss/app.scss Outdated Show resolved Hide resolved
assets/scss/app.scss Outdated Show resolved Hide resolved
Co-authored-by: Javier Spagnoletti <phansys@gmail.com>
VincentLanglet
VincentLanglet previously approved these changes Apr 24, 2021
@jordisala1991 jordisala1991 merged commit a077dd9 into sonata-project:master Apr 26, 2021
@jordisala1991 jordisala1991 deleted the feature/unify-js-files branch April 26, 2021 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants