xshell 1.2.19 → 1.2.21

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',
@@ -358,6 +358,10 @@ export class Bundler {
                                     loader: get_loader('@svgr/webpack'),
                                     options: { icon: true }
                                 },
+                                {
+                                    test: /\.raw\.svg$/,
+                                    type: 'asset/source',
+                                },
                                 {
                                     test: /\.(svg|ico|png|jpe?g|gif|woff2?|ttf|eot|otf|mp4|webm|ogg|mp3|wav|flac|aac)$/,
                                     type: 'asset/inline',
@@ -602,10 +606,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 +637,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 +653,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.21",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -53,13 +53,13 @@
         "@babel/parser": "^7.26.9",
         "@babel/traverse": "^7.26.9",
         "@koa/cors": "^5.0.0",
-        "@stylistic/eslint-plugin": "^4.0.1",
+        "@stylistic/eslint-plugin": "^4.2.0",
         "@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",
+        "@types/ws": "^8.18.0",
+        "@typescript-eslint/eslint-plugin": "^8.26.0",
+        "@typescript-eslint/parser": "^8.26.0",
+        "@typescript-eslint/utils": "^8.26.0",
         "archiver": "^7.0.1",
         "chalk": "^5.4.1",
         "cli-table3": "^0.6.5",
@@ -74,7 +74,7 @@
         "https-proxy-agent": "^7.0.6",
         "i18next": "^24.2.2",
         "i18next-scanner": "^4.6.0",
-        "koa": "^2.15.4",
+        "koa": "^2.16.0",
         "koa-compress": "^5.1.1",
         "license-webpack-plugin": "^4.0.2",
         "map-stream": "^0.0.7",
@@ -84,18 +84,18 @@
         "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",
         "style-loader": "^4.0.0",
         "through2": "^4.0.2",
-        "tough-cookie": "^5.1.1",
+        "tough-cookie": "^5.1.2",
         "ts-loader": "^9.5.2",
         "tslib": "^2.8.1",
-        "typescript": "^5.7.3",
+        "typescript": "^5.8.2",
         "ua-parser-js": "^2.0.2",
-        "undici": "^7.3.0",
+        "undici": "^7.4.0",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
         "webpack": "^5.98.0",
@@ -112,18 +112,18 @@
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.13.5",
+        "@types/node": "^22.13.9",
         "@types/react": "^19.0.10",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",
         "@types/vinyl-fs": "^3.0.5",
-        "@types/vscode": "^1.97.0",
+        "@types/vscode": "^1.98.0",
         "@types/webpack-bundle-analyzer": "^4.7.0"
     },
     "pnpm": {
         "patchedDependencies": {
-            "koa@2.15.4": "patches/koa@2.15.4.patch"
+            "koa@2.16.0": "patches/koa@2.16.0.patch"
         }
     }
 }

package/repl.js

@@ -1,3 +1,11 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
 import repl from 'repl';
 import process from 'process';
 import { fileURLToPath } from 'url';
@@ -28,7 +36,7 @@ export async function start_repl() {
         pollute_global(),
         (async () => {
             // --- http server
-            let { Server } = await import('./server.ts');
+            let { Server } = await import("./server.js");
             server = new Server({
                 name: 'repl',
                 http: true,
@@ -78,9 +86,9 @@ export async function pollute_global() {
     ]);
 }
 export async function pollute_module_exports(fp_mod) {
-    Object.assign(globalThis, await import(fp_mod));
+    Object.assign(globalThis, await import(__rewriteRelativeImportExtension(fp_mod)));
 }
 export async function pollute_module_default_export(fp_mod, name) {
-    globalThis[name] = (await import(fp_mod)).default;
+    globalThis[name] = (await import(__rewriteRelativeImportExtension(fp_mod))).default;
 }
 //# sourceMappingURL=repl.js.map

package/server.js

@@ -37,7 +37,7 @@ export class Server {
     /** sea 下最后修改时间，用于 http 资源缓存 */
     last_modified_str;
     static js_exts = new Set(['js', 'mjs', 'cjs']);
-    static logger_ignore_fexts = new Set(['js', 'css', 'map', 'png', 'jpg', 'svg', 'ico', 'json', 'woff2', 'ttf', 'php']);
+    static logger_ignore_fexts = new Set(['js', 'css', 'wasm', 'map', 'png', 'jpg', 'svg', 'ico', 'json', 'woff2', 'ttf', 'php']);
     static empty_body_statuses = new Set([304, 204, 205]);
     static empty_body_methods = new Set(['HEAD', 'OPTIONS']);
     app;