From 106e5972cc7145a942bdb34f624b5bc922b328d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jul 2026 12:33:00 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump the npm-dependencies group with 4 updates Bumps the npm-dependencies group with 4 updates: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js), [eslint](https://github.com/eslint/eslint), [react-dnd](https://github.com/react-dnd/react-dnd) and [react-dnd-html5-backend](https://github.com/react-dnd/react-dnd). Updates `@eslint/js` from 9.39.4 to 10.0.1 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/commits/v10.0.1/packages/js) Updates `eslint` from 9.39.4 to 10.6.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/compare/v9.39.4...v10.6.0) Updates `react-dnd` from 8.0.3 to 16.0.1 - [Release notes](https://github.com/react-dnd/react-dnd/releases) - [Changelog](https://github.com/react-dnd/react-dnd/blob/main/CHANGELOG.md) - [Commits](https://github.com/react-dnd/react-dnd/commits) Updates `react-dnd-html5-backend` from 8.0.3 to 16.0.1 - [Release notes](https://github.com/react-dnd/react-dnd/releases) - [Changelog](https://github.com/react-dnd/react-dnd/blob/main/CHANGELOG.md) - [Commits](https://github.com/react-dnd/react-dnd/commits) --- updated-dependencies: - dependency-name: "@eslint/js" dependency-version: 10.0.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: npm-dependencies - dependency-name: eslint dependency-version: 10.6.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: npm-dependencies - dependency-name: react-dnd dependency-version: 16.0.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: npm-dependencies - dependency-name: react-dnd-html5-backend dependency-version: 16.0.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: npm-dependencies ... Signed-off-by: dependabot[bot] --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index fd8f4f5a..4aa6bc5c 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "clsx": "^2.1.1" }, "devDependencies": { - "@eslint/js": "^9.39.4", + "@eslint/js": "^10.0.1", "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", "@testing-library/dom": "^10.4.1", @@ -68,7 +68,7 @@ "@types/react": "^19.2.17", "@types/react-dom": "^19.2.3", "dumi": "^2.4.38", - "eslint": "^9.39.4", + "eslint": "^10.6.0", "eslint-config-prettier": "^10.1.8", "eslint-plugin-jest": "^29.15.4", "eslint-plugin-react": "^7.37.5", @@ -82,8 +82,8 @@ "prettier": "^3.9.4", "rc-test": "^7.1.3", "react": "^19.2.7", - "react-dnd": "^8.0.3", - "react-dnd-html5-backend": "^8.0.3", + "react-dnd": "^16.0.1", + "react-dnd-html5-backend": "^16.0.1", "react-dom": "^19.2.7", "react-redux": "^9.0.4", "redux": "^5.0.0", From 2e0f59d4bceff4fbb7af3b8e990840cffdeee66d Mon Sep 17 00:00:00 2001 From: afc163 Date: Sun, 5 Jul 2026 15:36:49 +0800 Subject: [PATCH 2/3] fix: support eslint 10 dependency update --- .github/workflows/surge-preview.yml | 2 +- eslint.config.mjs | 5 +++-- package.json | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/surge-preview.yml b/.github/workflows/surge-preview.yml index cffac6cc..ba630374 100644 --- a/.github/workflows/surge-preview.yml +++ b/.github/workflows/surge-preview.yml @@ -33,7 +33,7 @@ jobs: - name: Build preview if: ${{ steps.surge-token.outputs.enabled == 'true' }} run: | - npm install + npm install --legacy-peer-deps npm run build - uses: afc163/surge-preview@bf90a5a86111f6311ca42f0a5a0f80fb0fb03cec if: ${{ steps.surge-token.outputs.enabled == 'true' }} diff --git a/eslint.config.mjs b/eslint.config.mjs index 40f08ec9..a298e8e0 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,4 +1,5 @@ import js from '@eslint/js'; +import { fixupConfigRules } from '@eslint/compat'; import { defineConfig } from 'eslint/config'; import { dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; @@ -40,8 +41,8 @@ export default defineConfig([ files: ['**/*.{js,jsx,ts,tsx}'], extends: [ js.configs.recommended, - react.configs.flat.recommended, - react.configs.flat['jsx-runtime'], + ...fixupConfigRules(react.configs.flat.recommended), + ...fixupConfigRules(react.configs.flat['jsx-runtime']), prettier, ], plugins: { diff --git a/package.json b/package.json index 4aa6bc5c..73d0439f 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ }, "devDependencies": { "@eslint/js": "^10.0.1", + "@eslint/compat": "^2.1.0", "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", "@testing-library/dom": "^10.4.1", From f9f50075dae1f487a80856118a17cb265f2f65b1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 6 Jul 2026 09:40:27 +0800 Subject: [PATCH 3/3] fix: support react dnd 16 examples --- docs/examples/components/useDraggable.ts | 6 ++++-- docs/examples/stateForm-list-draggable.tsx | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/examples/components/useDraggable.ts b/docs/examples/components/useDraggable.ts index 0dde2ffb..b1396713 100644 --- a/docs/examples/components/useDraggable.ts +++ b/docs/examples/components/useDraggable.ts @@ -1,8 +1,9 @@ import { useRef } from 'react'; -import type { DragObjectWithType } from 'react-dnd'; import { useDrag, useDrop } from 'react-dnd'; -type DragWithIndex = DragObjectWithType & { +type DragWithIndex = { + type: string; + id: string | number; index: number; }; export default function useDraggable( @@ -69,6 +70,7 @@ export default function useDraggable( }, }); const [{ isDragging }, drag] = useDrag({ + type, item: { type, id, index }, collect: monitor => ({ isDragging: monitor.isDragging(), diff --git a/docs/examples/stateForm-list-draggable.tsx b/docs/examples/stateForm-list-draggable.tsx index 2188ff14..c88a347e 100644 --- a/docs/examples/stateForm-list-draggable.tsx +++ b/docs/examples/stateForm-list-draggable.tsx @@ -2,7 +2,7 @@ import React from 'react'; /* eslint-enable react/prop-types */ -import HTML5Backend from 'react-dnd-html5-backend'; +import { HTML5Backend } from 'react-dnd-html5-backend'; import { DndProvider } from 'react-dnd'; import Form, { List, useForm } from 'rc-field-form'; import Input from './components/Input';