Skip to content

Commit edc9f0a

Browse files
committed
update react
1 parent c49bf3f commit edc9f0a

File tree

10 files changed

+53
-215
lines changed

10 files changed

+53
-215
lines changed

apps/example-dapp/eslint.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@ export default tseslint.config([
1919
ecmaVersion: 2020,
2020
globals: globals.browser,
2121
},
22+
// rules: {
23+
// "react-hooks/react-compiler": "error",
24+
// },
2225
},
2326
]);

apps/example-dapp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@tanstack/router-plugin": "^1.131.2",
4040
"@types/react": "^19.1.9",
4141
"@types/react-dom": "^19.1.7",
42-
"@vitejs/plugin-react": "^4.7.0",
42+
"@vitejs/plugin-react": "^5.0.0",
4343
"eslint": "catalog:",
4444
"eslint-plugin-react-hooks": "^5.2.0",
4545
"eslint-plugin-react-refresh": "^0.4.20",
@@ -49,7 +49,7 @@
4949
"typescript": "catalog:",
5050
"typescript-eslint": "^8.39.0",
5151
"vite": "^7.1.1",
52-
"vite-plugin-node-polyfills": "^0.22.0",
52+
"vite-plugin-node-polyfills": "^0.24.0",
5353
"vite-tsconfig-paths": "^5.1.4"
5454
},
5555
"lint-staged": {

apps/example-dapp/src/App.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const solanaClient = createSolanaClient({
4040
urlOrMoniker: import.meta.env.VITE_SOLANA_RPC_URL ?? "mainnet-beta",
4141
});
4242

43-
function App() {
43+
export const App: React.FC = () => {
4444
const wallets = useMemo(
4545
() => [new PhantomWalletAdapter(), new SolflareWalletAdapter()],
4646
[],
@@ -69,6 +69,4 @@ function App() {
6969
</QueryClientProvider>
7070
</ThemeProvider>
7171
);
72-
}
73-
74-
export default App;
72+
};

apps/example-dapp/src/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { StrictMode } from "react";
22
import { createRoot } from "react-dom/client";
33
import "./index.css";
4-
import App from "./App.tsx";
4+
import { App } from "./App";
55

66
createRoot(document.getElementById("root")!).render(
77
<StrictMode>

apps/example-dapp/vite.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import tailwindcss from "@tailwindcss/vite";
33
// @ts-expect-error something wrong with types here
44
import { tanstackRouter } from "@tanstack/router-plugin/vite";
5+
// @ts-expect-error something wrong with types here
56
import react from "@vitejs/plugin-react";
67
import { defineConfig } from "vite";
78
import { nodePolyfills } from "vite-plugin-node-polyfills";
@@ -11,13 +12,13 @@ import tsconfigPaths from "vite-tsconfig-paths";
1112
export default defineConfig({
1213
plugins: [
1314
tsconfigPaths(),
15+
react(),
1416
tanstackRouter({
1517
routesDirectory: "src/routes",
1618
generatedRouteTree: "src/routeTree.gen.ts",
1719
addExtensions: true,
1820
quoteStyle: "double",
1921
}),
20-
react(),
2122
tailwindcss(),
2223
nodePolyfills(),
2324
],

bun.lock

Lines changed: 36 additions & 200 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@macalinao/mast-monorepo",
2+
"name": "@macalinao/grill-monorepo",
33
"private": true,
44
"type": "module",
55
"license": "Apache-2.0",
@@ -55,8 +55,8 @@
5555
"lint-staged": {
5656
"*.{json,jsonc,html}": "biome format --write"
5757
},
58-
"dependencies": {
59-
"@coral-xyz/borsh": "^0.31.1",
60-
"@solana/kit": "^2.3.0"
58+
"overrides": {
59+
"react": "^19.1.1",
60+
"react-dom": "^19.1.1"
6161
}
6262
}

packages/dataloader-es/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@macalinao/eslint-config": "catalog:",
3737
"@macalinao/tsconfig": "catalog:",
3838
"@types/bun": "^1.2.19",
39-
"@types/node": "^22.17.1",
39+
"@types/node": "^24.2.1",
4040
"eslint": "catalog:",
4141
"typescript": "catalog:",
4242
"vitest": "catalog:"

packages/solana-batch-accounts-loader/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@macalinao/tsconfig": "catalog:",
4343
"@types/bun": "^1.2.19",
4444
"@types/lodash-es": "^4.17.12",
45-
"@types/node": "^22.17.1",
45+
"@types/node": "^24.2.1",
4646
"eslint": "catalog:",
4747
"typescript": "catalog:",
4848
"vitest": "catalog:"

packages/wallet-adapter-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@macalinao/eslint-config-react": "^3.1.2",
4242
"@macalinao/tsconfig": "catalog:",
4343
"@solana/web3.js": "^1.98.4",
44-
"@types/node": "^22.17.1",
44+
"@types/node": "^24.2.1",
4545
"@types/react": "^19.1.9",
4646
"@types/react-dom": "^19.1.7",
4747
"eslint": "catalog:",

0 commit comments

Comments
 (0)