Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 13:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt): async transform for inline middleware (#18460)

Browse Source
This commit is contained in:
Daniel Roe 2023-01-25 04:52:00 -08:00 committed by GitHub
parent 527dfbb5cf
commit 1d68b51c2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nuxt/src/core/nuxt.ts
View File

@ -80,8 +80,10 @@ async function initNuxt (nuxt: Nuxt) {
addWebpackPlugin(ImportProtectionPlugin.webpack(config))
// Add unctx transform
nuxt.hook('modules:done', () => {
addVitePlugin(UnctxTransformPlugin(nuxt).vite({ sourcemap: nuxt.options.sourcemap.server || nuxt.options.sourcemap.client }))
addWebpackPlugin(UnctxTransformPlugin(nuxt).webpack({ sourcemap: nuxt.options.sourcemap.server || nuxt.options.sourcemap.client }))
})
if (!nuxt.options.dev) {
const removeFromServer = ['onBeforeMount', 'onMounted', 'onBeforeUpdate', 'onRenderTracked', 'onRenderTriggered', 'onActivated', 'onDeactivated', 'onBeforeUnmount']

8
packages/nuxt/src/core/plugins/unctx.ts
View File

@ -3,6 +3,8 @@ import { normalize } from 'pathe'
import { createTransformer } from 'unctx/transform'
import { createUnplugin } from 'unplugin'
const TRANSFORM_MARKER = '/* _processed_nuxt_unctx_transform */\n'
export const UnctxTransformPlugin = (nuxt: Nuxt) => {
const transformer = createTransformer({
asyncFunctions: ['defineNuxtPlugin', 'defineNuxtRouteMiddleware']
@ -15,14 +17,18 @@ export const UnctxTransformPlugin = (nuxt: Nuxt) => {
name: 'unctx:transform',
enforce: 'post',
transformInclude (id) {
if (id.includes('macro=true')) { return true }
id = normalize(id).replace(/\?.*$/, '')
return app?.plugins.some(i => i.src === id) || app?.middleware.some(m => m.path === id)
},
transform (code, id) {
// TODO: needed for webpack - update transform in unctx/unplugin?
if (code.startsWith(TRANSFORM_MARKER)) { return }
const result = transformer.transform(code)
if (result) {
return {
code: result.code,
code: TRANSFORM_MARKER + result.code,
map: options.sourcemap
? result.magicString.generateMap({ source: id, includeContent: true })
: undefined

5
test/fixtures/basic/pages/navigate-to-redirect.vue vendored
View File

@ -4,8 +4,9 @@
<script setup>
definePageMeta({
middleware: () => {
middleware: defineNuxtRouteMiddleware(async () => {
await new Promise(resolve => setTimeout(resolve, 1))
return navigateTo({ path: '/' }, { redirectCode: 307 })
}
})
})
</script>