Skip to content

Commit 2e11feb

Browse files
committed
chore: upgrade react to v18
1 parent 4c905e6 commit 2e11feb

File tree

8 files changed

+20
-24
lines changed

8 files changed

+20
-24
lines changed

packages/autodemo/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
"@lukasbach/tsconfig": "^0.1.0",
2222
"@types/jest": "^27.4.1",
2323
"@types/react": "^18.0.14",
24-
"@types/react-dom": "^17.0.11",
24+
"@types/react-dom": "^18.0.7",
2525
"babel-jest": "^27.5.1",
2626
"babel-loader": "^8.2.2",
2727
"demodata": "^1.1.11",
2828
"jest": "^26.6.3",
2929
"react": "^18.2.0",
3030
"react-complex-tree": "^1.1.11",
31-
"react-dom": "^17.0.2",
31+
"react-dom": "^18.2.0",
3232
"react-test-renderer": "^18.2.0",
3333
"ts-node": "^10.7.0",
3434
"typescript": "4.7.4"

packages/blueprintjs-renderers/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
"@lukasbach/tsconfig": "^0.1.0",
2424
"@types/jest": "^27.4.1",
2525
"@types/react": "^18.0.14",
26-
"@types/react-dom": "^17.0.11",
26+
"@types/react-dom": "^18.0.7",
2727
"babel-jest": "^27.5.1",
2828
"babel-loader": "^8.2.2",
2929
"demodata": "^1.1.11",
3030
"jest": "^26.6.3",
3131
"react": "^18.2.0",
3232
"react-complex-tree": "^1.1.11",
33-
"react-dom": "^17.0.2",
33+
"react-dom": "^18.2.0",
3434
"react-test-renderer": "^18.2.0",
3535
"ts-node": "^10.7.0",
3636
"typescript": "4.7.4"

packages/core/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@lukasbach/tsconfig": "^0.1.0",
2929
"@types/jest": "^27.4.1",
3030
"@types/react": "^18.0.14",
31-
"@types/react-dom": "^17.0.11",
31+
"@types/react-dom": "^18.0.7",
3232
"@welldone-software/why-did-you-render": "^7.0.1",
3333
"babel-jest": "^27.5.1",
3434
"babel-loader": "^8.2.2",
@@ -50,7 +50,7 @@
5050
"jest-dom": "^4.0.0"
5151
},
5252
"peerDependencies": {
53-
"react": "*"
53+
"react": ">=18.0.0"
5454
},
5555
"scripts": {
5656
"build": "run-p \"build:*\"",

packages/core/src/controlledEnvironment/DragAndDropProvider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const DragAndDropContext = React.createContext<DragAndDropContextProps>(
2020
export const useDragAndDrop = () => React.useContext(DragAndDropContext);
2121

2222
// TODO tidy up
23-
export const DragAndDropProvider: React.FC = props => {
23+
export const DragAndDropProvider: React.FC<React.PropsWithChildren> = props => {
2424
const environment = useTreeEnvironment();
2525
const [isProgrammaticallyDragging, setIsProgrammaticallyDragging] =
2626
useState(false);

packages/core/src/controlledEnvironment/InteractionManagerProvider.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ const InteractionManagerContext = React.createContext<InteractionManager<any>>(
1111
export const useInteractionManager = () =>
1212
React.useContext(InteractionManagerContext);
1313

14-
export const InteractionManagerProvider: React.FC = props => {
14+
export const InteractionManagerProvider: React.FC<
15+
React.PropsWithChildren
16+
> = props => {
1517
const environment = useTreeEnvironment();
1618
const { defaultInteractionMode } = environment;
1719

packages/core/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": "@lukasbach/tsconfig/tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "lib/cjs"
4+
"outDir": "lib/cjs",
5+
"noImplicitAny": false
56
},
67
"exclude": ["src/stories", "**/*.spec.*", "test"],
78
"include": ["src"]

packages/demodata/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"@lukasbach/tsconfig": "^0.1.0",
1919
"@types/jest": "^27.4.1",
2020
"@types/react": "^18.0.14",
21-
"@types/react-dom": "^17.0.11",
21+
"@types/react-dom": "^18.0.7",
2222
"babel-jest": "^27.5.1",
2323
"babel-loader": "^8.2.2",
2424
"react": "^18.2.0",
25-
"react-dom": "^17.0.2",
25+
"react-dom": "^18.2.0",
2626
"react-test-renderer": "^18.2.0",
2727
"ts-node": "^10.7.0",
2828
"typescript": "4.7.4"

yarn.lock

+6-13
Original file line numberDiff line numberDiff line change
@@ -4937,14 +4937,7 @@
49374937
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
49384938
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
49394939

4940-
"@types/react-dom@^17.0.11":
4941-
version "17.0.17"
4942-
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1"
4943-
integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==
4944-
dependencies:
4945-
"@types/react" "^17"
4946-
4947-
"@types/react-dom@^18.0.0":
4940+
"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.7":
49484941
version "18.0.7"
49494942
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.7.tgz#ee7cf8ec4e6977e3f0a7b1d38bd89c75aa2aec28"
49504943
integrity sha512-HaXc+BbqAZE1RdsK3tC8SbkFy6UL2xF76lT9rQs5JkPrJg3rWA3Ou/Lhw3YJQzEDkBpmJ79nBsfnd05WrBd2QQ==
@@ -4977,10 +4970,10 @@
49774970
"@types/history" "^4.7.11"
49784971
"@types/react" "*"
49794972

4980-
"@types/react@*", "@types/react@17.0.38", "@types/react@^17", "@types/react@^18.0.14":
4981-
version "17.0.38"
4982-
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.38.tgz#f24249fefd89357d5fa71f739a686b8d7c7202bd"
4983-
integrity sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==
4973+
"@types/react@*", "@types/react@^18.0.14":
4974+
version "18.0.23"
4975+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.23.tgz#4190ecd58b99fa79fe2e67832bdcb287e5f893e4"
4976+
integrity sha512-R1wTULtCiJkudAN2DJGoYYySbGtOdzZyUWAACYinKdiQC8auxso4kLDUhQ7AJ2kh3F6A6z4v69U6tNY39hihVQ==
49844977
dependencies:
49854978
"@types/prop-types" "*"
49864979
"@types/scheduler" "*"
@@ -15927,7 +15920,7 @@ react-docgen@^5.0.0, react-docgen@^5.3.1:
1592715920
node-dir "^0.1.10"
1592815921
strip-indent "^3.0.0"
1592915922

15930-
react-dom@^17.0.1, react-dom@^17.0.2:
15923+
react-dom@^17.0.1:
1593115924
version "17.0.2"
1593215925
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
1593315926
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==

0 commit comments

Comments
 (0)