Skip to content

Commit

Permalink
Merge pull request #303 from SotSF/next-14
Browse files Browse the repository at this point in the history
Upgrade to Node 20 + Next 14
  • Loading branch information
brollin authored Oct 29, 2024
2 parents 07fad57 + 05f39e9 commit 4465e8f
Show file tree
Hide file tree
Showing 6 changed files with 1,185 additions and 428 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "18.x"
node-version: "20.x"
registry-url: "https://registry.npmjs.org"
- name: install dependencies
run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18
v20
8 changes: 4 additions & 4 deletions ONSITE_SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ It is assumed that there is no internet at the event.
### Update Conjurer

1. Run `git pull` to fetch the latest code (or `git clone` this repository)
1. Run `node -v` to ensure you are using node 18
1. Run `node -v` to ensure you are using node 20
- For easy node version management, [install `nvm`](https://github.com/nvm-sh/nvm?tab=readme-ov-file#installing-and-updating)
- Once it is installed, run `nvm install 18`
- If nvm and node 18 are already installed, simply run `nvm use 18`
- Run `node -v` again to verify you are using node 18
- Once it is installed, run `nvm install 20`
- If nvm and node 20 are already installed, simply run `nvm use 20`
- Run `node -v` again to verify you are using node 20
1. Run `yarn` to install dependencies
1. Run `yarn dev` to run conjurer locally
1. Visit http://localhost:3000 to test it out
Expand Down
2 changes: 1 addition & 1 deletion next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
/// <reference types="next/navigation-types/compat/navigation" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
"jimp": "^0.22.10",
"mobx": "^6.10.2",
"mobx-react-lite": "^4.0.5",
"next": "^13.5.5",
"next": "^14.2.16",
"postprocessing": "^6.33.2",
"prop-types": "15",
"raw-loader": "^4.0.2",
"react": "18.2.0",
"react": "^18.3.1",
"react-colorful": "^5.6.1",
"react-dom": "18.2.0",
"react-dom": "^18.3.1",
"react-draggable": "^4.4.6",
"react-icons": "^4.11.0",
"recharts": "^2.8.0",
Expand All @@ -77,8 +77,8 @@
"@types/three": "^0.156.0",
"@typescript-eslint/parser": "^6.7.4",
"drizzle-kit": "^0.25.0",
"eslint": "^8.51.0",
"eslint-config-next": "13.5.4",
"eslint": "^8.56.0",
"eslint-config-next": "^14.2.16",
"eslint-plugin-mobx": "^0.0.9",
"r3f-perf": "^7.1.2",
"typescript": "^5.2.2"
Expand Down
Loading

0 comments on commit 4465e8f

Please sign in to comment.