Skip to content

feat(vue3): migrate entry points to Vue 3 createApp API #13408

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

Open
GretaD wants to merge 1 commit into
base: vue3
Choose a base branch
from
+24 −36
Open

feat(vue3): migrate entry points to Vue 3 createApp API #13408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/main-oauth-popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@

import { getRequestToken } from '@nextcloud/auth'
import { generateFilePath } from '@nextcloud/router'
import Vue from 'vue'
import { createApp } from 'vue'
import OauthDone from './views/OauthDone.vue'
import Nextcloud from './mixins/Nextcloud.js'

__webpack_nonce__ = btoa(getRequestToken())

__webpack_public_path__ = generateFilePath('mail', '', 'js/')

Vue.mixin(Nextcloud)

const View = Vue.extend(OauthDone)
new View({}).$mount('#mail-oauth-done')
const app = createApp(OauthDone)
app.mixin(Nextcloud)
app.mount('#mail-oauth-done')

if (window.opener) {
window.opener.postMessage('DONE')
Expand Down
14 changes: 6 additions & 8 deletions src/main-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { getRequestToken } from '@nextcloud/auth'
import { loadState } from '@nextcloud/initial-state'
import { generateFilePath } from '@nextcloud/router'
import Vue from 'vue'
import { createApp } from 'vue'
import AdminSettings from './components/settings/AdminSettings.vue'
import Nextcloud from './mixins/Nextcloud.js'

Expand All @@ -16,11 +16,9 @@ __webpack_nonce__ = btoa(getRequestToken())

__webpack_public_path__ = generateFilePath('mail', '', 'js/')

Vue.mixin(Nextcloud)
const app = createApp(AdminSettings, {
provisioningSettings: loadState('mail', 'provisioning_settings') || [],
})

const View = Vue.extend(AdminSettings)
new View({
propsData: {
provisioningSettings: loadState('mail', 'provisioning_settings') || [],
},
}).$mount('#mail-admin-settings')
app.mixin(Nextcloud)
app.mount('#mail-admin-settings')
27 changes: 11 additions & 16 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
import { getRequestToken } from '@nextcloud/auth'
import { registerDavProperty } from '@nextcloud/files'
import { generateFilePath } from '@nextcloud/router'
import { createPinia, PiniaVuePlugin } from 'pinia'
import vToolTip from 'v-tooltip'
import Vue from 'vue'
import VueShortKey from 'vue-shortkey'
import { createPinia } from 'pinia'
import FloatingVue from 'floating-vue'

Check failure on line 10 in src/main.js

View workflow job for this annotation

GitHub Actions / NPM lint 

Expected "floating-vue" to come before "pinia"
import { createApp } from 'vue'
import VueShortKey from 'vue3-shortkey'
import App from './App.vue'
import Nextcloud from './mixins/Nextcloud.js'
import router from './router.js'
Expand All @@ -21,20 +21,15 @@

__webpack_public_path__ = generateFilePath('mail', '', 'js/')

Vue.use(PiniaVuePlugin)
const pinia = createPinia()
const app = createApp(App)

Vue.mixin(Nextcloud)

Vue.use(VueShortKey, { prevent: ['input', 'div', 'textarea'] })
Vue.use(vToolTip)
app.mixin(Nextcloud)
app.use(pinia)
app.use(router)
app.use(VueShortKey, { prevent: ['input', 'div', 'textarea'] })
app.use(FloatingVue)

registerDavProperty('nc:share-attributes', { nc: 'http://nextcloud.org/ns' })

export default new Vue({
el: '#content',
name: 'Mail',
router,
pinia,
render: (h) => h(App),
})
app.mount('#content')
10 changes: 3 additions & 7 deletions src/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { generateUrl } from '@nextcloud/router'
import Vue from 'vue'
import Router from 'vue-router'
import { createRouter, createWebHistory } from 'vue-router'

const Home = () => import('./views/Home.vue')
const Setup = () => import('./views/Setup.vue')

Vue.use(Router)

export default new Router({
mode: 'history',
base: generateUrl('/apps/mail/'),
export default createRouter({
history: createWebHistory(generateUrl('/apps/mail/')),
linkActiveClass: 'active',
routes: [
{
Expand Down
Loading