From 1b16353a2ba721beac2aaf2365914808c9ae007a Mon Sep 17 00:00:00 2001 From: abeer0 <47961062+iiio2@users.noreply.github.com> Date: Tue, 4 Nov 2025 09:13:36 +0600 Subject: [PATCH 1/2] docs(static-deploy): update redirected urls (#21037) --- guide/static-deploy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guide/static-deploy.md b/guide/static-deploy.md index d56f245d..64078a3a 100644 --- a/guide/static-deploy.md +++ b/guide/static-deploy.md @@ -296,7 +296,7 @@ Deploy your static site using [Flightcontrol](https://www.flightcontrol.dev/?ref ## Kinsta Static Site Hosting -Deploy your static site using [Kinsta](https://kinsta.com/static-site-hosting/) by following these [instructions](https://kinsta.com/docs/react-vite-example/). +Deploy your static site using [Kinsta](https://kinsta.com/static-site-hosting/) by following these [instructions](https://kinsta.com/docs/static-site-hosting/static-site-quick-start/react-static-site-examples/#react-with-vite). ## xmit Static Site Hosting @@ -308,4 +308,4 @@ Deploy your static site using [xmit](https://xmit.co) by following this [guide]( Zephyr follows a different approach than other cloud providers. It integrates directly with Vite build process, so every time you build or run the dev server for your application, it will be automatically deployed with Zephyr Cloud. -Follow the steps in [the Vite deployment guide](https://docs.zephyr-cloud.io/recipes/react-vite) to get started. +Follow the steps in [the Vite deployment guide](https://docs.zephyr-cloud.io/bundlers/vite) to get started. From 8b22c51222139aab083e65a6d4e40c4a8495c170 Mon Sep 17 00:00:00 2001 From: waynzh Date: Wed, 5 Nov 2025 11:45:38 +0800 Subject: [PATCH 2/2] docs: resolve conflicts --- guide/static-deploy.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/guide/static-deploy.md b/guide/static-deploy.md index f6d76e9a..7670d9cd 100644 --- a/guide/static-deploy.md +++ b/guide/static-deploy.md @@ -297,11 +297,7 @@ $ npx wrangler pages deploy dist ## Kinsta 静态站点托管 {#kinsta-static-site-hosting} -<<<<<<< HEAD -根据 [说明](https://kinsta.com/docs/react-vite-example/)，使用 [Kinsta](https://kinsta.com/static-site-hosting/) 来部署你的静态站点。 -======= -Deploy your static site using [Kinsta](https://kinsta.com/static-site-hosting/) by following these [instructions](https://kinsta.com/docs/static-site-hosting/static-site-quick-start/react-static-site-examples/#react-with-vite). ->>>>>>> 1b16353a2ba721beac2aaf2365914808c9ae007a +根据 [说明](https://kinsta.com/docs/react-vite-example/)，使用 [Kinsta](https://kinsta.com/docs/static-site-hosting/static-site-quick-start/react-static-site-examples/#react-with-vite) 来部署你的静态站点。 ## xmit 静态站点托管 {#xmit-static-site-hosting} @@ -313,8 +309,4 @@ Deploy your static site using [Kinsta](https://kinsta.com/static-site-hosting/) Zephyr 与其他云提供商采用不同的方法。它直接与 Vite 构建流程集成，因此每次你构建或运行应用程序的开发服务器时，它都会自动部署到 Zephyr Cloud。 -<<<<<<< HEAD -请按照 [Vite 部署指南](https://docs.zephyr-cloud.io/recipes/react-vite) 中的步骤开始使用。 -======= -Follow the steps in [the Vite deployment guide](https://docs.zephyr-cloud.io/bundlers/vite) to get started. ->>>>>>> 1b16353a2ba721beac2aaf2365914808c9ae007a +请按照 [Vite 部署指南](https://docs.zephyr-cloud.io/bundlers/vite) 中的步骤开始使用。