From 85cb7ef6bd2566b2a52bc640d81f4d2d050e2963 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Thu, 12 May 2022 15:04:24 -0600
Subject: [PATCH 1/2] feat: Treat Astro file scripts as TS

This updates the import scanner to treat `<script>` tags inside of `.astro` files as TypeScript and not JS. In Astro plain scripts can contain TypeScript and this changes prevents error messages coming from the import scanner.
---
 packages/vite/src/node/optimizer/scan.ts | 2 ++
 playground/optimize-deps/index.astro     | 4 ++++
 playground/optimize-deps/index.html      | 2 ++
 3 files changed, 8 insertions(+)
 create mode 100644 playground/optimize-deps/index.astro

diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index 157c8d28db1083..6f609991ecc7fb 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -277,6 +277,8 @@ function esbuildScanPlugin(
             let loader: Loader = 'js'
             if (lang === 'ts' || lang === 'tsx' || lang === 'jsx') {
               loader = lang
+            } else if (path.endsWith('.astro')) {
+              loader = 'ts'
             }
             const srcMatch = openTag.match(srcRE)
             if (srcMatch) {
diff --git a/playground/optimize-deps/index.astro b/playground/optimize-deps/index.astro
new file mode 100644
index 00000000000000..95790f5bf3a0d5
--- /dev/null
+++ b/playground/optimize-deps/index.astro
@@ -0,0 +1,4 @@
+<script>
+  type Foo = 'bar';
+  console.log("stuff");
+</script>
diff --git a/playground/optimize-deps/index.html b/playground/optimize-deps/index.html
index d11383bfcb3e04..3cd619f9ce9236 100644
--- a/playground/optimize-deps/index.html
+++ b/playground/optimize-deps/index.html
@@ -119,6 +119,8 @@ <h2>Reused variable names</h2>
 
   import { parse } from 'node:url'
   text('.url', parse('https://vitejs.dev').hostname)
+
+  import './index.astro'
 </script>
 
 <script type="module">

From 92f5f3a3615e931749f230cb41587788a371a3fb Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Thu, 12 May 2022 15:40:34 -0600
Subject: [PATCH 2/2] fix: use a test astro loader

---
 playground/optimize-deps/vite.config.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/playground/optimize-deps/vite.config.js b/playground/optimize-deps/vite.config.js
index a989cf1961de11..623cc413032fdf 100644
--- a/playground/optimize-deps/vite.config.js
+++ b/playground/optimize-deps/vite.config.js
@@ -50,6 +50,15 @@ module.exports = {
           res.end('pong')
         })
       }
+    },
+    {
+      name: 'test-astro',
+      transform(code, id) {
+        if (id.endsWith('.astro')) {
+          code = `export default {}`
+          return { code }
+        }
+      }
     }
   ]
 }