move apiserver proxy detection out of bundle

vite runtime url rendering has changed that it is evalutated before everything on production bundle, so let's just be safer and move the prerequisite out of bundle we loss typescript tooling on this little bit of code, guess that just the price need to be paid fixes production bundle after vite 5.2.9 See: vitejs/vite#16184
xdavidwu · May 8, 2024 · 160906b · 160906b
1 parent 9cce0d3
commit 160906b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/index.html b/index.html
@@ -5,6 +5,15 @@
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, interactive-widget=resizes-content" />
     <title>Sparkles</title>
+    <script>
+      const dns1123LabelFmt = '[a-z0-9]([-a-z0-9]*[a-z0-9])?';
+      const dns1123SubdomainFmt = `${dns1123LabelFmt}(\\.${dns1123LabelFmt})*`;
+      // TODO IANA_SVC_NAME/integer validation
+      const schemeNamePort = `((https?|):)?${dns1123SubdomainFmt}(:[^:/]*)?`;
+      const apiserverProxyRegex = new RegExp(`^/api/v1/namespaces/${dns1123SubdomainFmt}/(pods|services)/${schemeNamePort}/proxy/`);
+      const m = window.location.pathname.match(apiserverProxyRegex);
+      window.__base_url = m === null ? '%BASE_URL%' : m[0];
+    </script>
   </head>
   <body>
     <div id="app"></div>

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -12,14 +12,6 @@ declare global {
   }
 }
 
-const dns1123LabelFmt = '[a-z0-9]([-a-z0-9]*[a-z0-9])?';
-const dns1123SubdomainFmt = `${dns1123LabelFmt}(\\.${dns1123LabelFmt})*`;
-// TODO IANA_SVC_NAME/integer validation
-const schemeNamePort = `((https?|):)?${dns1123SubdomainFmt}(:[^:/]*)?`;
-const apiserverProxyRegex = new RegExp(`^/api/v1/namespaces/${dns1123SubdomainFmt}/(pods|services)/${schemeNamePort}/proxy/`);
-const m = window.location.pathname.match(apiserverProxyRegex);
-window.__base_url = m === null ? import.meta.env.BASE_URL : m[0];
-
 const checkNamespacedResourcePermission =
   (group: string, resource: string) => computedAsync(async () => {
     const { selectedNamespace } = storeToRefs(useNamespaces());