xshell 1.0.134 → 1.0.136

package/builder.d.ts

@@ -22,13 +22,15 @@ export interface Dependency {
     };
 }
 type DependencyId = 'react' | 'react-dom' | 'lodash' | 'jquery' | 'xterm' | 'swiper' | 'dayjs' | 'antd' | 'antd-icons' | 'vscode-oniguruma' | 'antd-plots' | 'gridstack' | 'quill' | 'monaco' | 'echarts';
-export interface HtmlBuildOptions {
+export interface HtmlOptions {
     title: string;
+    /** `./index.js` 也可以设置 entries 中的其他项, 应填写相对于 .html 的路径 */
+    fp_entry?: string;
     device_viewport?: boolean;
-    /** 也会在 copy_files 中一并被复制 */
-    fp_icon?: string;
+    /** 也会在 copy_files 中一并被复制，应填写相对于 fpd_root 和 fpd_out 的路径 */
+    icon?: string | AssetOption;
     dependencies?: DependencyId[];
-    fp_manifest?: string;
+    manifest?: string | AssetOption;
     /** 额外需要加载的脚本 */
     scripts?: {
         /** 在 index.js 之前加载 */
@@ -44,7 +46,7 @@ export interface HtmlBuildOptions {
 interface AssetOption {
     /** 相对 fpd_root 的路径 */
     src: string;
-    /** 默认为 {fpd_out}/ 加上 srcs 中的路径 */
+    /** 默认为 {fpd_out}/ 加上 src 中的路径 */
     out?: string;
 }
 type Assets = {
@@ -72,18 +74,19 @@ export interface BundlerOptions {
     license?: {
         ignores?: string[];
     };
-    htmls?: Record<string, HtmlBuildOptions>;
+    htmls?: Record<string, HtmlOptions>;
 }
 export declare class Bundler {
     name: string;
     fpd_root: string;
+    target: 'nodejs' | 'web';
     production: boolean;
     fpd_out: string;
     source_map: boolean;
     dependencies: DependencyId[];
     analyzer: boolean;
     config: Webpack.Configuration;
-    htmls?: Record<string, HtmlBuildOptions>;
+    htmls?: Record<string, HtmlOptions>;
     assets?: Assets;
     license?: {
         ignores?: string[];
@@ -121,7 +124,8 @@ export declare class Bundler {
     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, commonjs2, single_chunk, dynamic_import, resolve_alias, assets_stats, analyzer, dts, exclude_modules, cache_version, production, sass, dependencies, license, }?: BundlerOptions);
     build(print?: boolean): Promise<void>;
     close(): Promise<void>;
-    build_and_close(print?: boolean): Promise<void>;
+    build_all(print?: boolean): Promise<void>;
+    build_all_and_close(print?: boolean): Promise<void>;
     build_htmls(print?: {
         info: boolean;
         files: boolean;

package/builder.js

@@ -97,6 +97,7 @@ const dependencies = {
 export class Bundler {
     name;
     fpd_root;
+    target;
     production;
     fpd_out;
     source_map;
@@ -140,6 +141,7 @@ export class Bundler {
         this.name = name;
         this.analyzer = analyzer;
         this.production = production;
+        this.target = target;
         this.fpd_root = fpd_root;
         this.fpd_out = fpd_out;
         this.source_map = source_map;
@@ -440,12 +442,25 @@ export class Bundler {
             });
         }));
     }
-    async build_and_close(print = true) {
-        await this.build(print);
-        await this.close();
+    async build_all(print = true) {
+        await Promise.all([
+            this.build(print),
+            this.copy_files({ print: { info: print, files: false } }),
+            this.target === 'web' && this.build_htmls({ info: print, files: false })
+        ]);
+    }
+    async build_all_and_close(print = true) {
+        await Promise.all([
+            (async () => {
+                await this.build(print);
+                await this.close();
+            })(),
+            this.copy_files({ print: { info: print, files: false } }),
+            this.target === 'web' && this.build_htmls({ info: print, files: false })
+        ]);
     }
     async build_htmls(print = { info: true, files: false }) {
-        await Promise.all(Object.entries(this.htmls).map(async ([fp_html, { device_viewport: device_width = false, fp_icon, fp_manifest, dependencies: _dependencies = this.dependencies, title, scripts, mscripts, notice = false, heads, }]) => {
+        await Promise.all(Object.entries(this.htmls).map(async ([fp_html, { fp_entry = './index.js', device_viewport: device_width = false, icon, manifest, dependencies: _dependencies = this.dependencies, title, scripts, mscripts, notice = false, heads, }]) => {
             const html = '<!doctype html>\n' +
                 '<html>\n' +
                 '    <head>\n' +
@@ -453,12 +468,12 @@ export class Bundler {
                 "        <meta charset='utf-8' />\n" +
                 (heads ? heads.map(head => `        ${head}`).join_lines() : '') +
                 (device_width ? "        <meta name='viewport' content='width=device-width, initial-scale=1.0' />\n" : '') +
-                (fp_icon ? `        <link rel='icon' href='${fp_icon}' />\n` : '') +
-                (fp_manifest ? `        <link rel='manifest' href='${fp_manifest}' />\n` : '') +
+                (icon ? `        <link rel='icon' href='${path.relative(`${this.fpd_out}${fp_html}`, `${this.fpd_out}${typeof icon === 'string' ? icon : icon.out}`)}' />\n` : '') +
+                (manifest ? `        <link rel='manifest' href='${path.relative(`${this.fpd_out}${fp_html}`, `${this.fpd_out}${typeof manifest === 'string' ? manifest : manifest.out}`)}' />\n` : '') +
                 this.resolve_dependency_files(_dependencies, false, { production: this.production }).map(fp => `        <script src='./vendors/${fp}' defer></script>`).join_lines() +
                 (scripts?.before ? scripts.before.map(fp => `        <script src='${fp}' defer></script>`).join_lines() : '') +
                 (mscripts ? mscripts.map(fp => `        <script src='${fp}' type='module'></script>`).join_lines() : '') +
-                "        <script src='./index.js' type='module'></script>\n" +
+                `        <script src='${fp_entry}' type='module'></script>\n` +
                 (scripts?.after ? scripts.after.map(fp => `        <script src='${fp}' defer></script>`).join_lines() : '') +
                 '    </head>\n' +
                 '    <body>\n' +
@@ -507,26 +522,27 @@ export class Bundler {
             console.log(`复制项目文件及依赖到输出目录`);
         if (dependencies)
             await fmkdir(`${fpd_out}vendors/`, { print: false });
+        async function fcopy_asset(asset) {
+            let src, out;
+            if (typeof asset === 'string')
+                src = out = asset;
+            else
+                ({ src, out } = asset);
+            await fcopy(`${fpd_root}${src}`, `${fpd_out}${out}`, { print: print.files });
+        }
         await Promise.all([
             ...this.resolve_dependency_files(dependencies, true, { production })
                 .map(async (fp) => fcopy(`${fpd_root}node_modules/${fp}`, `${fpd_out}vendors/${fp}`, { print: print.files })),
             ...this.resolve_config(assets, production)
-                .map(async (asset) => {
-                let src, out;
-                if (typeof asset === 'string')
-                    src = out = asset;
-                else
-                    ({ src, out } = asset);
-                fcopy(`${fpd_root}${src}`, `${fpd_out}${out}`, { print: print.files });
-            }),
-            ...this.htmls ? Object.entries(this.htmls).map(async ([fp_html, { fp_icon, fp_manifest, scripts, mscripts }]) => Promise.all([
-                fp_icon,
-                fp_manifest,
+                .map(fcopy_asset),
+            ...this.htmls ? Object.entries(this.htmls).map(async ([fp_html, { icon, manifest, scripts, mscripts }]) => Promise.all([
+                icon,
+                manifest,
                 ...(scripts?.before || []),
                 ...(scripts?.after || []),
                 ...(mscripts || [])
             ].filter(not_empty)
-                .map(fp => fcopy(path.resolve(`${fpd_root}${fp_html}`.fdir, fp), path.resolve(`${fpd_out}${fp_html}`.fdir, fp), { print: print.files })))) : []
+                .map(fcopy_asset))) : []
         ]);
     }
     /** 为空时返回空数组 */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.134",
+    "version": "1.0.136",
     "type": "module",
     "main": "./index.js",
     "bin": {