Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: import ts with .js in vue #7998

Merged
merged 6 commits into from May 4, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/playground/vue/Main.vue
Expand Up @@ -15,6 +15,7 @@
<div class="slotted">this should be red</div>
</Slotted>
<ScanDep />
<TsImport />
<Suspense>
<AsyncComponent />
</Suspense>
Expand All @@ -33,6 +34,7 @@ import CustomBlock from './CustomBlock.vue'
import SrcImport from './src-import/SrcImport.vue'
import Slotted from './Slotted.vue'
import ScanDep from './ScanDep.vue'
import TsImport from './TsImport.vue'
import AsyncComponent from './AsyncComponent.vue'
import ReactivityTransform from './ReactivityTransform.vue'
import SetupImportTemplate from './setup-import-template/SetupImportTemplate.vue'
Expand Down
8 changes: 8 additions & 0 deletions packages/playground/vue/TsImport.vue
@@ -0,0 +1,8 @@
<template>
<h2>Ts Import</h2>
<p class="ts-import">{{ foo }}</p>
</template>

<script setup lang="ts">
import { foo } from './TsImportFile.js'
</script>
1 change: 1 addition & 0 deletions packages/playground/vue/TsImportFile.ts
@@ -0,0 +1 @@
export const foo = 'success'
4 changes: 4 additions & 0 deletions packages/playground/vue/__tests__/vue.spec.ts
Expand Up @@ -14,6 +14,10 @@ test('template/script latest syntax support', async () => {
expect(await page.textContent('.syntax')).toBe('baz')
})

test('import ts with .js extension with lang="ts"', async () => {
expect(await page.textContent('.ts-import')).toBe('success')
})

test('should remove comments in prod', async () => {
expect(await page.innerHTML('.comments')).toBe(isBuild ? `` : `<!--hello-->`)
})
Expand Down
14 changes: 11 additions & 3 deletions packages/plugin-vue/src/main.ts
Expand Up @@ -192,12 +192,13 @@ export async function transformMain(
}

// handle TS transpilation
let resolvedCode = output.join('\n')
if (
const isTs =
(descriptor.script?.lang === 'ts' ||
descriptor.scriptSetup?.lang === 'ts') &&
!descriptor.script?.src // only normal script can have src
bluwy marked this conversation as resolved.
Show resolved Hide resolved
) {

let resolvedCode = output.join('\n')
if (isTs) {
const { code, map } = await transformWithEsbuild(
resolvedCode,
filename,
Expand All @@ -212,6 +213,13 @@ export async function transformMain(
code: resolvedCode,
map: resolvedMap || {
mappings: ''
},
meta: {
vite: {
lang: isTs
? 'ts'
: descriptor.scriptSetup?.lang || descriptor.script?.lang || 'js'
}
bluwy marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions packages/vite/src/node/plugins/resolve.ts
Expand Up @@ -128,10 +128,12 @@ export function resolvePlugin(baseOptions: InternalResolveOptions): Plugin {

const options: InternalResolveOptions = {
isRequire,

...baseOptions,
isFromTsImporter: isTsRequest(importer ?? ''),
scan: resolveOpts?.scan ?? baseOptions.scan
scan: resolveOpts?.scan ?? baseOptions.scan,
isFromTsImporter: !importer
? false
: isTsRequest(importer) ||
this.getModuleInfo(importer)?.meta?.vite?.lang === 'ts'
}

let res: string | PartialResolvedId | undefined
Expand Down