Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/breezy-papayas-itch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lynx-js/react-alias-rsbuild-plugin": patch
---

Replace `enhanced-resolve` with `unrs-resolver`
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type { RsbuildPlugin } from '@rsbuild/core';
// Warning: (ae-missing-release-tag) "createLazyResolver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
export function createLazyResolver(context: string, conditionNames: string[]): (request: string) => Promise<string>;
export function createLazyResolver(directory: string, conditionNames: string[]): (request: string) => Promise<string>;

// Warning: (ae-missing-release-tag) "Options" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
Expand Down
2 changes: 1 addition & 1 deletion packages/rspeedy/plugin-react-alias/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"test": "pnpm -w run test --project rspeedy/react-alias"
},
"dependencies": {
"enhanced-resolve": "^5.18.1"
"unrs-resolver": "^1.7.3"
},
"devDependencies": {
"@lynx-js/react": "workspace:*",
Expand Down
39 changes: 27 additions & 12 deletions packages/rspeedy/plugin-react-alias/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { createRequire } from 'node:module'
import path from 'node:path'

import type { RsbuildPlugin } from '@rsbuild/core'
import type { ResolveFunction } from 'enhanced-resolve'
import type { ResolveResult } from 'unrs-resolver'

export interface Options {
lazy?: boolean | undefined
Expand Down Expand Up @@ -180,21 +180,36 @@ export function pluginReactAlias(options: Options): RsbuildPlugin {
}
}

export function createLazyResolver(context: string, conditionNames: string[]) {
let lazyExports: Record<string, string | false>
let resolverLazy: ResolveFunction
export function createLazyResolver(
directory: string,
conditionNames: string[],
) {
let lazyExports: Record<string, string>
let resolverLazy: (directory: string, request: string) => ResolveResult

return async (
request: string,
): Promise<string> => {
const { default: resolver } = await import('enhanced-resolve')
if (!lazyExports) {
lazyExports = {}
}

if (lazyExports[request] === undefined) {
if (!resolverLazy) {
const { ResolverFactory } = await import('unrs-resolver')
const resolver = new ResolverFactory({ conditionNames })
resolverLazy = (dir: string, req: string) => resolver.sync(dir, req)
}
const resolveResult = resolverLazy(directory, request)
if (resolveResult.error) {
throw new Error(resolveResult.error)
}
if (!resolveResult.path) {
throw new Error(`Failed to resolve ${request}`)
}
lazyExports[request] = resolveResult.path
}

return (
(lazyExports ??= {})[request] ??=
(resolverLazy ??= resolver.create.sync({ conditionNames }))(
context,
request,
)
) as string
return lazyExports[request]
}
}
Loading
Loading