chore: update this.resolve custom naming

patak-dev · patak-dev · commit 4c69e4fbc190 · 2023-04-19T10:46:51.000+02:00
diff --git a/packages/vite/src/node/plugins/importMetaGlob.ts b/packages/vite/src/node/plugins/importMetaGlob.ts
@@ -605,7 +605,7 @@ export async function toAbsoluteGlob(
 
   const resolved = normalizePath(
     (await resolveId(glob, importer, {
-      custom: { 'glob-imports': isSubImportsPattern },
+      custom: { 'vite:import-glob': { isSubImportsPattern } },
     })) || glob,
   )
   if (isSubImportsPattern) {
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -186,7 +186,7 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {
       if (resolvedImports) {
         id = resolvedImports
 
-        if (resolveOpts.custom?.['glob-imports']) {
+        if (resolveOpts.custom?.['vite:import-glob']?.isSubImportsPattern) {
           return id
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ export async function toAbsoluteGlob(`
`605`	`605`
`606`	`606`	`const resolved = normalizePath(`
`607`	`607`	`(await resolveId(glob, importer, {`
`608`		`- custom: { 'glob-imports': isSubImportsPattern },`
	`608`	`+ custom: { 'vite:import-glob': { isSubImportsPattern } },`
`609`	`609`	`})) \|\| glob,`
`610`	`610`	`)`
`611`	`611`	`if (isSubImportsPattern) {`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {`
`186`	`186`	`if (resolvedImports) {`
`187`	`187`	`id = resolvedImports`
`188`	`188`
`189`		`- if (resolveOpts.custom?.['glob-imports']) {`
	`189`	`+ if (resolveOpts.custom?.['vite:import-glob']?.isSubImportsPattern) {`
`190`	`190`	`return id`
`191`	`191`	`}`
`192`	`192`	`}`