diff --git a/.vscode/settings.json b/.vscode/settings.json index 4773d3aa..bde1c220 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -73,5 +73,8 @@ "editor.tabSize": 4, "jest.rootPath": "packages/struct", "jest.showCoverageOnLoad": true, - "markdown.extension.toc.levels": "2..6" + "markdown.extension.toc.levels": "2..6", + "files.associations": { + "*.mdx": "markdown" + } } diff --git a/apps/demo/components/terminal.tsx b/apps/demo/components/terminal.tsx index 9344dc14..25e95e9a 100644 --- a/apps/demo/components/terminal.tsx +++ b/apps/demo/components/terminal.tsx @@ -54,9 +54,9 @@ export class AdbTerminal extends AutoDisposable { this.element.style.height = '100%'; this.element.style.overflow = 'hidden'; - this.terminal.setOption('fontFamily', '"Cascadia Code", Consolas, monospace, "Source Han Sans SC", "Microsoft YaHei"'); - this.terminal.setOption('letterSpacing', 1); - this.terminal.setOption('cursorStyle', 'bar'); + this.terminal.options.fontFamily = '"Cascadia Code", Consolas, monospace, "Source Han Sans SC", "Microsoft YaHei"'; + this.terminal.options.letterSpacing = 1; + this.terminal.options.cursorStyle = 'bar'; this.terminal.loadAddon(this.searchAddon); this.terminal.loadAddon(this.fitAddon); } @@ -68,7 +68,7 @@ export class AdbTerminal extends AutoDisposable { this.terminal.open(this.element); this.terminal.loadAddon(new WebglAddon()); // WebGL renderer ignores `cursorBlink` set before it initialized - this.terminal.setOption('cursorBlink', true); + this.terminal.options.cursorBlink = true; this.fit(); } } diff --git a/apps/demo/package.json b/apps/demo/package.json index 19e535a6..7d08eeb4 100644 --- a/apps/demo/package.json +++ b/apps/demo/package.json @@ -27,10 +27,10 @@ "react-dom": "^17.0.2", "streamsaver": "^2.0.5", "tinyh264": "^0.0.7", - "xterm": "^4.14.1", + "xterm": "^4.15.0", "xterm-addon-fit": "^0.5.0", "xterm-addon-search": "^0.8.1", - "xterm-addon-webgl": "^0.11.2", + "xterm-addon-webgl": "^0.11.3", "yuv-buffer": "^1.0.0", "yuv-canvas": "^1.2.7" }, diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 9fc10fa1..71da18d3 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -18,7 +18,6 @@ dependencies: '@rush-temp/ts-package-builder': file:projects/ts-package-builder.tgz '@rush-temp/unofficial-adb-book': file:projects/unofficial-adb-book.tgz_@types+react@17.0.27 '@svgr/webpack': 5.5.0 - '@types/dom-webcodecs': 0.1.2 '@types/jest': 26.0.24 '@types/node': 16.9.1 '@types/react': 17.0.27 @@ -45,10 +44,10 @@ dependencies: tslib: 2.3.1 unist-util-visit: 2.0.3 url-loader: 4.1.1_file-loader@6.2.0 - xterm: 4.14.1 - xterm-addon-fit: 0.5.0_xterm@4.14.1 - xterm-addon-search: 0.8.1_xterm@4.14.1 - xterm-addon-webgl: 0.11.2_xterm@4.14.1 + xterm: 4.15.0 + xterm-addon-fit: 0.5.0_xterm@4.15.0 + xterm-addon-search: 0.8.1_xterm@4.15.0 + xterm-addon-webgl: 0.11.3_xterm@4.15.0 yuv-buffer: 1.0.0 yuv-canvas: 1.2.7 lockfileVersion: 5.2 @@ -14354,34 +14353,34 @@ packages: node: '>=0.4' resolution: integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - /xterm-addon-fit/0.5.0_xterm@4.14.1: + /xterm-addon-fit/0.5.0_xterm@4.15.0: dependencies: - xterm: 4.14.1 + xterm: 4.15.0 dev: false peerDependencies: xterm: ^4.0.0 resolution: integrity: sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== - /xterm-addon-search/0.8.1_xterm@4.14.1: + /xterm-addon-search/0.8.1_xterm@4.15.0: dependencies: - xterm: 4.14.1 + xterm: 4.15.0 dev: false peerDependencies: xterm: ^4.0.0 resolution: integrity: sha512-OtOaC9gxD2Q4ZnjZrCSRZmKLwwUjXX3gP7mIzq8Rs50317DGRDqgTLuHTYv/Nx/LvI5ceVFRYCxK36Ixs1nXNw== - /xterm-addon-webgl/0.11.2_xterm@4.14.1: + /xterm-addon-webgl/0.11.3_xterm@4.15.0: dependencies: - xterm: 4.14.1 + xterm: 4.15.0 dev: false peerDependencies: xterm: ^4.0.0 resolution: - integrity: sha512-eEOKEIMZO0IRb+UTHhTaUwxpD1cu7Zqr+jdUfhDv9cfVieg9c4mcRn9RWvNGlprGdlLmOSTUByhm8ve6qAc4HQ== - /xterm/4.14.1: + integrity: sha512-Lr6VjLYOrgxLNaUNLDdCBehkr1Vaja/laDMTtvghfRusUMRXTlRKlCb7E3yqx4VgCg5KcV96cArmh88KcwSpUg== + /xterm/4.15.0: dev: false resolution: - integrity: sha512-jgzNg5BuGPwq5/M4dGnmbghZvHx2jaj+9crSEt15bV34Za49VziBmCu7zIy88zUKKiGTxeo7aVzirFSJArIMFw== + integrity: sha512-Ik1GoSq1yqKZQ2LF37RPS01kX9t4TP8gpamUYblD09yvWX5mEYuMK4CcqH6+plgiNEZduhTz/UrcaWs97gOlOw== /y18n/4.0.3: dev: false resolution: @@ -14530,10 +14529,10 @@ packages: streamsaver: 2.0.5 tinyh264: 0.0.7 typescript: 4.4.3 - xterm: 4.14.1 - xterm-addon-fit: 0.5.0_xterm@4.14.1 - xterm-addon-search: 0.8.1_xterm@4.14.1 - xterm-addon-webgl: 0.11.2_xterm@4.14.1 + xterm: 4.15.0 + xterm-addon-fit: 0.5.0_xterm@4.15.0 + xterm-addon-search: 0.8.1_xterm@4.15.0 + xterm-addon-webgl: 0.11.3_xterm@4.15.0 yuv-buffer: 1.0.0 yuv-canvas: 1.2.7 dev: false @@ -14542,7 +14541,7 @@ packages: peerDependencies: '@mdx-js/react': '*' resolution: - integrity: sha512-yQ64kuvfu4zYm4ZajZmSBH/mu4xK54yOuKLfQXbX1UDDxM/Kn3hj2ZWuqXMqrCUf64R1t9PP8/XFKYgsvJkvew== + integrity: sha512-5zEy73JOnTj2je1iwyYva2J1zai6TiNnZJ5TgNP3Yh/CkdASyOqVQiaI1PuYkF0G/xvO/baF1ldaZsWz3A+RVQ== tarball: file:projects/demo.tgz version: 0.0.0 file:projects/event.tgz: @@ -14638,7 +14637,6 @@ specifiers: '@rush-temp/ts-package-builder': file:./projects/ts-package-builder.tgz '@rush-temp/unofficial-adb-book': file:./projects/unofficial-adb-book.tgz '@svgr/webpack': ^5.5.0 - '@types/dom-webcodecs': ^0.1.2 '@types/jest': ^26.0.23 '@types/node': ^16.9.1 '@types/react': 17.0.27 @@ -14665,9 +14663,9 @@ specifiers: tslib: ^2.3.1 unist-util-visit: ^2.0.0 url-loader: ^4.1.1 - xterm: ^4.14.1 + xterm: ^4.15.0 xterm-addon-fit: ^0.5.0 xterm-addon-search: ^0.8.1 - xterm-addon-webgl: ^0.11.2 + xterm-addon-webgl: ^0.11.3 yuv-buffer: ^1.0.0 yuv-canvas: ^1.2.7