Skip to content

Commit

Permalink
Update Node and many package versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Oksamies committed Sep 24, 2024
1 parent 651b16b commit 3a5467b
Show file tree
Hide file tree
Showing 20 changed files with 44,966 additions and 7,494 deletions.
2 changes: 1 addition & 1 deletion apps/cyberstorm-remix/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 5 additions & 6 deletions apps/cyberstorm-remix/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -171,7 +170,7 @@ function Root() {
>
<LinkingProvider value={LinkLibrary}>
<Toast.Provider toastDuration={10000}>
<TooltipProvider delayDuration={300}>
<RadixTooltip delayDuration={300}>
<div className={styles.root}>
{/* REMIX TODO: For whatever reason the Navigation seems to cause suspense boundary errors. Couldn't find a reason why */}
<Navigation />
Expand All @@ -190,7 +189,7 @@ function Root() {
</section>
<Footer />
</div>
</TooltipProvider>
</RadixTooltip>
</Toast.Provider>
</LinkingProvider>
</SessionProvider>
Expand Down Expand Up @@ -234,7 +233,7 @@ export function ErrorBoundary() {
<Scripts />
<LinkingProvider value={LinkLibrary}>
<Toast.Provider toastDuration={10000}>
<TooltipProvider delayDuration={300}>
<RadixTooltip delayDuration={300}>
<div className={styles.root}>
{/* <Navigation user={getEmptyUser} /> */}
<section className={styles.content}>
Expand All @@ -261,7 +260,7 @@ export function ErrorBoundary() {
</section>
<Footer />
</div>
</TooltipProvider>
</RadixTooltip>
</Toast.Provider>
</LinkingProvider>
</body>
Expand Down
49 changes: 24 additions & 25 deletions apps/cyberstorm-remix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,39 @@
"typecheck": "tsc"
},
"dependencies": {
"@remix-run/node": "^2.12.0",
"@remix-run/react": "^2.12.0",
"@remix-run/serve": "^2.12.0",
"@sentry/remix": "^8.7.0",
"@sentry/vite-plugin": "^2.22.2",
"@remix-run/node": "^2.12.1",
"@remix-run/react": "^2.12.1",
"@remix-run/serve": "^2.12.1",
"@sentry/remix": "^8.31.0",
"@sentry/vite-plugin": "^2.22.4",
"@thunderstore/cyberstorm": "^0.1.0",
"@thunderstore/cyberstorm-styles": "^0.1.0",
"@thunderstore/dapper": "^0.1.0",
"@thunderstore/dapper-ts": "^0.1.0",
"buffer": "^6.0.3",
"isbot": "^4.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"remix-utils": "^7.6.0"
"isbot": "^5.1.17",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"remix-utils": "^7.7.0"
},
"devDependencies": {
"@remix-run/dev": "^2.12.0",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"eslint": "^8.38.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"typescript": "^5.1.6",
"@remix-run/dev": "^2.12.1",
"@types/react": "^18.3.8",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"eslint": "^8.57.1",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-react": "^7.36.1",
"eslint-plugin-react-hooks": "^4.6.2",
"typescript": "^5.6.2",
"typescript-plugin-css-modules": "^5.1.0",
"vite": "^5.1.0",
"vite-plugin-cjs-interop": "^2.1.0",
"vite-tsconfig-paths": "^4.2.1"
"vite": "^5.4.7",
"vite-tsconfig-paths": "^5.0.1"
},
"engines": {
"node": ">=18.0.0"
"node": ">=20.17.0"
}
}
24 changes: 0 additions & 24 deletions apps/cyberstorm-remix/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { vitePlugin as remix } from "@remix-run/dev";
import { installGlobals } from "@remix-run/node";
import { defineConfig } from "vite";
import tsconfigPaths from "vite-tsconfig-paths";
import { cjsInterop } from "vite-plugin-cjs-interop";
import { sentryVitePlugin } from "@sentry/vite-plugin";

installGlobals();
Expand Down Expand Up @@ -86,29 +85,6 @@ export default defineConfig({
},
}),
tsconfigPaths(),
cjsInterop({
// REMIX TODO: Figure out if some of the radix packages can be updated
// so that we don't need to do this.
// List of CJS dependencies that require interop
dependencies: [
"@radix-ui/react-checkbox",
"@radix-ui/react-dialog",
"@radix-ui/react-dropdown-menu",
// "@radix-ui/react-radio-group",
// "@radix-ui/react-select",
// "@radix-ui/react-switch",
// "@radix-ui/react-toast",
"@radix-ui/react-tooltip",
// "@thunderstore/cyberstorm/**",
// "some-package",
// // Deep imports should be specified separately
// "some-package/deep/import",
// // But globs are supported
// "some-package/foo/*",
// // Even deep globs for scoped packages
// "@some-scope/**",
],
}),
sentryVitePlugin({
org: process.env.SENTRY_ORG,
project: process.env.SENTRY_PROJECT,
Expand Down
17 changes: 9 additions & 8 deletions apps/cyberstorm-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@
"main": "index.js",
"license": "MIT",
"dependencies": {
"@storybook/addon-essentials": "^7.4.5",
"@storybook/addon-interactions": "^7.4.5",
"@storybook/addon-links": "^7.4.5",
"@storybook/react-webpack5": "^7.4.5",
"@storybook/addon-essentials": "^8.3.3",
"@storybook/addon-interactions": "^8.3.3",
"@storybook/addon-links": "^8.3.3",
"@storybook/react-webpack5": "^8.3.3",
"@thunderstore/cyberstorm": "^0.1.0",
"@thunderstore/cyberstorm-styles": "^0.1.0",
"@thunderstore/dapper": "^0.1.0",
"@thunderstore/dapper-fake": "^0.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"storybook": "^7.4.5",
"storybook-css-modules": "^1.0.8"
"react": "^18.3.1",
"react-dom": "^18.3.1",
"storybook": "^8.3.3",
"storybook-css-modules": "^1.0.8",
"typescript": "^5.6.2"
},
"scripts": {
"storybook": "storybook dev -p 6006",
Expand Down
Loading

0 comments on commit 3a5467b

Please sign in to comment.