Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions packages/vite/src/node/__tests__/build.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,58 @@ test('chunkImportMap per environment with shared plugins', async () => {
expect(entry.code).toContain(JSON.stringify(cssSpecifier.slice(1)))
})

test('chunkImportMap import map keys match when base is not "/"', async () => {
const root = resolve(dirname, 'fixtures/shared-plugins/chunk-import-map')
let client: RolldownOutput | undefined
const builder = await createBuilder({
root,
base: '/sub/',
logLevel: 'warn',
environments: {
client: {
build: {
chunkImportMap: true,
write: false,
rolldownOptions: {
input: '/entry.js',
},
},
},
},
builder: {
sharedPlugins: true,
async buildApp(builder) {
client = (await builder.build(
builder.environments.client,
)) as RolldownOutput
},
},
})

await builder.buildApp()

const entry = client!.output.find(
(output): output is OutputChunk =>
output.type === 'chunk' && output.isEntry,
)!
const css = client!.output.find(
(output) => output.type === 'asset' && output.fileName.endsWith('.css'),
)!
const importMapAsset = client!.output.find(
(output): output is OutputAsset =>
output.type === 'asset' && output.fileName === 'importmap.json',
)!
const importMap = JSON.parse(importMapAsset.source.toString())
.imports as Record<string, string>
const cssSpecifier = Object.entries(importMap).find(
([, fileName]) => fileName === `/sub/${css.fileName}`,
)![0]
expect(cssSpecifier.startsWith('/sub/')).toBe(true)
expect(entry.code).toContain(
JSON.stringify(cssSpecifier.slice('/sub/'.length)),
)
})

test('chunkImportMap is emitted when emitAssets is false', async () => {
const root = resolve(dirname, 'fixtures/shared-plugins/chunk-import-map')
const builder = await createBuilder({
Expand Down
11 changes: 4 additions & 7 deletions packages/vite/src/node/plugins/html.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1700,13 +1700,10 @@ export function getImportMapFilename(
return 'importmap.json'
}

function getImportMapBaseUrl(options: ResolvedEnvironmentOptions): string {
const chunkImportMap =
options.build.rolldownOptions.experimental?.chunkImportMap
if (typeof chunkImportMap === 'object' && chunkImportMap.baseUrl) {
return chunkImportMap.baseUrl
}
return '/'
function getImportMapBaseUrl(
options: ResolvedEnvironmentOptions & ResolvedConfig,
): string {
return options.base ?? '/'
}

/**
Expand Down
Loading