From 6830292d23d84bdf70f9a39b0ba33282e348402c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 12 Aug 2024 05:42:12 +0200 Subject: [PATCH] package.json: Switch to @xterm/* These are the new names, and they have more recent releases. See /~https://github.com/cockpit-project/cockpit/commit/c9096a71671be7 Follow suit. --- .github/dependabot.yml | 2 +- Makefile | 2 +- node_modules | 2 +- package.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b756c67d5..5b99958f2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -34,7 +34,7 @@ updates: - "types*" xterm: patterns: - - "xterm*" + - "@xterm*" - package-ecosystem: "github-actions" directory: "/" diff --git a/Makefile b/Makefile index d70e85c3f..66c7e50d1 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ COCKPIT_REPO_FILES = \ $(NULL) COCKPIT_REPO_URL = /~https://github.com/cockpit-project/cockpit.git -COCKPIT_REPO_COMMIT = 07fddba43934fb256ec8da03812f081eab3baa18 # 321 + 117 commits +COCKPIT_REPO_COMMIT = b5a98be3e0601b45cd8a557cde1c80b896a903fb # 322 + 19 commits $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP) COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}' diff --git a/node_modules b/node_modules index 167a8700b..5ab1c64fb 160000 --- a/node_modules +++ b/node_modules @@ -1 +1 @@ -Subproject commit 167a8700bbadbb7c117cfa080c5a5b9aba77fcf1 +Subproject commit 5ab1c64fbe627f0f53945d19d0a47ca37c07cde3 diff --git a/package.json b/package.json index f78539ab4..784a688a2 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,8 @@ "@patternfly/react-styles": "5.3.1", "@patternfly/react-table": "5.3.4", "@patternfly/react-tokens": "5.3.1", + "@xterm/addon-canvas": "0.7.0", + "@xterm/xterm": "5.5.0", "dequal": "2.0.3", "prop-types": "15.8.1", "react": "18.3.1", @@ -59,8 +61,6 @@ "redux": "5.0.1", "redux-thunk": "3.1.0", "throttle-debounce": "5.0.2", - "xterm": "5.1.0", - "xterm-addon-canvas": "0.5.0", "@novnc/novnc": "1.4.0" } }