qwik: fix build so it works from its path

wmertens · wmertens · commit 98e6a8f251ca · 2023-11-08T13:39:26.000+01:00
diff --git a/frameworks/keyed/qwik/README.md b/frameworks/keyed/qwik/README.md
@@ -0,0 +1,13 @@
+# Qwik
+
+Please note that this benchmark does not test the true power of Qwik, namely resumability. So the expected result is that Qwik is average in this benchmark, but it is much faster in real world applications than other frameworks.
+
+See https://qwik.builder.io/docs/concepts/think-qwik/
+
+## Build
+
+The build uses the SSG capabilities of Qwik to create the static files.
+
+Note: `npm build-prod` involves moving the built files to the root of the dist dir, because Vite outputs the full directory structure that is expected, and we need to "deploy" this so the benchmark can load the files.
+
+That is to say, while `/dist` is the serving location for the benchmark, the files are actually built in `/dist/frameworks/keyed/qwik/dist`.
diff --git a/frameworks/keyed/qwik/adapters/static/vite.config.ts b/frameworks/keyed/qwik/adapters/static/vite.config.ts
@@ -12,7 +12,8 @@ export default extendConfig(baseConfig, () => {
     },
     plugins: [
       staticAdapter({
-        origin: "https://yoursite.qwik.dev",
+        origin:
+          "https://github.com/krausest/js-framework-benchmark/tree/master/frameworks/qwik",
       }),
     ],
   };
diff --git a/frameworks/keyed/qwik/package.json b/frameworks/keyed/qwik/package.json
@@ -13,7 +13,7 @@
   },
   "scripts": {
     "build-dev": "vite --mode ssr",
-    "build-prod": "qwik build",
+    "build-prod": "rm -rf dist; qwik build && mv dist/frameworks/keyed/qwik/dist/* dist/ && rm -rf dist/frameworks",
     "build": "qwik build",
     "build.client": "vite build",
     "build.preview": "vite build --ssr src/entry.preview.tsx",
diff --git a/frameworks/keyed/qwik/src/components/router-head/router-head.tsx b/frameworks/keyed/qwik/src/components/router-head/router-head.tsx
@@ -1,20 +1,17 @@
 import { component$ } from "@builder.io/qwik";
-import { useDocumentHead, useLocation } from "@builder.io/qwik-city";
+import { useDocumentHead } from "@builder.io/qwik-city";
 
 /**
  * The RouterHead component is placed inside of the document `<head>` element.
  */
 export const RouterHead = component$(() => {
   const head = useDocumentHead();
-  const loc = useLocation();
 
   return (
     <>
       <title>{head.title}</title>
 
-      <link rel="canonical" href={loc.url.href} />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 
       {/* Served by the benchmark */}
       <link rel="stylesheet" href="/css/currentStyle.css" />
diff --git a/frameworks/keyed/qwik/src/entry.ssr.tsx b/frameworks/keyed/qwik/src/entry.ssr.tsx
@@ -24,7 +24,6 @@ export default function (opts: RenderToStreamOptions) {
     // Use container attributes to set attributes on the html tag.
     containerAttributes: {
       lang: "en-us",
-      base: "/frameworks/keyed/qwik/dist",
       ...opts.containerAttributes,
     },
   });
diff --git a/frameworks/keyed/qwik/src/root.tsx b/frameworks/keyed/qwik/src/root.tsx
@@ -18,7 +18,6 @@ export default component$(() => {
     <QwikCityProvider>
       <head>
         <meta charSet="utf-8" />
-        <link rel="manifest" href="/manifest.json" />
         <RouterHead />
       </head>
       <body lang="en">
diff --git a/frameworks/keyed/qwik/vite.config.ts b/frameworks/keyed/qwik/vite.config.ts
@@ -5,18 +5,14 @@ import tsconfigPaths from "vite-tsconfig-paths";
 
 export default defineConfig(() => {
   return {
+    // This tells vite where the build is deployed
+    base: "/frameworks/keyed/qwik/dist/",
     plugins: [qwikCity(), qwikVite(), tsconfigPaths()],
     preview: {
       headers: {
         "Cache-Control": "public, max-age=600",
       },
     },
-    resolve: {
-      alias: {
-        // The benchmark CSS
-        "/css": "../../../css",
-      },
-    },
     server: {
       fs: {
         allow: ["../../.."],
