Merge pull request #7751 from QwikDev/v2-merge-main

chore: merge v1.15 into v2

Author: wmertens

packages/create-qwik/CHANGELOG.md

@@ -32,6 +32,14 @@
 
 ## 2.0.0-alpha.0
 
+## 1.15.0
+
+### Patch Changes
+
+- 🐞🩹 fix up vercel starter config (by [@cmbartschat](https://github.com/cmbartschat) in [#7663](https://github.com/QwikDev/qwik/pull/7663))
+
+- 🛠 update devDependencies and configurations (by [@JerryWu1234](https://github.com/JerryWu1234) in [#7695](https://github.com/QwikDev/qwik/pull/7695))
+
 ## 1.14.1
 
 ### Patch Changes

packages/docs/public/ecosystem/azion.svg

@@ -121,6 +121,11 @@
       "title": "Vercel",
       "href": "/docs/deployments/vercel-edge/",
       "imgSrc": "/ecosystem/vercel.svg"
+    },
+    {
+      "title": "Azion",
+      "href": "/docs/deployments/azion/",
+      "imgSrc": "/ecosystem/azion.svg"
     }
   ],
   "libraries": [

packages/docs/src/routes/(ecosystem)/ecosystem.json

@@ -443,7 +443,7 @@
       ],
       "kind": "Class",
       "content": "```typescript\nexport declare class ServerError<T = any> extends Error \n```\n**Extends:** Error\n\n\n<table><thead><tr><th>\n\nConstructor\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[(constructor)(status, data)](./router.servererror._constructor_.md)\n\n\n</td><td>\n\n\n</td><td>\n\nConstructs a new instance of the `ServerError` class\n\n\n</td></tr>\n</tbody></table>\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[data](#servererror-data)\n\n\n</td><td>\n\n\n</td><td>\n\nT\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[status](#servererror-status)\n\n\n</td><td>\n\n\n</td><td>\n\nnumber\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
-      "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/middleware/request-handler/error-handler.ts",
+      "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/middleware/request-handler/server-error.ts",
       "mdFile": "router.servererror.md"
     },
     {
@@ -456,7 +456,7 @@
         }
       ],
       "kind": "Interface",
-      "content": "```typescript\nexport interface ServerRenderOptions extends RenderOptions \n```\n**Extends:** RenderOptions\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[checkOrigin?](./router.serverrenderoptions.checkorigin.md)\n\n\n</td><td>\n\n\n</td><td>\n\nboolean\n\n\n</td><td>\n\n_(Optional)_ Protection against cross-site request forgery (CSRF) attacks.\n\nWhen `true`<!-- -->, for every incoming POST, PUT, PATCH, or DELETE form submissions, the request origin is checked to match the server's origin.\n\nBe careful when disabling this option as it may lead to CSRF attacks.\n\nDefaults to `true`<!-- -->.\n\n\n</td></tr>\n<tr><td>\n\n[qwikCityPlan?](./router.serverrenderoptions.qwikcityplan.md)\n\n\n</td><td>\n\n\n</td><td>\n\nQwikCityPlan\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[qwikRouterConfig?](./router.serverrenderoptions.qwikrouterconfig.md)\n\n\n</td><td>\n\n\n</td><td>\n\nQwikRouterConfig\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[render](./router.serverrenderoptions.render.md)\n\n\n</td><td>\n\n\n</td><td>\n\nRender\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
+      "content": "```typescript\nexport interface ServerRenderOptions extends RenderOptions \n```\n**Extends:** RenderOptions\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[checkOrigin?](./router.serverrenderoptions.checkorigin.md)\n\n\n</td><td>\n\n\n</td><td>\n\nboolean \\| 'lax-proto'\n\n\n</td><td>\n\n_(Optional)_ Protection against cross-site request forgery (CSRF) attacks.\n\nWhen `true`<!-- -->, for every incoming POST, PUT, PATCH, or DELETE form submissions, the request origin is checked to match the server's origin. `lax-proto` is for SSL-terminating proxies\n\nBe careful when disabling this option as it may lead to CSRF attacks.\n\nDefaults to `true`<!-- -->.\n\n\n</td></tr>\n<tr><td>\n\n[qwikCityPlan?](./router.serverrenderoptions.qwikcityplan.md)\n\n\n</td><td>\n\n\n</td><td>\n\nQwikCityPlan\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[qwikRouterConfig?](./router.serverrenderoptions.qwikrouterconfig.md)\n\n\n</td><td>\n\n\n</td><td>\n\nQwikRouterConfig\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[render](./router.serverrenderoptions.render.md)\n\n\n</td><td>\n\n\n</td><td>\n\nRender\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/middleware/request-handler/types.ts",
       "mdFile": "router.serverrenderoptions.md"
     },

packages/docs/src/routes/api/qwik-router-middleware-request-handler/api.json

@@ -1659,7 +1659,7 @@ number
 </td></tr>
 </tbody></table>
 
-[Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/middleware/request-handler/error-handler.ts)
+[Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/middleware/request-handler/server-error.ts)
 
 ## ServerRenderOptions
 
@@ -1694,13 +1694,13 @@ Description
 
 </td><td>
 
-boolean
+boolean \| 'lax-proto'
 
 </td><td>
 
 _(Optional)_ Protection against cross-site request forgery (CSRF) attacks.
 
-When `true`, for every incoming POST, PUT, PATCH, or DELETE form submissions, the request origin is checked to match the server's origin.
+When `true`, for every incoming POST, PUT, PATCH, or DELETE form submissions, the request origin is checked to match the server's origin. `lax-proto` is for SSL-terminating proxies
 
 Be careful when disabling this option as it may lead to CSRF attacks.
 

packages/docs/src/routes/api/qwik-router-middleware-request-handler/index.mdx

@@ -66,20 +66,20 @@ Intercepting errors with middleware has a few usecases: you might want to hide e
 ```tsx
 // src/routes/[email protected]
 import { type RequestHandler } from '@qwik.dev/router'
-import { RedirectMessage } from '@qwik.dev/router/middleware/request-handler'
+import { RedirectMessage, ServerError } from '@qwik.dev/router/middleware/request-handler'
 import { isDev } from '@qwik.dev/core/build'
 
 export const onRequest: RequestHandler = async ({ next }) => {
   try {
     return await next();
   } catch (err) {
     // Pass through 3xx redirects
-    if (isRedirectMessage(err)) {
+    if (err instanceof RedirectMessage) {
       throw err
     }
 
     // Pass through ServerErrors
-    if (isServerError(err)) {
+    if (err instanceof ServerError) {
       throw err
     }
 
@@ -94,19 +94,6 @@ export const onRequest: RequestHandler = async ({ next }) => {
   }
 };
 
-function isServerError(err: unknown): err is ServerError {
-  return (
-    err instanceof ServerError ||
-    // This is required for dev environments due to an issue with vite: https://github.com/vitejs/vite/issues/3910
-    (isDev && err instanceof Error && err.constructor.name === "ServerError")
-  );
-}
-
-function isRedirectMessage(err: unknown): err is RedirectMessage {
-  return (
-    err instanceof RedirectMessage ||
-    // This is required for dev environments due to an issue with vite: https://github.com/vitejs/vite/issues/3910
-    (isDev && err instanceof Error && err.constructor.name === "RedirectMessage")
-  );
-}
+
+
 ```

packages/docs/src/routes/docs/(qwikrouter)/error-handling/index.mdx

@@ -606,6 +606,7 @@ Set stream response.
 import type { RequestHandler } from '@qwik.dev/router';
 
 export const onGet: RequestHandler = async (requestEvent) => {
+  requestEvent.headers.set('content-type','text/event-stream')  
   const writableStream = requestEvent.getWritableStream();
   const writer = writableStream.getWriter();
   const encoder = new TextEncoder();

packages/docs/src/routes/docs/(qwikrouter)/middleware/index.mdx

@@ -19,7 +19,7 @@ By returning an asynchronous function from our `routeLoader$` we can stream/defe
 import { Resource, component$ } from '@qwik.dev/core';
 import { routeLoader$ } from '@qwik.dev/router';
 
-export const useMyData = routeLoader$(() => {
+export const useMyData = routeLoader$(async () => {
   return async () => {
     await delay(4_000);
     return 'MyData ' + Math.random();

packages/docs/src/routes/docs/cookbook/streaming-deferred-loaders/index.mdx

@@ -0,0 +1,120 @@
+---
+title: Azion Web Platform | Deployments
+contributors:
+  - egermano
+updated_at: '2025-06-17T11:37:18Z'
+created_at: '2025-06-17T11:37:18Z'
+---
+
+import PackageManagerTabs from '~/components/package-manager-tabs/index.tsx';
+
+# Azion Web Platform
+
+[Azion](https://azion.com) is a web platform that allows you to deploy your Qwik applications globally. It provides a fast and secure way to serve your applications with low latency.
+
+## Installation
+
+Currently, Azion only supports SSG Qwik applications. To deploy your Qwik application to Azion, you need to use the `static-site` adapter.
+
+To integrate the `static-site` adapter, use the `add` command:
+
+<PackageManagerTabs>
+<span q:slot="pnpm">
+```shell
+pnpm run qwik add static
+```
+</span>
+<span q:slot="npm">
+```shell
+npm run qwik add static
+```
+</span>
+<span q:slot="yarn">
+```shell
+yarn run qwik add static
+```
+</span>
+<span q:slot="bun">
+```shell
+bun run qwik add static
+```
+</span>
+</PackageManagerTabs>
+
+Above command will create a directory at project root named `adapters/static/vite.config.ts` with the below code.
+
+```ts title="adapters/static/vite.config.ts"
+import { staticAdapter } from "@builder.io/qwik-city/adapters/static/vite";
+import { extendConfig } from '@builder.io/qwik-city/vite';
+import baseConfig from '../../vite.config';
+
+export default extendConfig(baseConfig, () => {
+  return {
+    build: {
+      ssr: true,
+      rollupOptions: {
+        input: ['@qwik-city-plan'],
+      },
+    },
+    plugins: [
+      staticAdapter({
+        origin: 'https://yoursite.qwik.dev',
+      }),
+    ],
+  };
+});
+```
+
+> Remember to change the `origin` in this file to your domain.
+
+Now, you can generate static site while using `Qwik`'s rich ecosystem, file based routing and many more.
+
+## Deploy to Azion
+
+To deploy your Qwik application to Azion, you need to install the Azion CLI. You can install it by following this [guide](https://www.azion.com/en/documentation/products/azion-cli/overview/#installing-azion-cli).
+
+Once you have the Azion CLI installed, you can deploy your application by following these steps:
+
+1. Link your application. This will create a new project in Azion and link it to your local application.
+
+```shell
+azion link
+```
+
+Confirm the linking of the project to Azion:
+
+```shell
+? Do you want to link /[your-application-folder] to Azion? (y/N)
+```
+
+Enter the desired name for your **application**:
+
+```shell
+? (Hit enter to accept the suggested name in parenthesis) Your application's name:  (nimble-tyrion)
+```
+
+Choose a **preset**, `Qwik` is the option you are looking for:
+
+```shell
+? Choose a preset:  [Use arrows to move, type to filter]
+  ...
+> Qwik
+  ...
+```
+
+Now, the application will be linked to Azion. Different processes occur based on the selected preset, so you need to answer the interactions that are presented.
+
+2. Deploy your application. This will build your application and deploy it to Azion.
+
+```shell
+azion deploy
+```
+
+3. Wait while the project is built and deployed to the Azion Web Platform.
+
+> Once the deployment is triggered, Azion will open the browser and take you to a page on the Azion Console where the deployment logs and process can be monitored. If it doesn't open automatically, just click on the provided link.
+After the deployment is complete, you'll receive a domain to access your Qwik project on the Azion Platform.
+
+Wait a few minutes for propagation to take place, and then access your application using the provided domain, which should be similar to `https://xxxxxxx.map.azionedge.net`.
+
+For more information about the Azion Platform, check the [Azion documentation](https://www.azion.com/en/documentation/).

packages/docs/src/routes/docs/deployments/azion/index.mdx

@@ -176,7 +176,7 @@ Alternatively, you can use the `deepl-localize` command to translate your string
 
 It supports both runtime and compile-time translations.
 
-See the [Qwik-specific instructions](https://github.com/wmertens/compiled-i18n/blob/main/qwik.md).
+See the [Qwik-specific instructions](https://github.com/wmertens/compiled-i18n/blob/main/docs/qwik.md).
 
 Automatic translation is supported via [deepl-localize](https://github.com/tzdesign/deepl-localize).