mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-22 13:45:18 +00:00
fix(nuxt): async transform for inline middleware (#18460)
This commit is contained in:
parent
527dfbb5cf
commit
1d68b51c2c
@ -80,8 +80,10 @@ async function initNuxt (nuxt: Nuxt) {
|
|||||||
addWebpackPlugin(ImportProtectionPlugin.webpack(config))
|
addWebpackPlugin(ImportProtectionPlugin.webpack(config))
|
||||||
|
|
||||||
// Add unctx transform
|
// Add unctx transform
|
||||||
|
nuxt.hook('modules:done', () => {
|
||||||
addVitePlugin(UnctxTransformPlugin(nuxt).vite({ sourcemap: nuxt.options.sourcemap.server || nuxt.options.sourcemap.client }))
|
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 }))
|
addWebpackPlugin(UnctxTransformPlugin(nuxt).webpack({ sourcemap: nuxt.options.sourcemap.server || nuxt.options.sourcemap.client }))
|
||||||
|
})
|
||||||
|
|
||||||
if (!nuxt.options.dev) {
|
if (!nuxt.options.dev) {
|
||||||
const removeFromServer = ['onBeforeMount', 'onMounted', 'onBeforeUpdate', 'onRenderTracked', 'onRenderTriggered', 'onActivated', 'onDeactivated', 'onBeforeUnmount']
|
const removeFromServer = ['onBeforeMount', 'onMounted', 'onBeforeUpdate', 'onRenderTracked', 'onRenderTriggered', 'onActivated', 'onDeactivated', 'onBeforeUnmount']
|
||||||
|
@ -3,6 +3,8 @@ import { normalize } from 'pathe'
|
|||||||
import { createTransformer } from 'unctx/transform'
|
import { createTransformer } from 'unctx/transform'
|
||||||
import { createUnplugin } from 'unplugin'
|
import { createUnplugin } from 'unplugin'
|
||||||
|
|
||||||
|
const TRANSFORM_MARKER = '/* _processed_nuxt_unctx_transform */\n'
|
||||||
|
|
||||||
export const UnctxTransformPlugin = (nuxt: Nuxt) => {
|
export const UnctxTransformPlugin = (nuxt: Nuxt) => {
|
||||||
const transformer = createTransformer({
|
const transformer = createTransformer({
|
||||||
asyncFunctions: ['defineNuxtPlugin', 'defineNuxtRouteMiddleware']
|
asyncFunctions: ['defineNuxtPlugin', 'defineNuxtRouteMiddleware']
|
||||||
@ -15,14 +17,18 @@ export const UnctxTransformPlugin = (nuxt: Nuxt) => {
|
|||||||
name: 'unctx:transform',
|
name: 'unctx:transform',
|
||||||
enforce: 'post',
|
enforce: 'post',
|
||||||
transformInclude (id) {
|
transformInclude (id) {
|
||||||
|
if (id.includes('macro=true')) { return true }
|
||||||
|
|
||||||
id = normalize(id).replace(/\?.*$/, '')
|
id = normalize(id).replace(/\?.*$/, '')
|
||||||
return app?.plugins.some(i => i.src === id) || app?.middleware.some(m => m.path === id)
|
return app?.plugins.some(i => i.src === id) || app?.middleware.some(m => m.path === id)
|
||||||
},
|
},
|
||||||
transform (code, id) {
|
transform (code, id) {
|
||||||
|
// TODO: needed for webpack - update transform in unctx/unplugin?
|
||||||
|
if (code.startsWith(TRANSFORM_MARKER)) { return }
|
||||||
const result = transformer.transform(code)
|
const result = transformer.transform(code)
|
||||||
if (result) {
|
if (result) {
|
||||||
return {
|
return {
|
||||||
code: result.code,
|
code: TRANSFORM_MARKER + result.code,
|
||||||
map: options.sourcemap
|
map: options.sourcemap
|
||||||
? result.magicString.generateMap({ source: id, includeContent: true })
|
? result.magicString.generateMap({ source: id, includeContent: true })
|
||||||
: undefined
|
: undefined
|
||||||
|
@ -4,8 +4,9 @@
|
|||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
middleware: () => {
|
middleware: defineNuxtRouteMiddleware(async () => {
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 1))
|
||||||
return navigateTo({ path: '/' }, { redirectCode: 307 })
|
return navigateTo({ path: '/' }, { redirectCode: 307 })
|
||||||
}
|
})
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
Loading…
Reference in New Issue
Block a user