@rslib/core 0.10.5 → 0.11.0

package/dist/index.js

@@ -276,12 +276,11 @@ class LibCssExtractPlugin {
 }
 const cssConfig_require = createRequire(import.meta.url);
 const RSLIB_CSS_ENTRY_FLAG = '__rslib_css__';
-async function cssExternalHandler(request, callback, jsExtension, auto, styleRedirectPath, styleRedirectExtension, redirectPath, issuer) {
+async function cssExternalHandler(request, callback, jsExtension, auto, styleRedirectPath, styleRedirectExtension, redirectedPath, issuer) {
     if (/compiled\/css-loader\//.test(request)) return callback();
     let resolvedRequest = request;
     if (styleRedirectPath) {
-        const redirectedPath = await redirectPath(resolvedRequest);
-        if (void 0 === redirectedPath) return callback(void 0, request);
+        if (void 0 === redirectedPath) return false;
         resolvedRequest = redirectedPath;
     }
     if (!isCssFile(resolvedRequest)) {
@@ -2097,7 +2096,8 @@ const composeBundlelessExternalConfig = (jsExtension, redirect, cssModulesAuto,
     const styleRedirectExtension = redirect.style?.extension ?? true;
     const jsRedirectPath = redirect.js?.path ?? true;
     const jsRedirectExtension = redirect.js?.extension ?? true;
-    const assetRedirect = redirect.asset ?? true;
+    const assetRedirectPath = redirect.asset?.path ?? true;
+    const assetRedirectExtension = redirect.asset?.extension ?? true;
     let resolver;
     return {
         resolvedJsRedirect: {
@@ -2131,20 +2131,20 @@ const composeBundlelessExternalConfig = (jsExtension, redirect, cssModulesAuto,
                         }
                         if (issuer) {
                             let resolvedRequest = request;
-                            const cssExternal = await cssExternalHandler(resolvedRequest, callback, jsExtension, cssModulesAuto, styleRedirectPath, styleRedirectExtension, redirectPath, issuer);
+                            const redirectedPath = await redirectPath(resolvedRequest);
+                            const cssExternal = await cssExternalHandler(resolvedRequest, callback, jsExtension, cssModulesAuto, styleRedirectPath, styleRedirectExtension, redirectedPath, issuer);
                             if (false !== cssExternal) return cssExternal;
-                            if (jsRedirectPath) {
-                                const redirectedPath = await redirectPath(resolvedRequest);
-                                if (void 0 === redirectedPath) return callback(void 0, request);
-                                resolvedRequest = redirectedPath;
-                            }
+                            if (void 0 === redirectedPath) return callback(void 0, request);
+                            if (jsRedirectPath) resolvedRequest = redirectedPath;
                             if (resolvedRequest.startsWith('.')) {
                                 const ext = extname(resolvedRequest);
-                                if (ext) {
-                                    if (JS_EXTENSIONS_PATTERN.test(resolvedRequest)) {
-                                        if (jsRedirectExtension) resolvedRequest = resolvedRequest.replace(/\.[^.]+$/, jsExtension);
-                                    } else if (assetRedirect) resolvedRequest = resolvedRequest.replace(/\.[^.]+$/, jsExtension);
-                                } else if (jsRedirectExtension) resolvedRequest = `${resolvedRequest}${jsExtension}`;
+                                if (ext) if (JS_EXTENSIONS_PATTERN.test(resolvedRequest)) {
+                                    if (jsRedirectExtension) resolvedRequest = resolvedRequest.replace(/\.[^.]+$/, jsExtension);
+                                } else {
+                                    resolvedRequest = assetRedirectPath ? redirectedPath : request;
+                                    if (assetRedirectExtension) resolvedRequest = resolvedRequest.replace(/\.[^.]+$/, jsExtension);
+                                }
+                                else if (jsRedirectExtension) resolvedRequest = `${resolvedRequest}${jsExtension}`;
                             }
                             return callback(void 0, resolvedRequest);
                         }
@@ -2996,7 +2996,7 @@ const applyCommonOptions = (cli)=>{
 function runCli() {
     const cli = dist('rslib');
     cli.help();
-    cli.version("0.10.5");
+    cli.version("0.11.0");
     applyCommonOptions(cli);
     const buildCommand = cli.command('build', 'build the library for production');
     const inspectCommand = cli.command('inspect', 'inspect the Rsbuild / Rspack configs of Rslib projects');
@@ -3067,8 +3067,8 @@ function prepareCli() {
     initNodeEnv();
     const { npm_execpath } = process.env;
     if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) console.log();
-    logger.greet(`  Rslib v0.10.5\n`);
+    logger.greet(`  Rslib v0.11.0\n`);
 }
-const src_version = "0.10.5";
+const src_version = "0.11.0";
 var __webpack_exports__rspack = __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack;
 export { build, defineConfig, inspect, loadConfig, logger, prepareCli, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__ as rsbuild, runCli, startMFDevServer, composeCreateRsbuildConfig as unstable_composeCreateRsbuildConfig, src_version as version, __webpack_exports__rspack as rspack };

package/dist-types/css/cssConfig.d.ts

@@ -2,6 +2,6 @@ import type { EnvironmentConfig } from '@rsbuild/core';
 import { type CssLoaderOptionsAuto } from './utils';
 export declare const RSLIB_CSS_ENTRY_FLAG = "__rslib_css__";
 type ExternalCallback = (arg0?: undefined, arg1?: string) => void;
-export declare function cssExternalHandler(request: string, callback: ExternalCallback, jsExtension: string, auto: CssLoaderOptionsAuto, styleRedirectPath: boolean, styleRedirectExtension: boolean, redirectPath: (request: string) => Promise<string | undefined>, issuer: string): Promise<false | void>;
+export declare function cssExternalHandler(request: string, callback: ExternalCallback, jsExtension: string, auto: CssLoaderOptionsAuto, styleRedirectPath: boolean, styleRedirectExtension: boolean, redirectedPath: string | undefined, issuer: string): Promise<false | void>;
 export declare const composeCssConfig: (rootDir: string | null, auto: CssLoaderOptionsAuto, bundle?: boolean, banner?: string, footer?: string) => EnvironmentConfig;
 export {};

package/dist-types/types/config.d.ts

@@ -146,6 +146,18 @@ export type StyleRedirect = {
      */
     extension?: boolean;
 };
+export type AssetRedirect = {
+    /**
+     * Whether to automatically redirect the import paths of asset output files.
+     * @defaultValue `true`
+     */
+    path?: boolean;
+    /**
+     * Whether to automatically redirect the file extension to import paths based on the asset output files.
+     * @defaultValue `true`
+     */
+    extension?: boolean;
+};
 export type DtsRedirect = {
     /**
      * Whether to automatically redirect the import paths of TypeScript declaration output files.
@@ -164,7 +176,7 @@ export type Redirect = {
     /** Controls the redirect of the import paths of output style files. */
     style?: StyleRedirect;
     /** Controls the redirect of the import paths of output asset files. */
-    asset?: boolean;
+    asset?: AssetRedirect;
     /** Controls the redirect of the import paths of output TypeScript declaration files. */
     dts?: DtsRedirect;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.10.5",
+  "version": "0.11.0",
   "description": "The Rsbuild-based library development tool.",
   "homepage": "https://rslib.rs",
   "bugs": {
@@ -36,12 +36,12 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rsbuild/core": "~1.4.3",
+    "@rsbuild/core": "~1.4.8",
     "tinyglobby": "^0.2.14",
-    "rsbuild-plugin-dts": "0.10.5"
+    "rsbuild-plugin-dts": "0.11.0"
   },
   "devDependencies": {
-    "@module-federation/rsbuild-plugin": "^0.16.0",
+    "@module-federation/rsbuild-plugin": "^0.17.0",
     "@types/fs-extra": "^11.0.4",
     "cac": "^6.7.14",
     "chokidar": "^4.0.3",
@@ -50,7 +50,7 @@
     "picocolors": "1.1.1",
     "prebundle": "1.3.4",
     "rsbuild-plugin-publint": "^0.3.2",
-    "rslib": "npm:@rslib/core@0.10.4",
+    "rslib": "npm:@rslib/core@0.10.6",
     "rslog": "^1.2.9",
     "tsconfck": "3.1.6",
     "typescript": "^5.8.3",