diff --git a/.github/actions/get-node-version/Dockerfile b/.github/actions/get-node-version/Dockerfile index 5cd931e54..cb0da93d7 100644 --- a/.github/actions/get-node-version/Dockerfile +++ b/.github/actions/get-node-version/Dockerfile @@ -1,5 +1,5 @@ # Image already pulled on runners -FROM node:16-alpine +FROM node:20-alpine WORKDIR /src COPY package.json yarn.lock ./ RUN yarn install --frozen-lockfile diff --git a/.github/actions/get-node-version/package.json b/.github/actions/get-node-version/package.json index f3090a741..838aaf911 100644 --- a/.github/actions/get-node-version/package.json +++ b/.github/actions/get-node-version/package.json @@ -5,16 +5,16 @@ "directory": ".github/actions/get-node-version" }, "engines": { - "node": "^16.6.0" + "node": "^20.17.0" }, "scripts": { "build": "tsc" }, "dependencies": { "@actions/core": "^1.4.0", - "@types/node": "^16.6.2", + "@types/node": "^20.16.0", "@types/semver": "^7.3.8", "semver": "^7.3.5", - "typescript": "^4.4.2" + "typescript": "^5.6.2" } } diff --git a/.github/actions/get-node-version/yarn.lock b/.github/actions/get-node-version/yarn.lock index 3c48af75b..255f0d4de 100644 --- a/.github/actions/get-node-version/yarn.lock +++ b/.github/actions/get-node-version/yarn.lock @@ -7,10 +7,12 @@ resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz#cf2e6ee317e314b03886adfeb20e448d50d6e524" integrity sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg== -"@types/node@^16.6.2": - version "16.11.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz#2e3ad0a680d96367103d3e670d41c2fed3da61ae" - integrity sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA== +"@types/node@^20.16.0": + version "20.16.7" + resolved "https://registry.npmjs.org/@types/node/-/node-20.16.7.tgz#0a245bf5805add998a22b8b5adac612ee70190bc" + integrity sha512-QkDQjAY3gkvJNcZOWwzy3BN34RweT0OQ9zJyvLCU0kSK22dO2QYh/NHGfbEAYylPYzRB1/iXcojS79wOg5gFSw== + dependencies: + undici-types "~6.19.2" "@types/semver@^7.3.8": version "7.3.8" @@ -31,10 +33,15 @@ semver@^7.3.5: dependencies: lru-cache "^6.0.0" -typescript@^4.4.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998" - integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw== +typescript@^5.6.2: + version "5.6.2" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0" + integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw== + +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== yallist@^4.0.0: version "4.0.0" diff --git a/apps/cyberstorm-remix/Dockerfile b/apps/cyberstorm-remix/Dockerfile index 82dc3cfd0..6f953f385 100644 --- a/apps/cyberstorm-remix/Dockerfile +++ b/apps/cyberstorm-remix/Dockerfile @@ -1,5 +1,5 @@ # For running @thunderstore/cyberstorm-remix in Docker container. -FROM node:18-alpine3.17 +FROM node:20-alpine3.19 RUN apk add --no-cache libc6-compat WORKDIR /app diff --git a/apps/cyberstorm-remix/app/root.tsx b/apps/cyberstorm-remix/app/root.tsx index 072a5fd85..275f97145 100644 --- a/apps/cyberstorm-remix/app/root.tsx +++ b/apps/cyberstorm-remix/app/root.tsx @@ -15,8 +15,7 @@ import { } from "@remix-run/react"; // import { LinksFunction } from "@remix-run/react/dist/routeModules"; import { Footer } from "@thunderstore/cyberstorm/src/components/Footer/Footer"; -import * as RadixTooltip from "@radix-ui/react-tooltip"; -const { TooltipProvider } = RadixTooltip; +import { Provider as RadixTooltip } from "@radix-ui/react-tooltip"; import { Navigation } from "cyberstorm/navigation/Navigation"; import { LinkLibrary } from "cyberstorm/utils/LinkLibrary"; @@ -171,7 +170,7 @@ function Root() { > - + {/* REMIX TODO: For whatever reason the Navigation seems to cause suspense boundary errors. Couldn't find a reason why */} @@ -190,7 +189,7 @@ function Root() { - + @@ -234,7 +233,7 @@ export function ErrorBoundary() { - + {/* */} @@ -261,7 +260,7 @@ export function ErrorBoundary() { - +