@qwik.dev/core 2.0.0-alpha.9 → 2.0.0-beta.10

package/dist/starters/adapters/aws-lambda/adapters/aws-lambda/vite.config.mts

@@ -13,7 +13,7 @@ export default extendConfig(baseConfig, () => {
       minify: false,
       ssr: true,
       rollupOptions: {
-        input: ["./src/entry_aws-lambda.tsx", "@qwik-router-config"],
+        input: ["./src/entry_aws-lambda.tsx"],
       },
     },
     plugins: [nodeServerAdapter({ name: "aws-lambda" })],

package/dist/starters/adapters/aws-lambda/package.json

@@ -1,7 +1,7 @@
 {
   "description": "AWS Lambda",
   "scripts": {
-    "build.server": "vite build -c adapters/aws-lambda/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/aws-lambda/vite.config.mts",
     "serve": "qwik build && serverless offline",
     "deploy": "serverless deploy"
   },

package/dist/starters/adapters/aws-lambda/serverless.yml

@@ -18,6 +18,21 @@ functions:
 custom:
   serverless-offline:
     httpPort: 4000
+  serverless-http:
+    # Make sure serverless-http serves files correctly
+    binary:
+      contentTypes:
+        - "application/javascript"
+        - "text/javascript"
+        - "application/json"
+        - "text/html"
+        - "text/css"
+        - "image/*"
+        - "font/*"
+    # the js files under build have hash names and are immutable
+    cacheControl:
+      - pattern: "build/**/*.js"
+        value: "public, max-age=31536000, immutable"
 
 package:
   excludeDevDependencies: true

package/dist/starters/adapters/aws-lambda/src/entry_aws-lambda.tsx

@@ -7,8 +7,6 @@
  * - https://qwik.dev/docs/deployments/aws/
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import {
   createQwikRouter,
   type PlatformAwsLambda,
@@ -18,14 +16,10 @@ import "source-map-support/register";
 import render from "./entry.ssr";
 
 declare global {
-  interface QwikRouterPlatform extends PlatformAwsLambda {}
+  type QwikRouterPlatform = PlatformAwsLambda;
 }
 
-export const { handle } = createQwikRouter({
-  render,
-  qwikRouterConfig,
-  manifest,
-});
+export const { handle } = createQwikRouter({ render });
 
 export const qwikApp = serverless({ handle }, { binary: true });
 // handler is the default export for the lambda functions

package/dist/starters/adapters/azure-swa/adapters/azure-swa/vite.config.mts

@@ -8,7 +8,7 @@ export default extendConfig(baseConfig, () => {
       ssr: true,
       outDir: "azure-functions/render",
       rollupOptions: {
-        input: ["src/entry.azure-swa.tsx", "@qwik-router-config"],
+        input: ["src/entry.azure-swa.tsx"],
         output: {
           entryFileNames: `[name].[hash].mjs`,
           chunkFileNames: `[name].[hash].mjs`,

package/dist/starters/adapters/azure-swa/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Azure Static Web Apps",
   "scripts": {
-    "build.server": "vite build -c adapters/azure-swa/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/azure-swa/vite.config.mts",
     "serve": "swa start"
   },
   "devDependencies": {

package/dist/starters/adapters/azure-swa/public/staticwebapp.config.json

@@ -19,5 +19,12 @@
   },
   "platform": {
     "apiRuntime": "node:18"
+  },
+  "responseOverrides": {
+    "build/**/*.js": {
+      "headers": {
+        "Cache-Control": "public, max-age=31536000, immutable"
+      }
+    }
   }
 }

package/dist/starters/adapters/azure-swa/src/entry.azure-swa.tsx

@@ -7,8 +7,6 @@
  * - https://qwik.dev/docs/deployments/azure-swa/
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import {
   createQwikRouter,
   type PlatformAzure,
@@ -16,7 +14,7 @@ import {
 import render from "./entry.ssr";
 
 declare global {
-  interface QwikRouterPlatform extends PlatformAzure {}
+  type QwikRouterPlatform = PlatformAzure;
 }
 
-export default createQwikRouter({ render, qwikRouterConfig, manifest });
+export default createQwikRouter({ render });

package/dist/starters/adapters/bun/adapters/bun/vite.config.mts

@@ -11,7 +11,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.bun.ts", "@qwik-router-config"],
+        input: ["src/entry.bun.ts"],
       },
       minify: false,
     },
@@ -20,7 +20,7 @@ export default extendConfig(baseConfig, () => {
         ssg: {
           include: ["/*"],
           origin: "https://yoursite.dev",
-          maxWorkers: 1, // Limit Workers to 1, otherwise SSG will hang when compiling Qwik City app with `bun run --bun build`.
+          maxWorkers: 1, // Limit Workers to 1, otherwise SSG will hang when compiling Qwik Router app with `bun run --bun build`.
         },
       }),
     ],

package/dist/starters/adapters/bun/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Bun server",
   "scripts": {
-    "build.server": "vite build -c adapters/bun/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/bun/vite.config.mts",
     "serve": "bun server/entry.bun.js"
   },
   "__qwik__": {

package/dist/starters/adapters/bun/src/entry.bun.ts

@@ -8,16 +8,15 @@
  * - https://bun.sh/docs/api/http
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import { createQwikRouter } from "@qwik.dev/router/middleware/bun";
 import render from "./entry.ssr";
 
 // Create the Qwik Router Bun middleware
 const { router, notFound, staticFile } = createQwikRouter({
   render,
-  qwikRouterConfig,
-  manifest,
+  static: {
+    cacheControl: "public, max-age=31536000, immutable",
+  },
 });
 
 // Allow for dynamic port

package/dist/starters/adapters/cloud-run/adapters/cloud-run/vite.config.mts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.cloud-run.tsx", "@qwik-router-config"],
+        input: ["src/entry.cloud-run.tsx"],
       },
     },
     plugins: [cloudRunAdapter()],

package/dist/starters/adapters/cloud-run/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Google Cloud Run server",
   "scripts": {
-    "build.server": "vite build -c adapters/cloud-run/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/cloud-run/vite.config.mts",
     "deploy": "gcloud run deploy my-cloud-run-app --source ."
   },
   "__qwik__": {

package/dist/starters/adapters/cloud-run/src/entry.cloud-run.tsx

@@ -7,8 +7,6 @@
  * - https://qwik.dev/docs/deployments/gcp-cloud-run/
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import {
   createQwikRouter,
   type PlatformNode,
@@ -17,7 +15,7 @@ import { createServer } from "node:http";
 import render from "./entry.ssr";
 
 declare global {
-  interface QwikRouterPlatform extends PlatformNode {}
+  type QwikRouterPlatform = PlatformNode;
 }
 
 /** The default headers used by helmet */
@@ -51,10 +49,8 @@ const DEFAULT_HEADERS = {
 
 const { router, notFound, staticFile } = createQwikRouter({
   render,
-  qwikRouterConfig,
-  manifest,
   static: {
-    cacheControl: "public, max-age=31557600",
+    cacheControl: "public, max-age=31536000, immutable",
   },
   getOrigin(req) {
     // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto

package/dist/starters/adapters/cloudflare-pages/adapters/cloudflare-pages/vite.config.mts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.cloudflare-pages.tsx", "@qwik-router-config"],
+        input: ["src/entry.cloudflare-pages.tsx"],
       },
     },
     plugins: [cloudflarePagesAdapter()],

package/dist/starters/adapters/cloudflare-pages/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Cloudflare Pages",
   "scripts": {
-    "build.server": "vite build -c adapters/cloudflare-pages/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/cloudflare-pages/vite.config.mts",
     "deploy": "wrangler pages deploy ./dist",
     "serve": "wrangler pages dev ./dist --compatibility-flags=nodejs_als"
   },

package/dist/starters/adapters/cloudflare-pages/public/_headers

@@ -7,3 +7,5 @@
 
 /build/*
   Cache-Control: public, max-age=31536000, s-maxage=31536000, immutable
+/assets/*
+  Cache-Control: public, max-age=31536000, s-maxage=31536000, immutable

package/dist/starters/adapters/cloudflare-pages/src/entry.cloudflare-pages.tsx

@@ -7,8 +7,6 @@
  * - https://qwik.dev/docs/deployments/cloudflare-pages/
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import {
   createQwikRouter,
   type PlatformCloudflarePages,
@@ -16,9 +14,9 @@ import {
 import render from "./entry.ssr";
 
 declare global {
-  interface QwikRouterPlatform extends PlatformCloudflarePages {}
+  type QwikRouterPlatform = PlatformCloudflarePages;
 }
 
-const fetch = createQwikRouter({ render, qwikRouterConfig, manifest });
+const fetch = createQwikRouter({ render });
 
 export { fetch };

package/dist/starters/adapters/deno/adapters/deno/vite.config.mts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.deno.ts", "@qwik-router-config"],
+        input: ["src/entry.deno.ts"],
       },
       minify: false,
     },

package/dist/starters/adapters/deno/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Deno server",
   "scripts": {
-    "build.server": "vite build -c adapters/deno/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/deno/vite.config.mts",
     "serve": "deno run --allow-net --allow-read --allow-env server/entry.deno.js"
   },
   "__qwik__": {

package/dist/starters/adapters/deno/src/entry.deno.ts

@@ -8,16 +8,15 @@
  * - https://docs.deno.com/runtime/tutorials/http_server
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import { createQwikRouter } from "@qwik.dev/router/middleware/deno";
 import render from "./entry.ssr";
 
 // Create the Qwik Router Deno middleware
 const { router, notFound, staticFile } = createQwikRouter({
   render,
-  qwikRouterConfig,
-  manifest,
+  static: {
+    cacheControl: "public, max-age=31536000, immutable",
+  },
 });
 
 // Allow for dynamic port

package/dist/starters/adapters/express/adapters/express/vite.config.mts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.express.tsx", "@qwik-router-config"],
+        input: ["src/entry.express.tsx"],
       },
     },
     plugins: [nodeServerAdapter({ name: "express" })],

package/dist/starters/adapters/express/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Express.js server",
   "scripts": {
-    "build.server": "vite build -c adapters/express/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/express/vite.config.mts",
     "serve": "node server/entry.express"
   },
   "dependencies": {

package/dist/starters/adapters/express/src/entry.express.tsx

@@ -7,8 +7,6 @@
  * - https://qwik.dev/docs/deployments/node/
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import {
   createQwikRouter,
   type PlatformNode,
@@ -20,12 +18,13 @@ import { fileURLToPath } from "node:url";
 import render from "./entry.ssr";
 
 declare global {
-  interface QwikRouterPlatform extends PlatformNode {}
+  type QwikRouterPlatform = PlatformNode;
 }
 
 // Directories where the static assets are located
 const distDir = join(fileURLToPath(import.meta.url), "..", "..", "dist");
 const buildDir = join(distDir, "build");
+const assetsDir = join(distDir, "assets");
 
 // Allow for dynamic port
 const PORT = process.env.PORT ?? 3000;
@@ -33,8 +32,6 @@ const PORT = process.env.PORT ?? 3000;
 // Create the Qwik Router Node middleware
 const { router, notFound } = createQwikRouter({
   render,
-  qwikRouterConfig,
-  manifest,
   // getOrigin(req) {
   //   // If deploying under a proxy, you may need to build the origin from the request headers
   //   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto
@@ -55,6 +52,10 @@ const app = express();
 // Static asset handlers
 // https://expressjs.com/en/starter/static-files.html
 app.use(`/build`, express.static(buildDir, { immutable: true, maxAge: "1y" }));
+app.use(
+  `/assets`,
+  express.static(assetsDir, { immutable: true, maxAge: "1y" }),
+);
 app.use(express.static(distDir, { redirect: false }));
 
 // Use Qwik Router's page and endpoint request handler

package/dist/starters/adapters/fastify/adapters/fastify/vite.config.mts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.fastify.tsx", "@qwik-router-config"],
+        input: ["src/entry.fastify.tsx"],
       },
     },
     plugins: [nodeServerAdapter({ name: "fastify" })],

package/dist/starters/adapters/fastify/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Fastify server",
   "scripts": {
-    "build.server": "vite build -c adapters/fastify/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/fastify/vite.config.mts",
     "serve": "node server/entry.fastify"
   },
   "dependencies": {

package/dist/starters/adapters/fastify/src/entry.fastify.tsx

@@ -15,12 +15,13 @@ import { fileURLToPath } from "node:url";
 import FastifyQwik from "./plugins/fastify-qwik";
 
 declare global {
-  interface QwikRouterPlatform extends PlatformNode {}
+  type QwikRouterPlatform = PlatformNode;
 }
 
 // Directories where the static assets are located
 const distDir = join(fileURLToPath(import.meta.url), "..", "..", "dist");
 const buildDir = join(distDir, "build");
+const assetsDir = join(distDir, "assets");
 
 // Allow for dynamic port and host
 const PORT = parseInt(process.env.PORT ?? "3000");
@@ -39,7 +40,7 @@ const start = async () => {
   // await fastify.register(import('@fastify/compress'))
 
   // Handle Qwik Router using a plugin
-  await fastify.register(FastifyQwik, { distDir, buildDir });
+  await fastify.register(FastifyQwik, { distDir, buildDir, assetsDir });
 
   // Start the fastify server
   await fastify.listen({ port: PORT, host: HOST });

package/dist/starters/adapters/fastify/src/plugins/fastify-qwik.ts

@@ -1,5 +1,4 @@
 import fastifyStatic from "@fastify/static";
-import qwikRouterConfig from "@qwik-router-config";
 import { createQwikRouter } from "@qwik.dev/router/middleware/node";
 import type { FastifyPluginAsync } from "fastify";
 import fastifyPlugin from "fastify-plugin";
@@ -9,15 +8,16 @@ import render from "../entry.ssr";
 export interface FastifyQwikOptions {
   distDir: string;
   buildDir: string;
+  assetsDir: string;
 }
 
-const { router, notFound } = createQwikRouter({ render, qwikRouterConfig });
+const { router, notFound } = createQwikRouter({ render });
 
 const qwikPlugin: FastifyPluginAsync<FastifyQwikOptions> = async (
   fastify,
   options,
 ) => {
-  const { buildDir, distDir } = options;
+  const { buildDir, distDir, assetsDir } = options;
 
   fastify.register(fastifyStatic, {
     root: buildDir,
@@ -27,6 +27,13 @@ const qwikPlugin: FastifyPluginAsync<FastifyQwikOptions> = async (
     decorateReply: false,
   });
 
+  fastify.register(fastifyStatic, {
+    root: assetsDir,
+    prefix: "/assets",
+    immutable: true,
+    maxAge: "1y",
+  });
+
   fastify.register(fastifyStatic, {
     root: distDir,
     redirect: false,

package/dist/starters/adapters/firebase/adapters/firebase/vite.config.mts

@@ -12,7 +12,7 @@ export default extendConfig(baseConfig, () => {
       minify: false,
       ssr: true,
       rollupOptions: {
-        input: ["./src/entry-firebase.tsx", "@qwik-router-config"],
+        input: ["./src/entry-firebase.tsx"],
       },
       outDir: "./functions/server",
     },

package/dist/starters/adapters/firebase/firebase.json

@@ -19,6 +19,17 @@
         "function": "app"
       }
     ],
-    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+    "headers": [
+      {
+        "source": "build/**/*.js",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "public, max-age=31536000, s-maxage=31536000, immutable"
+          }
+        ]
+      }
+    ]
   }
 }

package/dist/starters/adapters/firebase/functions/index.js

@@ -1,5 +1,4 @@
 import { https } from "firebase-functions";
-import qwikApp from './server/entry-firebase.mjs';
+import qwikApp from "./server/entry-firebase.mjs";
 
-
-export const app = https.onRequest(qwikApp)
+export const app = https.onRequest(qwikApp);

package/dist/starters/adapters/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Firebase",
   "scripts": {
-    "build.server": "vite build -c adapters/firebase/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/firebase/vite.config.mts",
     "serve": "qwik build && firebase emulators:start",
     "deploy": "firebase deploy"
   },

package/dist/starters/adapters/firebase/src/entry-firebase.tsx

@@ -7,8 +7,6 @@
  * - https://qwik.dev/docs/deployments/firebase/
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import {
   createQwikRouter,
   type PlatformFirebase,
@@ -16,7 +14,7 @@ import {
 import render from "./entry.ssr";
 
 declare global {
-  interface QwikRouterPlatform extends PlatformFirebase {}
+  type QwikRouterPlatform = PlatformFirebase;
 }
 
-export default createQwikRouter({ render, qwikRouterConfig, manifest });
+export default createQwikRouter({ render });

package/dist/starters/adapters/netlify-edge/adapters/netlify-edge/vite.config.mts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.netlify-edge.tsx", "@qwik-router-config"],
+        input: ["src/entry.netlify-edge.tsx"],
       },
       outDir: ".netlify/edge-functions/entry.netlify-edge",
     },

package/dist/starters/adapters/netlify-edge/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Netlify Edge Functions",
   "scripts": {
-    "build.server": "vite build -c adapters/netlify-edge/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/netlify-edge/vite.config.mts",
     "deploy": "netlify deploy --build"
   },
   "devDependencies": {

package/dist/starters/adapters/netlify-edge/public/_headers

@@ -1,2 +1,4 @@
+/assets/*
+  Cache-Control: public, max-age=31536000, s-maxage=31536000, immutable
 /build/*
   Cache-Control: public, max-age=31536000, s-maxage=31536000, immutable

package/dist/starters/adapters/netlify-edge/src/entry.netlify-edge.tsx

@@ -7,8 +7,6 @@
  * - https://qwik.dev/docs/deployments/netlify-edge/
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import {
   createQwikRouter,
   type PlatformNetlify,
@@ -16,7 +14,7 @@ import {
 import render from "./entry.ssr";
 
 declare global {
-  interface QwikRouterPlatform extends PlatformNetlify {}
+  type QwikRouterPlatform = PlatformNetlify;
 }
 
-export default createQwikRouter({ render, qwikRouterConfig, manifest });
+export default createQwikRouter({ render });

package/dist/starters/adapters/node-server/adapters/node-server/vite.config.mts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ["src/entry.node-server.tsx", "@qwik-router-config"],
+        input: ["src/entry.node-server.tsx"],
       },
     },
     plugins: [nodeServerAdapter({ name: "node-server" })],

package/dist/starters/adapters/node-server/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Vanilla Node server",
   "scripts": {
-    "build.server": "vite build -c adapters/node-server/vite.config.mts",
+    "build.server": "qwik check-client src dist && vite build -c adapters/node-server/vite.config.mts",
     "serve": "node server/entry.node-server"
   },
   "__qwik__": {

package/dist/starters/adapters/node-server/src/entry.node-server.tsx

@@ -7,8 +7,6 @@
  * - https://qwik.dev/docs/deployments/node/
  *
  */
-import { manifest } from "@qwik-client-manifest";
-import qwikRouterConfig from "@qwik-router-config";
 import { createQwikRouter } from "@qwik.dev/router/middleware/node";
 import { createServer } from "node:http";
 import render from "./entry.ssr";
@@ -19,8 +17,9 @@ const PORT = process.env.PORT ?? 3004;
 // Create the Qwik Router express middleware
 const { router, notFound, staticFile } = createQwikRouter({
   render,
-  qwikRouterConfig,
-  manifest,
+  static: {
+    cacheControl: "public, max-age=31536000, immutable",
+  },
 });
 
 const server = createServer();

package/dist/starters/adapters/ssg/README.md

@@ -0,0 +1,9 @@
+## Static Site Generator (Node.js)
+
+Be sure to configure your server to serve very long cache headers for the `build/**/*.js` files.
+
+Typically you'd set the `Cache-Control` header for those files to `public, max-age=31536000, immutable`.
+
+```shell
+npm run build.server
+```

package/dist/starters/adapters/{static/adapters/static → ssg/adapters/ssg}/vite.config.mts

@@ -1,4 +1,4 @@
-import { staticAdapter } from "@qwik.dev/router/adapters/static/vite";
+import { ssgAdapter } from "@qwik.dev/router/adapters/ssg/vite";
 import { extendConfig } from "@qwik.dev/router/vite";
 import baseConfig from "../../vite.config.mts";
 
@@ -11,7 +11,7 @@ export default extendConfig(baseConfig, () => {
       },
     },
     plugins: [
-      staticAdapter({
+      ssgAdapter({
         origin: "https://yoursite.qwik.dev",
       }),
     ],