diff --git a/docs/astro.config.mjs b/docs/astro.config.mjs
index d68ce262b0..af4fed122b 100644
--- a/docs/astro.config.mjs
+++ b/docs/astro.config.mjs
@@ -1,4 +1,5 @@
-export default {
+// @ts-check
+export default /** @type {import('astro').AstroUserConfig} */ ({
   buildOptions: {
     site: 'https://docs.astro.build/',
   },
@@ -8,4 +9,12 @@ export default {
     // Needed for Algolia search component
     '@astrojs/renderer-react',
   ],
-};
+  vite: {
+    resolve: {
+      alias: {
+        '~': '/src',
+        'components': '/src/components',
+      }
+    }
+  }
+})
diff --git a/docs/package.json b/docs/package.json
index cd2e38f687..1272019f63 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@snowpack/plugin-dotenv": "^2.1.0",
-    "astro": "^0.21.0-next.0",
+    "astro": "^0.21.0-next.2",
     "broken-link-checker": "^0.7.8",
     "npm-run-all": "^4.1.5",
     "pa11y-ci": "^2.4.2",
diff --git a/docs/snowpack.config.mjs b/docs/snowpack.config.mjs
deleted file mode 100644
index d1ef58a5ff..0000000000
--- a/docs/snowpack.config.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-export default {
-  alias: {
-    components: './src/components',
-    '~': './src',
-  },
-  plugins: ['@snowpack/plugin-dotenv'],
-  workspaceRoot: '../',
-};
diff --git a/docs/src/components/HeadSEO.astro b/docs/src/components/HeadSEO.astro
index 9cc9046a6b..d3cd80901d 100644
--- a/docs/src/components/HeadSEO.astro
+++ b/docs/src/components/HeadSEO.astro
@@ -19,7 +19,7 @@ const lang = canonicalURL && getLanguageFromURL(canonicalURL.pathname);
 <link rel="canonical" href={canonicalURL}/>
 
 <!-- Algolia docsearch language facet -->
-<meta name="docsearch:language" content="{lang}" />
+<meta name="docsearch:language" content={lang} />
 
 <!-- OpenGraph Tags -->
 <meta property="og:title" content={content.title ?? SITE.title}/>
diff --git a/docs/src/components/Header/Header.astro b/docs/src/components/Header/Header.astro
index 901075cf42..06954bd7f1 100644
--- a/docs/src/components/Header/Header.astro
+++ b/docs/src/components/Header/Header.astro
@@ -1,8 +1,8 @@
 ---
 import SkipToContent from './SkipToContent.astro';
 import SidebarToggle from './SidebarToggle.tsx';
-import LanguageSelect from './LanguageSelect.jsx';
-import Search from "./Search.jsx";
+import LanguageSelect from './LanguageSelect.tsx';
+import Search from "./Search.tsx";
 import { getLanguageFromURL } from '../../util.ts';
 const {currentPage} = Astro.props;
 const lang = currentPage && getLanguageFromURL(currentPage);
diff --git a/docs/src/components/Header/Search.tsx b/docs/src/components/Header/Search.tsx
index 7b8532a816..4ca7b4ef12 100644
--- a/docs/src/components/Header/Search.tsx
+++ b/docs/src/components/Header/Search.tsx
@@ -1,10 +1,12 @@
 /* jsxImportSource: react */
 import { useState, useCallback, useRef } from 'react';
 import { createPortal } from 'react-dom';
-import { DocSearchModal, useDocSearchKeyboardEvents } from '@docsearch/react';
-import '@docsearch/css//dist/style.css';
+import * as docsearch from '@docsearch/react';
+import '@docsearch/css/dist/style.css';
 import './Search.css';
 
+const { DocSearchModal, useDocSearchKeyboardEvents } = ((docsearch as unknown as { default: typeof docsearch }).default || docsearch)
+
 export default function Search(props) {
   const [isOpen, setIsOpen] = useState(false);
   const searchButtonRef = useRef();
diff --git a/docs/src/components/PageContent/PageContent.astro b/docs/src/components/PageContent/PageContent.astro
index 0598d7a2fa..91ea90d622 100644
--- a/docs/src/components/PageContent/PageContent.astro
+++ b/docs/src/components/PageContent/PageContent.astro
@@ -1,11 +1,11 @@
 ---
-const {content, githubEditUrl, currentPage} = Astro.props;
-const title = content.title;
-const headers = content.astro?.headers;
 import MoreMenu from '../RightSidebar/MoreMenu.astro';
 import TableOfContents from '../RightSidebar/TableOfContents.tsx';
 import {getLanguageFromURL} from '../../util.ts';
 import {SIDEBAR} from '../../config.ts';
+const {content, githubEditUrl, currentPage} = Astro.props;
+const title = content.title;
+const headers = content.astro?.headers;
 const langCode = getLanguageFromURL(currentPage);
 const links = SIDEBAR[langCode].filter(x => x.link && typeof x.header === 'undefined');
 // handle cases with a trailing slash or not
diff --git a/docs/src/components/RightSidebar/MoreMenu.astro b/docs/src/components/RightSidebar/MoreMenu.astro
index 6be2d86ee5..6ae8425ccf 100644
--- a/docs/src/components/RightSidebar/MoreMenu.astro
+++ b/docs/src/components/RightSidebar/MoreMenu.astro
@@ -1,5 +1,5 @@
 ---
-import ThemeToggleButton from './ThemeToggleButton.jsx';
+import ThemeToggleButton from './ThemeToggleButton.tsx';
 const {editHref} = Astro.props;
 ---
 <style>
diff --git a/docs/src/components/RightSidebar/RightSidebar.astro b/docs/src/components/RightSidebar/RightSidebar.astro
index 04ce667725..5415d4cefb 100644
--- a/docs/src/components/RightSidebar/RightSidebar.astro
+++ b/docs/src/components/RightSidebar/RightSidebar.astro
@@ -1,5 +1,5 @@
 ---
-import TableOfContents from './TableOfContents.jsx';
+import TableOfContents from './TableOfContents.tsx';
 import MoreMenu from './MoreMenu.astro';
 const {content, githubEditUrl} = Astro.props;
 const headers = content.astro?.headers;
diff --git a/docs/src/layouts/MainLayout.astro b/docs/src/layouts/MainLayout.astro
index 2a559d57e9..b2302125e8 100644
--- a/docs/src/layouts/MainLayout.astro
+++ b/docs/src/layouts/MainLayout.astro
@@ -14,8 +14,7 @@ const currentFile = `src/pages${currentPage.replace(/\/$/, "")}.md`;
 const githubEditUrl = `https://github.com/snowpackjs/astro/blob/main/docs/${currentFile}`;
 const formatTitle = (content, SITE) => content.title ? `${content.title} 🚀 ${SITE.title}` : SITE.title;
 ---
-
-<html dir="{content.dir ?? 'ltr'}" lang="{content.lang ?? 'en-us'}" class="initial">
+<html dir={content.dir ?? 'ltr'} lang={content.lang ?? 'en-us'} class="initial">
   <head>
     <HeadCommon />
     <HeadSEO {content} canonicalURL={Astro.request.canonicalURL} />
diff --git a/docs/src/pages/guides/deploy.md b/docs/src/pages/guides/deploy.md
index b89a7fa5fb..18bbb12d2e 100644
--- a/docs/src/pages/guides/deploy.md
+++ b/docs/src/pages/guides/deploy.md
@@ -37,7 +37,7 @@ By default, the build output will be placed at `dist/`. You may deploy this `dis
 1. Set the correct `buildOptions.site` in `astro.config.mjs`.
 1. Inside your project, create `deploy.sh` with the following content (uncommenting the appropriate lines), and run it to deploy:
 
-   ```bash{13,20,23}
+   ```bash
    #!/usr/bin/env sh
 
    # abort on errors
diff --git a/docs/src/pages/themes.astro b/docs/src/pages/themes.astro
index 3bcc1df480..46ee24cecb 100644
--- a/docs/src/pages/themes.astro
+++ b/docs/src/pages/themes.astro
@@ -5,16 +5,16 @@ import {Markdown} from 'astro/components';
 import themes from '../data/themes.json';
 import components from '../data/components.json';
 ---
-<style>
-    .card-grid {
-        display: grid;
-        grid-column-gap: 15px;
-        grid-row-gap: 15px;
-        grid-auto-flow: dense;
-        grid-template-columns: repeat(auto-fit,minmax(300px,1fr))
-    }
-</style>
 <Layout content={{title: 'Themes'}} hideRightSidebar>
+    <style>
+        .card-grid {
+            display: grid;
+            grid-column-gap: 15px;
+            grid-row-gap: 15px;
+            grid-auto-flow: dense;
+            grid-template-columns: repeat(auto-fit,minmax(300px,1fr))
+        }
+    </style>
     <Markdown>
         ## Featured Theme
     </Markdown>