xshell 1.0.147 → 1.0.149

package/builder.d.ts

@@ -35,9 +35,9 @@ export interface HtmlOptions {
     /** 额外需要加载的脚本 */
     scripts?: {
         /** 在 index.js 之前加载 */
-        before?: string[];
+        before?: (string | AssetOption)[];
         /** 在 index.js 之后加载 */
-        after?: string[];
+        after?: (string | AssetOption)[];
     };
     /** 额外需要加载的 module 脚本, 在 index.js 之前 */
     mscripts?: (string | AssetOption)[];
@@ -66,6 +66,7 @@ export interface BundlerOptions {
     assets_stats?: boolean;
     globals?: Record<string, string>;
     resolve_alias?: Record<string, string>;
+    resolve_fallback?: Record<string, string>;
     analyzer?: boolean;
     dts?: boolean;
     cache_version?: string;
@@ -114,6 +115,7 @@ export declare class Bundler {
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
             - dynamic_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
             - resolve_alias?: 配置 resolve alias
+            - resolve_fallback?: 配置 resolve fallback
             - assets_stats?: `true` 打印输出的文件信息
             - analyzer?: `false` 启用 WebpackBundleAnalyzer 插件分析构建产物大小
             - dts?: `false` 生成 .d.ts 文件
@@ -122,7 +124,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, commonjs2, single_chunk, dynamic_import, resolve_alias, 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, commonjs2, 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>;

package/builder.js

@@ -134,6 +134,7 @@ export class Bundler {
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
             - dynamic_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
             - resolve_alias?: 配置 resolve alias
+            - resolve_fallback?: 配置 resolve fallback
             - assets_stats?: `true` 打印输出的文件信息
             - analyzer?: `false` 启用 WebpackBundleAnalyzer 插件分析构建产物大小
             - dts?: `false` 生成 .d.ts 文件
@@ -142,7 +143,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, commonjs2 = false, single_chunk = true, dynamic_import = true, resolve_alias, 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, commonjs2 = 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;
@@ -210,7 +211,6 @@ export class Bundler {
                 '@ant-design/icons': 'icons',
                 '@ant-design/plots': 'Plots',
                 echarts: 'echarts',
-                dolphindb: 'dolphindb',
                 ...externals
             }),
             resolve: {
@@ -223,6 +223,7 @@ export class Bundler {
                 // modules: [
                 //     '',
                 // ],
+                ...resolve_fallback ? { fallback: resolve_fallback } : {},
                 // fallback: {
                 //     os: false,
                 // }
@@ -497,7 +498,7 @@ export class Bundler {
                 console.log(`已构建 ${fp_html}`);
         }));
         if (print.info)
-            console.log('htmls 已构建完成');
+            console.log(`${this.name}.htmls 已构建完成`);
     }
     resolve_dependencies(dependency_ids = this.dependencies, resolveds = new Set()) {
         dependency_ids.forEach(id => {
@@ -526,7 +527,7 @@ export class Bundler {
     }
     async copy_files({ dependencies = this.dependencies, production = this.production, assets = this.assets, fpd_root = this.fpd_root, fpd_out = this.fpd_out, print = { info: true, files: false } } = {}) {
         if (print.info)
-            console.log(`复制 ${this.name} 项目文件及依赖到输出目录 ${this.fpd_out}`);
+            console.log(`复制 ${this.name} 项目文件及依赖 → ${this.fpd_out}`);
         if (dependencies)
             await fmkdir(`${fpd_out}vendors/`, { print: false });
         async function fcopy_asset(asset) {

package/package.json

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