Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions demo/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useCallback } from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Button, ButtonToolbar, Divider, Panel } from 'rsuite';
import { alert, confirm, prompt } from '../src';
import './styles.css';
Expand Down Expand Up @@ -216,4 +216,4 @@ function App() {
);
}

ReactDOM.render(<App />, document.getElementById('app'));
createRoot(document.getElementById('app')).render(<App />);
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
testEnvironment: 'jsdom',
setupFilesAfterEnv: ['./jest.setup.js'],
watchPathIgnorePatterns: ['node_modules'],
};
58 changes: 8 additions & 50 deletions jest.setup.js
Original file line number Diff line number Diff line change
@@ -1,56 +1,14 @@
import '@testing-library/jest-dom';

if (process.env.RSUITE_VERSION === '5') {
jest.mock(
'date-fns/_lib/toInteger/index.js',
() => {
return jest.requireActual('date-fns2/_lib/toInteger/index.js');
},
{ virtual: true }
);

jest.mock(
'date-fns/_lib/cloneObject',
() => {
return jest.requireActual('date-fns2/_lib/cloneObject');
},
{ virtual: true }
);
if (process.env.REACT_VERSION === '18') {
jest.mock('react', () => {
return jest.requireActual('react18');
});

jest.mock('rsuite', () => {
return jest.requireActual('rsuite5');
jest.mock('react-dom', () => {
return jest.requireActual('react-dom18');
});
} else {
jest.mock('rsuite', () => {
return jest.requireActual('rsuite4');
jest.mock('react-dom/test-utils', () => {
return jest.requireActual('react-dom18/test-utils');
});
}

switch (process.env.REACT_VERSION) {
case '16':
jest.mock('react', () => {
return jest.requireActual('react16');
});

jest.mock('react-dom', () => {
return jest.requireActual('react-dom16');
});
jest.mock('react-dom/test-utils', () => {
return jest.requireActual('react-dom16/test-utils');
});
break;
case '17':
jest.mock('react', () => {
return jest.requireActual('react17');
});

jest.mock('react-dom', () => {
return jest.requireActual('react-dom17');
});
jest.mock('react-dom/test-utils', () => {
return jest.requireActual('react-dom17/test-utils');
});
break;
default:
break;
}
44 changes: 21 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rsuite/interactions",
"version": "2.0.0",
"version": "2.4.0",
"description": "Call rsuite Modal at ease.",
"main": "cjs/index.js",
"module": "esm/index.js",
Expand Down Expand Up @@ -45,21 +45,22 @@
},
"homepage": "https://github.com/rsuite/interactions#readme",
"peerDependencies": {
"react": ">=16.8.0",
"react-dom": ">=16.8.0",
"rsuite": "^4.0.0 || ^5.0.1"
"react": ">=18",
"react-dom": ">=18",
"rsuite": "^6.0.0"
},
"devDependencies": {
"@babel/core": "^7.15.8",
"@babel/preset-env": "^7.15.8",
"@babel/preset-react": "^7.14.5",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^21.0.0",
"@rollup/plugin-node-resolve": "^13.0.5",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.0.4",
"@testing-library/user-event": "^12.1.7",
"@babel/core": "^7.26.10",
"@babel/preset-env": "^7.26.9",
"@babel/preset-react": "^7.26.3",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^28.0.3",
"@rollup/plugin-node-resolve": "^16.0.1",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
"@testing-library/user-event": "^14.6.1",
"babel-eslint": "^9.0.0",
"babel-jest": "^29.7.0",
"date-fns2": "npm:date-fns@^2.19.0",
"eslint": "^7.11.0",
"eslint-config-airbnb": "^18.2.0",
Expand All @@ -73,19 +74,16 @@
"eslint-plugin-react-hooks": "^4.1.2",
"gh-pages": "^2.0.1",
"husky": "^9.1.7",
"jest": "^26.5.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^10.4.0",
"prettier": "^2.1.2",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-dom16": "npm:react-dom@^16.8.0",
"react-dom17": "npm:react-dom@^17.0.2",
"react16": "npm:react@^16.8.0",
"react17": "npm:react@^17.0.2",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-dom18": "npm:react-dom@^18.0.0",
"react18": "npm:react@^18.0.0",
"rollup": "^2.58.0",
"rsuite": "^5.0.1",
"rsuite4": "npm:rsuite@^4.10.3",
"rsuite5": "npm:rsuite@^5.0.1",
"rsuite": "6.0.0-canary-20250315",
"semantic-release": "^19.0.3",
"vite": "^2.6.5"
},
Expand Down
Loading
Loading