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

feat: support resolve.alias per environment in Environment API #17583

Merged
merged 3 commits into from
Jul 19, 2024
Merged
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
101 changes: 101 additions & 0 deletions packages/vite/src/node/__tests__/environment.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import { fileURLToPath } from 'node:url'
import path from 'node:path'
import { expect, test } from 'vitest'
import { createServer } from '../server'
import { createServerModuleRunner } from '../ssr/runtime/serverModuleRunner'
import type { ResolveIdFn } from '../idResolver'
import { createIdResolver } from '../idResolver'
import { normalizePath } from '../utils'

const root = fileURLToPath(new URL('./', import.meta.url))

async function createDevServer() {
const server = await createServer({
configFile: false,
root,
logLevel: 'silent',
plugins: [
(() => {
let idResolver: ResolveIdFn
return {
name: 'environment-alias-test-plugin',
configResolved(config) {
idResolver = createIdResolver(config, {})
},
async resolveId(id) {
return await idResolver(this.environment, id)
},
}
})(),
],
environments: {
client: {
resolve: {
alias: [
{
find: 'mod',
replacement: '/fixtures/environment-alias/test.client.js',
},
],
},
},
ssr: {
resolve: {
alias: [
{
find: 'mod',
replacement: '/fixtures/environment-alias/test.ssr.js',
},
],
},
},
rsc: {
resolve: {
alias: [
{
find: 'mod',
replacement: '/fixtures/environment-alias/test.rsc.js',
},
],
},
},
},
})

const moduleRunner = createServerModuleRunner(server.environments.rsc)
return { server, moduleRunner }
}

test('alias', async () => {
expect.assertions(7)
const { server, moduleRunner } = await createDevServer()

const [clientId, ssrId, rscId, clientReq, ssrReq, rscReq, rscMod] =
await Promise.all([
server.environments.client.pluginContainer.resolveId('mod'),
server.environments.ssr.pluginContainer.resolveId('mod'),
server.environments.rsc.pluginContainer.resolveId('mod'),
server.environments.client.transformRequest('mod'),
server.environments.ssr.transformRequest('mod'),
server.environments.rsc.transformRequest('mod'),
moduleRunner.import('mod'),
])

expect(clientId?.id).toEqual(
normalizePath(
path.join(root, '/fixtures/environment-alias/test.client.js'),
),
)
expect(ssrId?.id).toEqual(
normalizePath(path.join(root, '/fixtures/environment-alias/test.ssr.js')),
)
expect(rscId?.id).toEqual(
normalizePath(path.join(root, '/fixtures/environment-alias/test.rsc.js')),
)

expect(clientReq?.code ?? '').toContain('(client)')
expect(ssrReq?.code ?? '').toContain('(ssr)')
expect(rscReq?.code ?? '').toContain('(rsc)')

expect(rscMod?.msg).toContain('(rsc)')
})
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const msg = `[success] (client) alias to mod path`
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const msg = `[success] (rsc) alias to mod path`
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const msg = `[success] (ssr) alias to mod path`
4 changes: 2 additions & 2 deletions packages/vite/src/node/idResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export function createIdResolver(
pluginContainer = await createEnvironmentPluginContainer(
environment as Environment,
[
aliasPlugin({ entries: config.resolve.alias }), // TODO: resolve.alias per environment?
aliasPlugin({ entries: environment.options.resolve.alias }),
resolvePlugin({
root: config.root,
isProduction: config.isProduction,
Expand Down Expand Up @@ -74,7 +74,7 @@ export function createIdResolver(
pluginContainer = await createEnvironmentPluginContainer(
environment as Environment,
[
aliasPlugin({ entries: config.resolve.alias }), // TODO: resolve.alias per environment?
aliasPlugin({ entries: environment.options.resolve.alias }),
],
)
aliasOnlyPluginContainerMap.set(environment, pluginContainer)
Expand Down
Loading