diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY index 982d6ab..e156d5c 100644 --- a/LICENSE-THIRD-PARTY +++ b/LICENSE-THIRD-PARTY @@ -164,8 +164,8 @@ │ ├─ repository: https://github.com/babel/babel │ ├─ publisher: The Babel Team │ ├─ url: https://babel.dev/team -│ ├─ path: H:\workspace\ng-terminal\node_modules\@babel\helper-remap-async-to-generator\node_modules\@babel\helper-annotate-as-pure -│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\@babel\helper-remap-async-to-generator\node_modules\@babel\helper-annotate-as-pure\LICENSE +│ ├─ path: H:\workspace\ng-terminal\node_modules\@babel\helper-create-class-features-plugin\node_modules\@babel\helper-annotate-as-pure +│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\@babel\helper-create-class-features-plugin\node_modules\@babel\helper-annotate-as-pure\LICENSE ├─ @babel/helper-builder-binary-assignment-operator-visitor@7.22.5 │ ├─ licenses: MIT │ ├─ repository: https://github.com/babel/babel @@ -1391,6 +1391,25 @@ │ ├─ publisher: Sven Sauleau │ ├─ path: H:\workspace\ng-terminal\node_modules\@webassemblyjs\wast-printer │ └─ licenseFile: H:\workspace\ng-terminal\node_modules\@webassemblyjs\wast-printer\LICENSE +├─ @xterm/addon-fit@0.9.0 +│ ├─ licenses: MIT +│ ├─ repository: https://github.com/xtermjs/xterm.js/tree/master/addons/addon-fit +│ ├─ publisher: The xterm.js authors +│ ├─ url: https://xtermjs.org/ +│ ├─ path: H:\workspace\ng-terminal\node_modules\@xterm\addon-fit +│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\@xterm\addon-fit\LICENSE +├─ @xterm/addon-web-links@0.10.0 +│ ├─ licenses: MIT +│ ├─ repository: https://github.com/xtermjs/xterm.js/tree/master/addons/addon-web-links +│ ├─ publisher: The xterm.js authors +│ ├─ url: https://xtermjs.org/ +│ ├─ path: H:\workspace\ng-terminal\node_modules\@xterm\addon-web-links +│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\@xterm\addon-web-links\LICENSE +├─ @xterm/xterm@5.4.0 +│ ├─ licenses: MIT +│ ├─ repository: https://github.com/xtermjs/xterm.js +│ ├─ path: H:\workspace\ng-terminal\node_modules\@xterm\xterm +│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\@xterm\xterm\LICENSE ├─ @xtuc/ieee754@1.2.0 │ ├─ licenses: BSD-3-Clause │ ├─ repository: https://github.com/feross/ieee754 @@ -3683,8 +3702,8 @@ │ ├─ licenses: MIT │ ├─ repository: https://github.com/webpack/loader-utils │ ├─ publisher: Tobias Koppers @sokra -│ ├─ path: H:\workspace\ng-terminal\node_modules\babel-loader\node_modules\loader-utils -│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\babel-loader\node_modules\loader-utils\LICENSE +│ ├─ path: H:\workspace\ng-terminal\node_modules\adjust-sourcemap-loader\node_modules\loader-utils +│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\adjust-sourcemap-loader\node_modules\loader-utils\LICENSE ├─ loader-utils@3.2.1 │ ├─ licenses: MIT │ ├─ repository: https://github.com/webpack/loader-utils @@ -6152,20 +6171,6 @@ │ ├─ email: raynos2@gmail.com │ ├─ path: H:\workspace\ng-terminal\node_modules\xtend │ └─ licenseFile: H:\workspace\ng-terminal\node_modules\xtend\LICENSE -├─ xterm-addon-fit@0.8.0 -│ ├─ licenses: MIT -│ ├─ repository: https://github.com/xtermjs/xterm.js -│ ├─ publisher: The xterm.js authors -│ ├─ url: https://xtermjs.org/ -│ ├─ path: H:\workspace\ng-terminal\node_modules\xterm-addon-fit -│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\xterm-addon-fit\LICENSE -├─ xterm-addon-web-links@0.9.0 -│ ├─ licenses: MIT -│ ├─ repository: https://github.com/xtermjs/xterm.js -│ ├─ publisher: The xterm.js authors -│ ├─ url: https://xtermjs.org/ -│ ├─ path: H:\workspace\ng-terminal\node_modules\xterm-addon-web-links -│ └─ licenseFile: H:\workspace\ng-terminal\node_modules\xterm-addon-web-links\LICENSE ├─ xterm-addon-webgl@0.16.0 │ ├─ licenses: MIT │ ├─ repository: https://github.com/xtermjs/xterm.js diff --git a/package-lock.json b/package-lock.json index c72c2cc..6ac06e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,13 +18,13 @@ "@angular/platform-browser-dynamic": "~14.3.0", "@angular/router": "~14.3.0", "@juggle/resize-observer": "^3.4.0", + "@xterm/addon-fit": "^0.9.0", + "@xterm/addon-web-links": "^0.10.0", + "@xterm/xterm": "^5.4.0", "angular-resizable-element": "^5.0.0", "ngx-json-viewer": "^2.4.0", "rxjs": "~7.5.0", "tslib": "^2.3.0", - "xterm": "^5.3.0", - "xterm-addon-fit": "^0.8.0", - "xterm-addon-web-links": "^0.9.0", "xterm-addon-webgl": "^0.16.0", "zone.js": "~0.11.4" }, @@ -3685,6 +3685,27 @@ "@xtuc/long": "4.2.2" } }, + "node_modules/@xterm/addon-fit": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.9.0.tgz", + "integrity": "sha512-hDlPPbTVPYyvwXu/asW8HbJkI/2RMi0cMaJnBZYVeJB0SWP2NeESMCNr+I7CvBlyI0sAxpxOg8Wk4OMkxBz9WA==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/addon-web-links": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-web-links/-/addon-web-links-0.10.0.tgz", + "integrity": "sha512-QhrHCUr8w6ATGviyXwcAIM1qN3nD1hdxwMC8fsW7z/6aaQlb2nt7zmByJt4eOn7ZzrHOzczljqV5S2pkdQp2xw==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/xterm": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.4.0.tgz", + "integrity": "sha512-GlyzcZZ7LJjhFevthHtikhiDIl8lnTSgol6eTM4aoSNLcuXu3OEhnbqdCVIjtIil3jjabf3gDtb1S8FGahsuEw==" + }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -13367,23 +13388,8 @@ "node_modules/xterm": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz", - "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==" - }, - "node_modules/xterm-addon-fit": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz", - "integrity": "sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw==", - "peerDependencies": { - "xterm": "^5.0.0" - } - }, - "node_modules/xterm-addon-web-links": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.9.0.tgz", - "integrity": "sha512-LIzi4jBbPlrKMZF3ihoyqayWyTXAwGfu4yprz1aK2p71e9UKXN6RRzVONR0L+Zd+Ik5tPVI9bwp9e8fDTQh49Q==", - "peerDependencies": { - "xterm": "^5.0.0" - } + "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==", + "peer": true }, "node_modules/xterm-addon-webgl": { "version": "0.16.0", @@ -16106,6 +16112,23 @@ "@xtuc/long": "4.2.2" } }, + "@xterm/addon-fit": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.9.0.tgz", + "integrity": "sha512-hDlPPbTVPYyvwXu/asW8HbJkI/2RMi0cMaJnBZYVeJB0SWP2NeESMCNr+I7CvBlyI0sAxpxOg8Wk4OMkxBz9WA==", + "requires": {} + }, + "@xterm/addon-web-links": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-web-links/-/addon-web-links-0.10.0.tgz", + "integrity": "sha512-QhrHCUr8w6ATGviyXwcAIM1qN3nD1hdxwMC8fsW7z/6aaQlb2nt7zmByJt4eOn7ZzrHOzczljqV5S2pkdQp2xw==", + "requires": {} + }, + "@xterm/xterm": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.4.0.tgz", + "integrity": "sha512-GlyzcZZ7LJjhFevthHtikhiDIl8lnTSgol6eTM4aoSNLcuXu3OEhnbqdCVIjtIil3jjabf3gDtb1S8FGahsuEw==" + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -23149,19 +23172,8 @@ "xterm": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz", - "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==" - }, - "xterm-addon-fit": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz", - "integrity": "sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw==", - "requires": {} - }, - "xterm-addon-web-links": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.9.0.tgz", - "integrity": "sha512-LIzi4jBbPlrKMZF3ihoyqayWyTXAwGfu4yprz1aK2p71e9UKXN6RRzVONR0L+Zd+Ik5tPVI9bwp9e8fDTQh49Q==", - "requires": {} + "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==", + "peer": true }, "xterm-addon-webgl": { "version": "0.16.0", diff --git a/package.json b/package.json index 111a01a..bc05b77 100644 --- a/package.json +++ b/package.json @@ -37,10 +37,10 @@ "ngx-json-viewer": "^2.4.0", "rxjs": "~7.5.0", "tslib": "^2.3.0", - "xterm": "^5.3.0", - "xterm-addon-fit": "^0.8.0", - "xterm-addon-web-links": "^0.9.0", + "@xterm/xterm": "^5.4.0", + "@xterm/addon-fit": "^0.9.0", "zone.js": "~0.11.4", + "@xterm/addon-web-links": "^0.10.0", "xterm-addon-webgl": "^0.16.0" }, "devDependencies": { diff --git a/projects/demo/src/app/example.component.ts b/projects/demo/src/app/example.component.ts index 0cde4ca..65186e0 100644 --- a/projects/demo/src/app/example.component.ts +++ b/projects/demo/src/app/example.component.ts @@ -11,9 +11,9 @@ import { Subject } from 'rxjs'; import { KindOfCharacterAttributes, NgTerminal } from 'ng-terminal'; import { FormControl } from '@angular/forms'; import { MatSlideToggleChange } from '@angular/material/slide-toggle'; -import { Terminal } from 'xterm'; +import { Terminal } from '@xterm/xterm'; import { FunctionsUsingCSI } from 'ng-terminal'; -import { WebLinksAddon } from 'xterm-addon-web-links'; +import { WebLinksAddon } from '@xterm/addon-web-links'; import { WebglAddon } from 'xterm-addon-webgl'; @Component({ diff --git a/projects/ng-terminal/package.json b/projects/ng-terminal/package.json index 9bd3555..ae1f458 100644 --- a/projects/ng-terminal/package.json +++ b/projects/ng-terminal/package.json @@ -38,8 +38,8 @@ "dependencies": { "angular-resizable-element": "^5.0.0", "@juggle/resize-observer": "^3.4.0", - "xterm-addon-fit": "^0.8.0", - "xterm": "^5.3.0", + "@xterm/addon-fit": "^0.9.0", + "@xterm/xterm": "^5.4.0", "tslib": "^2.3.0" } } diff --git a/projects/ng-terminal/src/lib/ng-terminal.component.ts b/projects/ng-terminal/src/lib/ng-terminal.component.ts index cf41b06..a8a3d93 100644 --- a/projects/ng-terminal/src/lib/ng-terminal.component.ts +++ b/projects/ng-terminal/src/lib/ng-terminal.component.ts @@ -15,8 +15,8 @@ import { SimpleChanges, isDevMode, } from '@angular/core'; -import { ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from 'xterm'; -import { FitAddon } from 'xterm-addon-fit'; +import { ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from '@xterm/xterm'; +import { FitAddon } from '@xterm/addon-fit'; import { NgTerminal } from './ng-terminal'; import { Subject, Observable, Subscription } from 'rxjs'; import { ResizeEvent } from 'angular-resizable-element'; diff --git a/projects/ng-terminal/src/lib/ng-terminal.ts b/projects/ng-terminal/src/lib/ng-terminal.ts index 304ba78..28ae15a 100644 --- a/projects/ng-terminal/src/lib/ng-terminal.ts +++ b/projects/ng-terminal/src/lib/ng-terminal.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from 'xterm'; +import { ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from '@xterm/xterm'; interface TerminalWrapper{ /**