Skip to content

Commit 0fdd81e

Browse files
authored
fix(optimizer): resolve subpath imports (#) with Vite's resolver (#23959)
1 parent 8069835 commit 0fdd81e

9 files changed

Lines changed: 40 additions & 1 deletion

File tree

‎packages/vite/src/node/optimizer/rolldownDepPlugin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ export function rolldownDepPlugin(
227227
cjsPackageCache.clear()
228228
},
229229
resolveId: {
230-
filter: { id: /^[\w@][^:]/ },
230+
filter: { id: /^[#\w@][^:]/ },
231231
async handler(id, importer, options) {
232232
const kind = options.kind
233233

‎playground/optimize-deps/__tests__/optimize-deps.spec.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ describe('optimize-deps', clientOptimizerUnsupported, () => {
106106
.toMatch(isBuild ? 'prod' : 'dev')
107107
})
108108

109+
test('import from dep with subpath imports (#) conditions', async () => {
110+
await expect
111+
.poll(() => page.textContent('.subpath-imports'))
112+
.toMatch(isBuild ? 'production' : 'development')
113+
})
114+
109115
test('import from dep with .notjs files', async () => {
110116
await expect.poll(() => page.textContent('.not-js')).toMatch(`[success]`)
111117
})
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const mode = 'development'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { mode } from '#mode'
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "@vitejs/test-dep-with-subpath-imports",
3+
"private": true,
4+
"version": "1.0.0",
5+
"type": "module",
6+
"exports": "./index.js",
7+
"imports": {
8+
"#mode": {
9+
"development": "./dev.js",
10+
"default": "./prod.js"
11+
}
12+
}
13+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const mode = 'production'

‎playground/optimize-deps/index.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ <h2>import * as ...</h2>
5050
<h2>Import from dependency with process.env.NODE_ENV</h2>
5151
<div class="node-env"></div>
5252

53+
<h2>Import from dependency with subpath imports (#) conditions</h2>
54+
<div class="subpath-imports"></div>
55+
5356
<h2>Import from dependency with .notjs files</h2>
5457
<div class="not-js"></div>
5558

@@ -180,6 +183,9 @@ <h2>Import the CommonJS external package that omits the js suffix</h2>
180183
import { env } from '@vitejs/test-dep-node-env'
181184
text('.node-env', env)
182185

186+
import { mode } from '@vitejs/test-dep-with-subpath-imports'
187+
text('.subpath-imports', mode)
188+
183189
import { notjsValue } from '@vitejs/test-dep-not-js'
184190
text('.not-js', notjsValue)
185191

‎playground/optimize-deps/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"@vitejs/test-dep-linked": "link:./dep-linked",
3131
"@vitejs/test-dep-linked-include": "link:./dep-linked-include",
3232
"@vitejs/test-dep-node-env": "file:./dep-node-env",
33+
"@vitejs/test-dep-with-subpath-imports": "file:./dep-with-subpath-imports",
3334
"@vitejs/test-dep-not-js": "file:./dep-not-js",
3435
"@vitejs/test-dep-optimize-exports-with-glob": "file:./dep-optimize-exports-with-glob",
3536
"@vitejs/test-dep-optimize-exports-with-root-glob": "file:./dep-optimize-exports-with-root-glob",

‎pnpm-lock.yaml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)