@rslib/core 0.5.5 → 0.6.1

package/dist/index.js

@@ -184,7 +184,7 @@ function prepareCli() {
     initNodeEnv();
     const { npm_execpath } = process.env;
     if (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) console.log();
-    __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rslib v0.5.5\n`);
+    __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rslib v0.6.1\n`);
 }
 const DEFAULT_CONFIG_NAME = 'rslib.config';
 const DEFAULT_CONFIG_EXTENSIONS = [
@@ -234,17 +234,16 @@ function getUndoPath(filename, outputPathArg, enforceRelative) {
     let depth = -1;
     let append = '';
     let outputPath = outputPathArg.replace(/[\\/]$/, '');
-    for (const part of filename.split(/[/\\]+/))if ('..' === part) {
-        if (depth > -1) depth--;
-        else {
-            const i = outputPath.lastIndexOf('/');
-            const j = outputPath.lastIndexOf('\\');
-            const pos = i < 0 ? j : j < 0 ? i : Math.max(i, j);
-            if (pos < 0) return `${outputPath}/`;
-            append = `${outputPath.slice(pos + 1)}/${append}`;
-            outputPath = outputPath.slice(0, pos);
-        }
-    } else if ('.' !== part) depth++;
+    for (const part of filename.split(/[/\\]+/))if ('..' === part) if (depth > -1) depth--;
+    else {
+        const i = outputPath.lastIndexOf('/');
+        const j = outputPath.lastIndexOf('\\');
+        const pos = i < 0 ? j : j < 0 ? i : Math.max(i, j);
+        if (pos < 0) return `${outputPath}/`;
+        append = `${outputPath.slice(pos + 1)}/${append}`;
+        outputPath = outputPath.slice(0, pos);
+    }
+    else if ('.' !== part) depth++;
     return depth > 0 ? `${'../'.repeat(depth)}${append}` : enforceRelative ? `./${append}` : append;
 }
 const LibSvgrPatchPlugin_pluginName = 'LIB_SVGR_PATCH_PLUGIN';
@@ -339,19 +338,17 @@ const pluginLibAsset = ({ bundle })=>({
                     });
                     config.plugin(LibSvgrPatchPlugin.name).use(LibSvgrPatchPlugin, []);
                 }
-                if (isUsingSvgr) {
-                    if (bundle) {
-                        const rule = config.module.rule(CHAIN_ID.RULE.SVG).oneOf(CHAIN_ID.ONE_OF.SVG_URL);
-                        const originalGeneratorOptions = rule.get('generator');
-                        const generatorOptions = isUserSetPublicPath ? originalGeneratorOptions : {
-                            ...originalGeneratorOptions,
-                            importMode: 'preserve'
-                        };
-                        rule.generator(generatorOptions);
-                    } else {
-                        const rule = config.module.rule(CHAIN_ID.RULE.SVG).oneOf(CHAIN_ID.ONE_OF.SVG);
-                        rule.issuer([]);
-                    }
+                if (isUsingSvgr) if (bundle) {
+                    const rule = config.module.rule(CHAIN_ID.RULE.SVG).oneOf(CHAIN_ID.ONE_OF.SVG_URL);
+                    const originalGeneratorOptions = rule.get('generator');
+                    const generatorOptions = isUserSetPublicPath ? originalGeneratorOptions : {
+                        ...originalGeneratorOptions,
+                        importMode: 'preserve'
+                    };
+                    rule.generator(generatorOptions);
+                } else {
+                    const rule = config.module.rule(CHAIN_ID.RULE.SVG).oneOf(CHAIN_ID.ONE_OF.SVG);
+                    rule.issuer([]);
                 }
                 if (bundle) config.plugins.get(CHAIN_ID.PLUGIN.MINI_CSS_EXTRACT)?.tap((options)=>[
                         {
@@ -552,15 +549,11 @@ class EntryChunkPlugin {
         this.contextToWatch = contextToWatch;
     }
     apply(compiler) {
-        compiler.hooks.afterCompile.tapPromise(EntryChunkPlugin_PLUGIN_NAME, (compilation)=>new Promise((resolve)=>{
-                if (null === this.contextToWatch) {
-                    resolve();
-                    return;
-                }
-                const contextDep = compilation.contextDependencies;
-                if (!contextDep.has(this.contextToWatch)) contextDep.add(this.contextToWatch);
-                resolve();
-            }));
+        compiler.hooks.afterCompile.tap(EntryChunkPlugin_PLUGIN_NAME, (compilation)=>{
+            if (null === this.contextToWatch) return;
+            const contextDep = compilation.contextDependencies;
+            if (!contextDep.has(this.contextToWatch)) contextDep.add(this.contextToWatch);
+        });
         compiler.hooks.make.tap(EntryChunkPlugin_PLUGIN_NAME, (compilation)=>{
             const entries = {};
             for (const [key, value] of compilation.entries){
@@ -1049,19 +1042,17 @@ async function find(filename, options) {
 }
 function findUp(dir, { resolve, reject, promise }, options) {
     const { cache, root, configName } = options ?? {};
-    if (cache) {
-        if (cache.hasConfigPath(dir, configName)) {
-            let cached;
-            try {
-                cached = cache.getConfigPath(dir, configName);
-            } catch (e) {
-                reject(e);
-                return;
-            }
-            if (cached?.then) cached.then(resolve).catch(reject);
-            else resolve(cached);
-        } else cache.setConfigPath(dir, promise, configName);
-    }
+    if (cache) if (cache.hasConfigPath(dir, configName)) {
+        let cached;
+        try {
+            cached = cache.getConfigPath(dir, configName);
+        } catch (e) {
+            reject(e);
+            return;
+        }
+        if (cached?.then) cached.then(resolve).catch(reject);
+        else resolve(cached);
+    } else cache.setConfigPath(dir, promise, configName);
     const tsconfig = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(dir, options?.configName ?? 'tsconfig.json');
     __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__["default"].stat(tsconfig, (err, stats)=>{
         if (stats && (stats.isFile() || stats.isFIFO())) resolve(tsconfig);
@@ -1138,36 +1129,33 @@ function stripJsonComments(jsonString) {
             const escaped = isEscaped(jsonString, index);
             if (!escaped) isInsideString = !isInsideString;
         }
-        if (!isInsideString) {
-            if (isInsideComment || currentCharacter + nextCharacter !== '//') {
-                if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
-                    index++;
-                    isInsideComment = false;
-                    result += strip(jsonString, offset, index);
-                    offset = index;
-                } else if (isInsideComment === singleComment && '\n' === currentCharacter) {
-                    isInsideComment = false;
-                    result += strip(jsonString, offset, index);
-                    offset = index;
-                } else if (isInsideComment || currentCharacter + nextCharacter !== '/*') {
-                    if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
-                        index++;
-                        isInsideComment = false;
-                        result += strip(jsonString, offset, index + 1);
-                        offset = index + 1;
-                    }
-                } else {
-                    result += jsonString.slice(offset, index);
-                    offset = index;
-                    isInsideComment = multiComment;
-                    index++;
-                }
-            } else {
-                result += jsonString.slice(offset, index);
-                offset = index;
-                isInsideComment = singleComment;
+        if (!isInsideString) if (isInsideComment || currentCharacter + nextCharacter !== '//') if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
+            index++;
+            isInsideComment = false;
+            result += strip(jsonString, offset, index);
+            offset = index;
+        } else if (isInsideComment === singleComment && '\n' === currentCharacter) {
+            isInsideComment = false;
+            result += strip(jsonString, offset, index);
+            offset = index;
+        } else if (isInsideComment || currentCharacter + nextCharacter !== '/*') {
+            if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
                 index++;
+                isInsideComment = false;
+                result += strip(jsonString, offset, index + 1);
+                offset = index + 1;
             }
+        } else {
+            result += jsonString.slice(offset, index);
+            offset = index;
+            isInsideComment = multiComment;
+            index++;
+        }
+        else {
+            result += jsonString.slice(offset, index);
+            offset = index;
+            isInsideComment = singleComment;
+            index++;
         }
     }
     return result + (isInsideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
@@ -1320,12 +1308,10 @@ function extendTSConfig(extending, extended) {
     for (const key of Object.keys(extendedConfig).filter((key)=>EXTENDABLE_KEYS.includes(key)))if ('compilerOptions' === key) {
         if (!extendingConfig.compilerOptions) extendingConfig.compilerOptions = {};
         for (const option of Object.keys(extendedConfig.compilerOptions))if (!Object.prototype.hasOwnProperty.call(extendingConfig.compilerOptions, option)) extendingConfig.compilerOptions[option] = rebaseRelative(option, extendedConfig.compilerOptions[option], relativePath);
-    } else if (void 0 === extendingConfig[key]) {
-        if ('watchOptions' === key) {
-            extendingConfig.watchOptions = {};
-            for (const option of Object.keys(extendedConfig.watchOptions))extendingConfig.watchOptions[option] = rebaseRelative(option, extendedConfig.watchOptions[option], relativePath);
-        } else extendingConfig[key] = rebaseRelative(key, extendedConfig[key], relativePath);
-    }
+    } else if (void 0 === extendingConfig[key]) if ('watchOptions' === key) {
+        extendingConfig.watchOptions = {};
+        for (const option of Object.keys(extendedConfig.watchOptions))extendingConfig.watchOptions[option] = rebaseRelative(option, extendedConfig.watchOptions[option], relativePath);
+    } else extendingConfig[key] = rebaseRelative(key, extendedConfig[key], relativePath);
 }
 const REBASE_KEYS = [
     'files',
@@ -1746,7 +1732,7 @@ const composeFormatConfig = ({ format, bundle = true, umdName, pkgJson })=>{
                             iife: false,
                             chunkFormat: 'commonjs',
                             library: {
-                                type: 'commonjs'
+                                type: 'commonjs-static'
                             },
                             chunkLoading: 'require',
                             workerChunkLoading: 'async-node',
@@ -2481,7 +2467,7 @@ const repeatableOption = (value, previous)=>(previous ?? []).concat([
         value
     ]);
 function runCli() {
-    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.name('rslib').usage('<command> [options]').version("0.5.5");
+    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.name('rslib').usage('<command> [options]').version("0.6.1");
     const buildCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.command('build');
     const inspectCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.command('inspect');
     const mfDevCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.command('mf-dev');
@@ -2542,6 +2528,7 @@ function runCli() {
     });
     __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.parse();
 }
-const src_rslib_entry_version = "0.5.5";
+const src_rslib_entry_version = "0.6.1";
 var __webpack_exports__logger = __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger;
-export { build, defineConfig, inspect, loadConfig, prepareCli, runCli, startMFDevServer, composeCreateRsbuildConfig as unstable_composeCreateRsbuildConfig, src_rslib_entry_version as version, __webpack_exports__logger as logger };
+var __webpack_exports__rspack = __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack;
+export { build, defineConfig, inspect, loadConfig, prepareCli, __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__ as rsbuild, runCli, startMFDevServer, composeCreateRsbuildConfig as unstable_composeCreateRsbuildConfig, src_rslib_entry_version as version, __webpack_exports__logger as logger, __webpack_exports__rspack as rspack };

package/dist-types/index.d.ts

@@ -7,3 +7,5 @@ export { defineConfig, loadConfig, composeCreateRsbuildConfig as unstable_compos
 export { logger } from './utils/logger';
 export type * from './types';
 export declare const version: string;
+export { rspack, type Rspack } from '@rsbuild/core';
+export * as rsbuild from '@rsbuild/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.5.5",
+  "version": "0.6.1",
   "description": "The Rsbuild-based library development tool.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {
@@ -36,12 +36,12 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "@rsbuild/core": "~1.2.19",
+    "@rsbuild/core": "1.3.1",
     "tinyglobby": "^0.2.12",
-    "rsbuild-plugin-dts": "0.5.5"
+    "rsbuild-plugin-dts": "0.6.1"
   },
   "devDependencies": {
-    "@module-federation/rsbuild-plugin": "^0.11.1",
+    "@module-federation/rsbuild-plugin": "^0.11.2",
     "@types/fs-extra": "^11.0.4",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",
@@ -50,7 +50,7 @@
     "picocolors": "1.1.1",
     "prebundle": "1.2.7",
     "rsbuild-plugin-publint": "^0.3.0",
-    "rslib": "npm:@rslib/core@0.5.4",
+    "rslib": "npm:@rslib/core@0.6.0",
     "rslog": "^1.2.3",
     "tsconfck": "3.1.5",
     "typescript": "^5.8.2",