Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies to fix #8032 #8051

Open
wants to merge 9 commits into
base: canary
Choose a base branch
from
Open

Upgrade dependencies to fix #8032 #8051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
48b1564
Create codeql.yml
philip-peterson Nov 22, 2024
5ed18b5
Temporarily disable mac and windows builds
philip-peterson Nov 22, 2024
c758523
rely only on codeql-analysis.yml
philip-peterson Nov 23, 2024
68b1950
empty
philip-peterson Nov 23, 2024
052dbea
Bump @types/node from 18.19.31 to 22.9.2 (#72)
dependabot[bot] Nov 23, 2024
ebd3ac2
Bump ava from 6.1.2 to 6.2.0 (#55)
dependabot[bot] Nov 23, 2024
bd24ae3
Bump typescript-json-schema from 0.63.0 to 0.65.1 (#54)
dependabot[bot] Nov 23, 2024
cfee97c
Tweak ava config (#77)
philip-peterson Nov 23, 2024
cc7141c
Moves xterm-* dependencies to @xterm/* dependencies and performs
philip-peterson Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ jobs:
strategy:
matrix:
os:
- macos-latest
- ubuntu-latest
- windows-latest
#TODO re-enable these:
#- macos-latest
#- windows-latest
fail-fast: false
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion ava-e2e.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ module.exports = {
files: ['test/*'],
extensions: ['ts'],
require: ['ts-node/register/transpile-only'],
timeout: '30s'
timeout: '2m'
};
16 changes: 8 additions & 8 deletions bin/snapshot-libs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require('redux');
require('reselect');
require('seamless-immutable');
require('stylis');
require('xterm-addon-unicode11');
require('@xterm/addon-unicode11');
// eslint-disable-next-line no-constant-condition
if (false) {
require('args');
Expand All @@ -21,11 +21,11 @@ if (false) {
require('react-dom');
require('react-redux');
require('react');
require('xterm-addon-fit');
require('xterm-addon-image');
require('xterm-addon-search');
require('xterm-addon-web-links');
require('xterm-addon-webgl');
require('xterm-addon-canvas');
require('xterm');
require('@xterm/addon-fit');
require('@xterm/addon-image');
require('@xterm/addon-search');
require('@xterm/addon-web-links');
require('@xterm/addon-webgl');
require('@xterm/addon-canvas');
require('@xterm/xterm');
}
24 changes: 12 additions & 12 deletions lib/components/term.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import {clipboard, shell} from 'electron';
import React from 'react';

import {CanvasAddon} from '@xterm/addon-canvas';
import {FitAddon} from '@xterm/addon-fit';
import {ImageAddon} from '@xterm/addon-image';
import {LigaturesAddon} from '@xterm/addon-ligatures';
import {SearchAddon} from '@xterm/addon-search';
import type {ISearchDecorationOptions} from '@xterm/addon-search';
import {Unicode11Addon} from '@xterm/addon-unicode11';
import {WebLinksAddon} from '@xterm/addon-web-links';
import {WebglAddon} from '@xterm/addon-webgl';
import {Terminal} from '@xterm/xterm';
import type {ITerminalOptions, IDisposable} from '@xterm/xterm';
import Color from 'color';
import isEqual from 'lodash/isEqual';
import pickBy from 'lodash/pickBy';
import {Terminal} from 'xterm';
import type {ITerminalOptions, IDisposable} from 'xterm';
import {CanvasAddon} from 'xterm-addon-canvas';
import {FitAddon} from 'xterm-addon-fit';
import {ImageAddon} from 'xterm-addon-image';
import {LigaturesAddon} from 'xterm-addon-ligatures';
import {SearchAddon} from 'xterm-addon-search';
import type {ISearchDecorationOptions} from 'xterm-addon-search';
import {Unicode11Addon} from 'xterm-addon-unicode11';
import {WebLinksAddon} from 'xterm-addon-web-links';
import {WebglAddon} from 'xterm-addon-webgl';

import type {TermProps} from '../../typings/hyper';
import terms from '../terms';
Expand All @@ -23,7 +23,7 @@ import {decorate} from '../utils/plugins';

import _SearchBox from './searchBox';

import 'xterm/css/xterm.css';
import '@xterm/xterm/css/xterm.css';

const SearchBox = decorate(_SearchBox, 'SearchBox');

Expand Down
24 changes: 12 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@
"shebang-loader": "0.0.1",
"styled-jsx": "5.1.2",
"stylis": "3.5.4",
"typescript-json-schema": "0.63.0",
"typescript-json-schema": "0.65.1",
"uuid": "9.0.1",
"webpack-cli": "5.1.4",
"xterm": "5.3.0",
"xterm-addon-canvas": "0.5.0",
"xterm-addon-fit": "0.8.0",
"xterm-addon-image": "0.5.0",
"xterm-addon-ligatures": "0.7.0",
"xterm-addon-search": "0.13.0",
"xterm-addon-unicode11": "0.6.0",
"xterm-addon-web-links": "0.9.0",
"xterm-addon-webgl": "0.16.0"
"@xterm/xterm": "5.4.0",
"@xterm/addon-canvas": "0.6.0",
"@xterm/addon-fit": "0.9.0",
"@xterm/addon-image": "0.7.0",
"@xterm/addon-ligatures": "0.8.0",
"@xterm/addon-search": "0.14.0",
"@xterm/addon-unicode11": "0.7.0",
"@xterm/addon-web-links": "0.10.0",
"@xterm/addon-webgl": "0.17.0"
},
"devDependencies": {
"@ava/babel": "2.0.0",
Expand All @@ -91,7 +91,7 @@
"@types/lodash": "^4.17.0",
"@types/mousetrap": "1.6.15",
"@types/ms": "0.7.34",
"@types/node": "18.19.31",
"@types/node": "22.9.2",
"@types/plist": "3.0.5",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
Expand All @@ -100,7 +100,7 @@
"@types/uuid": "9.0.8",
"@typescript-eslint/eslint-plugin": "7.0.0",
"@typescript-eslint/parser": "6.21.0",
"ava": "6.1.2",
"ava": "6.2.0",
"babel-loader": "9.1.3",
"concurrently": "8.2.2",
"copy-webpack-plugin": "12.0.2",
Expand Down
8 changes: 7 additions & 1 deletion test/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,11 @@ test.after(async () => {
});

test('see if dev tools are open', async (t) => {
t.false(await app.evaluate(({webContents}) => !!webContents.getFocusedWebContents()?.isDevToolsOpened()));
const result = app.evaluate(({webContents}) => {
const focused = webContents.getFocusedWebContents();
const isDevOpen = focused?.isDevToolsOpened();
return Boolean(isDevOpen);
});

t.false(await result);
});
2 changes: 1 addition & 1 deletion typings/config.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type {FontWeight} from 'xterm';
import type {FontWeight} from '@xterm/xterm';

export type ColorMap = {
black: string;
Expand Down
6 changes: 3 additions & 3 deletions typings/hyper.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export type ITermState = Immutable<{
}>;

export type cursorShapes = 'BEAM' | 'UNDERLINE' | 'BLOCK';
import type {FontWeight, IWindowsPty, Terminal} from 'xterm';
import type {FontWeight, IWindowsPty, Terminal} from '@xterm/xterm';
import type {ColorMap, configOptions} from './config';

export type uiState = Immutable<{
Expand Down Expand Up @@ -342,8 +342,8 @@ export type SearchBoxProps = {
font: string;
};

import type {FitAddon} from 'xterm-addon-fit';
import type {SearchAddon} from 'xterm-addon-search';
import type {FitAddon} from '@xterm/addon-fit';
import type {SearchAddon} from '@xterm/addon-search';
export type TermProps = {
backgroundColor: string;
bell: 'SOUND' | false;
Expand Down
14 changes: 7 additions & 7 deletions webpack.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,16 @@ const config: webpack.Configuration[] = [
reselect: 'require("./node_modules/reselect/lib/index.js")',
'seamless-immutable': 'require("./node_modules/seamless-immutable/src/seamless-immutable.js")',
stylis: 'require("./node_modules/stylis/stylis.js")',
'xterm-addon-unicode11': 'require("./node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js")',
'@xterm/addon-unicode11': 'require("./node_modules/@xterm/addon-unicode11/lib/addon-unicode11.js")',
args: 'require("./node_modules/args/lib/index.js")',
mousetrap: 'require("./node_modules/mousetrap/mousetrap.js")',
open: 'require("./node_modules/open/index.js")',
'xterm-addon-fit': 'require("./node_modules/xterm-addon-fit/lib/xterm-addon-fit.js")',
'xterm-addon-image': 'require("./node_modules/xterm-addon-image/lib/xterm-addon-image.js")',
'xterm-addon-search': 'require("./node_modules/xterm-addon-search/lib/xterm-addon-search.js")',
'xterm-addon-web-links': 'require("./node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js")',
'xterm-addon-webgl': 'require("./node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js")',
'xterm-addon-canvas': 'require("./node_modules/xterm-addon-canvas/lib/xterm-addon-canvas.js")',
'@xterm/addon-fit': 'require("./node_modules/@xterm/addon-fit/lib/addon-fit.js")',
'@xterm/addon-image': 'require("./node_modules/@xterm/addon-image/lib/addon-image.js")',
'@xterm/addon-search': 'require("./node_modules/@xterm/addon-search/lib/addon-search.js")',
'@xterm/addon-web-links': 'require("./node_modules/@xterm/addon-web-links/lib/addon-web-links.js")',
'@xterm/addon-webgl': 'require("./node_modules/@xterm/addon-webgl/lib/addon-webgl.js")',
'@xterm/addon-canvas': 'require("./node_modules/@xterm/addon-canvas/lib/addon-canvas.js")',
xterm: 'require("./node_modules/xterm/lib/xterm.js")'
},
plugins: [
Expand Down
Loading