@lynx-js/react-alias-rsbuild-plugin-canary 0.12.0-canary-20251129-2cd5c0c8 → 0.12.0-canary-20251201-738d44d6

package/CHANGELOG.md

@@ -1,6 +1,21 @@
 # @lynx-js/react-alias-rsbuild-plugin
 
-## 0.12.0-canary-20251129025626-2cd5c0c8d7c2e054c427d21763b420280c06d845
+## 0.12.0-canary-20251201075617-738d44d685870d7c3f64a1be7139e8d7af498feb
+
+### Minor Changes
+
+- **BREAKING CHANGE**: Use resolver from Rspack. ([#1964](https://github.com/lynx-family/lynx-stack/pull/1964))
+
+  The `createLazyResolver` now requires an `rspack` parameter:
+
+  ```diff
+  - function createLazyResolver(directory: string, conditionNames: string[]): (request: string) => Promise<string>;
+  + function createLazyResolver(rspack: rspack, directory: string, conditionNames: string[]): (request: string) => Promise<string>;
+  ```
+
+### Patch Changes
+
+- Support Yarn Plug'n'Play. ([#1964](https://github.com/lynx-family/lynx-stack/pull/1964))
 
 ## 0.11.4
 

package/dist/index.d.ts

@@ -8,4 +8,4 @@ export interface Options {
     rootPath?: string | undefined;
 }
 export declare function pluginReactAlias(options: Options): RsbuildPlugin;
-export declare function createLazyResolver(directory: string, conditionNames: string[]): (request: string) => Promise<string>;
+export declare function createLazyResolver(rspack: typeof import('@rspack/core').rspack, directory: string, conditionNames: string[]): (request: string) => Promise<string>;

package/dist/index.js

@@ -383,18 +383,6 @@ function pluginReactAlias(options) {
             });
             const { version } = require(reactLynxPkg);
             const reactLynxDir = node_path.dirname(reactLynxPkg);
-            const resolve = createLazyResolver(rootPath ?? api.context.rootPath, lazy ? [
-                'lazy',
-                'import'
-            ] : [
-                'import'
-            ]);
-            const resolvePreact = createLazyResolver(reactLynxDir, [
-                'import'
-            ]);
-            api.expose(Symbol.for('@lynx-js/react/internal:resolve'), {
-                resolve
-            });
             api.modifyRsbuildConfig((config, { mergeRsbuildConfig })=>mergeRsbuildConfig(config, {
                     source: {
                         include: [
@@ -402,8 +390,20 @@ function pluginReactAlias(options) {
                         ]
                     }
                 }));
-            api.modifyBundlerChain(async (chain, { isProd, environment })=>{
+            api.modifyBundlerChain(async (chain, { isProd, environment, rspack })=>{
                 if (Object.hasOwn(environment, S_PLUGIN_REACT_ALIAS)) return;
+                const resolve = createLazyResolver(rspack, rootPath ?? api.context.rootPath, lazy ? [
+                    'lazy',
+                    'import'
+                ] : [
+                    'import'
+                ]);
+                const resolvePreact = createLazyResolver(rspack, reactLynxDir, [
+                    'import'
+                ]);
+                api.expose(Symbol.for('@lynx-js/react/internal:resolve'), {
+                    resolve
+                });
                 Object.defineProperty(environment, S_PLUGIN_REACT_ALIAS, {
                     value: true
                 });
@@ -469,16 +469,17 @@ function pluginReactAlias(options) {
         }
     };
 }
-function createLazyResolver(directory, conditionNames) {
+function createLazyResolver(rspack, directory, conditionNames) {
+    const { ResolverFactory } = rspack.experiments.resolver;
     let lazyExports;
     let resolverLazy;
     return async (request)=>{
         if (!lazyExports) lazyExports = {};
         if (void 0 === lazyExports[request]) {
             if (!resolverLazy) {
-                const { ResolverFactory } = await import("unrs-resolver");
                 const resolver = new ResolverFactory({
-                    conditionNames
+                    conditionNames,
+                    enablePnp: true
                 });
                 resolverLazy = (dir, req)=>resolver.sync(dir, req);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/react-alias-rsbuild-plugin-canary",
-  "version": "0.12.0-canary-20251129-2cd5c0c8",
+  "version": "0.12.0-canary-20251201-738d44d6",
   "description": "A rsbuild plugin for making alias in ReactLynx",
   "keywords": [
     "rsbuild",
@@ -31,17 +31,15 @@
     "CHANGELOG.md",
     "README.md"
   ],
-  "dependencies": {
-    "unrs-resolver": "1.11.1"
-  },
   "devDependencies": {
     "@microsoft/api-extractor": "7.52.15",
     "@rsbuild/core": "1.6.9",
+    "@rspack/core": "1.6.5",
     "@types/semver": "^7.7.1",
     "semver": "^7.7.2",
-    "@lynx-js/react": "npm:@lynx-js/react-canary@0.114.6-canary-20251129-2cd5c0c8",
-    "@lynx-js/vitest-setup": "0.0.0",
-    "@lynx-js/react-webpack-plugin": "npm:@lynx-js/react-webpack-plugin-canary@0.7.2"
+    "@lynx-js/react": "npm:@lynx-js/react-canary@0.114.6-canary-20251201-738d44d6",
+    "@lynx-js/react-webpack-plugin": "npm:@lynx-js/react-webpack-plugin-canary@0.7.2",
+    "@lynx-js/vitest-setup": "0.0.0"
   },
   "engines": {
     "node": ">=18"