Skip to content

Commit 835c53f

Browse files
committed
Merge branch '82-dnd-kit-multiple-droppable-locations' into main
2 parents a5e9d75 + 7200d77 commit 835c53f

File tree

12 files changed

+116
-116
lines changed

12 files changed

+116
-116
lines changed

Diff for: base-project-js/package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
"cypress": "cypress open"
1010
},
1111
"dependencies": {
12-
"@apollo/client": "^3.8.1",
13-
"@reduxjs/toolkit": "^1.9.5",
14-
"ace-builds": "^1.24.0",
15-
"bootstrap": "^5.3.1",
12+
"@apollo/client": "^3.8.4",
13+
"@reduxjs/toolkit": "^1.9.6",
14+
"ace-builds": "^1.28.0",
15+
"bootstrap": "^5.3.2",
1616
"react": "^18.2.0",
1717
"react-ace": "^10.1.0",
18-
"react-bootstrap": "^2.8.0",
18+
"react-bootstrap": "^2.9.0",
1919
"react-dom": "^18.2.0",
20-
"react-draggable": "^4.4.5",
21-
"react-hook-form": "^7.45.4",
20+
"react-draggable": "^4.4.6",
21+
"react-hook-form": "^7.46.2",
2222
"react-redux": "^8.1.2",
23-
"react-router-dom": "^6.15.0",
23+
"react-router-dom": "^6.16.0",
2424
"redux": "^4.2.1"
2525
},
2626
"devDependencies": {
27-
"@types/react": "^18.2.20",
28-
"@types/react-dom": "^18.2.7",
29-
"@vitejs/plugin-react": "^4.0.4",
30-
"autoprefixer": "^10.4.14",
31-
"cypress": "^12.17.3",
32-
"postcss": "^8.4.27",
27+
"@types/react": "^18.2.23",
28+
"@types/react-dom": "^18.2.8",
29+
"@vitejs/plugin-react": "^4.1.0",
30+
"autoprefixer": "^10.4.16",
31+
"cypress": "^13.3.0",
32+
"postcss": "^8.4.30",
3333
"tailwindcss": "^3.3.3",
3434
"vite": "^4.4.9"
3535
}

Diff for: base-project-ts/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@reduxjs/toolkit": "^1.9.3",
11+
"@reduxjs/toolkit": "^1.9.6",
1212
"formis-react": "^1.0.7",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0",
15-
"react-draggable": "^4.4.5",
15+
"react-draggable": "^4.4.6",
1616
"react-redux": "^8.1.2",
1717
"react-router-dom": "^6.15.0"
1818
},
1919
"devDependencies": {
20-
"@types/jest": "^29.5.4",
21-
"@types/react": "^18.2.21",
22-
"@types/react-dom": "^18.0.11",
23-
"@vitejs/plugin-react": "^4.0.4",
24-
"cypress": "^12.17.4",
20+
"@types/jest": "^29.5.5",
21+
"@types/react": "^18.2.23",
22+
"@types/react-dom": "^18.2.8",
23+
"@vitejs/plugin-react": "^4.1.0",
24+
"cypress": "^13.3.0",
2525
"typescript": "^5.2.2",
26-
"vite": "^4.1.4"
26+
"vite": "^4.4.9"
2727
}
2828
}

Diff for: cypress-project-js/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"react-dom": "^18.2.0"
1515
},
1616
"devDependencies": {
17-
"@types/react": "^18.0.28",
18-
"@types/react-dom": "^18.0.11",
19-
"@vitejs/plugin-react": "^3.1.0",
20-
"cypress": "^12.7.0",
21-
"vite": "^4.1.4"
17+
"@types/react": "^18.2.23",
18+
"@types/react-dom": "^18.2.8",
19+
"@vitejs/plugin-react": "^4.1.0",
20+
"cypress": "^13.3.0",
21+
"vite": "^4.4.9"
2222
}
2323
}

Diff for: drag&drop/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
"react-dom": "^18.2.0"
1717
},
1818
"devDependencies": {
19-
"@types/react": "^18.0.35",
20-
"@types/react-dom": "^18.0.10",
21-
"@vitejs/plugin-react": "^3.1.0",
19+
"@types/react": "^18.2.23",
20+
"@types/react-dom": "^18.2.8",
21+
"@vitejs/plugin-react": "^4.1.0",
2222
"autoprefixer": "^10.4.14",
2323
"postcss": "^8.4.21",
2424
"postcss-import": "^15.1.0",
2525
"tailwindcss": "^3.3.1",
26-
"typescript": "^5.0.4",
27-
"vite": "^4.1.0"
26+
"typescript": "^5.2.2",
27+
"vite": "^4.4.9"
2828
}
2929
}

Diff for: mantine-react/package.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@emotion/react": "^11.10.6",
13-
"@mantine/core": "^6.0.1",
14-
"@mantine/ds": "^6.0.1",
15-
"@mantine/form": "^6.0.1",
16-
"@mantine/hooks": "^6.0.1",
17-
"@mantine/nprogress": "^6.0.1",
18-
"@mantine/prism": "^6.0.1",
19-
"@tabler/icons-react": "^2.28.0",
12+
"@emotion/react": "^11.11.1",
13+
"@mantine/core": "^7.1.0",
14+
"@mantine/ds": "^7.1.0",
15+
"@mantine/form": "^7.1.0",
16+
"@mantine/hooks": "^7.1.0",
17+
"@mantine/nprogress": "^7.1.0",
18+
"@mantine/prism": "^6.0.21",
19+
"@tabler/icons": "^2.36.0",
2020
"react": "^18.2.0",
2121
"react-dom": "^18.2.0",
22-
"react-router-dom": "^6.8.2"
22+
"react-router-dom": "^6.16.0"
2323
},
2424
"devDependencies": {
25-
"@types/react": "^18.0.28",
26-
"@types/react-dom": "^18.0.11",
27-
"@vitejs/plugin-react": "^4.0.4",
28-
"autoprefixer": "^10.4.14",
29-
"postcss": "^8.4.27",
30-
"tailwindcss": "^3.2.7",
31-
"typescript": "^5.1.6",
32-
"vite": "^4.1.4"
25+
"@types/react": "^18.2.23",
26+
"@types/react-dom": "^18.2.8",
27+
"@vitejs/plugin-react": "^4.1.0",
28+
"autoprefixer": "^10.4.16",
29+
"postcss": "^8.4.30",
30+
"tailwindcss": "^3.3.3",
31+
"typescript": "^5.2.2",
32+
"vite": "^4.4.9"
3333
}
3434
}

Diff for: react-form-tutorials/package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@emotion/react": "^11.10.6",
13-
"@mantine/core": "^6.0.1",
14-
"@mantine/form": "^6.0.1",
15-
"@mantine/hooks": "^6.0.1",
16-
"antd": "^5.3.0",
17-
"bootstrap": "^5.2.3",
12+
"@emotion/react": "^11.11.1",
13+
"@mantine/core": "^7.1.0",
14+
"@mantine/form": "^7.1.0",
15+
"@mantine/hooks": "^7.1.0",
16+
"antd": "^5.9.4",
17+
"bootstrap": "^5.3.2",
1818
"react": "^18.2.0",
19-
"react-bootstrap": "^2.7.2",
19+
"react-bootstrap": "^2.9.0",
2020
"react-dom": "^18.2.0",
21-
"react-hook-form": "^7.43.5",
22-
"react-router-dom": "^6.8.2",
23-
"react-select": "^5.7.0"
21+
"react-hook-form": "^7.46.2",
22+
"react-router-dom": "^6.16.0",
23+
"react-select": "^5.7.5"
2424
},
2525
"devDependencies": {
26-
"@types/react": "^18.0.28",
27-
"@types/react-dom": "^18.0.11",
28-
"@vitejs/plugin-react": "^3.1.0",
29-
"vite": "^4.1.4"
26+
"@types/react": "^18.2.23",
27+
"@types/react-dom": "^18.2.8",
28+
"@vitejs/plugin-react": "^4.1.0",
29+
"vite": "^4.4.9"
3030
}
3131
}

Diff for: react-query-tutorials/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
"serve-json": "json-server --watch db.json --port 4000"
1212
},
1313
"dependencies": {
14-
"axios": "^1.3.4",
15-
"bootstrap": "^5.2.3",
14+
"axios": "^1.5.1",
15+
"bootstrap": "^5.3.2",
1616
"json-server": "^0.17.3",
1717
"react": "^18.2.0",
18-
"react-bootstrap": "^2.7.3",
18+
"react-bootstrap": "^2.9.0",
1919
"react-dom": "^18.2.0",
2020
"react-query": "^3.39.3",
21-
"react-router-dom": "^6.10.0"
21+
"react-router-dom": "^6.16.0"
2222
},
2323
"devDependencies": {
24-
"@types/react": "^18.0.28",
25-
"@types/react-dom": "^18.0.11",
26-
"@vitejs/plugin-react": "^3.1.0",
27-
"vite": "^4.2.1"
24+
"@types/react": "^18.2.23",
25+
"@types/react-dom": "^18.2.8",
26+
"@vitejs/plugin-react": "^4.1.0",
27+
"vite": "^4.4.9"
2828
}
2929
}

Diff for: react-table-examples/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@faker-js/faker": "^7.5.0",
13-
"@tanstack/match-sorter-utils": "^8.5.14",
14-
"@tanstack/react-table": "^8.5.15",
15-
"bootstrap": "^5.2.2",
12+
"@faker-js/faker": "^8.1.0",
13+
"@tanstack/match-sorter-utils": "^8.8.4",
14+
"@tanstack/react-table": "^8.10.3",
15+
"bootstrap": "^5.3.2",
1616
"react": "^18.2.0",
17-
"react-bootstrap": "^2.5.0",
17+
"react-bootstrap": "^2.9.0",
1818
"react-dom": "^18.2.0",
19-
"react-router-dom": "^6.4.2",
20-
"sass": "^1.55.0"
19+
"react-router-dom": "^6.16.0",
20+
"sass": "^1.68.0"
2121
},
2222
"devDependencies": {
23-
"@types/react": "^18.0.17",
24-
"@types/react-dom": "^18.0.6",
25-
"@vitejs/plugin-react": "^3.0.0",
26-
"vite": "^4.0.1"
23+
"@types/react": "^18.2.23",
24+
"@types/react-dom": "^18.2.8",
25+
"@vitejs/plugin-react": "^4.1.0",
26+
"vite": "^4.4.9"
2727
}
2828
}

Diff for: redux-project-js/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@reduxjs/toolkit": "^1.9.1",
13-
"bootstrap": "^5.2.3",
12+
"@reduxjs/toolkit": "^1.9.6",
13+
"bootstrap": "^5.3.2",
1414
"react": "^18.2.0",
15-
"react-bootstrap": "^2.7.0",
15+
"react-bootstrap": "^2.9.0",
1616
"react-dom": "^18.2.0",
1717
"react-query": "^3.39.2",
18-
"react-redux": "^8.0.5",
19-
"react-router-dom": "^6.4.5",
20-
"redux-saga": "^1.2.2"
18+
"react-redux": "^8.1.2",
19+
"react-router-dom": "^6.16.0",
20+
"redux-saga": "^1.2.3"
2121
},
2222
"devDependencies": {
23-
"@types/react": "^18.0.26",
24-
"@types/react-dom": "^18.0.9",
25-
"@vitejs/plugin-react": "^3.0.0",
26-
"vite": "^4.0.0"
23+
"@types/react": "^18.2.23",
24+
"@types/react-dom": "^18.2.8",
25+
"@vitejs/plugin-react": "^4.1.0",
26+
"vite": "^4.4.9"
2727
}
2828
}

Diff for: storybook-project-js/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
"react-dom": "^18.2.0"
1515
},
1616
"devDependencies": {
17-
"@babel/core": "^7.21.0",
18-
"@storybook/addon-actions": "^6.5.16",
19-
"@storybook/addon-essentials": "^6.5.16",
20-
"@storybook/addon-interactions": "^6.5.16",
21-
"@storybook/addon-links": "^6.5.16",
22-
"@storybook/builder-vite": "^0.4.2",
23-
"@storybook/react": "^6.5.16",
24-
"@storybook/testing-library": "^0.0.13",
25-
"@types/react": "^18.0.28",
26-
"@types/react-dom": "^18.0.11",
27-
"@vitejs/plugin-react": "^3.0.0",
28-
"babel-loader": "^9.1.0",
29-
"vite": "^4.0.1"
17+
"@babel/core": "^7.23.0",
18+
"@storybook/addon-actions": "^7.4.5",
19+
"@storybook/addon-essentials": "^7.4.5",
20+
"@storybook/addon-interactions": "^7.4.5",
21+
"@storybook/addon-links": "^7.4.5",
22+
"@storybook/builder-vite": "^7.4.5",
23+
"@storybook/react": "^7.4.5",
24+
"@storybook/testing-library": "^0.2.1",
25+
"@types/react": "^18.2.23",
26+
"@types/react-dom": "^18.2.8",
27+
"@vitejs/plugin-react": "^4.1.0",
28+
"babel-loader": "^9.1.3",
29+
"vite": "^4.4.9"
3030
}
3131
}

Diff for: vite-ssr-project/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"dependencies": {
1010
"@types/compression": "^1.7.2",
1111
"@types/express": "^4.17.14",
12-
"@types/node": "^18.15.11",
13-
"@types/react": "^18.0.35",
12+
"@types/node": "^20.7.1",
13+
"@types/react": "^18.0.8",
1414
"@types/react-dom": "^18.0.3",
15-
"@vitejs/plugin-react": "^3.0.0",
15+
"@vitejs/plugin-react": "^4.1.0",
1616
"compression": "^1.7.4",
1717
"cross-env": "^7.0.3",
1818
"express": "^4.18.1",
@@ -21,9 +21,9 @@
2121
"react-dom": "^18.1.0",
2222
"sirv": "^2.0.2",
2323
"ts-node": "^10.9.1",
24-
"typescript": "^5.0.4",
25-
"vite": "^4.2.1",
26-
"vite-plugin-ssr": "^0.4.112"
24+
"typescript": "^5.2.2",
25+
"vite": "^4.0.3",
26+
"vite-plugin-ssr": "^0.4.87"
2727
},
2828
"type": "module"
2929
}

Diff for: zustand-react/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"immer": "^10.0.2",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0",
15-
"zustand": "^4.3.6"
15+
"zustand": "^4.4.1"
1616
},
1717
"devDependencies": {
18-
"@types/react": "^18.0.28",
19-
"@types/react-dom": "^18.0.11",
20-
"@vitejs/plugin-react": "^4.0.4",
21-
"vite": "^4.1.4"
18+
"@types/react": "^18.2.23",
19+
"@types/react-dom": "^18.2.8",
20+
"@vitejs/plugin-react": "^4.1.0",
21+
"vite": "^4.4.9"
2222
}
2323
}

0 commit comments

Comments
 (0)