refactor: use lang

vitejs · May 3, 2022 · 027fc71 · 027fc71
1 parent e272667
commit 027fc71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts
@@ -216,7 +216,9 @@ export async function transformMain(
     },
     meta: {
       vite: {
-        isTs
+        lang: isTs
+          ? 'ts'
+          : descriptor.scriptSetup?.lang || descriptor.script?.lang || 'js'
       }
     }
   }

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -133,7 +133,7 @@ export function resolvePlugin(baseOptions: InternalResolveOptions): Plugin {
         isFromTsImporter: !importer
           ? false
           : isTsRequest(importer) ||
-            this.getModuleInfo(importer)?.meta?.vite?.isTs
+            this.getModuleInfo(importer)?.meta?.vite?.lang === 'ts'
       }
 
       let res: string | PartialResolvedId | undefined