[6.x] Vue 3 - #10430

Closed
jasonvarga wants to merge 159 commits into
masterfrom
vue3
Closed

[6.x] Vue 3#10430
jasonvarga wants to merge 159 commits into
masterfrom
vue3

Conversation

@jasonvarga

@jasonvargajasonvarga commented Jul 10, 2024•
edited
Loading

Copy link
Copy Markdown
Member

Upgrades from Vue 2 to 3.

Todos: (Obviously not a complete list)

justkidding96and 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
jelleroordaand others added 26 commits August 18, 2024 20:04
@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.
@jasonvargajasonvarga mentioned this pull request Jan 9, 2025
Merged
@jasonvarga

jasonvarga commented Jan 9, 2025

Copy link
Copy Markdown
MemberAuthor

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 deleted the vue3 branch February 14, 2026 19:15
Sign up for freeto 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[6.x] Vue 3 - #10430
Closed
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Closed
[6.x] Vue 3#10430
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Conversation
@jasonvarga
@jasonvargajasonvarga
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Upgrades from Vue 2 to 3.
Todos: (Obviously not a complete list)
justkidding96and 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
jelleroordaand others
added 26 commits
August 18, 2024 20:04
@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.
@jasonvargajasonvarga
mentioned this pull request
Jan 9, 2025
 Merged

@jasonvarga
jasonvarga
commented
Jan 9, 2025

Copy link


Copy Markdown

MemberAuthor
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
deleted the

vue3

branch
February 14, 2026 19:15
Sign up for freeto 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Vue 3 - #10430
Closed
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Closed
[6.x] Vue 3#10430
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Conversation
@jasonvarga
@jasonvargajasonvarga
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Upgrades from Vue 2 to 3.
Todos: (Obviously not a complete list)
justkidding96and 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
jelleroordaand others
added 26 commits
August 18, 2024 20:04
@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.
@jasonvargajasonvarga
mentioned this pull request
Jan 9, 2025
 Merged

@jasonvarga
jasonvarga
commented
Jan 9, 2025

Copy link


Copy Markdown

MemberAuthor
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
deleted the

vue3

branch
February 14, 2026 19:15
Sign up for freeto 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Vue 3 - #10430
Closed
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Closed
[6.x] Vue 3#10430
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Conversation
@jasonvarga
@jasonvargajasonvarga
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Upgrades from Vue 2 to 3.
Todos: (Obviously not a complete list)
justkidding96and 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
jelleroordaand others
added 26 commits
August 18, 2024 20:04
@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.
@jasonvargajasonvarga
mentioned this pull request
Jan 9, 2025
 Merged

@jasonvarga
jasonvarga
commented
Jan 9, 2025

Copy link


Copy Markdown

MemberAuthor
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
deleted the

vue3

branch
February 14, 2026 19:15
Sign up for freeto 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[6.x] Vue 3 - #10430
Closed
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Closed
[6.x] Vue 3#10430
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Conversation
@jasonvarga
@jasonvargajasonvarga
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Upgrades from Vue 2 to 3.
Todos: (Obviously not a complete list)
justkidding96and 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
jelleroordaand others
added 26 commits
August 18, 2024 20:04
@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.
@jasonvargajasonvarga
mentioned this pull request
Jan 9, 2025
 Merged

@jasonvarga
jasonvarga
commented
Jan 9, 2025

Copy link


Copy Markdown

MemberAuthor
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
deleted the

vue3

branch
February 14, 2026 19:15
Sign up for freeto 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Vue 3 - #10430
Closed
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Closed
[6.x] Vue 3#10430
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Conversation
@jasonvarga
@jasonvargajasonvarga
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Upgrades from Vue 2 to 3.
Todos: (Obviously not a complete list)
justkidding96and 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
jelleroordaand others
added 26 commits
August 18, 2024 20:04
@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.
@jasonvargajasonvarga
mentioned this pull request
Jan 9, 2025
 Merged

@jasonvarga
jasonvarga
commented
Jan 9, 2025

Copy link


Copy Markdown

MemberAuthor
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
deleted the

vue3

branch
February 14, 2026 19:15
Sign up for freeto 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Vue 3 - #10430
Closed
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Closed
[6.x] Vue 3#10430
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Conversation
@jasonvarga
@jasonvargajasonvarga
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Upgrades from Vue 2 to 3.
Todos: (Obviously not a complete list)
justkidding96and 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
jelleroordaand others
added 26 commits
August 18, 2024 20:04
@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.
@jasonvargajasonvarga
mentioned this pull request
Jan 9, 2025
 Merged

@jasonvarga
jasonvarga
commented
Jan 9, 2025

Copy link


Copy Markdown

MemberAuthor
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
deleted the

vue3

branch
February 14, 2026 19:15
Sign up for freeto 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[6.x] Vue 3 - #10430
Closed
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Closed
[6.x] Vue 3#10430
jasonvarga wants to merge 159 commits into
masterfrom 
vue3
Conversation
@jasonvarga
@jasonvargajasonvarga
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Upgrades from Vue 2 to 3.
Todos: (Obviously not a complete list)
justkidding96and 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
jelleroordaand others
added 26 commits
August 18, 2024 20:04
@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.
@jasonvargajasonvarga
mentioned this pull request
Jan 9, 2025
 Merged

@jasonvarga
jasonvarga
commented
Jan 9, 2025

Copy link


Copy Markdown

MemberAuthor
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
deleted the

vue3

branch
February 14, 2026 19:15
Sign up for freeto 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