1- import { posix } from 'node:path'
1+ import path , { posix } from 'node:path'
22import MagicString from 'magic-string'
33import { init , parse as parseImports } from 'es-module-lexer'
44import type { ImportSpecifier } from 'es-module-lexer'
@@ -21,7 +21,9 @@ import {
2121} from '../utils'
2222import type { Environment } from '../environment'
2323import { perEnvironmentState } from '../environment'
24+ import type { PartialEnvironment } from '../baseEnvironment'
2425import { hasViteIgnoreRE } from './importAnalysis'
26+ import { resolveSubpathImports } from './resolve'
2527import { workerOrSharedWorkerRE } from './worker'
2628
2729export const dynamicImportHelperId = '\0vite/dynamic-import-helper.js'
@@ -172,6 +174,22 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
172174 tryIndex : false ,
173175 extensions : [ ] ,
174176 } )
177+ const resolveDynamicImport = (
178+ environment : PartialEnvironment ,
179+ id : string ,
180+ importer ?: string ,
181+ ) => {
182+ const subpathImports = resolveSubpathImports ( id , importer , {
183+ ...environment . config . resolve ,
184+ packageCache : config . packageCache ,
185+ isProduction : config . isProduction ,
186+ isRequire : false ,
187+ } )
188+ if ( subpathImports && importer ) {
189+ return normalizePath ( path . resolve ( path . dirname ( importer ) , subpathImports ) )
190+ }
191+ return resolve ( environment , id , importer )
192+ }
175193
176194 const getFilter = perEnvironmentState ( ( environment : Environment ) => {
177195 const { include, exclude } =
@@ -191,7 +209,7 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
191209 include,
192210 exclude,
193211 resolver ( id , importer ) {
194- return resolve ( environment , id , importer )
212+ return resolveDynamicImport ( environment , id , importer )
195213 } ,
196214 sourcemap : ! ! environment . config . build . sourcemap ,
197215 } )
@@ -264,7 +282,7 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
264282 result = await transformDynamicImport (
265283 source . slice ( start , end ) ,
266284 importer ,
267- ( id , importer ) => resolve ( environment , id , importer ) ,
285+ ( id , importer ) => resolveDynamicImport ( environment , id , importer ) ,
268286 config . root ,
269287 )
270288 } catch ( error ) {
0 commit comments