chore: removed adapters cleanup (#8726)

* update ci, readme, comments, remote workspaces * fix hosted test fixture * keep adapter config typedocs
2023-10-10 14:06:35 +00:00 · 2023-10-10 14:06:35 +00:00 · c071458257
commit c071458257
parent 0ab6bad7df
12 changed files with 16 additions and 83 deletions
--- a/.Dockerfile
+++ b/.Dockerfile
@ -1,8 +0,0 @@
-FROM gitpod/workspace-node
-
-# Install latest pnpm
-RUN curl -fsSL https://get.pnpm.io/install.sh | SHELL=`which bash` bash -
-
-# Install deno in gitpod
-RUN curl -fsSL https://deno.land/x/install/install.sh | sh
-RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno &&     echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno &&     echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@ -6,10 +6,6 @@ RUN npm install -g @playwright/test
 # Install latest pnpm
 RUN npm install -g pnpm

-# Install deno
-ENV DENO_INSTALL=/usr/local
-RUN curl -fsSL https://deno.land/x/install/install.sh | sh
-
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    && curl -sSL https://dl.google.com/linux/direct/google-chrome-stable_current_$(dpkg --print-architecture).deb -o /tmp/chrome.deb \
    && apt-get -y install /tmp/chrome.deb
--- a/.devcontainer/deno/devcontainer.json
+++ b/.devcontainer/deno/devcontainer.json
@ -1,34 +0,0 @@
-{
-  "name": "Deno",
-  "build": {
-    "dockerfile": "../examples.deno.Dockerfile"
-  },
-
-  "workspaceFolder": "/workspaces/astro/examples/deno",
-
-  "portsAttributes": {
-    "4321": {
-      "label": "Application",
-      "onAutoForward": "openPreview"
-    }
-  },
-
-  "forwardPorts": [4321],
-
-  "postCreateCommand": "pnpm install && cd /workspaces/astro && pnpm run build",
-
-  "waitFor": "postCreateCommand",
-
-  "postAttachCommand": {
-    "Server": "pnpm start --host"
-  },
-
-  "customizations": {
-    "codespaces": {
-      "openFiles": ["src/pages/index.astro"]
-    },
-    "vscode": {
-      "extensions": ["astro-build.astro-vscode", "esbenp.prettier-vscode"]
-    }
-  }
-}
--- a/.devcontainer/examples.deno.Dockerfile
+++ b/.devcontainer/examples.deno.Dockerfile
@ -1,10 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:0-18
-
-# Install latest pnpm
-RUN npm install -g pnpm
-
-# Install deno
-ENV DENO_INSTALL=/usr/local
-RUN curl -fsSL https://deno.land/x/install/install.sh | sh
-
-COPY example-welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -133,11 +133,6 @@ jobs:
          node-version: ${{ matrix.NODE_VERSION }}
          cache: "pnpm"

-      - name: Use Deno
-        uses: denoland/setup-deno@v1
-        with:
-          deno-version: v1.35.0
-
      - name: Install dependencies
        run: pnpm install

--- a/.github/workflows/test-hosts.yml
+++ b/.github/workflows/test-hosts.yml
@ -11,8 +11,6 @@ env:
  VERCEL_ORG_ID: ${{ secrets.VERCEL_TEST_ORG_ID }}
  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_TEST_PROJECT_ID }}
  VERCEL_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
-  NETLIFY_SITE_ID: ${{ secrets.NETLIFY_TEST_SITE_ID }}
-  NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_TEST_AUTH_TOKEN }}
  FORCE_COLOR: true

 jobs:
@ -34,22 +32,20 @@ jobs:

      - name: Install dependencies
        run: pnpm install
+      
+      - name: Build Astro
+        run: pnpm turbo build --filter astro --filter @astrojs/vercel 

-      - name: Install Hosts CLIs
-        run: pnpm install --global netlify-cli vercel
-
-      - name: Deploy Vercel
+      - name: Build test project
        working-directory: ./packages/integrations/vercel/test/hosted/hosted-astro-project
        run:
          pnpm run build
-          vercel --prod --prebuilt
-
-      - name: Deploy Netlify
-        working-directory: ./packages/integrations/netlify/test/hosted/hosted-astro-project
+      
+      - name: Deploy to Vercel
+        working-directory: ./packages/integrations/vercel/test/hosted/hosted-astro-project
        run:
-          pnpm run build
-          netlify deploy --prod
+          pnpm dlx vercel --prod --prebuilt

-      - name: Test both hosts
+      - name: Test
        run:
          pnpm run test:e2e:hosts
--- a/.gitpod.yml
+++ b/.gitpod.yml
@ -1,6 +1,4 @@
 ---
-image:
-  file: .Dockerfile
 # Commands to start on workspace startup
 tasks:
  - before: |
--- a/.gitpod/gitpod-setup.sh
+++ b/.gitpod/gitpod-setup.sh
@ -3,6 +3,9 @@
 # Convert context URL to an array
 mapfile -t CONTEXT_URL_ITEMS < <(echo "$GITPOD_WORKSPACE_CONTEXT_URL" | tr '/' '\n')

+# Install latest pnpm
+curl -fsSL https://get.pnpm.io/install.sh | SHELL=`which bash` bash -
+
 # Check if Gitpod started from a specific example directory in the repository
 if [ "${CONTEXT_URL_ITEMS[7]}" = "examples" ]; then
    EXAMPLE_PROJECT=${CONTEXT_URL_ITEMS[8]}
--- a/README.md
+++ b/README.md
@ -52,8 +52,6 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll
 | [@astrojs/svelte](packages/integrations/svelte)         | [![astro version](https://img.shields.io/npm/v/@astrojs/svelte.svg?label=%20)](packages/integrations/svelte/CHANGELOG.md)         |
 | [@astrojs/vue](packages/integrations/vue)               | [![astro version](https://img.shields.io/npm/v/@astrojs/vue.svg?label=%20)](packages/integrations/vue/CHANGELOG.md)               |
 | [@astrojs/lit](packages/integrations/lit)               | [![astro version](https://img.shields.io/npm/v/@astrojs/lit.svg?label=%20)](packages/integrations/lit/CHANGELOG.md)               |
-| [@astrojs/deno](packages/integrations/deno)             | [![astro version](https://img.shields.io/npm/v/@astrojs/deno.svg?label=%20)](packages/integrations/deno/CHANGELOG.md)             |
-| [@astrojs/netlify](packages/integrations/netlify)       | [![astro version](https://img.shields.io/npm/v/@astrojs/netlify.svg?label=%20)](packages/integrations/netlify/CHANGELOG.md)       |
 | [@astrojs/node](packages/integrations/node)             | [![astro version](https://img.shields.io/npm/v/@astrojs/node.svg?label=%20)](packages/integrations/node/CHANGELOG.md)             |
 | [@astrojs/vercel](packages/integrations/vercel)         | [![astro version](https://img.shields.io/npm/v/@astrojs/vercel.svg?label=%20)](packages/integrations/vercel/CHANGELOG.md)         |
 | [@astrojs/cloudflare](packages/integrations/cloudflare) | [![astro version](https://img.shields.io/npm/v/@astrojs/cloudflare.svg?label=%20)](packages/integrations/cloudflare/CHANGELOG.md) |
--- a/examples/integration/index.ts
+++ b/examples/integration/index.ts
@ -10,9 +10,9 @@ export default function createIntegration(): AstroIntegration {
 				// See the @astrojs/react integration for an example
 				// https://github.com/withastro/astro/blob/main/packages/integrations/react/src/index.ts
 			},
-			'astro:build:setup': ({ config, updateConfig }) => {
-				// See the @astrojs/netlify integration for an example
-				// https://github.com/withastro/astro/blob/main/packages/integrations/netlify/src/integration-functions.ts
+			'astro:build:setup': ({ pages, updateConfig }) => {
+				// See the @astrojs/lit integration for an example
+				// https://github.com/withastro/astro/blob/main/packages/integrations/lit/src/index.ts
 			},
 			'astro:build:done': ({ dir, routes }) => {
 				// See the @astrojs/partytown integration for an example
--- a/packages/astro/src/cli/add/index.ts
+++ b/packages/astro/src/cli/add/index.ts
@ -74,7 +74,6 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP: Record<string, string> = {
 	vercel: '@astrojs/vercel/serverless',
 	cloudflare: '@astrojs/cloudflare',
 	node: '@astrojs/node',
-	deno: '@astrojs/deno',
 };

 // Users might lack access to the global npm registry, this function
--- a/packages/integrations/vercel/test/hosted/hosted-astro-project/src/env.d.ts
+++ b/packages/integrations/vercel/test/hosted/hosted-astro-project/src/env.d.ts
@ -1 +1 @@
-/// <reference types="astro/client-image" />
+/// <reference types="astro/client" />