Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix encoding issues with payload paths #8738

Merged
merged 10 commits into from
Feb 2, 2021
Merged

fix: fix encoding issues with payload paths #8738

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b0853cd
fix(vue-renderer): decode url for use in static payload folder
danielroe Feb 1, 2021
2ef8cfc
refactor: use lighter `parseURL` and decode
danielroe Feb 1, 2021
ffdc953
fix(generator): normalize URLs when generating them
danielroe Feb 1, 2021
fa4e5a9
test: add test for generated payload/state files
danielroe Feb 1, 2021
dea9cc2
fix: simply decode url, not parse
danielroe Feb 1, 2021
b9dae0b
chore: revert
danielroe Feb 1, 2021
13b2c13
Merge branch 'dev' into 8679-encoded-url-fs-path
danielroe Feb 1, 2021
a34f403
Merge branch 'dev' into 8679-encoded-url-fs-path
danielroe Feb 1, 2021
b31af38
fix: decode asset path in generator
pi0 Feb 2, 2021
3c7b2b8
fix(vue-app): fix encoding issues for payload fetching
pi0 Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions packages/vue-renderer/src/renderers/ssr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { format } from 'util'
import fs from 'fs-extra'
import consola from 'consola'
import { TARGETS, urlJoin } from '@nuxt/utils'
import { parsePath, withoutTrailingSlash } from 'ufo'
import { $URL, withoutTrailingSlash } from 'ufo'
import devalue from '@nuxt/devalue'
import { createBundleRenderer } from 'vue-server-renderer'
import BaseRenderer from './base'
Expand Down Expand Up @@ -180,7 +180,11 @@ export default class SSRRenderer extends BaseRenderer {
if (renderContext.staticAssetsBase) {
const preloadScripts = []
renderContext.staticAssets = []
const { staticAssetsBase, url, nuxt, staticAssets } = renderContext
const { staticAssetsBase, nuxt, staticAssets } = renderContext
let url = new $URL(renderContext.url).pathname
danielroe marked this conversation as resolved.
Show resolved Hide resolved
if (!this.options.router.trailingSlash) {
url = withoutTrailingSlash(url) || '/'
pi0 marked this conversation as resolved.
Show resolved Hide resolved
}
const { data, fetch, mutations, ...state } = nuxt

// Initial state
Expand Down Expand Up @@ -210,11 +214,7 @@ export default class SSRRenderer extends BaseRenderer {
// Page level payload.js (async loaded for CSR)
const payloadPath = urlJoin(url, 'payload.js')
const payloadUrl = urlJoin(staticAssetsBase, payloadPath)
let routePath = parsePath(url).pathname // remove query params
if (!this.options.router.trailingSlash) {
routePath = withoutTrailingSlash(routePath) || '/'
}
const payloadScript = `__NUXT_JSONP__("${routePath}", ${devalue({ data, fetch, mutations })});`
const payloadScript = `__NUXT_JSONP__("${url}", ${devalue({ data, fetch, mutations })});`
staticAssets.push({ path: payloadPath, src: payloadScript })
preloadScripts.push(payloadUrl)
// Add manifest preload
Expand Down