@lynx-js/react-alias-rsbuild-plugin 0.11.4 → 0.12.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @lynx-js/react-alias-rsbuild-plugin
 
+## 0.12.1
+
+## 0.12.0
+
+### 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
 
 ## 0.11.3

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

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import node_path from "node:path";
 var __webpack_modules__ = {
-    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/classes/semver.js": function(module, __unused_webpack_exports, __webpack_require__) {
+    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/classes/semver.js" (module, __unused_webpack_exports, __webpack_require__) {
         const debug = __webpack_require__("../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/debug.js");
         const { MAX_LENGTH, MAX_SAFE_INTEGER } = __webpack_require__("../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/constants.js");
         const { safeRe: re, t } = __webpack_require__("../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/re.js");
@@ -181,17 +181,17 @@ var __webpack_modules__ = {
         }
         module.exports = SemVer;
     },
-    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/functions/compare.js": function(module, __unused_webpack_exports, __webpack_require__) {
+    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/functions/compare.js" (module, __unused_webpack_exports, __webpack_require__) {
         const SemVer = __webpack_require__("../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/classes/semver.js");
         const compare = (a, b, loose)=>new SemVer(a, loose).compare(new SemVer(b, loose));
         module.exports = compare;
     },
-    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/functions/gte.js": function(module, __unused_webpack_exports, __webpack_require__) {
+    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/functions/gte.js" (module, __unused_webpack_exports, __webpack_require__) {
         const compare = __webpack_require__("../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/functions/compare.js");
         const gte = (a, b, loose)=>compare(a, b, loose) >= 0;
         module.exports = gte;
     },
-    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/constants.js": function(module) {
+    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/constants.js" (module) {
         const SEMVER_SPEC_VERSION = '2.0.0';
         const MAX_LENGTH = 256;
         const MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
@@ -217,11 +217,11 @@ var __webpack_modules__ = {
             FLAG_LOOSE: 2
         };
     },
-    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/debug.js": function(module) {
+    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/debug.js" (module) {
         const debug = 'object' == typeof process && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG) ? (...args)=>console.error('SEMVER', ...args) : ()=>{};
         module.exports = debug;
     },
-    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/identifiers.js": function(module) {
+    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/identifiers.js" (module) {
         const numeric = /^[0-9]+$/;
         const compareIdentifiers = (a, b)=>{
             const anum = numeric.test(a);
@@ -238,7 +238,7 @@ var __webpack_modules__ = {
             rcompareIdentifiers
         };
     },
-    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/parse-options.js": function(module) {
+    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/parse-options.js" (module) {
         const looseOption = Object.freeze({
             loose: true
         });
@@ -250,7 +250,7 @@ var __webpack_modules__ = {
         };
         module.exports = parseOptions;
     },
-    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/re.js": function(module, exports, __webpack_require__) {
+    "../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/re.js" (module, exports, __webpack_require__) {
         const { MAX_SAFE_COMPONENT_LENGTH, MAX_SAFE_BUILD_LENGTH, MAX_LENGTH } = __webpack_require__("../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/constants.js");
         const debug = __webpack_require__("../../../node_modules/.pnpm/semver@7.7.2/node_modules/semver/internal/debug.js");
         exports = module.exports = {};
@@ -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",
-  "version": "0.11.4",
+  "version": "0.12.1",
   "description": "A rsbuild plugin for making alias in ReactLynx",
   "keywords": [
     "rsbuild",
@@ -31,16 +31,14 @@
     "CHANGELOG.md",
     "README.md"
   ],
-  "dependencies": {
-    "unrs-resolver": "1.11.1"
-  },
   "devDependencies": {
     "@microsoft/api-extractor": "7.52.15",
-    "@rsbuild/core": "1.5.17",
+    "@rsbuild/core": "1.6.13",
+    "@rspack/core": "1.6.6",
     "@types/semver": "^7.7.1",
     "semver": "^7.7.2",
-    "@lynx-js/react": "0.114.4",
-    "@lynx-js/react-webpack-plugin": "0.7.2",
+    "@lynx-js/react": "0.115.1",
+    "@lynx-js/react-webpack-plugin": "0.7.3",
     "@lynx-js/vitest-setup": "0.0.0"
   },
   "engines": {