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

fix: resolve browser mapping using bare imports (fix #11208) #11219

Merged
merged 4 commits into from
Mar 2, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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
17 changes: 15 additions & 2 deletions packages/vite/src/node/plugins/resolve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,13 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {
if (
targetWeb &&
options.browserField &&
(res = tryResolveBrowserMapping(fsPath, importer, options, true))
(res = tryResolveBrowserMapping(
fsPath,
importer,
options,
targetWeb,
true,
))
) {
return res
}
Expand Down Expand Up @@ -323,6 +329,7 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {
importer,
options,
false,
targetWeb,
external,
))
) {
Expand Down Expand Up @@ -1165,6 +1172,7 @@ function tryResolveBrowserMapping(
importer: string | undefined,
options: InternalResolveOptions,
isFilePath: boolean,
targetWeb: boolean,
externalize?: boolean,
) {
let res: string | undefined
Expand All @@ -1175,7 +1183,12 @@ function tryResolveBrowserMapping(
const browserMappedPath = mapWithBrowserField(mapId, pkg.data.browser)
if (browserMappedPath) {
const fsPath = path.join(pkg.dir, browserMappedPath)
if ((res = tryFsResolve(fsPath, options))) {

if (
(res = bareImportRE.test(browserMappedPath)
? tryNodeResolve(browserMappedPath, importer, options, targetWeb)?.id
: tryFsResolve(fsPath, options))
) {
isDebug &&
debug(`[browser mapped] ${colors.cyan(id)} -> ${colors.dim(res)}`)
idToPkgMap.set(res, pkg)
Expand Down
1 change: 1 addition & 0 deletions playground/resolve/browser-field-bare-import-fail/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default '[fail]'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default '[fail]'
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@vitejs/test-resolve-browser-field-bare-import-fail",
"private": true,
"version": "1.0.0",
"main": "main.js",
"module": "module.js",
"type": "module"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default '[fail]'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default '[success]'
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@vitejs/test-resolve-browser-field-bare-import-success",
"private": true,
"version": "1.0.0",
"main": "main.js",
"module": "module.js",
"type": "module"
}
2 changes: 2 additions & 0 deletions playground/resolve/browser-field/bare-import.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import message from '@vitejs/test-resolve-browser-field-bare-import-fail'
export default message
8 changes: 7 additions & 1 deletion playground/resolve/browser-field/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
"./ext.js": "./out/esm.browser.js",
"./ext-index/index.js": "./out/esm.browser.js",
"./no-ext-index": "./out/esm.browser.js",
"./bare-import": "./bare-import.js",
"./not-browser.js": false,
"./multiple.dot.path.js": false,
"jsdom": false
"jsdom": false,
"@vitejs/test-resolve-browser-field-bare-import-fail": "@vitejs/test-resolve-browser-field-bare-import-success"
},
"dependencies": {
"@vitejs/test-resolve-browser-field-bare-import-fail": "link:../browser-field-bare-import-fail",
"@vitejs/test-resolve-browser-field-bare-import-success": "link:../browser-field-bare-import-success"
}
}
3 changes: 2 additions & 1 deletion playground/resolve/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ <h2>resolve package that contains # in path</h2>
import f from '@vitejs/test-resolve-browser-field/ext-index'
import g from '@vitejs/test-resolve-browser-field/no-ext-index/index.js' // no substitution
import h from '@vitejs/test-resolve-browser-field/no-ext?query'
import i from '@vitejs/test-resolve-browser-field/bare-import'

import {
ra,
Expand All @@ -226,7 +227,7 @@ <h2>resolve package that contains # in path</h2>
rg,
} from '@vitejs/test-resolve-browser-field/relative'

const success = [main, a, c, d, e, f, h, ra, rc, rd, re, rf]
const success = [main, a, c, d, e, f, h, i, ra, rc, rd, re, rf]
const noSuccess = [b, g, rb, rg]

if (
Expand Down
11 changes: 11 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.