diff --git a/package-lock.json b/package-lock.json index e118261dd..886e54871 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13671,64 +13671,6 @@ "node": ">=10.0.0" } }, - "node_modules/@xterm/addon-clipboard": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0.tgz", - "integrity": "sha512-Dl31BCtBhLaUEECUbEiVcCLvLBbaeGYdT7NofB8OJkGTD3MWgBsaLjXvfGAD4tQNHhm6mbKyYkR7XD8kiZsdNg==", - "license": "MIT", - "dependencies": { - "js-base64": "^3.7.5" - } - }, - "node_modules/@xterm/addon-fit": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.11.0.tgz", - "integrity": "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==", - "license": "MIT" - }, - "node_modules/@xterm/addon-image": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0.tgz", - "integrity": "sha512-oYWA8/QAr5/Emwl1xL7WCoOqeG3IZfpzEz/OVq1j4Oi9934TQmHiyubClikRf0D/jL3JNiNuz/Lsqx0kXQ02BA==", - "license": "MIT" - }, - "node_modules/@xterm/addon-ligatures": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0.tgz", - "integrity": "sha512-/Few8ZSHMib7sGjRJoc5l7bCtEB9XJfkNofvPpOcWADxKaUl8og8P172j67OoACSNJAXqeCLIuvj8WFCBkcTxg==", - "license": "MIT", - "dependencies": { - "font-finder": "^1.1.0", - "font-ligatures": "^1.4.1" - }, - "engines": { - "node": ">8.0.0" - } - }, - "node_modules/@xterm/addon-search": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0.tgz", - "integrity": "sha512-9OeuBFu0/uZJPu+9AHKY6g/w0Czyb/Ut0A5t79I4ULoU4IfU5BEpPFVGQxP4zTTMdfZEYkVIRYbHBX1xWwjeSA==", - "license": "MIT" - }, - "node_modules/@xterm/addon-unicode11": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0.tgz", - "integrity": "sha512-FxDnYcyuXhNl+XSqGZL/t0U9eiNb/q3EWT5rYkQT/zuig8Gz/VagnQANKHdDWFM2lTMk9ly0EFQxxxtZUoRetw==", - "license": "MIT" - }, - "node_modules/@xterm/addon-web-links": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-web-links/-/addon-web-links-0.12.0.tgz", - "integrity": "sha512-4Smom3RPyVp7ZMYOYDoC/9eGJJJqYhnPLGGqJ6wOBfB8VxPViJNSKdgRYb8NpaM6YSelEKbA2SStD7lGyqaobw==", - "license": "MIT" - }, - "node_modules/@xterm/addon-webgl": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0.tgz", - "integrity": "sha512-b3fMOsyLVuCeNJWxolACEUED0vm7qC0cy4wRvf3oURSzDTYVQiGPhTnhWZwIHdvC48Y+oLhvYXnY4XDXPoJo6A==", - "license": "MIT" - }, "node_modules/@xterm/headless": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.0.0.tgz", @@ -13738,15 +13680,6 @@ "addons/*" ] }, - "node_modules/@xterm/xterm": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz", - "integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==", - "license": "MIT", - "workspaces": [ - "addons/*" - ] - }, "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", @@ -22193,33 +22126,6 @@ } } }, - "node_modules/font-finder": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/font-finder/-/font-finder-1.1.0.tgz", - "integrity": "sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==", - "license": "MIT", - "dependencies": { - "get-system-fonts": "^2.0.0", - "promise-stream-reader": "^1.0.1" - }, - "engines": { - "node": ">8.0.0" - } - }, - "node_modules/font-ligatures": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/font-ligatures/-/font-ligatures-1.4.1.tgz", - "integrity": "sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw==", - "license": "MIT", - "dependencies": { - "font-finder": "^1.0.3", - "lru-cache": "^6.0.0", - "opentype.js": "^0.8.0" - }, - "engines": { - "node": ">8.0.0" - } - }, "node_modules/fontfaceobserver": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.3.0.tgz", @@ -22603,15 +22509,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-system-fonts": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/get-system-fonts/-/get-system-fonts-2.0.2.tgz", - "integrity": "sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ==", - "license": "MIT", - "engines": { - "node": ">8.0.0" - } - }, "node_modules/get-tsconfig": { "version": "4.13.6", "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.6.tgz", @@ -30211,15 +30108,6 @@ "node": ">=10" } }, - "node_modules/promise-stream-reader": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz", - "integrity": "sha512-Tnxit5trUjBAqqZCGWwjyxhmgMN4hGrtpW3Oc/tRI4bpm/O2+ej72BB08l6JBnGQgVDGCLvHFGjGgQS6vzhwXg==", - "license": "MIT", - "engines": { - "node": ">8.0.0" - } - }, "node_modules/prompts": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", @@ -36426,15 +36314,15 @@ "@react-navigation/native": "^7.1.8", "@tanstack/react-query": "^5.90.11", "@tanstack/react-virtual": "^3.13.21", - "@xterm/addon-clipboard": "^0.2.0", - "@xterm/addon-fit": "^0.11.0", - "@xterm/addon-image": "^0.9.0", - "@xterm/addon-ligatures": "^0.10.0", - "@xterm/addon-search": "^0.16.0", - "@xterm/addon-unicode11": "^0.9.0", - "@xterm/addon-web-links": "^0.12.0", - "@xterm/addon-webgl": "^0.19.0", - "@xterm/xterm": "^6.0.0", + "@xterm/addon-clipboard": "^0.3.0-beta.213", + "@xterm/addon-fit": "^0.12.0-beta.213", + "@xterm/addon-image": "^0.10.0-beta.213", + "@xterm/addon-ligatures": "^0.11.0-beta.213", + "@xterm/addon-search": "^0.17.0-beta.213", + "@xterm/addon-unicode11": "^0.10.0-beta.213", + "@xterm/addon-web-links": "^0.13.0-beta.213", + "@xterm/addon-webgl": "^0.20.0-beta.212", + "@xterm/xterm": "^6.1.0-beta.213", "buffer": "^6.0.3", "expo": "^54.0.18", "expo-asset": "~12.0.12", @@ -36492,7 +36380,7 @@ "@types/ws": "^8.18.1", "@vitest/browser": "^4.1.7", "@vitest/browser-playwright": "^4.1.7", - "@xterm/headless": "^6.0.0", + "@xterm/headless": "^6.1.0-beta.213", "dotenv": "^17.2.3", "eas-cli": "^16.24.1", "eslint": "^9.25.0", @@ -36506,6 +36394,107 @@ "ws": "^8.20.0" } }, + "packages/app/node_modules/@xterm/addon-clipboard": { + "version": "0.3.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.213.tgz", + "integrity": "sha512-gFW1jSpKFhMN29ArgBXIyYzxrDcGeWVP943/BxcWelHthAjhWrt048LxkNtt7/FgF60ZfysIyvMXLeVetXfduA==", + "license": "MIT", + "dependencies": { + "js-base64": "^3.7.5" + }, + "peerDependencies": { + "@xterm/xterm": "^6.1.0-beta.213" + } + }, + "packages/app/node_modules/@xterm/addon-fit": { + "version": "0.12.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.12.0-beta.213.tgz", + "integrity": "sha512-hFupt6CX7MNO0XKjugPpm2T3/PUGT2Y7o92Y9UyQAH0a7Da/H5nzkDbJLH1LZHfyUFaJOOvkJOQl8oreWMr/SQ==", + "license": "MIT", + "peerDependencies": { + "@xterm/xterm": "^6.1.0-beta.213" + } + }, + "packages/app/node_modules/@xterm/addon-image": { + "version": "0.10.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.213.tgz", + "integrity": "sha512-L3QxLkj8g8TioVea9p1oVze52Jr75rRZPPLm1tgZl0X2EGJGFHnQzE3QRsgmYWI7R5j3kwwi3MRAkOAgvOK8uA==", + "license": "MIT", + "peerDependencies": { + "@xterm/xterm": "^6.1.0-beta.213" + } + }, + "packages/app/node_modules/@xterm/addon-ligatures": { + "version": "0.11.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.213.tgz", + "integrity": "sha512-4YLFsl+K/RfTrIxHuMLXvQ3iJmBtxHlLaC4sutPZT1Nkh01QxOmMAn+JZI2jm5u1RPO2F6WRfwu1jtqhunGCpQ==", + "license": "MIT", + "dependencies": { + "lru-cache": "^6.0.0", + "opentype.js": "^0.8.0" + }, + "engines": { + "node": ">8.0.0" + }, + "peerDependencies": { + "@xterm/xterm": "^6.1.0-beta.213" + } + }, + "packages/app/node_modules/@xterm/addon-search": { + "version": "0.17.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.213.tgz", + "integrity": "sha512-SlXOagJg8ZH78T6tfoUqauJPAWo1N8yb8FamrHNsGP7HAFpOq3m1U9hH8q8iHeOQzs7VcVzD7J2/X3gAMJRn+g==", + "license": "MIT", + "peerDependencies": { + "@xterm/xterm": "^6.1.0-beta.213" + } + }, + "packages/app/node_modules/@xterm/addon-unicode11": { + "version": "0.10.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.213.tgz", + "integrity": "sha512-Tk2u+4HrkOwlagO2w/Knc5RF2LLA9D2i6yxUMmnxFKaQ88qXOnyqEn4b+OhPCaWHJJnWsV5grjMMQq6utRGxcQ==", + "license": "MIT", + "peerDependencies": { + "@xterm/xterm": "^6.1.0-beta.213" + } + }, + "packages/app/node_modules/@xterm/addon-web-links": { + "version": "0.13.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/addon-web-links/-/addon-web-links-0.13.0-beta.213.tgz", + "integrity": "sha512-SNMLWgcVxchXTSxIzqZkQ7xennu0YVpmtDMVZi3K03JyFXw8NDu57B0O01JR8d7Rlk+EWk+B/aMxIehnCSgX6Q==", + "license": "MIT", + "peerDependencies": { + "@xterm/xterm": "^6.1.0-beta.213" + } + }, + "packages/app/node_modules/@xterm/addon-webgl": { + "version": "0.20.0-beta.212", + "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.212.tgz", + "integrity": "sha512-RzaTYeukTXTJth+Sl7FzCmb8AqiyDrNWNnqG+/300qJbfHYfCMmBlBVZ0yCTSZIWMdgFbgkhmnmBN7Yzs6xoBA==", + "license": "MIT", + "peerDependencies": { + "@xterm/xterm": "^6.1.0-beta.213" + } + }, + "packages/app/node_modules/@xterm/headless": { + "version": "6.1.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.213.tgz", + "integrity": "sha512-D08E4Bl0HRhYZRL2o5PxD4FNQN9qXpI8QSw3CkKrsym5dtTRAqsynVYE8V8echQrxfb+EpR0CB5reM7tEGZ/fA==", + "dev": true, + "license": "MIT", + "workspaces": [ + "addons/*" + ] + }, + "packages/app/node_modules/@xterm/xterm": { + "version": "6.1.0-beta.213", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.213.tgz", + "integrity": "sha512-bq5nJkgoZDSg6Ma4zgiQ7jlooGNo7U+HDa6vnhx43yXsVEK2laIF7R08bMYAuU0B+C9xX0gwSrcsW18GxjUoJQ==", + "license": "MIT", + "workspaces": [ + "addons/*" + ] + }, "packages/app/node_modules/expo-clipboard": { "version": "8.0.7", "resolved": "https://registry.npmjs.org/expo-clipboard/-/expo-clipboard-8.0.7.tgz", diff --git a/packages/app/package.json b/packages/app/package.json index 42e509fed..ca17374d7 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -42,15 +42,15 @@ "@react-navigation/native": "^7.1.8", "@tanstack/react-query": "^5.90.11", "@tanstack/react-virtual": "^3.13.21", - "@xterm/addon-clipboard": "^0.2.0", - "@xterm/addon-fit": "^0.11.0", - "@xterm/addon-image": "^0.9.0", - "@xterm/addon-ligatures": "^0.10.0", - "@xterm/addon-search": "^0.16.0", - "@xterm/addon-unicode11": "^0.9.0", - "@xterm/addon-web-links": "^0.12.0", - "@xterm/addon-webgl": "^0.19.0", - "@xterm/xterm": "^6.0.0", + "@xterm/addon-clipboard": "^0.3.0-beta.213", + "@xterm/addon-fit": "^0.12.0-beta.213", + "@xterm/addon-image": "^0.10.0-beta.213", + "@xterm/addon-ligatures": "^0.11.0-beta.213", + "@xterm/addon-search": "^0.17.0-beta.213", + "@xterm/addon-unicode11": "^0.10.0-beta.213", + "@xterm/addon-web-links": "^0.13.0-beta.213", + "@xterm/addon-webgl": "^0.20.0-beta.212", + "@xterm/xterm": "^6.1.0-beta.213", "buffer": "^6.0.3", "expo": "^54.0.18", "expo-asset": "~12.0.12", @@ -108,7 +108,7 @@ "@types/ws": "^8.18.1", "@vitest/browser": "^4.1.7", "@vitest/browser-playwright": "^4.1.7", - "@xterm/headless": "^6.0.0", + "@xterm/headless": "^6.1.0-beta.213", "dotenv": "^17.2.3", "eas-cli": "^16.24.1", "eslint": "^9.25.0", diff --git a/packages/app/src/terminal/runtime/terminal-emulator-runtime.ts b/packages/app/src/terminal/runtime/terminal-emulator-runtime.ts index b844c6125..86b21e13e 100644 --- a/packages/app/src/terminal/runtime/terminal-emulator-runtime.ts +++ b/packages/app/src/terminal/runtime/terminal-emulator-runtime.ts @@ -178,14 +178,13 @@ export class TerminalEmulatorRuntime { convertEol: false, cursorBlink: true, cursorStyle: "bar", - customGlyphs: true, fontFamily: DEFAULT_TERMINAL_FONT_FAMILY, fontSize: 13, lineHeight: 1.0, macOptionIsMeta: true, minimumContrastRatio: 1, rescaleOverlappingGlyphs: true, - overviewRuler: { + scrollbar: { width: 8, }, scrollback: input.scrollback, diff --git a/packages/app/src/terminal/webview/terminal-emulator-webview-html.ts b/packages/app/src/terminal/webview/terminal-emulator-webview-html.ts index 6ff3a7554..6b68d68cc 100644 --- a/packages/app/src/terminal/webview/terminal-emulator-webview-html.ts +++ b/packages/app/src/terminal/webview/terminal-emulator-webview-html.ts @@ -2,4 +2,4 @@ // Do not edit by hand. export const terminalEmulatorWebViewHtml = - '\n\n
\n \n \n \n \n \n \n'; + '\n\n \n \n \n \n \n \n \n';