Skip to content

Commit

Permalink
Merge pull request #160 from komarovalexander/dev
Browse files Browse the repository at this point in the history
update react to v17
  • Loading branch information
komarovalexander authored Jun 4, 2021
2 parents 4ca4176 + af5cda0 commit af8d0c5
Show file tree
Hide file tree
Showing 32 changed files with 388 additions and 359 deletions.
2 changes: 2 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ gulp.task('compile', function () {
delete pkg.scripts;
delete pkg.husky;
delete pkg.jest;
delete pkg.browserslist;
delete pkg.eslintConfig;
var outputFile = 'dist/package.json';
file(outputFile, '');
jsonfile.writeFile('dist/package.json', pkg, { spaces: 2 });
Expand Down
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,20 @@
"homepage": "https://komarovalexander.github.io/ka-table/#/overview",
"dependencies": {
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/materialize-css": "^1.0.8",
"@types/react": "16.9.25",
"@types/react": "17.0.9",
"@types/react-csv": "^1.1.1",
"@types/react-redux": "^7.1.7",
"bootstrap": "^4.5.0",
"jspdf": "^2.3.1",
"jspdf-autotable": "^3.5.13",
"lorem-ipsum": "^2.0.3",
"materialize-css": "^1.0.0",
"react": "^16.13.1",
"react": "17.0.2",
"react-csv": "^2.0.3",
"react-dom": "^16.13.1",
"react-dom": "17.0.2",
"react-redux": "^7.2.0",
"react-to-print": "^2.10.0"
"react-to-print": "^2.12.6"
},
"scripts": {
"start": "react-scripts start",
Expand Down Expand Up @@ -57,13 +56,13 @@
"devDependencies": {
"@types/jest": "25.1.4",
"@types/node": "13.9.2",
"@types/react-dom": "16.9.5",
"@types/react-dom": "17.0.6",
"@types/react-highlight": "^0.12.2",
"@types/react-router-dom": "^5.1.3",
"@types/react-router-dom": "^5.1.7",
"@types/simulant": "^0.2.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
"coveralls": "^3.0.11",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"gulp": "^4.0.2",
"gulp-file": "^0.4.0",
"gulp-gh-pages": "^0.5.4",
Expand All @@ -75,7 +74,7 @@
"react-ga": "^2.7.0",
"react-highlight": "^0.12.0",
"react-router-dom": "^5.1.2",
"react-scripts": "^4.0.3",
"react-scripts": "4.0.0",
"simulant": "^0.2.2",
"tslint": "^6.1.0",
"tslint-react": "^4.2.0",
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/CellComponent/CellComponent.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { DataType, EditingMode } from '../../enums';
import CellComponent, { ICellProps } from './CellComponent';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType } from '../../enums';
import { ICellEditorProps } from '../../props';
import CellEditorBoolean from './CellEditorBoolean';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/CellEditorDate/CellEditorDate.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType } from '../../enums';
import { ICellEditorProps } from '../CellEditor/CellEditor';
import CellEditorDate from './CellEditorDate';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType } from '../../enums';
import { ICellEditorProps } from '../CellEditor/CellEditor';
import CellEditorNumber from './CellEditorNumber';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType } from '../../enums';
import { ICellEditorProps } from '../CellEditor/CellEditor';
import CellEditorString from './CellEditorString';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/CellText/CellText.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType, EditingMode } from '../../enums';
import { ICellContentProps } from '../CellContent/CellContent';
import CellText from './CellText';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/DataRow/DataRow.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount, shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { DataType, EditingMode } from '../../enums';
import { IRowProps } from '../../props';
import DataRow from './DataRow';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/DetailsRow/DetailsRow.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { DataType, EditingMode } from '../../enums';
import { IRowProps } from '../DataRow/DataRow';
import DetailsRow from './DetailsRow';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType } from '../../enums';
import { ICellEditorProps } from '../CellEditor/CellEditor';
import FilterRowBoolean from './FilterRowBoolean';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/FilterRowDate/FilterRowDate.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType } from '../../enums';
import { IFilterRowEditorProps } from '../CellEditor/CellEditor';
import FilterRowDate from './FilterRowDate';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/FilterRowNumber/FilterRowNumber.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType } from '../../enums';
import FilterRowNumber from './FilterRowNumber';

Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/FilterRowString/FilterRowString.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, DataType } from '../../enums';
import FilterRowString from './FilterRowString';

Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/GroupRow/GroupRow.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { DataType } from '../../enums';
import { IGroupRowProps } from '../GroupRowContent/GroupRowContent';
import GroupRow from './GroupRow';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/GroupRowContent/GroupRowContent.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType } from '../../enums';
import { ChildComponents } from '../../Models/ChildComponents';
import { Column } from '../../Models/Column';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/HeadCellContent/HeadCellContent.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType, SortDirection, SortingMode } from '../../enums';
import { IHeadCellProps } from '../../props';
import HeadCellContent from './HeadCellContent';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/HeadCellResize/HeadCellResize.test.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import Enzyme, { mount, shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';
import simulant from 'simulant';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import HeadCellResize from './HeadCellResize';

Enzyme.configure({ adapter: new Adapter() });
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/HeadRow/HeadRow.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { DataType } from '../../enums';
import HeaderRow from './HeadRow';

Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/Loading/Loading.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import Loading, { ILoadingProps } from './Loading';

Enzyme.configure({ adapter: new Adapter() });
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/Paging/Paging.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { IPagingProps } from '../../props';
import Paging from './Paging';

Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/PagingIndex/PagingIndex.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType } from '../../enums';
import PagingIndex, { IPagingIndexProps } from './PagingIndex';

Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/PagingPages/PagingPages.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React, { useState } from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType } from '../../enums';
import { IPagingPagesProps } from '../../props';
import PagingPages from './PagingPages';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/PagingSize/PagingSize.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType } from '../../enums';
import { IPagingSizeProps } from '../../props';
import PagingSize from './PagingSize';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/PagingSizes/PagingSizes.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType } from '../../enums';
import { IPagingPagesProps } from '../../props';
import PagingSizes from './PagingSizes';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/Rows/Rows.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { EditingMode } from '../../enums';
import { getGroupMark } from '../../Utils/GroupUtils';
import { ITableBodyProps } from '../TableBody/TableBody';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/Table/Table.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { loadData } from '../../actionCreators';
import { ActionType, PagingPosition } from '../../enums';
import { Table } from './Table';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/TableBody/TableBody.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { EditingMode } from '../../enums';
import TableBody from './TableBody';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { newRowId } from '../../const';
import { EditingMode } from '../../enums';
import { ITableBodyProps } from '../TableBody/TableBody';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/TablePaging/TablePaging.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { TablePaging } from './TablePaging';

Enzyme.configure({ adapter: new Adapter() });
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Components/TableWrapper/TableWrapper.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Enzyme, { mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import ReactDOM from 'react-dom';

import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

import { ActionType } from '../../enums';
import { TableWrapper } from './TableWrapper';

Expand Down
Loading

0 comments on commit af8d0c5

Please sign in to comment.