Skip to content

Commit b0a023d

Browse files
lochiesammdec
andauthored
fix: upgrade protobufjs to 6.11.6 & fix other issues when bumping related deps (#2986)
Co-authored-by: Sam Mason de Caires <sam.m@aave.com>
1 parent abc811f commit b0a023d

12 files changed

Lines changed: 4138 additions & 3268 deletions

File tree

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20.19

cypress/support/e2e.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
import './commands';
2+
3+
Cypress.on('uncaught:exception', (err) => {
4+
if (err.message.includes('Account is not connected')) {
5+
return false;
6+
}
7+
});

next-env.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference path="./.next/types/routes.d.ts" />
34

45
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/basic-features/typescript for more information.
6+
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

next.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ module.exports = withSentryConfig(
3636
},
3737
reactStrictMode: true,
3838
// assetPrefix: "./",
39+
// Next.js 15 static export: `next build` emits the `out/` directory.
40+
// Gated behind STATIC_EXPORT so the default build remains a regular build.
41+
...(process.env.STATIC_EXPORT === 'true' ? { output: 'export' } : {}),
3942
trailingSlash: true,
4043
pageExtensions,
4144
// NOTE: Needed for SAFE testing locally

package.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
"private": true,
55
"license": "BSD-3-Clause",
66
"resolutions": {
7-
"h3": "^1.15.5",
8-
"minimatch": ">=5.1.7"
7+
"postcss": "^8.5.10",
8+
"protobufjs": "^7.5.5",
9+
"qs": "^6.14.1",
10+
"@types/react": "^18.3.30",
11+
"@types/react-dom": "^18.3.7"
912
},
1013
"scripts": {
1114
"dev": "next dev",
1215
"dev:special": "NODE_OPTIONS='--inspect --max_old_space_size=8000' next dev",
1316
"build": "next build",
1417
"build:analyze": "ANALYZE=true yarn build",
15-
"build:static": "next build && next export",
18+
"build:static": "STATIC_EXPORT=true next build",
1619
"build:optimize-svgs": "find public -type f -name '*.svg' -print0 | xargs -0 -n 1 -P 6 npx svgo --final-newline",
1720
"serve:static": "npx serve out",
18-
"export": "next export",
1921
"start": "next start",
2022
"lint:code": "next lint --dir src --dir pages",
2123
"lint:code:fix": "next lint --dir src --dir pages --fix",
@@ -73,7 +75,7 @@
7375
"@visx/tooltip": "^2.16.0",
7476
"@wagmi/core": "^2.17.1",
7577
"blo": "^1.1.1",
76-
"connectkit": "1.9.0",
78+
"connectkit": "1.9.2",
7779
"d3-array": "^3.2.0",
7880
"d3-time-format": "^4.1.0",
7981
"dayjs": "^1.11.5",
@@ -85,10 +87,10 @@
8587
"immer": "^9.0.15",
8688
"json-stringify-deterministic": "^1.0.12",
8789
"micro-memoize": "^4.1.2",
88-
"next": "12.3.7",
89-
"react": "^18.0.0",
90+
"next": "15.5.19",
91+
"react": "^18.3.1",
9092
"react-cookie-consent": "^8.0.1",
91-
"react-dom": "^18.0.0",
93+
"react-dom": "^18.3.1",
9294
"react-infinite-scroller": "^1.2.6",
9395
"react-lazy-load": "^4.0.1",
9496
"react-markdown": "^8.0.7",
@@ -97,7 +99,7 @@
9799
"remark-gfm": "^3.0.1",
98100
"sonner": "^2.0.3",
99101
"tiny-invariant": "^1.3.1",
100-
"viem": "^2.45.1",
102+
"viem": "2.45.1",
101103
"wagmi": "^2.15.2",
102104
"zustand": "^5.0.2"
103105
},
@@ -119,7 +121,8 @@
119121
"@types/d3-array": "^3.0.3",
120122
"@types/d3-time-format": "^4.0.0",
121123
"@types/lodash": "^4.14.189",
122-
"@types/react": "latest",
124+
"@types/react": "^18.3.30",
125+
"@types/react-dom": "^18.3.7",
123126
"@types/react-infinite-scroller": "^1.2.3",
124127
"@typescript-eslint/eslint-plugin": "^5.38.1",
125128
"babel-plugin-macros": "^3.1.0",

src/components/primitives/Link.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export const NextLinkComposed = React.forwardRef<HTMLAnchorElement, NextLinkComp
3838
shallow={shallow}
3939
passHref
4040
locale={locale}
41+
legacyBehavior
4142
>
4243
<Anchor ref={ref} {...other} />
4344
</NextLink>

src/components/transactions/CancelCowOrder/CancelAdapterOrderActions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export const CancelAdapterOrderActions = ({
8787
);
8888
}
8989

90-
queryClient.invalidateQueries({ queryKey: 'transactionHistory' });
90+
queryClient.invalidateQueries({ queryKey: ['transactionHistory'] });
9191
setMainTxState({
9292
...mainTxState,
9393
loading: false,

src/components/transactions/CancelCowOrder/CancelCowOrderActions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const CancelCowOrderActions = ({ cowOrder, blocked }: CancelCowOrderActio
4848
updateCowOrderStatus(cowOrder.chainId, account, cowOrder.id, OrderStatus.CANCELLED);
4949
}
5050

51-
queryClient.invalidateQueries({ queryKey: 'transactionHistory' });
51+
queryClient.invalidateQueries({ queryKey: ['transactionHistory'] });
5252
setTimeout(() => {
5353
setMainTxState({
5454
...mainTxState,

src/components/transactions/Swap/inputs/shared/PriceInput.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { BigNumberValue, valueToBigNumber } from '@aave/math-utils';
22
import { ExclamationIcon, RefreshIcon } from '@heroicons/react/outline';
33
import { Box, Button, CircularProgress, InputBase, SvgIcon, Typography } from '@mui/material';
4-
import { BigNumber } from 'bignumber.js';
54
import React, { useEffect, useRef, useState } from 'react';
65
import NumberFormat, { NumberFormatProps } from 'react-number-format';
76
import { FormattedNumber } from 'src/components/primitives/FormattedNumber';

src/components/transactions/Withdraw/WithdrawError.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { valueToBigNumber } from '@aave/math-utils';
22
import { Trans } from '@lingui/macro';
3-
import { BigNumber } from 'bignumber.js';
43
import {
54
ComputedReserveData,
65
ExtendedFormattedUser,

0 commit comments

Comments
 (0)