From 527f6942ddc4966098914ebd6b507b7392b03ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0?= Date: Wed, 21 Jan 2026 12:24:25 +0900 Subject: [PATCH 1/4] docs(static-deploy): simplify instructions (#21447) --- guide/static-deploy.md | 52 ++++++++++++------------------------------ 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/guide/static-deploy.md b/guide/static-deploy.md index c54f3717..12286d0a 100644 --- a/guide/static-deploy.md +++ b/guide/static-deploy.md @@ -113,27 +113,11 @@ Now the `preview` command will launch the server at `http://localhost:8080`. ### Netlify CLI -1. Install the [Netlify CLI](https://cli.netlify.com/). -2. Create a new site using `ntl init`. -3. Deploy using `ntl deploy`. +1. Install the [Netlify CLI](https://docs.netlify.com/api-and-cli-guides/cli-guides/get-started-with-cli/) via `npm install -g netlify-cli`. +2. Create a new site using `netlify init`. +3. Deploy using `netlify deploy`. -```bash -# Install the Netlify CLI -$ npm install -g netlify-cli - -# Create a new site in Netlify -$ ntl init - -# Deploy to a unique preview URL -$ ntl deploy -``` - -The Netlify CLI will share with you a preview URL to inspect. When you are ready to go into production, use the `prod` flag: - -```bash -# Deploy the site into production -$ ntl deploy --prod -``` +The Netlify CLI will share with you a preview URL to inspect. When you are ready to go into production, use the `prod` flag: `netlify deploy --prod`. ### Netlify with Git @@ -149,19 +133,11 @@ After your project has been imported and deployed, all subsequent pushes to bran ### Vercel CLI -1. Install the [Vercel CLI](https://vercel.com/cli) and run `vercel` to deploy. +1. Install the [Vercel CLI](https://vercel.com/cli) via `npm i -g vercel` and run `vercel` to deploy. 2. Vercel will detect that you are using Vite and will enable the correct settings for your deployment. 3. Your application is deployed! (e.g. [vite-vue-template.vercel.app](https://vite-vue-template.vercel.app/)) -```bash -$ npm i -g vercel -$ vercel init vite -Vercel CLI -> Success! Initialized "vite" example in ~/your-folder. -- To deploy, `cd vite` and run `vercel`. -``` - -### Vercel for Git +### Vercel with Git 1. Push your code to your git repository (GitHub, GitLab, Bitbucket). 2. [Import your Vite project](https://vercel.com/new) into Vercel. @@ -213,9 +189,11 @@ You can also add custom domains and handle custom build settings on Pages. Learn ## Google Firebase -1. Make sure you have [firebase-tools](https://www.npmjs.com/package/firebase-tools) installed. +1. Install [firebase-tools](https://www.npmjs.com/package/firebase-tools) via `npm i -g firebase-tools`. + +2. Create the following files at the root of your project: -2. Create `firebase.json` and `.firebaserc` at the root of your project with the following content: + ::: code-group ```json [firebase.json] { @@ -240,14 +218,14 @@ You can also add custom domains and handle custom build settings on Pages. Learn } ``` + ::: + 3. After running `npm run build`, deploy using the command `firebase deploy`. ## Surge -1. First install [surge](https://www.npmjs.com/package/surge), if you haven’t already. - +1. Install [surge](https://www.npmjs.com/package/surge) via `npm i -g surge`. 2. Run `npm run build`. - 3. Deploy to surge by typing `surge dist`. You can also deploy to a [custom domain](https://surge.sh/help/adding-a-custom-domain) by adding `surge dist yourdomain.com`. @@ -280,9 +258,7 @@ You can deploy your Vite app as a Static Site on [Render](https://render.com/). - **Build Command**: `npm install && npm run build` - **Publish Directory**: `dist` -5. Click **Create Static Site**. - - Your app should be deployed at `https://.onrender.com/`. +5. Click **Create Static Site**. Your app should be deployed at `https://.onrender.com/`. By default, any new commit pushed to the specified branch will automatically trigger a new deployment. [Auto-Deploy](https://render.com/docs/deploys#toggling-auto-deploy-for-a-service) can be configured in the project settings. From 35be5036025fd9c1e85a025696c7708be5af9336 Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Thu, 22 Jan 2026 10:21:59 +0800 Subject: [PATCH 2/4] resolve conflict --- guide/static-deploy.md | 86 ++++++------------------------------------ 1 file changed, 11 insertions(+), 75 deletions(-) diff --git a/guide/static-deploy.md b/guide/static-deploy.md index 1e42cb58..c39555d3 100644 --- a/guide/static-deploy.md +++ b/guide/static-deploy.md @@ -113,35 +113,11 @@ $ npm run preview ### Netlify CLI {#netlify-cli} -<<<<<<< HEAD -1. 安装 [Netlify CLI](https://cli.netlify.com/)。 -2. 使用 `ntl init` 创建一个新站点。 -3. 使用 `ntl deploy` 来部署。 +1. 通过 `npm install -g netlify-cli` 安装 [Netlify CLI](https://docs.netlify.com/api-and-cli-guides/cli-guides/get-started-with-cli/) 。 +2. 使用 `netlify init` 创建一个新站点。 +3. 使用 `netlify deploy` 来部署。 -```bash -# 安装 Netlify CLI -$ npm install -g netlify-cli - -# 在 Netlify 中创建一个新站点 -$ ntl init - -# 部署一个独一无二的预览 URL -$ ntl deploy -``` - -Netlify CLI 会给你分享一个预览的 URL 来检查部署结果。当你准备好了发布生产版本时，请使用 `prod` 标志： - -```bash -# 部署站点到生产环境 -$ ntl deploy --prod -``` -======= -1. Install the [Netlify CLI](https://docs.netlify.com/api-and-cli-guides/cli-guides/get-started-with-cli/) via `npm install -g netlify-cli`. -2. Create a new site using `netlify init`. -3. Deploy using `netlify deploy`. - -The Netlify CLI will share with you a preview URL to inspect. When you are ready to go into production, use the `prod` flag: `netlify deploy --prod`. ->>>>>>> 527f6942ddc4966098914ebd6b507b7392b03ae8 +Netlify 命令行工具（CLI）会为你提供一个预览链接，供你查看效果。当你准备发布到生产环境时，可使用 `prod` 参数执行命令：`netlify deploy --prod`。 ### Netlify with Git {#netlify-with-git} @@ -157,27 +133,11 @@ The Netlify CLI will share with you a preview URL to inspect. When you are ready ### Vercel CLI {#vercel-cli} -<<<<<<< HEAD -1. 安装 [Vercel CLI](https://vercel.com/cli) 并运行 `vercel` 来部署。 +1. 通过 `npm i -g vercel` 命令安装 [Vercel CLI](https://vercel.com/cli)，然后运行 vercel 命令完成部署。 2. Vercel 会检测到你正在使用 Vite，并会为你开启相应的正确配置。 3. 你的应用被部署好了！（示例：[vite-vue-template.vercel.app](https://vite-vue-template.vercel.app/)） -```bash -$ npm i -g vercel -$ vercel init vite -Vercel CLI -> Success! Initialized "vite" example in ~/your-folder. -- To deploy, `cd vite` and run `vercel`. -``` - ### Vercel for Git {#vercel-for-git} -======= -1. Install the [Vercel CLI](https://vercel.com/cli) via `npm i -g vercel` and run `vercel` to deploy. -2. Vercel will detect that you are using Vite and will enable the correct settings for your deployment. -3. Your application is deployed! (e.g. [vite-vue-template.vercel.app](https://vite-vue-template.vercel.app/)) - -### Vercel with Git ->>>>>>> 527f6942ddc4966098914ebd6b507b7392b03ae8 1. 将你的代码推送到远程仓库（GitHub，GitLab，Bitbucket） 2. [导入你的 Vite 仓库](https://vercel.com/new) 到 Vercel @@ -229,17 +189,11 @@ $ npx wrangler pages deploy dist ## Google Firebase {#google-firebase} -<<<<<<< HEAD -1. 确保已经安装 [firebase-tools](https://www.npmjs.com/package/firebase-tools)。 +1. 通过 `npm i -g firebase-tools` 命令安装 [firebase-tools](https://www.npmjs.com/package/firebase-tools) 工具。 -2. 在项目根目录创建 `firebase.json` 和 `.firebaserc` 两个文件，包含以下内容： -======= -1. Install [firebase-tools](https://www.npmjs.com/package/firebase-tools) via `npm i -g firebase-tools`. +2. 在你的项目根目录下创建以下文件： -2. Create the following files at the root of your project: - - ::: code-group ->>>>>>> 527f6942ddc4966098914ebd6b507b7392b03ae8 + ::: code-group ```json [firebase.json] { @@ -264,27 +218,15 @@ $ npx wrangler pages deploy dist } ``` -<<<<<<< HEAD -3. 运行 `npm run build` 后，通过 `firebase deploy` 命令部署。 -======= ::: -3. After running `npm run build`, deploy using the command `firebase deploy`. ->>>>>>> 527f6942ddc4966098914ebd6b507b7392b03ae8 +3. 运行 `npm run build` 后，通过 `firebase deploy` 命令部署。 ## Surge {#surge} -<<<<<<< HEAD -1. 首先确保已经安装 [surge](https://www.npmjs.com/package/surge)。 - +1. 通过 `npm i -g surge` 命令安装 [surge](https://www.npmjs.com/package/surge)。 2. 运行 `npm run build`。 - 3. 运行 `surge dist` 命令部署到 surge。 -======= -1. Install [surge](https://www.npmjs.com/package/surge) via `npm i -g surge`. -2. Run `npm run build`. -3. Deploy to surge by typing `surge dist`. ->>>>>>> 527f6942ddc4966098914ebd6b507b7392b03ae8 你也可以通过添加 `surge dist yourdomain.com` 部署到一个 [自定义域名](https://surge.sh/help/adding-a-custom-domain)。 @@ -314,16 +256,10 @@ $ npx wrangler pages deploy dist 4. 指定一个项目名称和所用分支 -<<<<<<< HEAD - **构建命令**：`npm install && npm run build` - **发布目录**：`dist` -5. 点击 **Create Static Site** -======= -5. Click **Create Static Site**. Your app should be deployed at `https://.onrender.com/`. ->>>>>>> 527f6942ddc4966098914ebd6b507b7392b03ae8 - - 你的应用将会被部署在 `https://.onrender.com/`。 +5. 点击 **Create Static Site**， 你的应用将会被部署在 `https://.onrender.com/`。 默认情况下，推送到该指定分支的任何新的 commit 都会自动触发一个新的部署。[Auto-Deploy](https://render.com/docs/deploys#toggling-auto-deploy-for-a-service) 可以在项目设置中部署。 From fb24bf026820679dac59dbbe699d230f1c669d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0?= Date: Thu, 22 Jan 2026 21:42:14 +0900 Subject: [PATCH 3/4] feat: update rolldown to 1.0.0-rc.1 (#21463) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d5bb25c3..5a7cf8fc 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@voidzero-dev/vitepress-theme": "^4.2.1", "feed": "^5.2.0", "markdown-it-image-size": "^15.0.1", - "oxc-minify": "^0.108.0", + "oxc-minify": "^0.110.0", "vitepress": "^2.0.0-alpha.15", "vitepress-plugin-group-icons": "^1.7.1", "vitepress-plugin-llms": "^1.10.0", From 0e25f66355217749e918931dcfb82b81a0062132 Mon Sep 17 00:00:00 2001 From: thinkasany <480968828@qq.com> Date: Fri, 23 Jan 2026 09:23:46 +0800 Subject: [PATCH 4/4] resolve deps --- package.json | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/package.json b/package.json index 268d0edb..3edd008f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "name": "vite-docs-cn", "version": "8.0.0-beta.0", "description": "Vite.js documentation Chinese translation.", @@ -40,27 +39,4 @@ "gitHooks": { "commit-msg": "node scripts/verifyCommit.js" } -======= - "name": "@vitejs/monorepo-docs", - "private": true, - "type": "module", - "scripts": { - "docs": "vitepress dev", - "docs-build": "vitepress build", - "docs-serve": "vitepress serve" - }, - "devDependencies": { - "@shikijs/vitepress-twoslash": "^3.21.0", - "@types/express": "^5.0.6", - "@voidzero-dev/vitepress-theme": "^4.2.1", - "feed": "^5.2.0", - "markdown-it-image-size": "^15.0.1", - "oxc-minify": "^0.110.0", - "vitepress": "^2.0.0-alpha.15", - "vitepress-plugin-group-icons": "^1.7.1", - "vitepress-plugin-llms": "^1.10.0", - "vue": "^3.5.27", - "vue-tsc": "^3.2.2" - } ->>>>>>> fb24bf026820679dac59dbbe699d230f1c669d29 }