xshell 1.0.123 → 1.0.124

package/builder.d.ts

@@ -5,7 +5,7 @@ export interface BundlerOptions {
     production?: boolean;
     externals?: Record<string, string>;
     sass?: typeof import('sass');
-    module_import?: boolean;
+    dynamic_import?: boolean;
     commonjs2?: boolean;
     assets_stats?: boolean;
     globals?: Record<string, string>;
@@ -13,6 +13,7 @@ export interface BundlerOptions {
     dts?: boolean;
     cache_version?: string;
     single_chunk?: boolean;
+    exclude_modules?: RegExp;
 }
 export declare class Bundler {
     name: string;
@@ -33,14 +34,15 @@ export declare class Bundler {
             - externals?: 配置外部模块
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
-            - module_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
+            - dynamic_import: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
             - assets_stats?: `true` 打印输出的文件信息
             - analyzer?: `false` 启用 WebpackBundleAnalyzer 插件分析构建产物大小
             - dts?: `false` 生成 .d.ts 文件
+            - exclude_modules?: 传入正则表达式 ，匹配时使用 IgnorePlugin 强制不打包这个模块，但是一旦导入就会报错
             - cache_version?: webpack cache version, 用于区分同一个 name 的不同版本
             - production?: `true` webpack mode 设置为 'production'
             - sass?: 传入 sass 实例避免 webpack 重复加载 .cjs 版本 */
-    constructor(name: string, target: 'web' | 'nodejs', fpd_root: string, fpd_out: string, fpdt_cache: string, entry: Record<string, string>, { source_map, globals, externals, commonjs2, single_chunk, module_import, assets_stats, analyzer, dts, cache_version, production, sass, }?: BundlerOptions);
+    constructor(name: string, target: 'web' | 'nodejs', fpd_root: string, fpd_out: string, fpdt_cache: string, entry: Record<string, string>, { source_map, globals, externals, commonjs2, single_chunk, dynamic_import, assets_stats, analyzer, dts, exclude_modules, cache_version, production, sass, }?: BundlerOptions);
     build(print?: boolean): Promise<void>;
     close(): Promise<void>;
 }

package/builder.js

@@ -19,14 +19,15 @@ export class Bundler {
             - externals?: 配置外部模块
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
-            - module_import?: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
+            - dynamic_import: `true` 对于 await import('...') 要不要打包外部模块到输出文件中
             - assets_stats?: `true` 打印输出的文件信息
             - analyzer?: `false` 启用 WebpackBundleAnalyzer 插件分析构建产物大小
             - dts?: `false` 生成 .d.ts 文件
+            - exclude_modules?: 传入正则表达式 ，匹配时使用 IgnorePlugin 强制不打包这个模块，但是一旦导入就会报错
             - cache_version?: webpack cache version, 用于区分同一个 name 的不同版本
             - production?: `true` webpack mode 设置为 'production'
             - sass?: 传入 sass 实例避免 webpack 重复加载 .cjs 版本 */
-    constructor(name, target, fpd_root, fpd_out, fpdt_cache, entry, { source_map = true, globals, externals, commonjs2 = false, single_chunk = true, module_import = true, assets_stats = true, analyzer = false, dts = false, cache_version, production = true, sass, } = {}) {
+    constructor(name, target, fpd_root, fpd_out, fpdt_cache, entry, { source_map = true, globals, externals, commonjs2 = false, single_chunk = true, dynamic_import = true, assets_stats = true, analyzer = false, dts = false, exclude_modules, cache_version, production = true, sass, } = {}) {
         this.name = name;
         this.analyzer = analyzer;
         // let smp = new SpeedMeasurePlugin()
@@ -98,7 +99,7 @@ export class Bundler {
                 loader: { sass }
             } : {},
             module: {
-                ...module_import === false ? {
+                ...dynamic_import === false ? {
                     parser: {
                         javascript: {
                             // 保留 await import() 这样的引用
@@ -197,12 +198,15 @@ export class Bundler {
                         ...globals
                         // process: { env: { }, argv: [] }
                     })
-                ] : []
+                ] : [],
                 // 使用 IgnorePlugin 能够不打包，但是一旦导入就会报错
-                // new Webpack.IgnorePlugin({
-                //     checkResource: (resource, context) => 
-                //         resource.startsWith('./vendors/') && !context.fp.startsWith(fpd_node_modules) ,
-                // }),
+                ...exclude_modules ? [
+                    new Webpack.IgnorePlugin({
+                        resourceRegExp: exclude_modules,
+                        // checkResource: (resource, context) => 
+                        //     resource.startsWith('./vendors/') && !context.fp.startsWith(fpd_node_modules) ,
+                    })
+                ] : [],
             ],
             optimization: {
                 minimize: false
@@ -220,8 +224,9 @@ export class Bundler {
                 ...target === 'nodejs' ? [
                     /Can't resolve '(bufferutil|utf-8-validate)'/
                 ] : [],
-                // warning =>
-                //     warning.message.includes('the request of a dependency is an expression') && warning.module?.context?.endsWith('any-promise')
+                // 打包 ali-oss 时可能的报错
+                warning => warning.message.includes('the request of a dependency is an expression') &&
+                    warning.module?.context?.endsWith('any-promise')
             ],
             performance: {
                 hints: false,

package/package.json

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