diff --git a/docs/src/pages/en/guides/deploy.md b/docs/src/pages/en/guides/deploy.md index f9d34e4bea43..d5b6797db32b 100644 --- a/docs/src/pages/en/guides/deploy.md +++ b/docs/src/pages/en/guides/deploy.md @@ -344,13 +344,30 @@ You can also deploy to a [custom domain](http://surge.sh/help/adding-a-custom-do ## Vercel -To deploy your Astro project with a [Vercel for Git](https://vercel.com/docs/git), make sure it has been pushed to a Git repository. +You can deploy Astro to [Vercel](http://vercel.com) through the CLI or the Vercel git integrations. -Go to https://vercel.com/import/git and import the project into Vercel using your Git of choice (GitHub, GitLab or BitBucket). Follow the wizard to select the project root with the project's `package.json` and override the build step using `npm run build` and the output dir to be `./dist` +### CLI -After your project has been imported, all subsequent pushes to branches will generate Preview Deployments, and all changes made to the Production Branch (commonly "main") will result in a Production Deployment. +1. Install the [Vercel CLI](https://vercel.com/cli) and run `vercel` to deploy. +2. When asked `Want to override the settings? [y/N]`, choose `Y`. +3. Update `Output Directory` to `./dist`. +4. Your application is deployed! (e.g. [astro.vercel.app](https://astro.vercel.app/)) -Once deployed, you will get a URL to see your app live, such as the following: https://astro.vercel.app +```bash +$ npm i -g vercel +$ vercel +``` + +### Git + +1. Push your code to your git repository (GitHub, GitLab, BitBucket). +2. [Import your project](https://vercel.com/new) into Vercel. +3. Update `Output Directory` to `./dist`. +4. Your application is deployed! (e.g. [astro.vercel.app](https://astro.vercel.app/)) + +After your project has been imported and deployed, all subsequent pushes to branches will generate [Preview Deployments](https://vercel.com/docs/concepts/deployments/environments#preview), and all changes made to the Production Branch (commonly “main”) will result in a [Production Deployment](https://vercel.com/docs/concepts/deployments/environments#production). + +Learn more about Vercel’s [Git Integration](https://vercel.com/docs/concepts/git). ## Azure Static Web Apps diff --git a/docs/src/pages/es/guides/deploy.md b/docs/src/pages/es/guides/deploy.md index 6f81c0125799..8af1c4aa8eda 100644 --- a/docs/src/pages/es/guides/deploy.md +++ b/docs/src/pages/es/guides/deploy.md @@ -296,13 +296,30 @@ También puedes implementar en un [dominio personalizado](http://surge.sh/help/a ## Vercel -Para implementar tu proyecto Astro con [Vercel para Git](https://vercel.com/docs/git), asegúrate de que lo has enviado a un repositorio de Git. +Puede implementar Astro en [Vercel](http://vercel.com) a través de la CLI o las integraciones de Vercel Git. -Ve a https://vercel.com/import/git e importa el proyecto en Vercel utilizando tu elección de Git (GitHub, GitLab o BitBucket). Sigue el asistente para seleccionar la raíz del proyecto con el `package.json` del proyecto y anula el paso de compilación usando `npm run build` y el directorio de salida sea `./dist`. +### CLI -Una vez que se has importado tu proyecto, todos los envíos posteriores a las ramas generarán vistas previas de desarrollos y todos los cambios realizados en la rama de producción (comúnmente "main") darán como resultado un despliegue de producción. +1. Instale la [Vercel CLI](https://vercel.com/cli) y ejecute `vercel` para implementar. +2. Cuando se le pregunte `¿Desea anular la configuración? [s/N]`, seleccione `S`. +3. Actualice `Directorio de salida` a `./dist`. +4. ¡Su aplicación está implementada! (por ejemplo, [astro.vercel.app](https://astro.vercel.app/)) -Una vez desplegado, obtendrás una URL para ver tu aplicación en vivo, como la siguiente: https://astro.vercel.app +```jsx +$ npm i -g vercel +$ vercel +``` + +### Git + +1. Inserte su código en su repositorio git (GitHub, GitLab, BitBucket). +2. [Importe su proyecto](https://vercel.com/new) a Vercel. +3. Actualice `Directorio de salida` a `./dist`. +4. ¡Su aplicación está implementada! (por ejemplo, [astro.vercel.app](https://astro.vercel.app/)) + +Después de que su proyecto haya sido importado e implementado, todos los envíos subsiguientes a las sucursales generarán [Vista previa de implementaciones] (https://vercel.com/docs/concepts/deployments/environments#preview), y todos los cambios realizados en la rama de producción (comúnmente “principal”) dará como resultado una [Implementación de producción](https://vercel.com/docs/concepts/deployments/environments#production). + +Obtenga más información sobre [Git Integration] de Vercel (https://vercel.com/docs/concepts/git). ## Aplicaciones web estáticas de Azure diff --git a/package.json b/package.json index a7997a7f975a..002e8cf1261c 100644 --- a/package.json +++ b/package.json @@ -18,38 +18,6 @@ "lint": "eslint \"packages/**/*.ts\"", "format": "prettier -w ." }, - "turbo": { - "baseBranch": "origin/main", - "pipeline": { - "build": { - "dependsOn": [ - "^build" - ], - "outputs": [ - "**/dist/**", - "!**/vendor/**" - ] - }, - "dev": { - "cache": false - }, - "test": { - "outputs": [] - }, - "test:templates": { - "outputs": [] - }, - "benchmark": { - "dependsOn": [ - "^build" - ], - "outputs": [] - }, - "lint": { - "outputs": [] - } - } - }, "workspaces": [ "compiled/*", "packages/markdown/*", @@ -89,5 +57,6 @@ }, "engines": { "node": "^14.15.0 || >=16.0.0" - } + }, + "packageManager": "yarn@1.22.5" } diff --git a/packages/astro/package.json b/packages/astro/package.json index 881f3070421c..494ca3f49672 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -74,7 +74,6 @@ "astring": "^1.7.5", "ci-info": "^3.2.0", "common-ancestor-path": "^1.0.1", - "debug": "^4.3.3", "eol": "^0.9.1", "es-module-lexer": "^0.9.3", "esbuild": "0.13.7", diff --git a/scripts/stats/stats.csv b/scripts/stats/stats.csv index 907a30b8258e..d1de6d0b4a16 100644 --- a/scripts/stats/stats.csv +++ b/scripts/stats/stats.csv @@ -1,4 +1,7 @@ Date,Commits (24hr),Issues (24hr),Issues:BUG (24hr),Issues:RFC (24hr),Issues:DOC (24hr),PRs (24hr),Open PRs,Open Issues,Bugs: Needs Triage,Bugs: Accepted,RFC: In Progress,RFC: Accepted,Date (ISO) +"Monday, January 31, 2022",1,2,2,0,0,4,19,113,9,73,0,0,"2022-01-31T12:01:45.838Z" +"Sunday, January 30, 2022",3,1,1,0,0,4,15,110,6,73,0,0,"2022-01-30T12:01:50.356Z" +"Saturday, January 29, 2022",18,1,1,0,0,9,12,109,5,73,0,0,"2022-01-29T12:01:53.380Z" "Friday, January 28, 2022",7,3,3,0,0,4,11,124,4,73,0,0,"2022-01-28T12:02:02.682Z" "Thursday, January 27, 2022",1,3,3,0,0,1,13,122,4,71,0,0,"2022-01-27T12:02:03.363Z" "Wednesday, January 26, 2022",11,1,1,0,0,14,13,119,1,71,0,0,"2022-01-26T12:01:48.421Z" diff --git a/turbo.json b/turbo.json new file mode 100644 index 000000000000..d599d2f1d873 --- /dev/null +++ b/turbo.json @@ -0,0 +1,25 @@ +{ + "baseBranch": "origin/main", + "pipeline": { + "build": { + "dependsOn": ["^build"], + "outputs": ["**/dist/**", "!**/vendor/**"] + }, + "dev": { + "cache": false + }, + "test": { + "outputs": [] + }, + "test:templates": { + "outputs": [] + }, + "benchmark": { + "dependsOn": ["^build"], + "outputs": [] + }, + "lint": { + "outputs": [] + } + } +}