feat(resolve): support "fallback array" in package exports field #10504
+100
−112
Next
Next commit
feat(resolve): support "fallback array" in package exports field
- Loading branch information
commit 165cdef666a1ac3bc55725b84bb00fbfc759b0f5
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ import fs from 'node:fs' | |
| import path from 'node:path' | ||
| import colors from 'picocolors' | ||
| import type { PartialResolvedId } from 'rollup' | ||
| import { resolveExports } from 'resolve.exports' | ||
| import { hasESMSyntax } from 'mlly' | ||
| import type { Plugin } from '../plugin' | ||
| import { | ||
|
|
@@ -923,29 +923,28 @@ export function resolvePackageEntry( | |
| return cached | ||
| } | ||
| try { | ||
| let entryPoints: string[] = [] | ||
|
|
||
| // the exports field takes highest priority as described in | ||
| // https://nodejs.org/api/packages.html#package-entry-points | ||
| if (data.exports) { | ||
|
There was a problem hiding this comment. No need for |
||
| entryPoints = resolveExports( | ||
| data, | ||
| '.', | ||
| options, | ||
| getInlineConditions(options.conditions, targetWeb) | ||
|
There was a problem hiding this comment. Conditions that can't be inferred from Vite's resolve options are generated with |
||
| ) | ||
| if (!entryPoints.length) { | ||
| packageEntryFailure(id) | ||
|
There was a problem hiding this comment. This comes from #8484, and it makes resolution more strict when an |
||
| } | ||
| } else if (targetWeb && options.browserField) { | ||
| // check browser field | ||
| // https://github.com/defunctzombie/package-browser-field-spec | ||
| const browserEntry = | ||
| typeof data.browser === 'string' | ||
| ? data.browser | ||
| : isObject(data.browser) && data.browser['.'] | ||
|
|
||
| if (browserEntry) { | ||
| // check if the package also has a "module" field. | ||
| if ( | ||
|
|
@@ -968,34 +967,34 @@ export function resolvePackageEntry( | |
| const content = fs.readFileSync(resolvedBrowserEntry, 'utf-8') | ||
| if (hasESMSyntax(content)) { | ||
| // likely ESM, prefer browser | ||
| entryPoints[0] = browserEntry | ||
| } else { | ||
| // non-ESM, UMD or IIFE or CJS(!!! e.g. firebase 7.x), prefer module | ||
| entryPoints[0] = data.module | ||
| } | ||
| } | ||
| } else { | ||
| entryPoints[0] = browserEntry | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!entryPoints[0]) { | ||
| for (const field of options.mainFields) { | ||
| if (field === 'browser') continue // already checked above | ||
| if (typeof data[field] === 'string') { | ||
| entryPoints[0] = data[field] | ||
| break | ||
| } | ||
| } | ||
| entryPoints[0] ||= data.main | ||
| } | ||
|
|
||
| // try default entry when entry is not define | ||
| // https://nodejs.org/api/modules.html#all-together | ||
| if (!entryPoints[0]) { | ||
| entryPoints = ['index.js', 'index.json', 'index.node'] | ||
| } | ||
|
|
||
| for (let entry of entryPoints) { | ||
| // make sure we don't get scripts when looking for sass | ||
|
|
@@ -1040,52 +1039,8 @@ function packageEntryFailure(id: string, details?: string) { | |
| ) | ||
| } | ||
|
|
||
| function getInlineConditions(conditions: string[], targetWeb: boolean) { | ||
| return targetWeb && !conditions.includes('node') ? ['browser'] : ['node'] | ||
| } | ||
|
|
||
| function resolveDeepImport( | ||
|
|
@@ -1098,56 +1053,55 @@ function resolveDeepImport( | |
| data | ||
| }: PackageData, | ||
| targetWeb: boolean, | ||
| options: InternalResolveOptionsWithOverrideConditions | ||
| ): string | undefined { | ||
| const cache = getResolvedCache(id, targetWeb) | ||
| if (cache) { | ||
| return cache | ||
| } | ||
|
|
||
| const { exports: exportsField, browser: browserField } = data | ||
| const { file, postfix } = splitFileAndPostfix(id) | ||
|
|
||
| let possibleFiles: string[] | undefined | ||
| if (exportsField) { | ||
| // map relative based on exports data | ||
| possibleFiles = resolveExports( | ||
| data, | ||
| file, | ||
| options, | ||
| getInlineConditions(options.conditions, targetWeb), | ||
| options.overrideConditions | ||
| ) | ||
| if (!possibleFiles.length) { | ||
| throw new Error( | ||
| `Package subpath '${file}' is not defined by "exports" in ` + | ||
| `${path.join(dir, 'package.json')}.` | ||
| ) | ||
| } | ||
| } else if (targetWeb && options.browserField && isObject(browserField)) { | ||
| const mapped = mapWithBrowserField(file, browserField) | ||
| if (mapped) { | ||
| possibleFiles = [mapped] | ||
| } else if (mapped === false) { | ||
| return (webResolvedImports[id] = browserExternalId) | ||
| } | ||
| } | ||
|
|
||
| possibleFiles ||= [id] | ||
| if (possibleFiles[0]) { | ||
| let resolved: string | undefined | ||
| possibleFiles.some( | ||
| (file) => | ||
| (resolved = tryFsResolve( | ||
| path.join(dir, file), | ||
| options, | ||
| !exportsField, // try index only if no exports field | ||
| targetWeb | ||
| )) | ||
| ) | ||
| if (resolved) { | ||
| resolved += postfix | ||
| isDebug && | ||
| debug( | ||
| `[node/deep-import] ${colors.cyan(id)} -> ${colors.dim(resolved)}` | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new
resolveExportsreturns an array of possible module paths. It prefers to return an empty array, rather than throw an error. Vite should only throw if none of the paths in the array are found.