Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 08:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(renderer): deep merge runtimeConfig for server (#8856)

Browse Source
This commit is contained in:
pooya parsa 2021-02-19 17:33:00 +01:00 committed by GitHub
parent 5346963585
commit 1b9a9d6449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/vue-app/template/server.js
View File

@ -103,7 +103,7 @@ export default async (ssrContext) => {
__webpack_public_path__ = joinURL(ssrContext.nuxt.config.app.cdnURL, ssrContext.nuxt.config.app.assetsPath) __webpack_public_path__ = joinURL(ssrContext.nuxt.config.app.cdnURL, ssrContext.nuxt.config.app.assetsPath)
} }
// Create the app definition and the instance (created for each request) // Create the app definition and the instance (created for each request)
const { app, router<%= (store ? ', store' : '') %> } = await createApp(ssrContext, { ...ssrContext.runtimeConfig.public, ...ssrContext.runtimeConfig.private }) const { app, router<%= (store ? ', store' : '') %> } = await createApp(ssrContext, ssrContext.runtimeConfig.private)
const _app = new Vue(app) const _app = new Vue(app)
// Add ssr route path to nuxt context so we can account for page navigation between ssr and csr // Add ssr route path to nuxt context so we can account for page navigation between ssr and csr
ssrContext.nuxt.routePath = app.context.route.path ssrContext.nuxt.routePath = app.context.route.path

3
packages/vue-renderer/src/renderer.js
View File

@ -4,6 +4,7 @@ import consola from 'consola'
import { template } from 'lodash' import { template } from 'lodash'
import { TARGETS, isModernRequest, urlJoin, waitFor } from '@nuxt/utils' import { TARGETS, isModernRequest, urlJoin, waitFor } from '@nuxt/utils'
import { normalizeURL } from 'ufo' import { normalizeURL } from 'ufo'
import defu from 'defu'
import SPARenderer from './renderers/spa' import SPARenderer from './renderers/spa'
import SSRRenderer from './renderers/ssr' import SSRRenderer from './renderers/ssr'
@ -296,7 +297,7 @@ export default class VueRenderer {
// Set runtime config on renderContext // Set runtime config on renderContext
renderContext.runtimeConfig = { renderContext.runtimeConfig = {
private: renderContext.spa ? {} : { ...this.options.privateRuntimeConfig }, private: renderContext.spa ? {} : defu(this.options.privateRuntimeConfig, this.options.publicRuntimeConfig),
public: { ...this.options.publicRuntimeConfig } public: { ...this.options.publicRuntimeConfig }
} }

11
test/fixtures/runtime-config/nuxt.config.js vendored
View File

@ -2,12 +2,19 @@ export default {
publicRuntimeConfig: { publicRuntimeConfig: {
baseURL: process.env.BASE_URL, baseURL: process.env.BASE_URL,
isFixture: true, isFixture: true,
TOKEN: 'default' TOKEN: 'default',
nested: {
priv: 0,
pub: 1
}
}, },
privateRuntimeConfig: { privateRuntimeConfig: {
baseURL: '${PUBLIC_URL}${BASE_URL}', baseURL: '${PUBLIC_URL}${BASE_URL}',
API_SECRET: '', API_SECRET: '',
FOO: '123/${FOO}' FOO: '123/${FOO}',
nested: {
priv: 1
}
}, },
serverMiddleware: [ serverMiddleware: [
(req, _, next) => { (req, _, next) => {