From 621d1a600556f5d37057c5f157bde559db634c63 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 15:23:33 +0100 Subject: [PATCH 1/8] Improve typing of defineNuxtPlugin function --- packages/bridge/src/runtime/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bridge/src/runtime/app.ts b/packages/bridge/src/runtime/app.ts index 5df4cc0b620..4359a344668 100644 --- a/packages/bridge/src/runtime/app.ts +++ b/packages/bridge/src/runtime/app.ts @@ -58,7 +58,7 @@ export const setNuxtAppInstance = (nuxt: NuxtAppCompat | null) => { currentNuxtAppInstance = nuxt } -export const defineNuxtPlugin = plugin => (ctx: Context) => { +export function defineNuxtPlugin (plugin: (nuxtApp: NuxtAppCompat) => void): (ctx: Context) => void { setNuxtAppInstance(ctx.$_nuxtApp) plugin(ctx.$_nuxtApp) setNuxtAppInstance(null) From 41fe67a85bd01398175b76dec388686dabeea7d0 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 15:26:33 +0100 Subject: [PATCH 2/8] Update setup.js --- test/fixtures/bridge/plugins/setup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/bridge/plugins/setup.js b/test/fixtures/bridge/plugins/setup.js index 25e13f23261..e9370590fe2 100644 --- a/test/fixtures/bridge/plugins/setup.js +++ b/test/fixtures/bridge/plugins/setup.js @@ -2,10 +2,10 @@ import { onGlobalSetup, ref } from '@nuxtjs/composition-api' import { defineNuxtPlugin } from '#app' -export default defineNuxtPlugin((nuxt) => { +export default defineNuxtPlugin((nuxtApp) => { const globalsetup = ref('🚧') onGlobalSetup(() => { globalsetup.value = '✅' }) - nuxt.provide('globalsetup', globalsetup) + nuxtApp.provide('globalsetup', globalsetup) }) From 0bfc605f89acabfc99a89d0db5e0c2dc96de5ac7 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 15:29:52 +0100 Subject: [PATCH 3/8] Update nitro-bridge.server.mjs --- packages/bridge/src/runtime/nitro-bridge.server.mjs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/bridge/src/runtime/nitro-bridge.server.mjs b/packages/bridge/src/runtime/nitro-bridge.server.mjs index 53de642511d..b961c872044 100644 --- a/packages/bridge/src/runtime/nitro-bridge.server.mjs +++ b/packages/bridge/src/runtime/nitro-bridge.server.mjs @@ -26,12 +26,12 @@ const vueMetaRenderer = (nuxt) => { } } -export default defineNuxtPlugin((nuxt) => { +export default defineNuxtPlugin((nuxtApp) => { const metaRenderers = [vueMetaRenderer] - nuxt.callHook('meta:register', metaRenderers) + nuxtApp.callHook('meta:register', metaRenderers) - nuxt.ssrContext.renderMeta = async () => { + nuxtApp.ssrContext.renderMeta = async () => { const metadata = { htmlAttrs: '', headAttrs: '', @@ -41,7 +41,7 @@ export default defineNuxtPlugin((nuxt) => { bodyScripts: '' } for await (const renderer of metaRenderers) { - const result = await renderer(nuxt) + const result = await renderer(nuxtApp) for (const key in result) { metadata[key] += result[key] } From 4436008c2bf3b5399116edd2dbaaec7476118295 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 15:30:42 +0100 Subject: [PATCH 4/8] Update vue-meta.plugin.ts --- .../src/meta/runtime/lib/vue-meta.plugin.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/nuxt3/src/meta/runtime/lib/vue-meta.plugin.ts b/packages/nuxt3/src/meta/runtime/lib/vue-meta.plugin.ts index 03b8bc66f30..86a7a838154 100644 --- a/packages/nuxt3/src/meta/runtime/lib/vue-meta.plugin.ts +++ b/packages/nuxt3/src/meta/runtime/lib/vue-meta.plugin.ts @@ -3,12 +3,12 @@ import { createMetaManager } from 'vue-meta' import type { MetaObject } from '../types' import { defineNuxtPlugin } from '#app' -export default defineNuxtPlugin((nuxt) => { +export default defineNuxtPlugin((nuxtApp) => { const manager = createMetaManager(process.server) - nuxt.vueApp.use(manager) + nuxtApp.vueApp.use(manager) - nuxt._useMeta = (meta: MetaObject) => manager.addMeta(meta) + nuxtApp._useMeta = (meta: MetaObject) => manager.addMeta(meta) if (process.client) { const teleportTarget = document.createElement('div') @@ -19,19 +19,19 @@ export default defineNuxtPlugin((nuxt) => { } if (process.server) { - nuxt.ssrContext.renderMeta = async () => { + nuxtApp.ssrContext.renderMeta = async () => { const { renderMetaToString } = await import('vue-meta/ssr') - nuxt.ssrContext.teleports = nuxt.ssrContext.teleports || {} + nuxtApp.ssrContext.teleports = nuxtApp.ssrContext.teleports || {} - await renderMetaToString(nuxt.app, nuxt.ssrContext) + await renderMetaToString(nuxtApp.app, nuxtApp.ssrContext) return { - htmlAttrs: nuxt.ssrContext.teleports.htmlAttrs || '', - headAttrs: nuxt.ssrContext.teleports.headAttrs || '', - bodyAttrs: nuxt.ssrContext.teleports.bodyAttrs || '', - headTags: nuxt.ssrContext.teleports.head || '', - bodyPrepend: nuxt.ssrContext.teleports['body-prepend'] || '', - bodyScripts: nuxt.ssrContext.teleports.body || '' + htmlAttrs: nuxtApp.ssrContext.teleports.htmlAttrs || '', + headAttrs: nuxtApp.ssrContext.teleports.headAttrs || '', + bodyAttrs: nuxtApp.ssrContext.teleports.bodyAttrs || '', + headTags: nuxtApp.ssrContext.teleports.head || '', + bodyPrepend: nuxtApp.ssrContext.teleports['body-prepend'] || '', + bodyScripts: nuxtApp.ssrContext.teleports.body || '' } } } From bb16926917bd30996ef4cf42e654101b55b4354f Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 15:31:05 +0100 Subject: [PATCH 5/8] Update vueuse-head.plugin.ts --- packages/nuxt3/src/meta/runtime/lib/vueuse-head.plugin.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nuxt3/src/meta/runtime/lib/vueuse-head.plugin.ts b/packages/nuxt3/src/meta/runtime/lib/vueuse-head.plugin.ts index 7698a3b1b6d..c073a7cc590 100644 --- a/packages/nuxt3/src/meta/runtime/lib/vueuse-head.plugin.ts +++ b/packages/nuxt3/src/meta/runtime/lib/vueuse-head.plugin.ts @@ -3,12 +3,12 @@ import { ref, watchEffect, onBeforeUnmount, getCurrentInstance } from 'vue' import type { MetaObject } from '..' import { defineNuxtPlugin } from '#app' -export default defineNuxtPlugin((nuxt) => { +export default defineNuxtPlugin((nuxtApp) => { const head = createHead() - nuxt.vueApp.use(head) + nuxtApp.vueApp.use(head) - nuxt._useMeta = (meta: MetaObject) => { + nuxtApp._useMeta = (meta: MetaObject) => { const headObj = ref(meta as any) head.addHeadObjs(headObj) @@ -28,6 +28,6 @@ export default defineNuxtPlugin((nuxt) => { } if (process.server) { - nuxt.ssrContext.renderMeta = () => renderHeadToString(head) + nuxtApp.ssrContext.renderMeta = () => renderHeadToString(head) } }) From e6edf502652dba7c82d592517aa0a590e710b920 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 15:31:37 +0100 Subject: [PATCH 6/8] Update capi.legacy.plugin.mjs --- packages/bridge/src/runtime/capi.legacy.plugin.mjs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/bridge/src/runtime/capi.legacy.plugin.mjs b/packages/bridge/src/runtime/capi.legacy.plugin.mjs index cb2a5a0a013..411e3bbb0f2 100644 --- a/packages/bridge/src/runtime/capi.legacy.plugin.mjs +++ b/packages/bridge/src/runtime/capi.legacy.plugin.mjs @@ -1,13 +1,13 @@ import { defineNuxtPlugin } from '#app' -export default defineNuxtPlugin((nuxt) => { - nuxt._setupFns = [] +export default defineNuxtPlugin((nuxtApp) => { + nuxtApp._setupFns = [] - const _originalSetup = nuxt.nuxt2Context.app.setup + const _originalSetup = nuxtApp.nuxt2Context.app.setup - nuxt.nuxt2Context.app.setup = function (...args) { + nuxtApp.nuxt2Context.app.setup = function (...args) { const result = _originalSetup instanceof Function ? _originalSetup(...args) : {} - for (const fn of nuxt._setupFns) { + for (const fn of nuxtApp._setupFns) { Object.assign(result, fn.call(this, ...args)) } return result From 8e61d7c1139b758c310523cecff9591192e43ca0 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 18:11:39 +0100 Subject: [PATCH 7/8] Fix definition of defineNuxtPlugin --- packages/bridge/src/runtime/app.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/bridge/src/runtime/app.ts b/packages/bridge/src/runtime/app.ts index 4359a344668..8fbffb112ed 100644 --- a/packages/bridge/src/runtime/app.ts +++ b/packages/bridge/src/runtime/app.ts @@ -59,9 +59,11 @@ export const setNuxtAppInstance = (nuxt: NuxtAppCompat | null) => { } export function defineNuxtPlugin (plugin: (nuxtApp: NuxtAppCompat) => void): (ctx: Context) => void { - setNuxtAppInstance(ctx.$_nuxtApp) - plugin(ctx.$_nuxtApp) - setNuxtAppInstance(null) + return ctx => { + setNuxtAppInstance(ctx.$_nuxtApp) + plugin(ctx.$_nuxtApp) + setNuxtAppInstance(null) + } } export const useNuxtApp = () => { From cb1431d2b7b9b0e5ef99378fec26383ceb2bcb66 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 18:15:25 +0100 Subject: [PATCH 8/8] Fix checkstyle --- packages/bridge/src/runtime/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bridge/src/runtime/app.ts b/packages/bridge/src/runtime/app.ts index 8fbffb112ed..9754a0612e8 100644 --- a/packages/bridge/src/runtime/app.ts +++ b/packages/bridge/src/runtime/app.ts @@ -59,7 +59,7 @@ export const setNuxtAppInstance = (nuxt: NuxtAppCompat | null) => { } export function defineNuxtPlugin (plugin: (nuxtApp: NuxtAppCompat) => void): (ctx: Context) => void { - return ctx => { + return (ctx) => { setNuxtAppInstance(ctx.$_nuxtApp) plugin(ctx.$_nuxtApp) setNuxtAppInstance(null)