xshell 1.2.19 → 1.2.20

package/builder.d.ts

@@ -172,7 +172,7 @@ export declare class Bundler {
         production?: boolean;
         source_map?: BundlerOptions['source_map'];
     }): (string | AssetOption)[];
-    copy_files({ dependencies, production, assets, fpd_root, fpd_out, print }?: {
+    copy_files({ dependencies: _dependencies, production, assets, fpd_root, fpd_out, print }?: {
         dependencies?: DependencyId[];
         production?: boolean;
         assets?: Assets;

package/builder.js

@@ -2,7 +2,7 @@ import { fileURLToPath } from 'url';
 import { not_empty } from "./prototype.js";
 import { noprint } from "./process.js";
 import { Lock, check, filter_values } from "./utils.js";
-import { fcopy, fmkdir, fwrite } from "./file.js";
+import { fcopy, fmkdir, fwrite, fread } from "./file.js";
 import { path } from "./path.js";
 const monaco_files = [
     'loader.js',
@@ -602,10 +602,10 @@ export class Bundler {
             ];
         }).flat();
     }
-    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 } } = {}) {
+    async copy_files({ dependencies: _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.files)
             console.log(`复制 ${this.name} 的依赖文件到 ${this.fpd_out}`);
-        if (dependencies.length)
+        if (_dependencies.length)
             await fmkdir(`${fpd_out}vendors/`, noprint);
         // 输出路径 -> 原路径，用来保证只复制一次且是同样的映射
         let records = new Map();
@@ -633,7 +633,7 @@ export class Bundler {
             }
         }
         await Promise.all([
-            ...this.resolve_dependency_assets(dependencies, true, { production })
+            ...this.resolve_dependency_assets(_dependencies, true, { production })
                 .map(async (asset) => typeof asset === 'string'
                 ? fcopy_record(`${fpd_root}node_modules/${asset}`, `${fpd_out}vendors/${asset}`)
                 : fcopy_record(path.resolve_with_slash(fpd_root, asset.src), path.resolve_with_slash(fpd_out, asset.out || asset.src))),
@@ -649,6 +649,12 @@ export class Bundler {
                 ].filter(not_empty)
                     .map(fcopy_asset))) : []
         ]);
+        // antd 需要修复 this, 才能在 module 下正常加载
+        if (this.single_js && (_dependencies.includes('antd') || _dependencies.includes('antd-icons'))) {
+            const fp_out = `${fpd_out}vendors/${dependencies.antd[production ? 'productions' : 'devs'][0]}`;
+            await fwrite(fp_out, (await fread(fp_out, noprint))
+                .replace(')(this,', ')(globalThis,'), noprint);
+        }
     }
     /** 为空时返回空数组 */
     resolve_config(config, production) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.2.19",
+    "version": "1.2.20",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -57,9 +57,9 @@
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.5.14",
-        "@typescript-eslint/eslint-plugin": "^8.24.1",
-        "@typescript-eslint/parser": "^8.24.1",
-        "@typescript-eslint/utils": "^8.24.1",
+        "@typescript-eslint/eslint-plugin": "^8.25.0",
+        "@typescript-eslint/parser": "^8.25.0",
+        "@typescript-eslint/utils": "^8.25.0",
         "archiver": "^7.0.1",
         "chalk": "^5.4.1",
         "cli-table3": "^0.6.5",
@@ -84,7 +84,7 @@
         "react-i18next": "^15.4.1",
         "react-object-model": "^1.2.23",
         "resolve-path": "^1.4.0",
-        "sass": "^1.85.0",
+        "sass": "^1.85.1",
         "sass-loader": "^16.0.5",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",