Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-21 07:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: bring back nuxt3 support

Browse Source
This commit is contained in:
Pooya Parsa 2021-01-18 12:42:00 +01:00
parent b07a4a5c8d
commit 9e9b20ef90
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nitro/src/context.ts
View File

@ -38,6 +38,7 @@ export interface SigmaContext {
publicDir: string publicDir: string
} }
_nuxt: { _nuxt: {
majorVersion: number
dev: boolean dev: boolean
rootDir: string rootDir: string
srcDir: string srcDir: string
@ -88,6 +89,7 @@ export function getsigmaContext (nuxtOptions: NuxtOptions, input: SigmaInput): S
publicDir: '{{ output.dir }}/public' publicDir: '{{ output.dir }}/public'
}, },
_nuxt: { _nuxt: {
majorVersion: nuxtOptions._majorVersion || 2,
dev: nuxtOptions.dev, dev: nuxtOptions.dev,
rootDir: nuxtOptions.rootDir, rootDir: nuxtOptions.rootDir,
srcDir: nuxtOptions.srcDir, srcDir: nuxtOptions.srcDir,

6
packages/nitro/src/rollup/config.ts
View File

@ -159,13 +159,13 @@ export const getRollupConfig = (sigmaContext: SigmaContext) => {
})) }))
// https://github.com/rollup/plugins/tree/master/packages/alias // https://github.com/rollup/plugins/tree/master/packages/alias
const renderer = sigmaContext.renderer || 'vue2' const renderer = sigmaContext.renderer || (sigmaContext._nuxt.majorVersion === 3 ? 'vue3' : 'vue2')
const vueServerRenderer = 'vue-server-renderer/' + (sigmaContext._nuxt.dev ? 'build.dev.js' : 'build.prod.js') const vue2ServerRenderer = 'vue-server-renderer/' + (sigmaContext._nuxt.dev ? 'build.dev.js' : 'build.prod.js')
rollupConfig.plugins.push(alias({ rollupConfig.plugins.push(alias({
entries: { entries: {
'~runtime': sigmaContext._internal.runtimeDir, '~runtime': sigmaContext._internal.runtimeDir,
'~renderer': require.resolve(resolve(sigmaContext._internal.runtimeDir, 'app', renderer)), '~renderer': require.resolve(resolve(sigmaContext._internal.runtimeDir, 'app', renderer)),
'~vueServerRenderer': vueServerRenderer, '~vueServerRenderer': vue2ServerRenderer,
'~build': sigmaContext._nuxt.buildDir, '~build': sigmaContext._nuxt.buildDir,
...env.alias ...env.alias
} }

3
packages/nitro/src/runtime/app/render.ts
View File

@ -33,7 +33,8 @@ export async function renderMiddleware (req, res) {
...(req.context || {}) ...(req.context || {})
} }
const rendered = await renderer.renderToString(ssrContext) const rendered = await renderer.renderToString(ssrContext)
const payload = ssrContext.nuxt /* nuxt 2 */ || ssrContext.payload /* nuxt 3 */ // TODO: nuxt3 should not reuse `nuxt` property for different purpose!
const payload = ssrContext.payload /* nuxt 3 */ || ssrContext.nuxt /* nuxt 2 */
if (process.env.NUXT_FULL_STATIC) { if (process.env.NUXT_FULL_STATIC) {
payload.staticAssetsBase = STATIC_ASSETS_BASE payload.staticAssetsBase = STATIC_ASSETS_BASE