Skip to content

Commit e4c4618

Browse files
dkamburovdkamburov
authored
Merge pull request #122 from IgniteUI/mdragnev/update-react
Update react version to latest. Update standalone samples. Update packages
2 parents 1088bdb + 113a1b7 commit e4c4618

File tree

18 files changed

+175
-142
lines changed

18 files changed

+175
-142
lines changed

‎dist/npm/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://github.com/IgniteUI/igniteui-react-wrappers.git"
88
},
99
"dependencies": {
10-
"react": "^16.6.3",
10+
"react": "^17.0.2",
1111
"create-react-class": "^15.6.3",
1212
"prop-types": "^15.6.2"
1313
}

‎package-lock.json‎

Lines changed: 26 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"url": "https://github.com/IgniteUI/igniteui-react-wrappers.git"
88
},
99
"dependencies": {
10-
"react": "^16.6.3",
11-
"react-dom": "^16.6.3",
12-
"create-react-class": "^15.6.3",
10+
"babel-core": "^6.26.3",
11+
"create-react-class": "^15.7.0",
1312
"prop-types": "^15.6.2",
14-
"babel-core": "^6.26.3"
13+
"react": "^17.0.2",
14+
"react-dom": "^17.0.2"
1515
},
1616
"scripts": {
1717
"build": "npm run prepare-dist",

‎samples/ig-dashboard/package.json‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,34 @@
11
{
2-
"name": "ig-dashboard",
3-
"version": "1.0.0",
4-
"private": true,
5-
"dependencies": {
6-
"@infragistics/ignite-ui-full": "^18.1.152",
7-
"babel-runtime": "6.22.0",
8-
"bootstrap": "^3.3.7",
9-
"igniteui-react": "^1.1.0",
10-
"jquery": ">=3.5.0",
11-
"jquery-ui": ">=1.13.0",
12-
"react": "^16.6.3",
13-
"react-dom": "^16.6.3",
14-
"react-scripts": "1.0.17"
15-
},
16-
"scripts": {
17-
"start": "react-scripts start",
18-
"build": "react-scripts build",
19-
"test": "react-scripts test --env=jsdom",
20-
"eject": "react-scripts eject"
21-
}
2+
"name": "ig-dashboard",
3+
"version": "1.0.0",
4+
"private": true,
5+
"dependencies": {
6+
"@infragistics/ignite-ui-full": "^18.1.152",
7+
"babel-runtime": "6.22.0",
8+
"bootstrap": "^3.3.7",
9+
"igniteui-react-wrappers": "^1.4.0",
10+
"jquery": ">=3.5.0",
11+
"jquery-ui": ">=1.13.0",
12+
"react": "^17.0.2",
13+
"react-dom": "^17.0.2",
14+
"react-scripts": "^5.0.0"
15+
},
16+
"scripts": {
17+
"start": "react-scripts start",
18+
"build": "react-scripts build",
19+
"test": "react-scripts test --env=jsdom",
20+
"eject": "react-scripts eject"
21+
},
22+
"browserslist": {
23+
"production": [
24+
">0.2%",
25+
"not dead",
26+
"not op_mini all"
27+
],
28+
"development": [
29+
"last 1 chrome version",
30+
"last 1 firefox version",
31+
"last 1 safari version"
32+
]
33+
}
2234
}

‎samples/ig-dashboard/src/App.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class App extends React.Component {
4444
<div className="col-md-4">
4545
<p className="lead">This sample demonstrates how to reflect every change in the igGrid data source on the igDataChart by using ReactJS.</p>
4646
<p><a href="https://github.com/IgniteUI/igniteui-react/blob/master/samples/ig-dashboard" className="btn btn-default btn-lg btn-primary"
47-
target="_blank"><i class="fa fa-code fa-lg"></i> View Source</a></p>
47+
target="_blank"><i className="fa fa-code fa-lg"></i> View Source</a></p>
4848
</div>
4949
</div>
5050

‎samples/ig-dashboard/src/components/IgEditBox.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
2-
import IgNumericEditor from 'igniteui-react/ui/igNumericEditor.js';
3-
import IgButton from 'igniteui-react/ui/igButton.js';
2+
import IgNumericEditor from 'igniteui-react-wrappers/ui/igNumericEditor.js';
3+
import IgButton from 'igniteui-react-wrappers/ui/igButton.js';
44

55
// Ignite UI Required Combined JavaScript Files
66
import "@infragistics/ignite-ui-full/en/js/infragistics.core.js";

‎samples/ig-dashboard/src/components/MainComponent.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
2-
import IgGrid from 'igniteui-react/ui/igGrid.js';
3-
import IgDataChart from 'igniteui-react/ui/igDataChart.js';
2+
import IgGrid from 'igniteui-react-wrappers/ui/igGrid.js';
3+
import IgDataChart from 'igniteui-react-wrappers/ui/igDataChart.js';
44
import IgEditBox from './IgEditBox.js';
55

66
// Ignite UI Required Combined JavaScript Files

‎samples/ig-editors/package.json‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,34 @@
11
{
2-
"name": "ig-editors",
3-
"version": "1.0.0",
4-
"private": true,
5-
"dependencies": {
6-
"@infragistics/ignite-ui-full": "^18.1.152",
7-
"babel-runtime": "6.22.0",
8-
"bootstrap": "^3.3.7",
9-
"igniteui-react": "^1.1.0",
10-
"jquery": ">=1.9.1",
11-
"jquery-ui": ">=1.10.5",
12-
"react": "^16.6.3",
13-
"react-dom": "^16.6.3",
14-
"react-scripts": "1.0.17"
15-
},
16-
"scripts": {
17-
"start": "react-scripts start",
18-
"build": "react-scripts build",
19-
"test": "react-scripts test --env=jsdom",
20-
"eject": "react-scripts eject"
21-
}
2+
"name": "ig-editors",
3+
"version": "1.0.0",
4+
"private": true,
5+
"dependencies": {
6+
"@infragistics/ignite-ui-full": "^18.1.152",
7+
"babel-runtime": "6.22.0",
8+
"bootstrap": "^3.3.7",
9+
"igniteui-react-wrappers": "^1.4.0",
10+
"jquery": ">=1.9.1",
11+
"jquery-ui": ">=1.10.5",
12+
"react": "^17.0.2",
13+
"react-dom": "^17.0.2",
14+
"react-scripts": "^5.0.0"
15+
},
16+
"scripts": {
17+
"start": "react-scripts start",
18+
"build": "react-scripts build",
19+
"test": "react-scripts test --env=jsdom",
20+
"eject": "react-scripts eject"
21+
},
22+
"browserslist": {
23+
"production": [
24+
">0.2%",
25+
"not dead",
26+
"not op_mini all"
27+
],
28+
"development": [
29+
"last 1 chrome version",
30+
"last 1 firefox version",
31+
"last 1 safari version"
32+
]
33+
}
2234
}

‎samples/ig-editors/src/components/MainComponent.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from 'react';
2-
import IgTextEditor from 'igniteui-react/ui/igTextEditor.js';
3-
import IgMaskEditor from 'igniteui-react/ui/igMaskEditor.js';
4-
import IgNumericEditor from 'igniteui-react/ui/igNumericEditor.js';
5-
import IgDateEditor from 'igniteui-react/ui/igDateEditor.js';
6-
import IgDatePicker from 'igniteui-react/ui/igDatePicker.js';
2+
import IgTextEditor from 'igniteui-react-wrappers/ui/igTextEditor.js';
3+
import IgMaskEditor from 'igniteui-react-wrappers/ui/igMaskEditor.js';
4+
import IgNumericEditor from 'igniteui-react-wrappers/ui/igNumericEditor.js';
5+
import IgDateEditor from 'igniteui-react-wrappers/ui/igDateEditor.js';
6+
import IgDatePicker from 'igniteui-react-wrappers/ui/igDatePicker.js';
77
import PropTypes from 'prop-types';
88

99
// Ignite UI Required Combined JavaScript Files

‎samples/ig-financial-state/package.json‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,35 @@
11
{
2-
"name": "ig-financial-state",
3-
"version": "0.1.0",
4-
"private": true,
5-
"dependencies": {
6-
"@infragistics/ignite-ui-full": "^18.1.152",
7-
"babel-runtime": "6.22.0",
8-
"bootstrap": "^3.3.7",
9-
"igniteui-react": "^1.1.0",
10-
"jquery": ">=1.9.1",
11-
"jquery-ui": ">=1.10.5",
12-
"react": "^16.6.3",
13-
"react-dom": "^16.6.3",
14-
"react-scripts": "1.0.17"
15-
},
16-
"scripts": {
17-
"start": "react-scripts start",
18-
"build": "react-scripts build",
19-
"test": "react-scripts test --env=jsdom",
20-
"eject": "react-scripts eject"
21-
}
2+
"name": "ig-financial-state",
3+
"version": "0.1.0",
4+
"private": true,
5+
"dependencies": {
6+
"@infragistics/ignite-ui-full": "latest",
7+
"babel-runtime": "6.22.0",
8+
"bootstrap": "^3.3.7",
9+
"create-react-class": "^15.7.0",
10+
"igniteui-react-wrappers": "^1.4.0",
11+
"jquery": ">=1.9.1",
12+
"jquery-ui": ">=1.10.5",
13+
"react": "^17.0.2",
14+
"react-dom": "^17.0.2",
15+
"react-scripts": "^5.0.0"
16+
},
17+
"scripts": {
18+
"start": "react-scripts start",
19+
"build": "react-scripts build",
20+
"test": "react-scripts test --env=jsdom",
21+
"eject": "react-scripts eject"
22+
},
23+
"browserslist": {
24+
"production": [
25+
">0.2%",
26+
"not dead",
27+
"not op_mini all"
28+
],
29+
"development": [
30+
"last 1 chrome version",
31+
"last 1 firefox version",
32+
"last 1 safari version"
33+
]
34+
}
2235
}

0 commit comments

Comments
 (0)