diff --git a/build.assets/versions.mk b/build.assets/versions.mk index eeb874a007faf..2475160ea4dcf 100644 --- a/build.assets/versions.mk +++ b/build.assets/versions.mk @@ -5,7 +5,7 @@ # Sync with devbox.json. GOLANG_VERSION ?= go1.21.7 -NODE_VERSION ?= 18.18.2 +NODE_VERSION ?= 18.19.1 # Run lint-rust check locally before merging code after you bump this. RUST_VERSION ?= 1.71.1 diff --git a/web/packages/build/package.json b/web/packages/build/package.json index 8e3f300c0427a..034c0b85fb409 100644 --- a/web/packages/build/package.json +++ b/web/packages/build/package.json @@ -49,7 +49,7 @@ "@testing-library/user-event": "^14.4.3", "@types/jest": "^29.5.6", "@types/jsdom": "^21.1.0", - "@types/node": "^18.18.5", + "@types/node": "^18.19.17", "@types/react": "^16.8.19", "@types/react-router-dom": "^5.1.1", "@types/react-transition-group": "^4.4.5", diff --git a/web/packages/teleport/src/Player/ProgressBar/ProgressBarDesktop.tsx b/web/packages/teleport/src/Player/ProgressBar/ProgressBarDesktop.tsx index ff87ad60e59bf..8b447ea5e04af 100644 --- a/web/packages/teleport/src/Player/ProgressBar/ProgressBarDesktop.tsx +++ b/web/packages/teleport/src/Player/ProgressBar/ProgressBarDesktop.tsx @@ -31,7 +31,7 @@ export const ProgressBarDesktop = (props: { id?: string; }) => { const { playerClient, durationMs } = props; - const intervalRef = useRef(); + const intervalRef = useRef(); let playSpeed = 1.0; const toHuman = (currentMs: number) => { @@ -71,7 +71,7 @@ export const ProgressBarDesktop = (props: { const smoothOutProgress = (speed: number) => { const smoothingInterval = 25; - intervalRef.current = setInterval(() => { + intervalRef.current = window.setInterval(() => { setState(prevState => { const nextTimeMs = prevState.current + smoothingInterval * speed; if (nextTimeMs <= durationMs) { @@ -91,7 +91,7 @@ export const ProgressBarDesktop = (props: { // should be called when the playback is paused or ended. const stopProgress = () => { throttledUpdateCurrentTime.cancel(); - clearInterval(intervalRef.current); + window.clearInterval(intervalRef.current); }; const throttledUpdateCurrentTime = throttle( diff --git a/web/packages/teleterm/package.json b/web/packages/teleterm/package.json index f659b824e1d39..39cc3c71faf83 100644 --- a/web/packages/teleterm/package.json +++ b/web/packages/teleterm/package.json @@ -44,7 +44,7 @@ "@types/whatwg-url": "^11.0.1", "clean-webpack-plugin": "4.0.0", "cross-env": "5.0.5", - "electron": "28.0.0", + "electron": "28.2.3", "electron-notarize": "^1.2.1", "eslint-import-resolver-webpack": "0.13.2", "eslint-loader": "3.0.3", diff --git a/yarn.lock b/yarn.lock index 948a80aaa4ffd..822bc85e6abe0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4241,21 +4241,18 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^18.11.18": - version "18.16.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.7.tgz#86d0ba2541f808cb78d4dc5d3e40242a349d6db8" - integrity sha512-MFg7ua/bRtnA1hYE3pVyWxGd/r7aMqjNOdHvlSsXV3n8iaeGKkOaPzpJh6/ovf4bEXWcojkeMJpTsq3mzXW4IQ== +"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^18.11.18", "@types/node@^18.19.17": + version "18.19.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.17.tgz#a581a9fb4b2cfdbc61f008804f4436b2d5c40354" + integrity sha512-SzyGKgwPzuWp2SHhlpXKzCX0pIOfcI4V2eF37nNBJOhwlegQ83omtVQ1XxZpDE06V/d6AQvfQdPfnw0tRC//Ng== + dependencies: + undici-types "~5.26.4" "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0": version "16.18.16" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.16.tgz#09ff98b144abae2d7cce3e9fe9040ab2bf73222c" integrity sha512-ZOzvDRWp8dCVBmgnkIqYCArgdFOO9YzocZp8Ra25N/RStKiWvMOXHMz+GjSeVNe5TstaTmTWPucGJkDw0XXJWA== -"@types/node@^18.18.5": - version "18.18.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.5.tgz#afc0fd975df946d6e1add5bbf98264225b212244" - integrity sha512-4slmbtwV59ZxitY4ixUZdy1uRLf9eSIvBWPQxNjhHYWEtn0FryfKpyS2cvADYXTayWdKEIsJengncrVvkI4I6A== - "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -7690,10 +7687,10 @@ electron-to-chromium@^1.4.535: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.551.tgz#14db6660a88f66ce095ea2657abe5653bc7f42ed" integrity sha512-/Ng/W/kFv7wdEHYzxdK7Cv0BHEGSkSB3M0Ssl8Ndr1eMiYeas/+Mv4cNaDqamqWx6nd2uQZfPz6g25z25M/sdw== -electron@28.0.0: - version "28.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-28.0.0.tgz#21e5590c967125a3c1ec6b0d8d923baf9eb6fd72" - integrity sha512-eDhnCFBvG0PGFVEpNIEdBvyuGUBsFdlokd+CtuCe2ER3P+17qxaRfWRxMmksCOKgDHb5Wif5UxqOkZSlA4snlw== +electron@28.2.3: + version "28.2.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.3.tgz#d26821bcfda7ee445b4b75231da4b057a7ce6e7b" + integrity sha512-he9nGphZo03ejDjYBXpmFVw0KBKogXvR2tYxE4dyYvnfw42uaFIBFrwGeenvqoEOfheJfcI0u4rFG6h3QxDwnA== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" @@ -16124,6 +16121,11 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + unfetch@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" @@ -17141,16 +17143,16 @@ xterm-addon-fit@^0.8.0: resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz#48ca99015385141918f955ca7819e85f3691d35f" integrity sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw== -xterm-addon-webgl@^0.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0.tgz#9872d08a64136f893b27ef9a6412136d3bf563c4" - integrity sha512-E8cq1AiqNOv0M/FghPT+zPAEnvIQRDbAbkb04rRYSxUym69elPWVJ4sv22FCLBqM/3LcrmBLl/pELnBebVFKgA== - xterm-addon-web-links@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.9.0.tgz#c65b18588d1f613e703eb6feb7f129e7ff1c63e7" integrity sha512-LIzi4jBbPlrKMZF3ihoyqayWyTXAwGfu4yprz1aK2p71e9UKXN6RRzVONR0L+Zd+Ik5tPVI9bwp9e8fDTQh49Q== +xterm-addon-webgl@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0.tgz#9872d08a64136f893b27ef9a6412136d3bf563c4" + integrity sha512-E8cq1AiqNOv0M/FghPT+zPAEnvIQRDbAbkb04rRYSxUym69elPWVJ4sv22FCLBqM/3LcrmBLl/pELnBebVFKgA== + xterm@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0.tgz#867daf9cc826f3d45b5377320aabd996cb0fce46"