@rslib/core 0.1.0 → 0.1.1

package/compiled/chokidar/license

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2012 Paul Miller (https://paulmillr.com), Elan Shanker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/compiled/chokidar/package.json

@@ -0,0 +1 @@
+{"name":"chokidar","author":"Paul Miller (https://paulmillr.com)","version":"4.0.1","funding":"https://paulmillr.com/funding/","license":"MIT","types":"index.d.ts","type":"commonjs"}

package/dist/entryModuleLoader.js

@@ -39,7 +39,7 @@ function splitFromFirstLine(text) {
         text.slice(match.index)
     ];
 }
-const entryModuleLoader_loader = function(source) {
+const entryModuleLoader_rslib_entry_loader = function(source) {
     let result = source;
     if (this.resourceQuery === `?${RSLIB_ENTRY_QUERY}`) {
         const [firstLine1, rest] = splitFromFirstLine(result);
@@ -49,5 +49,5 @@ const entryModuleLoader_loader = function(source) {
     }
     return result;
 };
-/* ESM default export */ const entryModuleLoader = entryModuleLoader_loader;
-export { entryModuleLoader as default };
+/* ESM default export */ const entryModuleLoader_rslib_entry_ = entryModuleLoader_rslib_entry_loader;
+export { entryModuleLoader_rslib_entry_ as default };

package/dist/index.js

@@ -8,6 +8,7 @@ import * as __WEBPACK_EXTERNAL_MODULE__rsbuild_core__ from "@rsbuild/core";
 import * as __WEBPACK_EXTERNAL_MODULE_tinyglobby__ from "tinyglobby";
 import * as __WEBPACK_EXTERNAL_MODULE_node_module__ from "node:module";
 import * as __WEBPACK_EXTERNAL_MODULE_module__ from "module";
+import * as __WEBPACK_EXTERNAL_MODULE__compiled_chokidar_index_js__ from "../compiled/chokidar/index.js";
 /**
  * Node.js built-in modules.
  * Copied from https://github.com/webpack/webpack/blob/dd44b206a9c50f4b4cb4d134e1a0bd0387b159a3/lib/node/NodeTargetPlugin.js#L12-L72
@@ -138,6 +139,18 @@ function checkMFPlugin(config) {
     }
     return added;
 }
+function debounce(func, wait) {
+    let timeoutId = null;
+    return (...args)=>{
+        if (null !== timeoutId) clearTimeout(timeoutId);
+        timeoutId = setTimeout(()=>{
+            func(...args);
+        }, wait);
+    };
+}
+/**
+ * Check if running in a TTY context
+ */ const isTTY = (type = 'stdout')=>('stdin' === type ? process.stdin.isTTY : process.stdout.isTTY) && !process.env.CI;
 // setup the logger level
 if (process.env.DEBUG) __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.level = 'verbose';
 function initNodeEnv() {
@@ -154,7 +167,7 @@ function prepareCli() {
     // Some package managers automatically output a blank line, some do not.
     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__.logger.greet(`  Rslib v0.1.0\n`);
+    __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.greet(`  Rslib v0.1.1\n`);
 }
 const DEFAULT_CONFIG_NAME = 'rslib.config';
 const DEFAULT_CONFIG_EXTENSIONS = [
@@ -1434,7 +1447,10 @@ async function loadConfig({ cwd = process.cwd(), path, envMode }) {
         path: configFilePath,
         envMode
     });
-    return content;
+    return {
+        content: content,
+        filePath: configFilePath
+    };
 }
 const composeExternalsWarnConfig = (format, ...externalsArray)=>{
     if ('esm' !== format) return {};
@@ -1807,9 +1823,9 @@ const composeFormatConfig = ({ format, bundle = true, umdName, pkgJson })=>{
                         },
                         // can not set nodeEnv to false, because mf format should build shared module.
                         // If nodeEnv is false, the process.env.NODE_ENV in third-party packages's will not be replaced
-                        // now we have not provide dev mode for users, so we can always set nodeEnv as 'production'
                         optimization: {
-                            nodeEnv: 'production'
+                            nodeEnv: 'production',
+                            moduleIds: 'deterministic'
                         }
                     }
                 },
@@ -1961,7 +1977,14 @@ const composeSyntaxConfig = (target, syntax)=>{
 };
 const appendEntryQuery = (entry)=>{
     const newEntry = {};
-    for(const key in entry)newEntry[key] = `${entry[key]}?${RSLIB_ENTRY_QUERY}`;
+    for (const [key, value] of Object.entries(entry)){
+        let result = value;
+        result = 'string' == typeof value ? `${value}?${RSLIB_ENTRY_QUERY}` : Array.isArray(value) ? value.map((item)=>`${item}?${RSLIB_ENTRY_QUERY}`) : {
+            ...value,
+            import: 'string' == typeof value.import ? `${value.import}?${RSLIB_ENTRY_QUERY}` : value.import.map((item)=>`${item}?${RSLIB_ENTRY_QUERY}`)
+        };
+        newEntry[key] = result;
+    }
     return newEntry;
 };
 const composeEntryConfig = async (entries, bundle, root, cssModulesAuto)=>{
@@ -2282,6 +2305,47 @@ const pruneEnvironments = (environments, libs)=>{
     if (!libs) return environments;
     return Object.fromEntries(Object.entries(environments).filter(([name])=>libs.includes(name)));
 };
+async function watchFilesForRestart(files, restart) {
+    if (!files.length) return;
+    const watcher = __WEBPACK_EXTERNAL_MODULE__compiled_chokidar_index_js__["default"].watch(files, {
+        ignoreInitial: true,
+        // If watching fails due to read permissions, the errors will be suppressed silently.
+        ignorePermissionErrors: true,
+        ignored: [
+            '**/node_modules/**',
+            '**/.git/**',
+            '**/.DS_Store/**'
+        ]
+    });
+    const callback = debounce(async (filePath)=>{
+        watcher.close();
+        await beforeRestart({
+            filePath
+        });
+        await restart();
+    }, 300);
+    watcher.on('add', callback);
+    watcher.on('change', callback);
+    watcher.on('unlink', callback);
+}
+let cleaners = [];
+/**
+ * Add a cleaner to handle side effects
+ */ const onBeforeRestart = (cleaner)=>{
+    cleaners.push(cleaner);
+};
+const clearConsole = ()=>{
+    if (isTTY() && !process.env.DEBUG) process.stdout.write('\x1B[H\x1B[2J');
+};
+const beforeRestart = async ({ filePath, clear = true } = {})=>{
+    if (clear) clearConsole();
+    if (filePath) {
+        const filename = __WEBPACK_EXTERNAL_MODULE_node_path__["default"].basename(filePath);
+        __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.info(`Restart because ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js__["default"].yellow(filename)} is changed.\n`);
+    } else __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.info('Restarting...\n');
+    for (const cleaner of cleaners)await cleaner();
+    cleaners = [];
+};
 async function build(config, options = {}) {
     const environments = await composeRsbuildEnvironments(config);
     const rsbuildInstance = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.createRsbuild)({
@@ -2289,20 +2353,21 @@ async function build(config, options = {}) {
             environments: pruneEnvironments(environments, options.lib)
         }
     });
-    await rsbuildInstance.build({
+    const buildInstance = await rsbuildInstance.build({
         watch: options.watch
     });
+    if (options.watch) onBeforeRestart(buildInstance.close);
+    else await buildInstance.close();
     return rsbuildInstance;
 }
 async function loadRslibConfig(options) {
     const cwd = process.cwd();
     const root = options.root ? getAbsolutePath(cwd, options.root) : cwd;
-    const rslibConfig = await loadConfig({
+    return loadConfig({
         cwd: root,
         path: options.config,
         envMode: options.envMode
     });
-    return rslibConfig;
 }
 async function inspect(config, options = {}) {
     const environments = await composeRsbuildEnvironments(config);
@@ -2332,7 +2397,8 @@ async function initMFRsbuild(rslibConfig) {
     const rsbuildInstance = await (0, __WEBPACK_EXTERNAL_MODULE__rsbuild_core__.createRsbuild)({
         rsbuildConfig: mfRsbuildConfig.config
     });
-    await rsbuildInstance.startDevServer();
+    const devServer = await rsbuildInstance.startDevServer();
+    onBeforeRestart(devServer.server.close);
     return rsbuildInstance;
 }
 function changeEnvToDev(rsbuildConfig) {
@@ -2344,7 +2410,8 @@ function changeEnvToDev(rsbuildConfig) {
         tools: {
             rspack: {
                 optimization: {
-                    nodeEnv: 'development'
+                    nodeEnv: 'development',
+                    moduleIds: 'named'
                 }
             }
         }
@@ -2357,7 +2424,7 @@ const repeatableOption = (value, previous)=>(previous ?? []).concat([
         value
     ]);
 function runCli() {
-    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.name('rslib').usage('<command> [options]').version("0.1.0");
+    __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.name('rslib').usage('<command> [options]').version("0.1.1");
     const buildCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.command('build');
     const inspectCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.command('inspect');
     const mfDevCommand = __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.command('mf dev');
@@ -2368,11 +2435,16 @@ function runCli() {
     ].forEach(applyCommonOptions);
     buildCommand.option('--lib <id>', 'build the specified library (may be repeated)', repeatableOption).option('-w --watch', 'turn on watch mode, watch for changes and rebuild').description('build the library for production').action(async (options)=>{
         try {
-            const rslibConfig = await loadRslibConfig(options);
-            await build(rslibConfig, {
-                lib: options.lib,
-                watch: options.watch
-            });
+            const cliBuild = async ()=>{
+                const { content: rslibConfig, filePath } = await loadRslibConfig(options);
+                await build(rslibConfig, options);
+                if (options.watch) watchFilesForRestart([
+                    filePath
+                ], async ()=>{
+                    await cliBuild();
+                });
+            };
+            await cliBuild();
         } catch (err) {
             __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.error('Failed to build.');
             __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.error(err);
@@ -2382,7 +2454,7 @@ function runCli() {
     inspectCommand.description('inspect the Rsbuild / Rspack configs of Rslib projects').option('--lib <id>', 'inspect the specified library (may be repeated)', repeatableOption).option('--output <output>', 'specify inspect content output path', '.rsbuild').option('--verbose', 'show full function definitions in output').action(async (options)=>{
         try {
             // TODO: inspect should output Rslib's config
-            const rslibConfig = await loadRslibConfig(options);
+            const { content: rslibConfig } = await loadRslibConfig(options);
             await inspect(rslibConfig, {
                 lib: options.lib,
                 mode: options.mode,
@@ -2397,9 +2469,17 @@ function runCli() {
     });
     mfDevCommand.description('start Rsbuild dev server of Module Federation format').action(async (options)=>{
         try {
-            const rslibConfig = await loadRslibConfig(options);
-            // TODO: support lib option in mf dev server
-            await startMFDevServer(rslibConfig);
+            const cliMfDev = async ()=>{
+                const { content: rslibConfig, filePath } = await loadRslibConfig(options);
+                // TODO: support lib option in mf dev server
+                await startMFDevServer(rslibConfig);
+                watchFilesForRestart([
+                    filePath
+                ], async ()=>{
+                    await cliMfDev();
+                });
+            };
+            await cliMfDev();
         } catch (err) {
             __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.error('Failed to start mf dev.');
             __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger.error(err);
@@ -2408,6 +2488,6 @@ function runCli() {
     });
     __WEBPACK_EXTERNAL_MODULE__compiled_commander_index_js__.program.parse();
 }
-const src_version = "0.1.0";
+const src_rslib_entry_version = "0.1.1";
 var __webpack_exports__logger = __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js__.logger;
-export { build, defineConfig, inspect, loadConfig, prepareCli, runCli, startMFDevServer, composeCreateRsbuildConfig as unstable_composeCreateRsbuildConfig, src_version as version, __webpack_exports__logger as 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/libCssExtractLoader.js

@@ -9,7 +9,7 @@ import * as __WEBPACK_EXTERNAL_MODULE_node_path__ from "node:path";
 function stringifyLocal(value) {
     return 'function' == typeof value ? value.toString() : JSON.stringify(value);
 }
-const libCssExtractLoader_loader = function(content) {
+const libCssExtractLoader_rslib_entry_loader = function(content) {
     if (this._compiler?.options?.experiments?.css && this._module && ('css' === this._module.type || 'css/auto' === this._module.type || 'css/global' === this._module.type || 'css/module' === this._module.type)) return content;
 };
 const pitch = function(request, _, _data) {
@@ -121,5 +121,5 @@ const pitch = function(request, _, _data) {
         handleExports(exports);
     });
 };
-/* ESM default export */ const libCssExtractLoader = libCssExtractLoader_loader;
-export { libCssExtractLoader as default, pitch };
+/* ESM default export */ const libCssExtractLoader_rslib_entry_ = libCssExtractLoader_rslib_entry_loader;
+export { libCssExtractLoader_rslib_entry_ as default, pitch };

package/dist-types/cli/init.d.ts

@@ -1,3 +1,6 @@
 import type { RslibConfig } from '../types';
 import type { CommonOptions } from './commands';
-export declare function loadRslibConfig(options: CommonOptions): Promise<RslibConfig>;
+export declare function loadRslibConfig(options: CommonOptions): Promise<{
+    content: RslibConfig;
+    filePath: string;
+}>;

package/dist-types/cli/restart.d.ts

@@ -0,0 +1,7 @@
+export declare function watchFilesForRestart(files: string[], restart: () => Promise<void>): Promise<void>;
+type Cleaner = () => Promise<unknown> | unknown;
+/**
+ * Add a cleaner to handle side effects
+ */
+export declare const onBeforeRestart: (cleaner: Cleaner) => void;
+export {};

package/dist-types/config.d.ts

@@ -1,5 +1,5 @@
 import { type EnvironmentConfig, type RsbuildConfig } from '@rsbuild/core';
-import type { AutoExternal, BannerAndFooter, LibConfig, PkgJson, RsbuildConfigWithLibInfo, RslibConfig, RslibConfigAsyncFn, RslibConfigExport, RslibConfigSyncFn } from './types';
+import type { AutoExternal, BannerAndFooter, LibConfig, PkgJson, RsbuildConfigEntry, RsbuildConfigWithLibInfo, RslibConfig, RslibConfigAsyncFn, RslibConfigExport, RslibConfigSyncFn } from './types';
 /**
  * This function helps you to autocomplete configuration types.
  * It accepts a Rslib config object, or a function that returns a config.
@@ -12,7 +12,10 @@ export declare function loadConfig({ cwd, path, envMode, }: {
     cwd?: string;
     path?: string;
     envMode?: string;
-}): Promise<RslibConfig>;
+}): Promise<{
+    content: RslibConfig;
+    filePath: string;
+}>;
 export declare const composeAutoExternalConfig: (options: {
     autoExternal: AutoExternal;
     pkgJson?: PkgJson;
@@ -23,6 +26,7 @@ export declare function composeBannerFooterConfig(banner: BannerAndFooter, foote
 export declare function composeDecoratorsConfig(compilerOptions?: Record<string, any>, version?: NonNullable<NonNullable<RsbuildConfig['source']>['decorators']>['version']): RsbuildConfig;
 export declare function createConstantRsbuildConfig(): Promise<RsbuildConfig>;
 export declare const composeModuleImportWarn: (request: string) => string;
+export declare const appendEntryQuery: (entry: RsbuildConfigEntry) => RsbuildConfigEntry;
 export declare function composeCreateRsbuildConfig(rslibConfig: RslibConfig): Promise<RsbuildConfigWithLibInfo[]>;
 export declare function composeRsbuildEnvironments(rslibConfig: RslibConfig): Promise<Record<string, EnvironmentConfig>>;
 export declare const pruneEnvironments: (environments: Record<string, EnvironmentConfig>, libs?: string[]) => Record<string, EnvironmentConfig>;

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

@@ -9,6 +9,8 @@ export type RsbuildConfigWithLibInfo = {
     format: Format;
     config: RsbuildConfig;
 };
+export type RsbuildConfigEntry = NonNullable<NonNullable<RsbuildConfig['source']>['entry']>;
+export type RsbuildConfigEntryItem = RsbuildConfigEntry[string];
 export type RsbuildConfigOutputTarget = NonNullable<RsbuildConfig['output']>['target'];
 export type Syntax = EcmaScriptVersion | string[];
 export type Dts = (Pick<PluginDtsOptions, 'bundle' | 'distPath' | 'abortOnError' | 'build'> & {

package/dist-types/utils/helper.d.ts

@@ -15,4 +15,9 @@ export declare function pick<T, U extends keyof T>(obj: T, keys: ReadonlyArray<U
 export declare function omit<T extends object, U extends keyof T>(obj: T, keysObj: Record<U, boolean>): Omit<T, keyof U>;
 export declare function isPluginIncluded(pluginName: string, plugins?: RsbuildPlugins): boolean;
 export declare function checkMFPlugin(config: LibConfig): boolean;
+export declare function debounce<T extends (...args: any[]) => void>(func: T, wait: number): (...args: Parameters<T>) => void;
+/**
+ * Check if running in a TTY context
+ */
+export declare const isTTY: (type?: "stdin" | "stdout") => boolean;
 export { color };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rslib/core",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "The Rsbuild-based library development tool.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {
@@ -32,18 +32,19 @@
     "compiled"
   ],
   "dependencies": {
-    "@rsbuild/core": "~1.1.4",
+    "@rsbuild/core": "~1.1.6",
     "tinyglobby": "^0.2.10",
-    "rsbuild-plugin-dts": "0.1.0"
+    "rsbuild-plugin-dts": "0.1.1"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
+    "chokidar": "^4.0.1",
     "commander": "^12.1.0",
     "fs-extra": "^11.2.0",
     "memfs": "^4.14.0",
     "picocolors": "1.1.1",
     "prebundle": "1.2.5",
-    "rslib": "npm:@rslib/core@0.0.18",
+    "rslib": "npm:@rslib/core@0.1.0",
     "rslog": "^1.2.3",
     "tsconfck": "3.1.4",
     "typescript": "^5.6.3",