Merge pull request #551 from discretize/may-2-dependencies-2

discretize · May 2, 2023 · 04be6f9 · 04be6f9
2 parents c5b88ea + 0bd9d27
commit 04be6f9
Show file tree

Hide file tree

Showing 12 changed files with 901 additions and 632 deletions.
diff --git a/.github/workflows/main-build-deploy-GH.yml b/.github/workflows/main-build-deploy-GH.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 16
+  NODE_VERSION: 18
 
 jobs:
   build-and-deploy:

diff --git a/.github/workflows/staging-build-nodeploy.yml b/.github/workflows/staging-build-nodeploy.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 16
+  NODE_VERSION: 18
 
 jobs:
   build-and-deploy:

diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
@@ -9,7 +9,7 @@ on:
       - staging
 
 env:
-  NODE_VERSION: 16
+  NODE_VERSION: 18
 
 jobs:
   testAll:

diff --git a/.github/workflows/test-modifiers.yml b/.github/workflows/test-modifiers.yml
@@ -7,7 +7,7 @@ on:
       - src/assets/modifierdata/**
 
 env:
-  NODE_VERSION: 16
+  NODE_VERSION: 18
 
 jobs:
   testModifiers:

diff --git a/.github/workflows/test-presets.yml b/.github/workflows/test-presets.yml
@@ -7,7 +7,7 @@ on:
       - src/assets/presetdata/**
 
 env:
-  NODE_VERSION: 16
+  NODE_VERSION: 18
 
 jobs:
   testPresets:

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16
+v18
diff --git a/build/main.jsx b/build/main.jsx
@@ -4,22 +4,24 @@ import { globals } from '@discretize/react-discretize-components';
 import { Global } from '@emotion/react';
 import { CssBaseline, ThemeProvider } from '@mui/material';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
 import IndexPage from '../src/pages/build/index';
 import createStore from '../src/state/createStore';
 import muiTheme from '../src/utils/placeholder-unused-theme';
 
-import 'typeface-fira-mono';
 import '@discretize/typeface-menomonia';
+import 'typeface-fira-mono';
 import 'typeface-muli';
 import 'typeface-raleway';
 
 import '../src/utils/i18n';
 
 const store = createStore();
 
-ReactDOM.render(
+const container = document.getElementById('root');
+const root = createRoot(container);
+root.render(
   <React.StrictMode>
     <Provider store={store}>
       <Global styles={globals} />
@@ -30,5 +32,4 @@ ReactDOM.render(
       </ThemeProvider>
     </Provider>
   </React.StrictMode>,
-  document.getElementById('root'),
 );
diff --git a/package.json b/package.json
@@ -33,10 +33,10 @@
     "cleanupLocale": "node cleanupLocale.js"
   },
   "resolutions": {
-    "@discretize/gw2-ui-new": "^0.0.21"
+    "@discretize/gw2-ui-new": "^0.1.2"
   },
   "dependencies": {
-    "@discretize/gw2-ui-new": "^0.0.21",
+    "@discretize/gw2-ui-new": "^0.1.2",
     "@discretize/object-compression": "^1.0.3",
     "@discretize/react-discretize-components": "2.3.0",
     "@discretize/typeface-menomonia": "^0.1.3",
@@ -46,47 +46,47 @@
     "@mui/material": "^5.2.7",
     "@reduxjs/toolkit": "^1.7.1",
     "@types/js-yaml": "^4.0.5",
-    "@types/node": "^17.0.23",
+    "@types/node": "^18.16.3",
     "arraybuffer-equal": "^1.0.4",
     "buffer": "^6.0.3",
     "classnames": "^2.3.1",
-    "i18next": "^21.6.5",
+    "i18next": "^22.4.15",
     "js-yaml": "^4.1.0",
     "json-url": "^3.0.0",
-    "material-ui-popup-state": "^2.0.0",
+    "material-ui-popup-state": "^5.0.8",
     "pako": "^2.0.4",
     "prop-types": "^15.8.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-error-boundary": "^3.1.4",
-    "react-i18next": "^11.15.3",
-    "react-redux": "^7.2.0",
+    "react-i18next": "^12.2.2",
+    "react-redux": "^8.0.5",
     "redux": "^4.0.5",
     "redux-saga": "^1.1.3",
-    "tss-react": "^3.3.1",
+    "tss-react": "^4.8.3",
     "typeface-fira-mono": "^1.1.13",
     "typeface-muli": "^1.1.13",
     "typeface-raleway": "^1.1.13",
     "urlsafe-base64": "^1.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.7",
-    "@babel/core": "7.21.5",
+    "@babel/core": "7.21.8",
     "@babel/plugin-transform-modules-commonjs": "^7.17.9",
     "@babel/plugin-transform-typescript": "^7.16.7",
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
     "@babel/types": "^7.16.7",
-    "@cloudflare/workers-types": "^3.4.0",
+    "@cloudflare/workers-types": "^4.20230404.0",
     "@types/babel__core": "^7.1.19",
-    "@types/react": "^17.0.43",
-    "@types/react-dom": "^17.0.14",
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.1",
     "@typescript-eslint/eslint-plugin": "^5.59.2",
     "@typescript-eslint/parser": "^5.59.2",
-    "@vitejs/plugin-react": "^1.0.7",
+    "@vitejs/plugin-react": "^4.0.0",
     "axios": "^0.21.4",
     "babel-eslint": "^10.0.0",
-    "babel-plugin-i18next-extract": "^0.8.3",
+    "babel-plugin-i18next-extract": "^0.9.0",
     "eslint": "^8.0.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-prettier": "^8.3.0",
@@ -102,8 +102,8 @@
     "esm": "^3.2.25",
     "gh-pages": "^3.2.3",
     "prettier": "^2.4.1",
-    "typescript": "~4.4.4",
-    "vite": "^2.9.0",
-    "wrangler": "^0.0.24"
+    "typescript": "~5.0.4",
+    "vite": "^4.3.4",
+    "wrangler": "^2.18.0"
   }
 }
diff --git a/src/components/nav/NavBar.jsx b/src/components/nav/NavBar.jsx
@@ -12,8 +12,8 @@ import {
   Typography,
   useMediaQuery,
 } from '@mui/material';
-import { bindHover, bindMenu, usePopupState } from 'material-ui-popup-state/es/hooks';
-import Menu from 'material-ui-popup-state/es/HoverMenu';
+import { bindHover, bindMenu, usePopupState } from 'material-ui-popup-state/hooks';
+import Menu from 'material-ui-popup-state/HoverMenu';
 import React, { useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';

diff --git a/src/pages/index/main.jsx b/src/pages/index/main.jsx
@@ -5,7 +5,7 @@ import '@discretize/typeface-menomonia';
 import { Global } from '@emotion/react';
 import { CssBaseline, ThemeProvider } from '@mui/material';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
 import 'typeface-fira-mono';
 import 'typeface-muli';
@@ -17,7 +17,9 @@ import IndexPage from './index';
 
 const store = createStore();
 
-ReactDOM.render(
+const container = document.getElementById('root');
+const root = createRoot(container);
+root.render(
   <React.StrictMode>
     <Provider store={store}>
       <Global styles={globals} />
@@ -28,5 +30,4 @@ ReactDOM.render(
       </ThemeProvider>
     </Provider>
   </React.StrictMode>,
-  document.getElementById('root'),
 );
diff --git a/vite.config.js b/vite.config.js
@@ -5,6 +5,9 @@ import yamlImporter from './plugins/YAMLImporter';
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  server: {
+    port: 3000,
+  },
   build: {
     rollupOptions: {
       input: {