@lynx-js/rspeedy-canary 0.11.2-canary-20250911-c9781c71 → 0.11.2-canary-20250911-7bfd4bfb

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @lynx-js/rspeedy
 
-## 0.11.2-canary-20250911134840-c9781c710032e0c59d3c761459b581067b0c3168
+## 0.11.2-canary-20250911165142-7bfd4bfb3da200017abaf7838e3be0b4f7c71bc5
 
 ### Patch Changes
 
@@ -38,10 +38,27 @@
   });
   ```
 
+- Support `resolve.aliasStrategy` for controlling priority between `tsconfig.json` paths and `resolve.alias` ([#1722](https://github.com/lynx-family/lynx-stack/pull/1722))
+
+  ```js
+  import { defineConfig } from "@lynx-js/rspeedy";
+
+  export default defineConfig({
+    resolve: {
+      alias: {
+        "@": "./src",
+      },
+      // 'prefer-tsconfig' (default): tsconfig.json paths take priority
+      // 'prefer-alias': resolve.alias takes priority
+      aliasStrategy: "prefer-alias",
+    },
+  });
+  ```
+
 - Bump Rsbuild v1.5.4 with Rspack v1.5.2. ([#1644](https://github.com/lynx-family/lynx-stack/pull/1644))
 
 - Updated dependencies [[`d7c5da3`](https://github.com/lynx-family/lynx-stack/commit/d7c5da329caddfb12ed77159fb8b1b8f38717cff)]:
-  - @lynx-js/chunk-loading-webpack-plugin@0.3.3-canary-20250911134840-c9781c710032e0c59d3c761459b581067b0c3168
+  - @lynx-js/chunk-loading-webpack-plugin@0.3.3-canary-20250911165142-7bfd4bfb3da200017abaf7838e3be0b4f7c71bc5
   - @lynx-js/cache-events-webpack-plugin@0.0.2
 
 ## 0.11.1

package/dist/index.d.ts

@@ -2541,6 +2541,30 @@ export declare interface Resolve {
      * ```
      */
     alias?: Record<string, string | false | string[]> | undefined;
+    /**
+     * Set the strategy for path alias resolution, to control the priority relationship
+     * between the `paths` option in `tsconfig.json` and the `resolve.alias` option of Rsbuild.
+     * - `prefer-tsconfig` (default): The `paths` option in `tsconfig.json` will take precedence over the
+     * `resolve.alias` option of Rsbuild.
+     * - `prefer-alias`: The `resolve.alias` option of Rsbuild will take precedence over the
+     * `paths` option in `tsconfig.json`.
+     *
+     * @example
+     *
+     * ```js
+     * import { defineConfig } from '@lynx-js/rspeedy'
+     *
+     * export default defineConfig({
+     *   resolve: {
+     *     alias: {
+     *       '@': './src',
+     *     },
+     *     aliasStrategy: 'prefer-alias',
+     *   },
+     * })
+     * ```
+     */
+    aliasStrategy?: 'prefer-tsconfig' | 'prefer-alias' | undefined;
     /**
      * Force to resolve the specified packages from project root, which is useful for deduplicating packages and reducing the bundle size.
      *

package/dist/index.js

@@ -343,6 +343,7 @@ function toRsbuildConfig(config) {
         },
         resolve: {
             alias: config.resolve?.alias,
+            aliasStrategy: config.resolve?.aliasStrategy,
             dedupe: config.resolve?.dedupe
         },
         source: {

package/dist/src_cli_build_ts.js

@@ -327,6 +327,7 @@ export const __webpack_modules__ = {
                 },
                 resolve: {
                     alias: config.resolve?.alias,
+                    aliasStrategy: config.resolve?.aliasStrategy,
                     dedupe: config.resolve?.dedupe
                 },
                 source: {

package/dist/src_cli_dev_ts.js

@@ -319,6 +319,7 @@ export const __webpack_modules__ = {
                 },
                 resolve: {
                     alias: config.resolve?.alias,
+                    aliasStrategy: config.resolve?.aliasStrategy,
                     dedupe: config.resolve?.dedupe
                 },
                 source: {

package/dist/src_cli_inspect_ts.js

@@ -265,6 +265,7 @@ export const __webpack_modules__ = {
                 },
                 resolve: {
                     alias: config.resolve?.alias,
+                    aliasStrategy: config.resolve?.aliasStrategy,
                     dedupe: config.resolve?.dedupe
                 },
                 source: {

package/dist/src_cli_preview_ts.js

@@ -267,6 +267,7 @@ export const __webpack_modules__ = {
                 },
                 resolve: {
                     alias: config.resolve?.alias,
+                    aliasStrategy: config.resolve?.aliasStrategy,
                     dedupe: config.resolve?.dedupe
                 },
                 source: {

package/dist/src_config_validate_ts.js

@@ -1492,9 +1492,9 @@ export const __webpack_modules__ = {
                     if (void 0 === value) return true;
                     return "string" == typeof value || "boolean" == typeof value;
                 });
-            const _io41 = (input, _exceptionable = true)=>"string" == typeof input["__@toStringTag@6652"] && (1 === Object.keys(input).length || Object.keys(input).every((key)=>{
+            const _io41 = (input, _exceptionable = true)=>"string" == typeof input["__@toStringTag@922"] && (1 === Object.keys(input).length || Object.keys(input).every((key)=>{
                     if ([
-                        "__@toStringTag@6652"
+                        "__@toStringTag@922"
                     ].some((prop)=>key === prop)) return true;
                     const value = input[key];
                     if (void 0 === value) return true;
@@ -3102,14 +3102,14 @@ export const __webpack_modules__ = {
                     if (void 0 === value) return true;
                     return false;
                 })));
-            const _io149 = (input, _exceptionable = true)=>"number" == typeof input.BYTES_PER_ELEMENT && (input.buffer instanceof ArrayBuffer || input.buffer instanceof SharedArrayBuffer) && "number" == typeof input.byteLength && "number" == typeof input.byteOffset && "number" == typeof input.length && "Uint8Array" === input["__@toStringTag@6652"] && Object.keys(input).every((key)=>{
+            const _io149 = (input, _exceptionable = true)=>"number" == typeof input.BYTES_PER_ELEMENT && (input.buffer instanceof ArrayBuffer || input.buffer instanceof SharedArrayBuffer) && "number" == typeof input.byteLength && "number" == typeof input.byteOffset && "number" == typeof input.length && "Uint8Array" === input["__@toStringTag@922"] && Object.keys(input).every((key)=>{
                     if ([
                         "BYTES_PER_ELEMENT",
                         "buffer",
                         "byteLength",
                         "byteOffset",
                         "length",
-                        "__@toStringTag@6652"
+                        "__@toStringTag@922"
                     ].some((prop)=>key === prop)) return true;
                     const value = input[key];
                     if (void 0 === value) return true;
@@ -6363,9 +6363,9 @@ export const __webpack_modules__ = {
                     if (void 0 === value) return true;
                     return false;
                 }));
-            const _io406 = (input, _exceptionable = true)=>"string" == typeof input["__@toStringTag@6652"] && (1 === Object.keys(input).length || Object.keys(input).every((key)=>{
+            const _io406 = (input, _exceptionable = true)=>"string" == typeof input["__@toStringTag@922"] && (1 === Object.keys(input).length || Object.keys(input).every((key)=>{
                     if ([
-                        "__@toStringTag@6652"
+                        "__@toStringTag@922"
                     ].some((prop)=>key === prop)) return true;
                     const value = input[key];
                     if (void 0 === value) return true;
@@ -6508,9 +6508,10 @@ export const __webpack_modules__ = {
                     if (void 0 === value) return true;
                     return false;
                 }));
-            const _io418 = (input, _exceptionable = true)=>(void 0 === input.alias || "object" == typeof input.alias && null !== input.alias && false === Array.isArray(input.alias) && _io419(input.alias, _exceptionable)) && (void 0 === input.dedupe || Array.isArray(input.dedupe) && input.dedupe.every((elem, _index338)=>"string" == typeof elem)) && (0 === Object.keys(input).length || Object.keys(input).every((key)=>{
+            const _io418 = (input, _exceptionable = true)=>(void 0 === input.alias || "object" == typeof input.alias && null !== input.alias && false === Array.isArray(input.alias) && _io419(input.alias, _exceptionable)) && (void 0 === input.aliasStrategy || "prefer-tsconfig" === input.aliasStrategy || "prefer-alias" === input.aliasStrategy) && (void 0 === input.dedupe || Array.isArray(input.dedupe) && input.dedupe.every((elem, _index338)=>"string" == typeof elem)) && (0 === Object.keys(input).length || Object.keys(input).every((key)=>{
                     if ([
                         "alias",
+                        "aliasStrategy",
                         "dedupe"
                     ].some((prop)=>key === prop)) return true;
                     const value = input[key];
@@ -6966,18 +6967,18 @@ export const __webpack_modules__ = {
                     return false;
                 })();
             const _iu1 = (input, _exceptionable = true)=>(()=>{
-                    if (void 0 !== input["__@toStringTag@6652"]) return _io149(input, _exceptionable);
+                    if (void 0 !== input["__@toStringTag@922"]) return _io149(input, _exceptionable);
                     if (void 0 !== input.pem) return _io150(input, _exceptionable);
                     return false;
                 })();
             const _iu2 = (input, _exceptionable = true)=>(()=>{
-                    if (void 0 !== input["__@toStringTag@6652"]) return _io149(input, _exceptionable);
+                    if (void 0 !== input["__@toStringTag@922"]) return _io149(input, _exceptionable);
                     if (void 0 !== input.buf) return _io151(input, _exceptionable);
                     return false;
                 })();
             const _iu3 = (input, _exceptionable = true)=>(()=>{
                     if (void 0 !== input.name) return _io405(input, _exceptionable);
-                    if (void 0 !== input["__@toStringTag@6652"]) return _io406(input, _exceptionable);
+                    if (void 0 !== input["__@toStringTag@922"]) return _io406(input, _exceptionable);
                     return false;
                 })();
             const _iu4 = (input, _exceptionable = true)=>(()=>{
@@ -9572,14 +9573,14 @@ export const __webpack_modules__ = {
                     }).every((flag)=>flag)
                 ].every((flag)=>flag);
             const _vo41 = (input, _path, _exceptionable = true)=>[
-                    "string" == typeof input["__@toStringTag@6652"] || _report(_exceptionable, {
-                        path: _path + "[\"__@toStringTag@6652\"]",
+                    "string" == typeof input["__@toStringTag@922"] || _report(_exceptionable, {
+                        path: _path + "[\"__@toStringTag@922\"]",
                         expected: "string",
-                        value: input["__@toStringTag@6652"]
+                        value: input["__@toStringTag@922"]
                     }),
                     1 === Object.keys(input).length || false === _exceptionable || Object.keys(input).map((key)=>{
                         if ([
-                            "__@toStringTag@6652"
+                            "__@toStringTag@922"
                         ].some((prop)=>key === prop)) return true;
                         const value = input[key];
                         if (void 0 === value) return true;
@@ -18593,10 +18594,10 @@ export const __webpack_modules__ = {
                         expected: "number",
                         value: input.length
                     }),
-                    "Uint8Array" === input["__@toStringTag@6652"] || _report(_exceptionable, {
-                        path: _path + "[\"__@toStringTag@6652\"]",
+                    "Uint8Array" === input["__@toStringTag@922"] || _report(_exceptionable, {
+                        path: _path + "[\"__@toStringTag@922\"]",
                         expected: "\"Uint8Array\"",
-                        value: input["__@toStringTag@6652"]
+                        value: input["__@toStringTag@922"]
                     }),
                     false === _exceptionable || Object.keys(input).map((key)=>{
                         if ([
@@ -18605,7 +18606,7 @@ export const __webpack_modules__ = {
                             "byteLength",
                             "byteOffset",
                             "length",
-                            "__@toStringTag@6652"
+                            "__@toStringTag@922"
                         ].some((prop)=>key === prop)) return true;
                         const value = input[key];
                         if (void 0 === value) return true;
@@ -36666,14 +36667,14 @@ export const __webpack_modules__ = {
                     }).every((flag)=>flag)
                 ].every((flag)=>flag);
             const _vo406 = (input, _path, _exceptionable = true)=>[
-                    "string" == typeof input["__@toStringTag@6652"] || _report(_exceptionable, {
-                        path: _path + "[\"__@toStringTag@6652\"]",
+                    "string" == typeof input["__@toStringTag@922"] || _report(_exceptionable, {
+                        path: _path + "[\"__@toStringTag@922\"]",
                         expected: "string",
-                        value: input["__@toStringTag@6652"]
+                        value: input["__@toStringTag@922"]
                     }),
                     1 === Object.keys(input).length || false === _exceptionable || Object.keys(input).map((key)=>{
                         if ([
-                            "__@toStringTag@6652"
+                            "__@toStringTag@922"
                         ].some((prop)=>key === prop)) return true;
                         const value = input[key];
                         if (void 0 === value) return true;
@@ -37437,6 +37438,11 @@ export const __webpack_modules__ = {
                         expected: "(Record<string, string | false | string[]> | undefined)",
                         value: input.alias
                     }),
+                    void 0 === input.aliasStrategy || "prefer-tsconfig" === input.aliasStrategy || "prefer-alias" === input.aliasStrategy || _report(_exceptionable, {
+                        path: _path + ".aliasStrategy",
+                        expected: "(\"prefer-alias\" | \"prefer-tsconfig\" | undefined)",
+                        value: input.aliasStrategy
+                    }),
                     void 0 === input.dedupe || (Array.isArray(input.dedupe) || _report(_exceptionable, {
                         path: _path + ".dedupe",
                         expected: "(Array<string> | undefined)",
@@ -37453,6 +37459,7 @@ export const __webpack_modules__ = {
                     0 === Object.keys(input).length || false === _exceptionable || Object.keys(input).map((key)=>{
                         if ([
                             "alias",
+                            "aliasStrategy",
                             "dedupe"
                         ].some((prop)=>key === prop)) return true;
                         const value = input[key];
@@ -39745,7 +39752,7 @@ export const __webpack_modules__ = {
                     });
                 })();
             const _vu1 = (input, _path, _exceptionable = true)=>(()=>{
-                    if (void 0 !== input["__@toStringTag@6652"]) return _vo149(input, _path, _exceptionable);
+                    if (void 0 !== input["__@toStringTag@922"]) return _vo149(input, _path, _exceptionable);
                     if (void 0 !== input.pem) return _vo150(input, _path, _exceptionable);
                     return _report(_exceptionable, {
                         path: _path,
@@ -39754,7 +39761,7 @@ export const __webpack_modules__ = {
                     });
                 })();
             const _vu2 = (input, _path, _exceptionable = true)=>(()=>{
-                    if (void 0 !== input["__@toStringTag@6652"]) return _vo149(input, _path, _exceptionable);
+                    if (void 0 !== input["__@toStringTag@922"]) return _vo149(input, _path, _exceptionable);
                     if (void 0 !== input.buf) return _vo151(input, _path, _exceptionable);
                     return _report(_exceptionable, {
                         path: _path,
@@ -39764,7 +39771,7 @@ export const __webpack_modules__ = {
                 })();
             const _vu3 = (input, _path, _exceptionable = true)=>(()=>{
                     if (void 0 !== input.name) return _vo405(input, _path, _exceptionable);
-                    if (void 0 !== input["__@toStringTag@6652"]) return _vo406(input, _path, _exceptionable);
+                    if (void 0 !== input["__@toStringTag@922"]) return _vo406(input, _path, _exceptionable);
                     return _report(_exceptionable, {
                         path: _path,
                         expected: "(LooseRsbuildPlugin | RsbuildPlugins | LooseRsbuildPlugin | Falsy)",

package/dist/src_plugins_api_plugin_ts.js

@@ -20,11 +20,11 @@ export const __webpack_modules__ = {
                         config,
                         debug: _debug_js__WEBPACK_IMPORTED_MODULE_1__.Yz,
                         async exit (code) {
-                            const { exit } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "./src/cli/exit.ts"));
+                            const { exit } = await __webpack_require__.e("src_cli_exit_ts").then(__webpack_require__.bind(__webpack_require__, "./src/cli/exit.ts"));
                             return exit(code);
                         },
                         logger: _rsbuild_core__WEBPACK_IMPORTED_MODULE_0__.logger,
-                        version: _version_js__WEBPACK_IMPORTED_MODULE_2__.version
+                        version: _version_js__WEBPACK_IMPORTED_MODULE_2__.rE
                     });
                 }
             };

package/dist/src_plugins_rsdoctor_plugin_ts.js

@@ -8,8 +8,10 @@ export const __webpack_modules__ = {
         __webpack_require__.d(__webpack_exports__, {
             pluginRsdoctor: ()=>pluginRsdoctor
         });
-        var _rsbuild_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("@rsbuild/core");
-        var _utils_is_ci_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/utils/is-ci.ts");
+        var core_ = __webpack_require__("@rsbuild/core");
+        function isCI() {
+            return !!process.env['CI'] && 'false' !== process.env['CI'];
+        }
         function pluginRsdoctor(options) {
             return {
                 name: 'lynx:rsbuild:rsdoctor',
@@ -26,7 +28,7 @@ export const __webpack_modules__ = {
                             if (registered) continue;
                             config.plugins ??= [];
                             const defaultOptions = {
-                                disableClientServer: (0, _utils_is_ci_js__WEBPACK_IMPORTED_MODULE_1__.J)(),
+                                disableClientServer: isCI(),
                                 supports: {
                                     banner: true
                                 },
@@ -41,20 +43,12 @@ export const __webpack_modules__ = {
                                     }
                                 }
                             };
-                            config.plugins.push(new RsdoctorRspackPlugin((0, _rsbuild_core__WEBPACK_IMPORTED_MODULE_0__.mergeRsbuildConfig)(defaultOptions, options)));
+                            config.plugins.push(new RsdoctorRspackPlugin((0, core_.mergeRsbuildConfig)(defaultOptions, options)));
                         }
-                        _rsbuild_core__WEBPACK_IMPORTED_MODULE_0__.logger.info("Rsdoctor is enabled.");
+                        core_.logger.info("Rsdoctor is enabled.");
                     });
                 }
             };
         }
-    },
-    "./src/utils/is-ci.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-        __webpack_require__.d(__webpack_exports__, {
-            J: ()=>isCI
-        });
-        function isCI() {
-            return !!process.env['CI'] && 'false' !== process.env['CI'];
-        }
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/rspeedy-canary",
-  "version": "0.11.2-canary-20250911-c9781c71",
+  "version": "0.11.2-canary-20250911-7bfd4bfb",
   "description": "A webpack/rspack-based frontend toolchain for Lynx",
   "keywords": [
     "webpack",
@@ -49,7 +49,7 @@
   ],
   "dependencies": {
     "@lynx-js/cache-events-webpack-plugin": "npm:@lynx-js/cache-events-webpack-plugin-canary@0.0.2",
-    "@lynx-js/chunk-loading-webpack-plugin": "npm:@lynx-js/chunk-loading-webpack-plugin-canary@0.3.3-canary-20250911-c9781c71",
+    "@lynx-js/chunk-loading-webpack-plugin": "npm:@lynx-js/chunk-loading-webpack-plugin-canary@0.3.3-canary-20250911-7bfd4bfb",
     "@lynx-js/webpack-dev-transport": "npm:@lynx-js/webpack-dev-transport-canary@0.2.0",
     "@lynx-js/websocket": "npm:@lynx-js/websocket-canary@0.0.4",
     "@rsbuild/core": "1.5.4",