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.

Sign up for GitHub

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

Jump to bottom

[6.x] Vue 3 #10430

Closed
wants to merge 159 commits into from
Closed

[6.x] Vue 3 #10430

wants to merge 159 commits into from

Conversation

jasonvarga
Copy link
Member

@jasonvarga jasonvarga commented Jul 10, 2024 •
edited
Loading

Upgrades from Vue 2 to 3.

Todos: (Obviously not a complete list)

justkidding96 and others added 30 commits June 14, 2024 00:54
@justkidding96
Initial start with Vue 3.
bf53318
@justkidding96
Refactored some components for Vue 3
2d41364
@jelleroorda
wip.
684ebe2
@jelleroorda
Merge branch forks together.
665f37d
@jelleroorda
Use $slots instead of $scopedSlots.
c54a83d
@jelleroorda
Refactor popovers. Start moving portals + stacks to vuex.
cee9b61
@jelleroorda
Refactor progress bar to a composable.
79a001e
@jelleroorda
Fix render functions, import it from vue.
9ca655c
@jelleroorda
Start with collections listing.
d3bd7bc
@jelleroorda
Refactor dirty state to a composable.
8c3ce1a
@jelleroorda
WIP on pages in tree view.
096fc75
@justkidding96
Suppress the translation warnings
f7c77e9
@jelleroorda
Fix classes not displaying for dropdown list.
4b64719
@jelleroorda
Fix tree drag-and-drop and save functionality.
b3fc5d5
@jelleroorda
Fix all slot scopes, except for WIP components.
300bb42
@jelleroorda
Wip on collection list view.
a5e6c5b
@jelleroorda
Fix custom field registration.
4232b1e
@justkidding96
Add tooltip styling
2f563a4
@jelleroorda
WIP replacing modal, fix keyboard shortcuts modal.
e628764
@jelleroorda
Change opening of confirmation modals to v-model.
33e2843
@jelleroorda
Pass modal id so it can be accessed programmatically.
882a879
@jelleroorda
Pass v-model instead of v-if for normal modals.
7725c9c
@jelleroorda
Fix $toast.
b46cdf7
@jelleroorda
Set default width of 600px for modal.
c17b881
@jelleroorda
Remove test modals component.
029fe8f
@jelleroorda @github-actions
Fix styling
2aa1c4c
@jelleroorda
Add another note about the new vue toastification package.
e75739a
@jelleroorda
Prop type fix.
dd083f1
@jelleroorda
Fix undefined property for slots.
7bc3654
@jelleroorda
Merge remote-tracking branch 'upstream/5.x' into vue3
c60eede
jelleroorda and others added 27 commits August 18, 2024 19:41
@jelleroorda
Fix warning about id on portal target.
c1f34aa
@jelleroorda
Fix field conditions.
c8be342
@jelleroorda
Update Fuse usage to v7 syntax.
65692b7
@jelleroorda
Value -> modelValue in field meta.
bfcdd93
@jelleroorda
Remove emits, since events are fired by the modal.
8975cc0
@jelleroorda
Make blueprint builder work for globals.
8c4c366
@jelleroorda
Formatting of blueprint builder related files.
2282b62
@jelleroorda
Remove unused v-model overrides.
5a8291f
@jelleroorda
Remove passed is-config prop that doesn't do anything.
965b9ee
@jelleroorda
Taxonomy blueprint listing.
08e92a5
@jelleroorda
Collection blueprints
0d036cb
@jelleroorda
Fix create entry button.
277e9b6
@jelleroorda
Base entry creation.
7b7ebd4
@jelleroorda
Fix more slot scopes.
1801815
@jelleroorda
Dictionary fieldtype.
c3b0976
@jelleroorda
Fix ordering of taxonomy and collection blueprint listings.
34c260b
@jelleroorda
Fieldset listing, create, update.
9e5d977
@jasonvarga
Merge branch 'master' into vue3
133c49a 
# Conflicts:
#	package-lock.json
#	package.json
#	resources/js/app.js
#	resources/js/bootstrap/components.js
#	resources/js/components/data-list/Filter.vue
#	resources/js/components/fieldsets/Listing.vue
#	resources/js/components/fieldtypes/DictionaryFieldtype.vue
#	resources/js/components/fieldtypes/RadioFieldtype.vue
#	resources/js/components/fieldtypes/bard/LinkToolbar.vue
#	resources/js/components/fieldtypes/bard/Set.vue
#	resources/js/components/fieldtypes/replicator/Set.vue
#	resources/js/components/nav/Builder.vue
#	resources/js/components/nav/ItemEditor.vue
#	resources/js/components/users/Wizard.vue
@jasonvarga
Merge branch 'master' into vue3
ff709ce 
# Conflicts:
#	package-lock.json
#	package.json
#	resources/js/components/AddonDetails.vue
#	resources/js/components/SessionExpiry.vue
#	resources/js/components/ToastBus.js
#	resources/js/components/assets/Uploader.vue
#	resources/js/components/collections/Listing.vue
#	resources/js/components/entries/Listing.vue
#	resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@jasonvarga
re-run npm update for each tiptap dependency as per #10883
e5a61a2
@jasonvarga
Merge branch 'master' into vue3
68d6215 
# Conflicts:
#	resources/js/components/assets/Browser/Browser.vue
#	resources/js/components/assets/Selector.vue
#	resources/js/components/assets/Upload.vue
#	resources/js/components/assets/Uploader.vue
#	resources/js/components/entries/PublishForm.vue
#	resources/js/components/fields/Settings.vue
#	resources/js/components/fieldtypes/FilesFieldtype.vue
#	resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
#	resources/js/components/terms/PublishForm.vue
@jasonvarga
Merge branch 'master' into vue3
4e2d98f 
# Conflicts:
#	package-lock.json
#	package.json
#	resources/js/app.js
#	resources/js/bootstrap/components.js
#	resources/js/bootstrap/fieldtypes.js
#	resources/js/components/DropdownList.vue
#	resources/js/components/Statamic.js
#	resources/js/components/assets/Uploader.vue
#	resources/js/components/blueprints/TabContent.vue
#	resources/js/components/fieldtypes/AssetFolderFieldtype.vue
#	resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
#	resources/js/components/fieldtypes/CodeFieldtype.vue
#	resources/js/components/fieldtypes/ColorFieldtype.vue
#	resources/js/components/fieldtypes/FilesFieldtype.vue
#	resources/js/components/fieldtypes/GroupFieldtype.vue
#	resources/js/components/fieldtypes/TableFieldtype.vue
#	resources/js/components/fieldtypes/bard/BardFieldtype.vue
#	resources/js/components/fieldtypes/grid/Grid.vue
#	resources/js/components/fieldtypes/grid/Stacked.vue
#	resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue
#	resources/js/components/fieldtypes/replicator/AddSetButton.vue
#	resources/js/components/fieldtypes/replicator/Field.vue
#	resources/js/components/fieldtypes/replicator/Replicator.vue
#	resources/js/components/fieldtypes/replicator/Set.vue
#	resources/js/components/inputs/relationship/InlinePublishForm.vue
#	resources/js/components/publish/Container.vue
#	resources/js/components/publish/Field.vue
#	resources/js/components/structures/PageEditor.vue
@jasonvarga
fix field actions
786f9c2
@jasonvarga
enable this
8316551
@jasonvarga
fix some warnings about property not being defined
7b0e042
@jasonvarga
_self doesnt seem to work anymore
203f62e
@jasonvarga
first chunk of reverting the v-model changes to fieldtypes ...
cca4914 
it goes against the vue3 convention, but it should make migrating fieldtypes much simpler.
@jasonvarga jasonvarga mentioned this pull request Jan 9, 2025
Draft
@jasonvarga
Copy link
Member Author

Closing in favor of #11339.

Thank you for your hard work! We really appreciate it. We'll be sure to credit you guys in there.

We'll be cherry picking from this branch. We wanted to be able to have a cleaner slate where all formatting changes aren't mixed throughout the PR so if we need to look back in the history it would make more sense to us.

We'll probably have a separate PR that applies standardized formatting/linting in one go.

@jasonvarga jasonvarga closed this Jan 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jasonvarga @justkidding96 @jelleroorda