|
37 | 37 | "test:update": "jest --coverage --updateSnapshot" |
38 | 38 | }, |
39 | 39 | "devDependencies": { |
40 | | -<<<<<<< HEAD |
41 | 40 | "@rollup/plugin-commonjs": "^25.0.2", |
42 | 41 | "@rollup/plugin-node-resolve": "^15.1.0", |
43 | 42 | "@rollup/plugin-typescript": "^11.1.2", |
44 | 43 | "@testing-library/jest-dom": "^5.16.5", |
45 | 44 | "@testing-library/react": "^14.0.0", |
46 | 45 | "@types/react": "^18.2.14", |
47 | 46 | "@types/react-dom": "^18.2.6", |
48 | | -======= |
49 | | - "@rollup/plugin-commonjs": "^25.0.1", |
50 | | - "@rollup/plugin-node-resolve": "^15.1.0", |
51 | | - "@rollup/plugin-typescript": "^11.1.1", |
52 | | - "@testing-library/jest-dom": "^5.16.5", |
53 | | - "@testing-library/react": "^14.0.0", |
54 | | - "@types/react": "^18.2.11", |
55 | | - "@types/react-dom": "^18.2.4", |
56 | | ->>>>>>> 41c5ac7443275a0274a06661f0569b5026cdf917 |
57 | 47 | "classnames": "^2.3.2", |
58 | 48 | "jest": "^29.6.1", |
59 | 49 | "jest-environment-jsdom": "^29.6.1", |
60 | 50 | "prop-types": "^15.8.1", |
61 | 51 | "react": "^18.2.0", |
62 | 52 | "react-dom": "^18.2.0", |
63 | | -<<<<<<< HEAD |
64 | 53 | "rollup": "^3.26.2", |
65 | 54 | "rollup-plugin-import-css": "^3.3.1", |
66 | 55 | "ts-jest": "^29.1.1", |
67 | 56 | "typescript": "^5.1.6" |
68 | | -======= |
69 | | - "rollup": "^3.25.0", |
70 | | - "rollup-plugin-import-css": "^3.2.1", |
71 | | - "ts-jest": "^29.1.0", |
72 | | - "typescript": "^4.9.5" |
73 | | ->>>>>>> 41c5ac7443275a0274a06661f0569b5026cdf917 |
74 | 57 | }, |
75 | 58 | "peerDependencies": { |
76 | 59 | "react": ">=17", |
|
0 commit comments