Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

fix(nuxt): ensure payload url has no protocol #8675

Merged
merged 3 commits into from Nov 3, 2022
Merged

fix(nuxt): ensure payload url has no protocol #8675

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbdf9c3
fix(nuxt): ensure payload url has no protocol
pi0 Nov 3, 2022
d6ea2a0
explicitly check host
pi0 Nov 3, 2022
4fd9a8c
fix lint
pi0 Nov 3, 2022
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
11 changes: 7 additions & 4 deletions packages/nuxt/src/app/composables/payload.ts
View file
Open in desktop
@@ -1,4 +1,4 @@
import { parseURL, joinURL } from 'ufo'
import { joinURL } from 'ufo'
import { useNuxtApp } from '../nuxt'
import { useHead, useRuntimeConfig } from '..'

Expand Down Expand Up @@ -37,12 +37,15 @@ export function preloadPayload (url: string, opts: LoadPayloadOptions = {}) {
// --- Internal ---

function _getPayloadURL (url: string, opts: LoadPayloadOptions = {}) {
const parsed = parseURL(url)
if (parsed.search) {
const u = new URL(url, 'http://localhost')
if (u.search) {
throw new Error('Payload URL cannot contain search params: ' + url)
}
if (u.host !== 'localhost') {
throw new Error('Payload URL cannot contain host: ' + url)
}
const hash = opts.hash || (opts.fresh ? Date.now() : '')
return joinURL(useRuntimeConfig().app.baseURL, parsed.pathname, hash ? `_payload.${hash}.js` : '_payload.js')
return joinURL(useRuntimeConfig().app.baseURL, u.pathname, hash ? `_payload.${hash}.js` : '_payload.js')
}

async function _importPayload (payloadURL: string) {
Expand Down