Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-14 10:04:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt3): use ts-friendly paths for global imports (#662)

Browse Source
This commit is contained in:
Daniel Roe 2021-10-05 22:47:19 +02:00 committed by GitHub
parent baa4ddbae0
commit ae0dbda2ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/nuxt3/src/global-imports/module.ts
View File

@ -1,5 +1,5 @@
import { addVitePlugin, addWebpackPlugin, defineNuxtModule, addTemplate, resolveAlias, addPluginTemplate } from '@nuxt/kit' import { addVitePlugin, addWebpackPlugin, defineNuxtModule, addTemplate, resolveAlias, addPluginTemplate } from '@nuxt/kit'
import { resolve } from 'pathe' import { isAbsolute, relative, resolve } from 'pathe'
import type { Identifiers, GlobalImportsOptions } from './types' import type { Identifiers, GlobalImportsOptions } from './types'
import { TransformPlugin } from './transform' import { TransformPlugin } from './transform'
import { defaultIdentifiers } from './identifiers' import { defaultIdentifiers } from './identifiers'
@ -31,7 +31,17 @@ export default defineNuxtModule<GlobalImportsOptions>({
// Add types // Add types
const resolved = {} const resolved = {}
const r = id => resolved[id] || (resolved[id] = resolveAlias(id, nuxt.options.alias)) const r = (id: string) => {
if (resolved[id]) { return resolved[id] }
let path = resolveAlias(id, nuxt.options.alias)
if (isAbsolute(path)) {
path = relative(nuxt.options.buildDir, path)
}
// Remove file extension for benefit of TypeScript
path = path.replace(/\.[a-z]+$/, '')
resolved[id] = path
return path
}
addTemplate({ addTemplate({
filename: 'global-imports.d.ts', filename: 'global-imports.d.ts',