Skip to content

Commit

Permalink
fix: resolve browser mapping using bare imports (fix #11208) (#11219)
Browse files Browse the repository at this point in the history
Co-authored-by: bluwy <bjornlu.dev@gmail.com>
  • Loading branch information
hershelh and bluwy committed Mar 2, 2023
1 parent 209c3bd commit 22de84f
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 4 deletions.
7 changes: 5 additions & 2 deletions packages/vite/src/node/plugins/resolve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1208,8 +1208,11 @@ function tryResolveBrowserMapping(
const mapId = isFilePath ? './' + slash(path.relative(pkg.dir, id)) : id
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, true)?.id
: tryFsResolve(path.join(pkg.dir, browserMappedPath), 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 @@ -233,6 +233,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 @@ -244,7 +245,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.

0 comments on commit 22de84f

Please sign in to comment.