diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b34294fe..5735e2d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,115 +1,6 @@ -name: CI - -on: ['push', 'pull_request'] - +name: ✅ test +on: [push, pull_request] jobs: - setup: - runs-on: ubuntu-latest - steps: - - name: checkout - uses: actions/checkout@v4 - - - uses: actions/setup-node@v4 - with: - node-version: '20' - - - name: cache package-lock.json - uses: actions/cache@v4 - with: - path: package-temp-dir - key: lock-${{ github.sha }} - - - name: create package-lock.json - run: npm i --package-lock-only --legacy-peer-deps - - - name: hack for singe file - run: | - if [ ! -d "package-temp-dir" ]; then - mkdir package-temp-dir - fi - cp package-lock.json package-temp-dir - - - name: cache node_modules - id: node_modules_cache_id - uses: actions/cache@v4 - with: - path: node_modules - key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} - - - name: install - if: steps.node_modules_cache_id.outputs.cache-hit != 'true' - run: npm i - - lint: - runs-on: ubuntu-latest - steps: - - name: checkout - uses: actions/checkout@v4 - - - name: restore cache from package-lock.json - uses: actions/cache@v4 - with: - path: package-temp-dir - key: lock-${{ github.sha }} - - - name: restore cache from node_modules - uses: actions/cache@v4 - with: - path: node_modules - key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} - - - name: lint - run: npm run lint - - needs: setup - - compile: - runs-on: ubuntu-latest - steps: - - name: checkout - uses: actions/checkout@v4 - - - name: restore cache from package-lock.json - uses: actions/cache@v4 - with: - path: package-temp-dir - key: lock-${{ github.sha }} - - - name: restore cache from node_modules - uses: actions/cache@v4 - with: - path: node_modules - key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} - - - name: compile - run: npm run compile - - needs: setup - - coverage: - runs-on: ubuntu-latest - steps: - - name: checkout - uses: actions/checkout@v4 - - - name: restore cache from package-lock.json - uses: actions/cache@v4 - with: - path: package-temp-dir - key: lock-${{ github.sha }} - - - name: restore cache from node_modules - uses: actions/cache@v4 - with: - path: node_modules - key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} - - - name: coverage - run: npm test -- --coverage - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} - - needs: setup + test: + uses: react-component/rc-test/.github/workflows/test.yml@main + secrets: inherit \ No newline at end of file diff --git a/.gitignore b/.gitignore index 338e0c94..b56b05fa 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ .env.local .dumi/ package-lock.json + +bun.lockb \ No newline at end of file diff --git a/bunfig.toml b/bunfig.toml new file mode 100644 index 00000000..80d57b63 --- /dev/null +++ b/bunfig.toml @@ -0,0 +1,2 @@ +[install] +peer = false \ No newline at end of file diff --git a/docs/examples/stateForm-list-draggable.tsx b/docs/examples/stateForm-list-draggable.tsx index f0710cd0..2188ff14 100644 --- a/docs/examples/stateForm-list-draggable.tsx +++ b/docs/examples/stateForm-list-draggable.tsx @@ -31,7 +31,7 @@ const Draggable: React.FunctionComponent = ({ id, index, move, c opacity: isDragging ? 0.5 : 1, }} > - {children} + {children as React.ReactElement} ); }; @@ -39,6 +39,7 @@ const Demo = () => { const [form] = useForm(); return ( + // @ts-ignore https://github.com/react-dnd/react-dnd/issues/3636

Draggable List of Form

diff --git a/package.json b/package.json index 2c07d3e9..b692c9e0 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "prettier": "^3.1.0", "rc-test": "^7.0.15", "react": "^18.0.0", - "react-dnd": "^16.0.1", + "react-dnd": "^8.0.3", "react-dnd-html5-backend": "^8.0.3", "react-dom": "^18.0.0", "react-redux": "^9.0.4", diff --git a/tests/common/index.ts b/tests/common/index.ts index abac7dd5..23f03605 100644 --- a/tests/common/index.ts +++ b/tests/common/index.ts @@ -68,7 +68,7 @@ export function matchError( return; } -export function matchArray(source: any[], target: any[], matchKey: React.Key) { +export function matchArray(source: any[], target: any[], matchKey: string | number) { expect(matchKey).toBeTruthy(); try {