fix: support any URL protocol

vikejs · Jun 19, 2024 · 886a99f · pdanpdan · Jun 19, 2024 · brillout
1 parent 73e53a0
commit 886a99f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/vike/utils/parseUrl.spec.ts b/vike/utils/parseUrl.spec.ts
@@ -385,6 +385,16 @@ describe('parseUrl', () => {
     })
   })
 
+  // https://github.com/vikejs/vike/issues/1706
+  it('capacitor', () => {
+    expect(parseUrl('capacitor://localhost/assets/chunks/chunk-v3mOCch-.js', '/')).toEqual({
+      ...resultBase,
+      origin: 'capacitor://localhost',
+      pathname: '/assets/chunks/chunk-v3mOCch-.js',
+      pathnameOriginal: '/assets/chunks/chunk-v3mOCch-.js'
+    })
+  })
+
   it('relative paths', () => {
     expect(parseUrl('.', '/b1/b2/')).toEqual({
       ...resultBase,

diff --git a/vike/utils/parseUrl.ts b/vike/utils/parseUrl.ts
@@ -16,21 +16,10 @@ import { slice } from './slice.js'
 import { assert, assertUsage } from './assert.js'
 import pc from '@brillout/picocolors'
 
-const PROTOCOLS = [
-  'http://',
-  'https://',
-  // For [Tauri](https://tauri.app/)
-  'tauri://',
-  // For Electron: https://github.com/vikejs/vike/issues/1557
-  'file://',
-  // For Capacitor: https://github.com/vikejs/vike/issues/1706
-  'capacitor://'
-]
-
 function isParsable(url: string): boolean {
   // `parseUrl()` works with these URLs
   return (
-    PROTOCOLS.some((p) => url.startsWith(p)) ||
+    isUrlWithProtocol(url) ||
     url.startsWith('/') ||
     url.startsWith('.') ||
     url.startsWith('?') ||
@@ -172,7 +161,7 @@ function getPathname(url: string, baseServer: string): { origin: null | string;
 }
 
 function parseOrigin(url: string): { pathname: string; origin: null | string } {
-  if (!PROTOCOLS.some((protocol) => url.startsWith(protocol))) {
+  if (!isUrlWithProtocol(url)) {
     return { pathname: url, origin: null }
   } else {
     const [originPart1, originPart2, originPart3, ...pathnameParts] = url.split('/')
@@ -294,3 +283,12 @@ function isUriWithProtocol(uri: string): boolean {
   // https://en.wikipedia.org/wiki/List_of_URI_schemes
   return /^[a-z0-9][a-z0-9\.\+\-]*:/i.test(uri)
 }
+
+function isUrlWithProtocol(url: string) {
+  // http://
+  // https://
+  // tauri:// # For [Tauri](https://tauri.app/)
+  // file:// # For Electron: https://github.com/vikejs/vike/issues/1557
+  // capacitor:// # For Capacitor: https://github.com/vikejs/vike/issues/1706
+  return /[a-z]+\:\/\//i.test(url)
+}