xshell 1.0.161 → 1.0.163

package/builder.d.ts

@@ -1,4 +1,4 @@
-import Webpack from 'webpack';
+import type Webpack from 'webpack';
 import { Lock } from './utils.js';
 /** target web 时的 npm 包依赖管理
     有 productions 但无 devs 时，大部分情况是相同配置，因此在 dev 模式下会用 productions
@@ -90,6 +90,8 @@ export declare class Bundler {
     config: Webpack.Configuration;
     htmls?: Record<string, HtmlOptions>;
     assets?: Assets;
+    globals?: BundlerOptions['globals'];
+    exclude_modules?: BundlerOptions['exclude_modules'];
     license?: {
         ignores?: string[];
     };

package/builder.js

@@ -1,19 +1,19 @@
 import { fileURLToPath } from 'url';
-import Webpack from 'webpack';
 import { noprint } from './process.js';
 import { Lock, Timer, assert, filter_values, not_empty } from './utils.js';
 import { fcopy, fmkdir, fwrite } from './file.js';
 import { path } from './path.js';
 const monaco_files = [
     'loader.js',
+    'nls.messages.zh-cn.js',
     'editor/editor.main.js',
     'editor/editor.main.css',
-    'editor/editor.main.nls.js',
-    'editor/editor.main.nls.zh-cn.js',
-    'base/common/worker/simpleWorker.nls.js',
     'base/worker/workerMain.js',
     'base/browser/ui/codicons/codicon/codicon.ttf',
     ...['python', 'javascript', 'typescript', 'css', 'html', 'cpp', 'sql', 'scss', 'shell'].map(language => `basic-languages/${language}/${language}.js`),
+    // 太大了，先不加
+    // 'language/typescript/tsMode.js',
+    // 'language/typescript/tsWorker.js',
 ];
 const dependencies = {
     react: {
@@ -84,8 +84,9 @@ const dependencies = {
             devs: monaco_files.map(fp => `monaco-editor/dev/vs/${fp}`)
         },
         maps: {
-            productions: monaco_files.filter(fp => fp.endsWith('.js') && !fp.startsWith('basic-languages/') && !fp.startsWith('language/'))
-                .map(fp => `monaco-editor/min-maps/vs/${fp}.map`),
+            productions: monaco_files.filter(fp => fp.endsWith('.js') &&
+                !fp.startsWith('basic-languages/') &&
+                !fp.startsWith('language/')).map(fp => `monaco-editor/min-maps/${fp.startsWith('nls.messages.') ? '' : 'vs/'}${fp}.map`),
             devs: [
                 'monaco-editor/dev/vs/base/worker/workerMain.js.map',
                 'monaco-editor/dev/vs/editor/editor.main.js.map',
@@ -112,6 +113,8 @@ export class Bundler {
     config;
     htmls;
     assets;
+    globals;
+    exclude_modules;
     license;
     lcompiler;
     /** 通过 webpack 从入口文件打包所有依赖生成单个 index.{mjs,cjs} 文件
@@ -154,6 +157,8 @@ export class Bundler {
         this.source_map = source_map;
         this.htmls = htmls;
         this.assets = assets;
+        this.globals = globals;
+        this.exclude_modules = exclude_modules;
         if (dependencies) {
             assert(target === 'web');
             this.dependencies = dependencies;
@@ -263,6 +268,8 @@ export class Bundler {
                                 module: 'ESNext',
                                 moduleResolution: 'Bundler',
                                 declaration: dts,
+                                noEmit: false,
+                                allowImportingTsExtensions: false,
                                 ...commonjs2 ? {
                                     // 编译为 commonjs 后 import 的依赖是通过 require 引入的，所以需要 interop 去生成 default
                                     // nodejs 默认的 import 会自动加上 default，所以不需要 interop
@@ -324,22 +331,6 @@ export class Bundler {
                     }
                 ]
             },
-            plugins: [
-                ...globals ? [
-                    new Webpack.DefinePlugin({
-                        ...globals
-                        // process: { env: { }, argv: [] }
-                    })
-                ] : [],
-                // 使用 IgnorePlugin 能够不打包，但是一旦导入就会报错
-                ...exclude_modules ? [
-                    new Webpack.IgnorePlugin({
-                        resourceRegExp: exclude_modules,
-                        // checkResource: (resource, context) => 
-                        //     resource.startsWith('./vendors/') && !context.fp.startsWith(fpd_node_modules) ,
-                    })
-                ] : [],
-            ],
             optimization: {
                 minimize: false
             },
@@ -387,42 +378,63 @@ export class Bundler {
     async build(print = true) {
         let timer = new Timer();
         if (!this.lcompiler) {
-            if (this.analyzer) {
-                const { BundleAnalyzerPlugin } = await import('webpack-bundle-analyzer');
-                this.config.plugins.push(new BundleAnalyzerPlugin({
-                    analyzerPort: 8880,
-                    openAnalyzer: false,
-                }));
-            }
-            if (this.license) {
-                const { LicenseWebpackPlugin } = await import('license-webpack-plugin');
-                const ignores = new Set([
-                    'xshell',
-                    'react-object-model',
-                    '@ant-design/icons-svg',
-                    '@ant-design/pro-layout',
-                    '@ant-design/pro-provider',
-                    '@ant-design/pro-table',
-                    '@ant-design/pro-utils',
-                    '@ant-design/pro-form',
-                    '@ant-design/pro-card',
-                    '@ant-design/pro-field',
-                    'toggle-selection',
-                    'ahooks',
-                    'size-sensor',
-                    'client-only',
-                    'only',
-                    'koa-compose',
-                    'cache-content-type',
-                    'isarray',
-                    ...this.license.ignores || []
-                ]);
-                this.config.plugins.push(new LicenseWebpackPlugin({
-                    perChunkOutput: false,
-                    outputFilename: 'ThirdPartyNotice.txt',
-                    excludedPackageTest: pkgname => ignores.has(pkgname),
-                }));
-            }
+            const { default: Webpack } = await import('webpack');
+            this.config.plugins = [
+                ...this.globals ? [
+                    new Webpack.DefinePlugin({
+                        ...this.globals
+                        // process: { env: { }, argv: [] }
+                    })
+                ] : [],
+                // 使用 IgnorePlugin 能够不打包，但是一旦导入就会报错
+                ...this.exclude_modules ? [
+                    new Webpack.IgnorePlugin({
+                        resourceRegExp: this.exclude_modules,
+                        // checkResource: (resource, context) => 
+                        //     resource.startsWith('./vendors/') && !context.fp.startsWith(fpd_node_modules) ,
+                    })
+                ] : [],
+                ...this.analyzer ? await (async () => {
+                    const { BundleAnalyzerPlugin } = await import('webpack-bundle-analyzer');
+                    return [
+                        new BundleAnalyzerPlugin({
+                            analyzerPort: 8880,
+                            openAnalyzer: false,
+                        })
+                    ];
+                })() : [],
+                ...this.license ? await (async () => {
+                    const { LicenseWebpackPlugin } = await import('license-webpack-plugin');
+                    const ignores = new Set([
+                        'xshell',
+                        'react-object-model',
+                        '@ant-design/icons-svg',
+                        '@ant-design/pro-layout',
+                        '@ant-design/pro-provider',
+                        '@ant-design/pro-table',
+                        '@ant-design/pro-utils',
+                        '@ant-design/pro-form',
+                        '@ant-design/pro-card',
+                        '@ant-design/pro-field',
+                        'toggle-selection',
+                        'ahooks',
+                        'size-sensor',
+                        'client-only',
+                        'only',
+                        'koa-compose',
+                        'cache-content-type',
+                        'isarray',
+                        ...this.license.ignores || []
+                    ]);
+                    return [
+                        new LicenseWebpackPlugin({
+                            perChunkOutput: false,
+                            outputFilename: 'ThirdPartyNotice.txt',
+                            excludedPackageTest: pkgname => ignores.has(pkgname),
+                        })
+                    ];
+                })() : [],
+            ];
             this.lcompiler = new Lock(Webpack(this.config));
         }
         const stats = await this.lcompiler.request(async (compiler) => new Promise((resolve, reject) => {

package/git.d.ts

@@ -4,7 +4,7 @@ export declare class Git {
     cwd: string;
     constructor(cwd: string);
     static init(cwd: string, print?: boolean): Promise<Git>;
-    static clone(repo: string, fpd: string): Promise<void>;
+    static clone(repo: string, fpd: string, shallow?: boolean): Promise<void>;
     call(args?: any[], { color, print, printers }?: {
         color?: boolean;
         print?: CallOptions['print'];

package/git.js

@@ -11,9 +11,15 @@ export class Git {
         await git.call(['init'], { print });
         return git;
     }
-    static async clone(repo, fpd) {
+    static async clone(repo, fpd, shallow = false) {
         await fmkdir(fpd);
-        await new this(fpd).call(['clone', repo, '.']);
+        await new this(fpd)
+            .call([
+            'clone',
+            ...shallow ? ['--depth', '1'] : [],
+            repo,
+            '.'
+        ]);
     }
     async call(args = [], { color = true, print, printers } = {}) {
         return call(Git.exe, [

package/i18n/scanner/index.js

@@ -9,7 +9,7 @@ import CliTable from 'cli-table3';
 import '../../prototype.js';
 import { path } from '../../path.js';
 import { map_stream } from '../../utils.js';
-import { LANGUAGES, } from '../index.js';
+import { LANGUAGES } from '../index.js';
 import { RWDict } from '../rwdict.js';
 import { try_load_dict } from '../utils.js';
 import { mix_parse_trans_from_string_by_babel } from './parser.js';

package/i18n/scanner/parser.js

@@ -2,6 +2,7 @@ import castArray from 'lodash/castArray.js';
 import trim from 'lodash/trim.js';
 import _get from 'lodash/get.js';
 import babel_traverse from '@babel/traverse';
+// @ts-ignore
 const { default: traverse } = babel_traverse;
 import { parse } from '@babel/parser';
 import t from '@babel/types';

package/net.d.ts

@@ -2,11 +2,6 @@ import { type Readable } from 'stream';
 import type { FormData } from 'undici';
 import type { WebSocket, CloseEvent, ErrorEvent } from 'ws';
 import type { Cookie, CookieJar, MemoryCookieStore } from 'tough-cookie';
-declare module 'tough-cookie' {
-    interface MemoryCookieStore {
-        idx: Record<string, any>;
-    }
-}
 import './prototype.js';
 import type { Encoding } from './file.js';
 import { inspect, Lock } from './utils.js';

package/net.js

@@ -39,7 +39,8 @@ const drop_request_headers = new Set([
 ]);
 let proxy_agents = {};
 async function request_retry(url, options, timeout, retries = 0, count = 0) {
-    const { request: undici_request } = await import('undici');
+    let { default: undici, request: undici_request } = await import('undici');
+    undici_request ??= undici.request;
     try {
         if (timeout > 0)
             options.signal = AbortSignal.timeout(timeout);
@@ -60,7 +61,9 @@ async function request_retry(url, options, timeout, retries = 0, count = 0) {
     }
 }
 export async function request(url, options = {}) {
-    const { ProxyAgent: UndiciProxyAgent, FormData } = await import('undici');
+    let { default: undici, ProxyAgent: UndiciProxyAgent, FormData } = await import('undici');
+    UndiciProxyAgent ??= undici.ProxyAgent;
+    FormData ??= undici.FormData;
     const { Cookie } = await import('tough-cookie');
     await cookies.init();
     const { queries, headers: _headers, body, type = 'application/json', timeout = 5 * 1000, auth, cookies: _cookies, raw = false, full = false, redirect = 'follow', decode = true, } = options;
@@ -82,7 +85,7 @@ export async function request(url, options = {}) {
     let headers = {
         'accept-language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja-JP;q=0.6,ja;q=0.5',
         'accept-encoding': 'gzip, deflate, br',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36',
         'sec-ch-ua-platform': '"Windows"',
         'sec-ch-ua-platform-version': '"15.0.0"',
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.161",
+    "version": "1.0.163",
     "type": "module",
     "main": "./index.js",
     "bin": {
@@ -50,16 +50,16 @@
     },
     "dependencies": {
         "@babel/core": "^7.25.2",
-        "@babel/parser": "^7.25.3",
-        "@babel/traverse": "^7.25.3",
+        "@babel/parser": "^7.25.4",
+        "@babel/traverse": "^7.25.4",
         "@koa/cors": "^5.0.0",
         "@stylistic/eslint-plugin": "^2.6.4",
         "@svgr/webpack": "^8.1.0",
         "@types/sass-loader": "^8.0.9",
         "@types/ws": "^8.5.12",
-        "@typescript-eslint/eslint-plugin": "^8.2.0",
-        "@typescript-eslint/parser": "^8.2.0",
-        "@typescript-eslint/utils": "^8.2.0",
+        "@typescript-eslint/eslint-plugin": "^8.3.0",
+        "@typescript-eslint/parser": "^8.3.0",
+        "@typescript-eslint/utils": "^8.3.0",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/addon-web-links": "^0.11.0",
         "@xterm/addon-webgl": "^0.18.0",
@@ -74,8 +74,8 @@
         "colors": "^1.4.0",
         "commander": "^12.1.0",
         "css-loader": "^7.1.2",
-        "emoji-regex": "^10.3.0",
-        "eslint": "^9.9.0",
+        "emoji-regex": "^10.4.0",
+        "eslint": "^9.9.1",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-react": "^7.35.0",
         "gulp-sort": "^2.0.0",
@@ -89,10 +89,10 @@
         "lodash": "^4.17.21",
         "map-stream": "^0.0.7",
         "mime-types": "^2.1.35",
-        "ora": "^8.0.1",
+        "ora": "^8.1.0",
         "react": "^18.3.1",
         "react-i18next": "^15.0.1",
-        "react-object-model": "^1.2.11",
+        "react-object-model": "^1.2.13",
         "resolve-path": "^1.4.0",
         "sass": "^1.77.8",
         "sass-loader": "^16.0.1",
@@ -100,34 +100,34 @@
         "strip-ansi": "^7.1.0",
         "style-loader": "^4.0.0",
         "through2": "^4.0.2",
-        "tough-cookie": "^4.1.4",
+        "tough-cookie": "^5.0.0-rc.4",
         "ts-loader": "^9.5.1",
-        "tslib": "^2.6.3",
+        "tslib": "^2.7.0",
         "typescript": "^5.5.4",
         "ua-parser-js": "^2.0.0-beta.3",
         "undici": "^6.19.8",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^4.0.0",
-        "webpack": "^5.93.0",
+        "webpack": "^5.94.0",
         "webpack-bundle-analyzer": "^4.10.2",
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "@babel/types": "^7.25.2",
+        "@babel/types": "^7.25.4",
         "@types/ali-oss": "^6.16.11",
         "@types/archiver": "^6.0.2",
         "@types/babel__traverse": "^7.20.6",
         "@types/byte-size": "^8.1.2",
         "@types/chardet": "^0.8.3",
-        "@types/eslint": "^9.6.0",
+        "@types/eslint": "^9.6.1",
         "@types/estree": "^1.0.5",
         "@types/gulp-sort": "^2.0.4",
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/lodash": "^4.17.7",
         "@types/mime-types": "^2.1.4",
-        "@types/node": "^22.4.1",
-        "@types/react": "^18.3.3",
+        "@types/node": "^22.5.0",
+        "@types/react": "^18.3.4",
         "@types/through2": "^2.0.41",
         "@types/tough-cookie": "^4.0.5",
         "@types/ua-parser-js": "^0.7.39",

package/polyfill.browser.d.ts

@@ -1 +1 @@
-export {};
+declare function define(proto: any, key: string, func: Function): void;

package/polyfill.browser.js

@@ -29,5 +29,13 @@ if (!Array.prototype.at)
     define(Array.prototype, 'at', function at(index) {
         return index >= 0 ? this[index] : this[index + this.length];
     });
-export {};
+if (!Object.groupBy)
+    define(Object, 'groupBy', function groupBy(array, callback) {
+        return array.reduce((result, element, index) => {
+            const key = callback(element, index);
+            result[key] ??= [];
+            result[key].push(element);
+            return result;
+        }, {});
+    });
 //# sourceMappingURL=polyfill.browser.js.map

package/process.d.ts

@@ -99,7 +99,7 @@ export interface CallError {
             child output encoding. When set to binary, return stdout, stderr is of type Buffer; otherwise it is string
         - print?: `true` print 选项，支持设置细项  print option (with details)
         - stdio?: `'pipe'` 设置为 'ignore' 时忽略 stdio 处理  when 'ignore' then ignore stdio processing
-        - input?: string, start 子进程之后写入到子进程 stdin 中的内容  After starting the sub-process, write to the content of the sub-process STDIN
+        - input?: string, 启动子进程之后写入到子进程 stdin 中的内容，写完后关闭子进程 stdin (pty 不关闭)
         - detached?: `false` 是否断开和 child 的关系 (ignore stdio, unref)  whether to break the connection with child (ignore stdio, unref)
         - throw_code?: `true` code 不为 0 时是否抛出异常  whether to throw Error when code is not 0 */
 export declare function call(exe: string, args?: string[]): Promise<CallResult<string>>;

package/process.js

@@ -122,7 +122,7 @@ export async function call(exe, args = [], options = {}) {
         print: false,
     });
     if (input)
-        child.stdin.write(input);
+        child.stdin.end(input);
     // --- collect output
     let stdouts = [];
     let stderrs = [];

package/tsconfig.json

@@ -1,8 +1,8 @@
 {
     "compilerOptions": {
         // --- module
-        "module": "NodeNext", // none, CommonJS, amd, system, umd, es6, es2015, ESNext
-        "moduleResolution": "NodeNext",
+        "module": "ESNext", // none, CommonJS, amd, system, umd, es6, es2015, ESNext
+        "moduleResolution": "Bundler",
         "allowSyntheticDefaultImports": true,
         "esModuleInterop": false,
         "resolveJsonModule": true,
@@ -22,6 +22,7 @@
         
         
         // --- emit
+        "noEmit": true,
         "declaration": true,
         "emitDeclarationOnly": false,
         "noEmitOnError": false,
@@ -38,6 +39,7 @@
         "removeComments": false,
         "preserveConstEnums": true,
         "forceConsistentCasingInFileNames": true,
+        "allowImportingTsExtensions": true,
         
         
         // --- type checking