xshell 1.2.16 → 1.2.18

package/builder.d.ts

@@ -48,6 +48,10 @@ export interface HtmlOptions {
     heads?: string[];
     notice?: boolean;
 }
+export interface SingleJsConfig {
+    js: string;
+    entry: string;
+}
 interface AssetOption {
     /** 相对 fpd_root 的路径，或者绝对路径 */
     src: string;
@@ -82,6 +86,10 @@ export interface BundlerOptions {
     template?: boolean;
     license?: boolean;
     htmls?: Record<string, HtmlOptions>;
+    single_js?: {
+        js: string;
+        entry: string;
+    };
 }
 export declare class Bundler {
     name: string;
@@ -97,6 +105,7 @@ export declare class Bundler {
     assets?: Assets;
     assets_root: string;
     template: boolean;
+    single_js?: BundlerOptions['single_js'];
     globals?: BundlerOptions['globals'];
     exclude_modules?: BundlerOptions['exclude_modules'];
     license?: boolean;
@@ -121,6 +130,9 @@ export declare class Bundler {
                 启用后 assets, html 中的 icon, scripts 路径直接在前面添加 assets_root 来生成最终 html href
                 未启用时使用相对 html 路径来生成最终 html href
             - template?: `false` 除了生成对应的 html 之外，还生成所有路径为 `{root}/...` 的模板 html 文件, 方便后续 server 替换渲染
+            - single_js?: 设置生成的单个 js 入口文件，无其他依赖，通过 script module 作为入口加载，含有 import 加载其他 externals 和某个 entry，类似 htmls 配置要生成的 html
+                - js: js 入口文件名
+                - entry: 使用的 entry
             - local_loaders?: `true` true 时使用项目 node_modules/ 中的 loader;  false 时使用 D:/0/ 下面的
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - expose?: `false` 入口模块所有导出的属性赋值到全局对象 globalThis 上
@@ -136,7 +148,7 @@ export declare class Bundler {
             - production?: `true` webpack mode 设置为 'production'
             - sass?: 传入 sass 实例避免 webpack 重复加载 .cjs 版本
             - license?: 使用 license-webpack-plugin 构建 ThirdPartyNotice.txt */
-    constructor(name: string, target: 'web' | 'nodejs', fpd_root: string, fpd_out: string, fpdt_cache: string, entry: Record<string, string>, { source_map, globals, external_dayjs, externals, htmls, assets, assets_root, template, commonjs2, expose, single_chunk, dynamic_import, resolve_alias, resolve_fallback, assets_stats, analyzer, dts, exclude_modules, cache_version, production, sass, dependencies, license, }?: BundlerOptions);
+    constructor(name: string, target: 'web' | 'nodejs', fpd_root: string, fpd_out: string, fpdt_cache: string, entry: Record<string, string>, { source_map, globals, external_dayjs, externals, htmls, assets, assets_root, template, single_js, commonjs2, expose, single_chunk, dynamic_import, resolve_alias, resolve_fallback, assets_stats, analyzer, dts, exclude_modules, cache_version, production, sass, dependencies, license, }?: BundlerOptions);
     build(print?: boolean): Promise<void>;
     close(): Promise<void>;
     build_all(print?: boolean): Promise<void>;
@@ -148,6 +160,10 @@ export declare class Bundler {
         info: boolean;
         files: boolean;
     }): Promise<void>;
+    build_single_js(print?: {
+        info: boolean;
+        files: boolean;
+    }): Promise<void>;
     resolve_dependencies(dependency_ids: DependencyId[], resolveds?: Set<DependencyId>): Set<DependencyId>;
     /** 解析依赖的文件
         - dependencies: 依赖 id

package/builder.js

@@ -137,6 +137,7 @@ export class Bundler {
     assets;
     assets_root;
     template;
+    single_js;
     globals;
     exclude_modules;
     license;
@@ -161,6 +162,9 @@ export class Bundler {
                 启用后 assets, html 中的 icon, scripts 路径直接在前面添加 assets_root 来生成最终 html href
                 未启用时使用相对 html 路径来生成最终 html href
             - template?: `false` 除了生成对应的 html 之外，还生成所有路径为 `{root}/...` 的模板 html 文件, 方便后续 server 替换渲染
+            - single_js?: 设置生成的单个 js 入口文件，无其他依赖，通过 script module 作为入口加载，含有 import 加载其他 externals 和某个 entry，类似 htmls 配置要生成的 html
+                - js: js 入口文件名
+                - entry: 使用的 entry
             - local_loaders?: `true` true 时使用项目 node_modules/ 中的 loader;  false 时使用 D:/0/ 下面的
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - expose?: `false` 入口模块所有导出的属性赋值到全局对象 globalThis 上
@@ -176,7 +180,7 @@ export class Bundler {
             - production?: `true` webpack mode 设置为 'production'
             - sass?: 传入 sass 实例避免 webpack 重复加载 .cjs 版本
             - license?: 使用 license-webpack-plugin 构建 ThirdPartyNotice.txt */
-    constructor(name, target, fpd_root, fpd_out, fpdt_cache, entry, { source_map = true, globals, external_dayjs = false, externals, htmls, assets, assets_root = '/', template = false, commonjs2 = false, expose = false, single_chunk = true, dynamic_import = true, resolve_alias, resolve_fallback, assets_stats = true, analyzer = false, dts = false, exclude_modules, cache_version, production = true, sass, dependencies, license, } = {}) {
+    constructor(name, target, fpd_root, fpd_out, fpdt_cache, entry, { source_map = true, globals, external_dayjs = false, externals, htmls, assets, assets_root = '/', template = false, single_js, commonjs2 = false, expose = false, single_chunk = true, dynamic_import = true, resolve_alias, resolve_fallback, assets_stats = true, analyzer = false, dts = false, exclude_modules, cache_version, production = true, sass, dependencies, license, } = {}) {
         this.name = name;
         this.analyzer = analyzer;
         this.production = production;
@@ -188,6 +192,7 @@ export class Bundler {
         this.assets = assets;
         this.assets_root = assets_root;
         this.template = template;
+        this.single_js = single_js;
         this.globals = globals;
         this.exclude_modules = exclude_modules;
         if (dependencies) {
@@ -499,7 +504,8 @@ export class Bundler {
         await Promise.all([
             this.build(print),
             this.copy_files({ print: { info: print, files: false } }),
-            this.target === 'web' && this.htmls && this.build_htmls({ info: print, files: false })
+            this.target === 'web' && this.htmls && this.build_htmls({ info: print, files: false }),
+            this.target === 'web' && this.single_js && this.build_single_js({ info: print, files: false })
         ]);
     }
     /** 打包构建 js, 构建 html, 复制依赖文件 */
@@ -507,7 +513,8 @@ export class Bundler {
         await Promise.all([
             this.build_and_close(print),
             this.copy_files({ print: { info: print, files: false } }),
-            this.target === 'web' && this.htmls && this.build_htmls({ info: print, files: false })
+            this.target === 'web' && this.htmls && this.build_htmls({ info: print, files: false }),
+            this.target === 'web' && this.single_js && this.build_single_js({ info: print, files: false })
         ]);
     }
     /** 仅打包构建 js, 不复制依赖 */
@@ -558,6 +565,18 @@ export class Bundler {
         if (print.files)
             console.log(`${this.name} 的所有 html 页面构建完成`);
     }
+    async build_single_js(print = { info: true, files: false }) {
+        const { js, entry } = this.single_js;
+        await fwrite(`${this.fpd_out}${js}`, [
+            ...this.resolve_dependency_assets(this.dependencies, false, { production: this.production })
+                .map(asset => get_vendor_asset_out(asset)),
+            entry
+        ]
+            .map(script => `import from '${this.assets_root}${script}'`)
+            .join_lines(), noprint);
+        if (print.files)
+            console.log(`${this.name} 的入口 ${js} 构建完成`);
+    }
     resolve_dependencies(dependency_ids, resolveds = new Set()) {
         dependency_ids.forEach(id => {
             if (!resolveds.has(id)) {

package/net.d.ts

@@ -285,5 +285,5 @@ export declare class RemoteClient {
     [inspect.custom](): {
         remote: string;
         websocket: string;
-    } & Omit<this, typeof import("util").inspect.custom | "websocket" | "call" | "remote" | "send">;
+    } & Omit<this, "websocket" | typeof import("util").inspect.custom | "call" | "remote" | "send">;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.16",
+    "version": "1.2.18",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -67,7 +67,7 @@
         "commander": "^13.1.0",
         "css-loader": "^7.1.2",
         "emoji-regex": "^10.4.0",
-        "eslint": "^9.20.1",
+        "eslint": "^9.21.0",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-react": "^7.37.4",
         "gulp-sort": "^2.0.0",
@@ -100,7 +100,7 @@
         "vinyl-fs": "^4.0.0",
         "webpack": "^5.98.0",
         "webpack-bundle-analyzer": "^4.10.2",
-        "ws": "^8.18.0"
+        "ws": "^8.18.1"
     },
     "devDependencies": {
         "@babel/types": "^7.26.9",
@@ -112,7 +112,7 @@
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.13.4",
+        "@types/node": "^22.13.5",
         "@types/react": "^19.0.10",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",

package/process.d.ts

@@ -136,12 +136,11 @@ export interface CallError<TOutput extends string | Buffer = string> extends Err
     code: number;
     signal: NodeJS.Signals;
     command: string;
-    child: SubProcess<TOutput>;
     print: FullPrintOptions;
 }
 export declare class CallError<TOutput extends string | Buffer = string> extends Error {
     name: "CallError";
-    constructor({ message, pid, stdout, stderr, code, signal, command, child, print }: CallResult<TOutput>);
+    constructor({ message, pid, stdout, stderr, code, signal, command, print }: CallResult<TOutput>);
     [inspect.custom](depth: number, options: InspectOptions, inspect: Function): string;
 }
 /** 调用 exe 启动子进程，等待并获取返回结果，错误时抛出 CallError

package/process.js

@@ -167,7 +167,7 @@ export async function start(exe, args = [], options = {}) {
 }
 export class CallError extends Error {
     name = 'CallError';
-    constructor({ message, pid, stdout, stderr, code, signal, command, child, print }) {
+    constructor({ message, pid, stdout, stderr, code, signal, command, print }) {
         super(message);
         // defineProperty 默认 enumerable: false，不会在 inspect 中显示
         Object.defineProperties(this, {
@@ -177,7 +177,6 @@ export class CallError extends Error {
             code: { value: code },
             signal: { value: signal },
             command: { value: command },
-            child: { value: child },
             print: { value: print }
         });
     }