Revert "Fix tsconfig alias regression (#6617)"

This reverts commit 38e6ec2.
withastro · Mar 23, 2023 · 8726aa3 · 8726aa3
1 parent 58c612b
commit 8726aa3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 35 deletions.
diff --git a/packages/astro/src/vite-plugin-config-alias/index.ts b/packages/astro/src/vite-plugin-config-alias/index.ts
@@ -71,18 +71,16 @@ export default function configAliasVitePlugin({
 				};
 			}
 		},
-		async resolveId(id, importer, options) {
-			if (id.startsWith('.') || path.isAbsolute(id)) return;
+		resolveId(id) {
+			if (id.startsWith('.') || id.startsWith('/')) return;
 
 			// Handle baseUrl mapping for non-relative and non-root imports.
 			// Since TypeScript only applies `baseUrl` autocompletions for files that exist
 			// in the filesystem only, we can use this heuristic to skip resolve if needed.
 			const resolved = path.posix.join(resolvedBaseUrl, id);
-
-			return await this.resolve(resolved, importer, {
-				skipSelf: true,
-				...options,
-			});
+			if (fs.existsSync(resolved)) {
+				return resolved;
+			}
 		},
 	};
 }
diff --git a/packages/astro/test/alias-tsconfig.test.js b/packages/astro/test/alias-tsconfig.test.js
@@ -44,16 +44,10 @@ describe('Aliases with tsconfig.json', () => {
 
 		it('works in css @import', async () => {
 			const html = await fixture.fetch('/').then((res) => res.text());
+			console.log(html);
 			// imported css should be bundled
 			expect(html).to.include('#style-red');
 			expect(html).to.include('#style-blue');
 		});
-
-		it('can load load typescript files without .ts or .d.ts extensions', async () => {
-			const html = await fixture.fetch('/').then((res) => res.text());
-			const $ = cheerio.load(html);
-
-			expect($('#mistery').text()).to.equal("I'm a TypeScript file!");
-		});
 	});
 });
diff --git a/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro b/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro
@@ -1,24 +1,20 @@
 ---
-import Client from '@components/Client.svelte';
+import Client from '@components/Client.svelte'
 import Foo from 'src/components/Foo.astro';
 import StyleComp from 'src/components/Style.astro';
-import '@styles/main.css';
-import { whoImI } from 'src/ts-file';
-const mistery = whoImI();
+import '@styles/main.css'
 ---
-
 <html lang="en">
-	<head>
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width" />
-		<title>Aliases using tsconfig</title>
-	</head>
-	<body>
-		<main>
-			<Client client:load />
-			<Foo />
-			<StyleComp />
-			<div id="mistery">{mistery}</div>
-		</main>
-	</body>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>Aliases using tsconfig</title>
+  </head>
+  <body>
+    <main>
+      <Client client:load />
+      <Foo />
+      <StyleComp />
+    </main>
+  </body>
 </html>
diff --git a/packages/astro/test/fixtures/alias-tsconfig/src/ts-file.ts b/packages/astro/test/fixtures/alias-tsconfig/src/ts-file.ts