@rslib/core 0.5.1 → 0.5.3

package/dist/index.js

@@ -160,7 +160,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.1\n`);
+    __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rslib v0.5.3\n`);
 }
 const DEFAULT_CONFIG_NAME = 'rslib.config';
 const DEFAULT_CONFIG_EXTENSIONS = [
@@ -315,8 +315,16 @@ const pluginLibAsset = ({ bundle })=>({
                     });
                     config.plugin(LibSvgrPatchPlugin.name).use(LibSvgrPatchPlugin, []);
                 }
-                if (!bundle) {
-                    if (isUsingSvgr) {
+                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([]);
                     }
@@ -369,14 +377,6 @@ class LibCssExtractPlugin {
         this.options = options ?? {};
     }
     apply(compiler) {
-        compiler.hooks.thisCompilation.tap(LibCssExtractPlugin_pluginName, (compilation)=>{
-            compilation.hooks.chunkAsset.tap(LibCssExtractPlugin_pluginName, (_chunk, filename)=>{
-                const asset = compilation.getAsset(filename);
-                if (!asset) return;
-                const needRemove = Boolean(asset.name.match(RSLIB_CSS_ENTRY_FLAG));
-                if (needRemove) compilation.deleteAsset(filename);
-            });
-        });
         compiler.hooks.make.tap(LibCssExtractPlugin_pluginName, (compilation)=>{
             compilation.hooks.processAssets.tap(LibCssExtractPlugin_pluginName, (assets)=>{
                 const chunkAsset = Object.keys(assets).filter((name)=>/\.css/.test(name));
@@ -454,6 +454,11 @@ const cssConfig_PLUGIN_NAME = 'rsbuild:lib-css';
 const pluginLibCss = (rootDir, banner, footer)=>({
         name: cssConfig_PLUGIN_NAME,
         setup (api) {
+            api.processAssets({
+                stage: 'additional'
+            }, ({ assets, compilation })=>{
+                for (const key of Object.keys(assets))if (key.match(RSLIB_CSS_ENTRY_FLAG)) compilation.deleteAsset(key);
+            });
             api.modifyBundlerChain((config, { CHAIN_ID })=>{
                 let isUsingCssExtract = false;
                 for (const ruleId of [
@@ -493,45 +498,16 @@ const composeCssConfig = (rootDir, bundle = true, banner, footer)=>{
         }
     };
 };
-const importMetaUrlShim = `const __rslib_import_meta_url__ = /*#__PURE__*/ (function () {
+const EntryChunkPlugin_require = (0, __WEBPACK_EXTERNAL_MODULE_node_module_ab9f2194__.createRequire)(import.meta.url);
+const EntryChunkPlugin_PLUGIN_NAME = 'rsbuild:lib-entry-chunk';
+const EntryChunkPlugin_LOADER_NAME = 'rsbuild:lib-entry-module';
+const IMPORT_META_URL_SHIM = `const __rslib_import_meta_url__ = /*#__PURE__*/ (function () {
   return typeof document === 'undefined'
     ? new (require('url'.replace('', '')).URL)('file:' + __filename).href
     : (document.currentScript && document.currentScript.src) ||
       new URL('main.js', document.baseURI).href;
 })();
 `;
-const pluginCjsImportMetaUrlShim = ()=>({
-        name: 'rsbuild:cjs-import-meta-url-shim',
-        setup (api) {
-            api.modifyEnvironmentConfig((config)=>{
-                config.source.define = {
-                    ...config.source.define,
-                    'import.meta.url': '__rslib_import_meta_url__'
-                };
-            });
-        }
-    });
-const requireShim = `// Rslib ESM shims
-import __rslib_shim_module__ from 'module';
-const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(import.meta.url);
-`;
-const pluginEsmRequireShim = ()=>({
-        name: 'rsbuild:esm-require-shim',
-        setup (api) {
-            api.modifyRspackConfig((config)=>{
-                config.plugins ??= [];
-                config.plugins.push(new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.BannerPlugin({
-                    banner: requireShim,
-                    stage: __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE - 1,
-                    raw: true,
-                    include: /\.(js|cjs)$/
-                }));
-            });
-        }
-    });
-const EntryChunkPlugin_require = (0, __WEBPACK_EXTERNAL_MODULE_node_module_ab9f2194__.createRequire)(import.meta.url);
-const EntryChunkPlugin_PLUGIN_NAME = 'rsbuild:lib-entry-chunk';
-const EntryChunkPlugin_LOADER_NAME = 'rsbuild:lib-entry-module';
 const matchFirstLine = (source, regex)=>{
     const lineBreakPos = source.match(/(\r\n|\n)/);
     const firstLineContent = source.slice(0, lineBreakPos?.index);
@@ -541,6 +517,7 @@ const matchFirstLine = (source, regex)=>{
 };
 class EntryChunkPlugin {
     reactDirectives = {};
+    shimsInjectedAssets = new Set();
     shebangChmod = 493;
     shebangEntries = {};
     shebangInjectedAssets = new Set();
@@ -587,6 +564,7 @@ class EntryChunkPlugin {
                 if (!isJs) return;
                 const name = chunk.name;
                 if (!name) return;
+                this.shimsInjectedAssets.add(filename);
                 const shebangEntry = this.shebangEntries[name];
                 if (shebangEntry) this.shebangEntries[filename] = shebangEntry;
                 const reactDirective = this.reactDirectives[name];
@@ -596,12 +574,12 @@ class EntryChunkPlugin {
         compiler.hooks.make.tap(EntryChunkPlugin_PLUGIN_NAME, (compilation)=>{
             compilation.hooks.processAssets.tap(EntryChunkPlugin_PLUGIN_NAME, (assets)=>{
                 if (!this.enabledImportMetaUrlShim) return;
-                const chunkAsset = Object.keys(assets).filter((name)=>JS_EXTENSIONS_PATTERN.test(name));
+                const chunkAsset = Object.keys(assets).filter((name)=>JS_EXTENSIONS_PATTERN.test(name) && this.shimsInjectedAssets.has(name));
                 for (const name of chunkAsset)compilation.updateAsset(name, (old)=>{
                     const oldSource = old.source().toString();
                     const replaceSource = new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.sources.ReplaceSource(old);
-                    if (oldSource.startsWith('use strict;') || oldSource.startsWith('"use strict";')) replaceSource.replace(0, 11, `"use strict";\n${importMetaUrlShim}`);
-                    else replaceSource.insert(0, importMetaUrlShim);
+                    if (oldSource.startsWith('use strict;') || oldSource.startsWith('"use strict";')) replaceSource.replace(0, 11, `"use strict";\n${IMPORT_META_URL_SHIM}`);
+                    else replaceSource.insert(0, IMPORT_META_URL_SHIM);
                     return replaceSource;
                 });
             });
@@ -653,6 +631,35 @@ const composeEntryChunkConfig = ({ enabledImportMetaUrlShim, contextToWatch = nu
             }
         }
     });
+const pluginCjsImportMetaUrlShim = ()=>({
+        name: 'rsbuild:cjs-import-meta-url-shim',
+        setup (api) {
+            api.modifyEnvironmentConfig((config)=>{
+                config.source.define = {
+                    ...config.source.define,
+                    'import.meta.url': '__rslib_import_meta_url__'
+                };
+            });
+        }
+    });
+const requireShim = `// Rslib ESM shims
+import __rslib_shim_module__ from 'module';
+const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(import.meta.url);
+`;
+const pluginEsmRequireShim = ()=>({
+        name: 'rsbuild:esm-require-shim',
+        setup (api) {
+            api.modifyRspackConfig((config)=>{
+                config.plugins ??= [];
+                config.plugins.push(new __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.BannerPlugin({
+                    banner: requireShim,
+                    stage: __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE - 1,
+                    raw: true,
+                    include: /\.(js|cjs)$/
+                }));
+            });
+        }
+    });
 const getDefaultExtension = (options)=>{
     const { format, pkgJson, autoExtension } = options;
     let jsExtension = '.js';
@@ -2442,7 +2449,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.1");
+    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.name('rslib').usage('<command> [options]').version("0.5.3");
     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');
@@ -2503,6 +2510,6 @@ function runCli() {
     });
     __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js_bca3ceaa__.program.parse();
 }
-const src_rslib_entry_version = "0.5.1";
+const src_rslib_entry_version = "0.5.3";
 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 };

package/dist-types/plugins/shims.d.ts

@@ -1,4 +1,3 @@
 import { type RsbuildPlugin } from '@rsbuild/core';
-export declare const importMetaUrlShim = "const __rslib_import_meta_url__ = /*#__PURE__*/ (function () {\n  return typeof document === 'undefined'\n    ? new (require('url'.replace('', '')).URL)('file:' + __filename).href\n    : (document.currentScript && document.currentScript.src) ||\n      new URL('main.js', document.baseURI).href;\n})();\n";
 export declare const pluginCjsImportMetaUrlShim: () => RsbuildPlugin;
 export declare const pluginEsmRequireShim: () => RsbuildPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "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.10",
+    "@rsbuild/core": "~1.2.13",
     "tinyglobby": "^0.2.12",
-    "rsbuild-plugin-dts": "0.5.1"
+    "rsbuild-plugin-dts": "0.5.3"
   },
   "devDependencies": {
-    "@module-federation/rsbuild-plugin": "^0.8.12",
+    "@module-federation/rsbuild-plugin": "^0.9.1",
     "@types/fs-extra": "^11.0.4",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",
@@ -50,10 +50,10 @@
     "picocolors": "1.1.1",
     "prebundle": "1.2.7",
     "rsbuild-plugin-publint": "^0.3.0",
-    "rslib": "npm:@rslib/core@0.5.0",
+    "rslib": "npm:@rslib/core@0.5.2",
     "rslog": "^1.2.3",
     "tsconfck": "3.1.5",
-    "typescript": "^5.7.3",
+    "typescript": "^5.8.2",
     "@rslib/tsconfig": "0.0.1"
   },
   "peerDependencies": {
@@ -69,7 +69,7 @@
     }
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=16.7.0"
   },
   "publishConfig": {
     "access": "public",