add is_root_relative helper

sveltejs · Nov 23, 2021 · d73a7e2 · d73a7e2
1 parent 93ce803
commit d73a7e2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/packages/kit/src/core/adapt/prerender.js b/packages/kit/src/core/adapt/prerender.js
@@ -5,7 +5,7 @@ import { mkdirp } from '../../utils/filesystem.js';
 import { __fetch_polyfill } from '../../install-fetch.js';
 import { SVELTE_KIT } from '../constants.js';
 import { get_single_valued_header } from '../../utils/http.js';
-import { resolve } from '../../utils/url.js';
+import { is_root_relative, resolve } from '../../utils/url.js';
 
 /**
  * @typedef {import('types/config').PrerenderErrorHandler} PrerenderErrorHandler
@@ -194,7 +194,7 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 					written_files.push(file);
 
 					const resolved = resolve(path, location);
-					if (resolved.startsWith('/')) {
+					if (is_root_relative(resolved)) {
 						await visit(resolved, path);
 					}
 				} else {
@@ -270,7 +270,7 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 					if (!href) continue;
 
 					const resolved = resolve(path, href);
-					if (!resolved.startsWith('/') || resolved.startsWith('//')) continue;
+					if (!is_root_relative(resolved)) continue;
 
 					const parsed = new URL(resolved, 'http://localhost');
 					const pathname = decodeURI(parsed.pathname).replace(config.kit.paths.base, '');

diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js
@@ -1,7 +1,7 @@
 import { normalize } from '../../load.js';
 import { respond } from '../index.js';
 import { escape_json_string_in_html } from '../../../utils/escape.js';
-import { resolve } from '../../../utils/url.js';
+import { is_root_relative, resolve } from '../../../utils/url.js';
 
 const s = JSON.stringify;
 
@@ -127,7 +127,7 @@ export async function load_node({
 								`http://${page.host}/${asset.file}`,
 								/** @type {RequestInit} */ (opts)
 						  );
-				} else if (resolved.startsWith('/') && !resolved.startsWith('//')) {
+				} else if (is_root_relative(resolved)) {
 					const relative = resolved;
 
 					const headers = /** @type {import('types/helper').RequestHeaders} */ ({

diff --git a/packages/kit/src/utils/url.js b/packages/kit/src/utils/url.js
@@ -28,3 +28,8 @@ export function resolve(base, path) {
 
 	return `${prefix}${baseparts.join('/')}`;
 }
+
+/** @param {string} path */
+export function is_root_relative(path) {
+	return path[0] === '/' && path[1] !== '/';
+}