Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(react-grid): Put the dx-react-grid dependencies in order #148

Merged
merged 17 commits into from
Jun 20, 2017
Merged

fix(react-grid): Put the dx-react-grid dependencies in order #148

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
31950c8
Fix dependencies
dxbykov Jun 15, 2017
cc0e793
Update docs
dxbykov Jun 16, 2017
542f0dc
Update docs
dxbykov Jun 16, 2017
006679b
Use exact packages version until RTM
dxbykov Jun 16, 2017
a7d1de4
Update README.md
viterobk Jun 16, 2017
fb0c01d
Update README.md
viterobk Jun 16, 2017
aaf5a19
Update README.md
viterobk Jun 16, 2017
65e2c6c
Update README.md
viterobk Jun 16, 2017
638da87
Hide dx-core dependency from the dx-react-grid users
dxbykov Jun 19, 2017
543e11a
Merge remote-tracking branch 'upstream/master' into fix-dependencies
dxbykov Jun 19, 2017
056ec6f
Update README.md
dirk-pieterse Jun 19, 2017
173662a
Merge remote-tracking branch 'upstream/master' into fix-dependencies
dxbykov Jun 19, 2017
687ba4c
Update README.md
viterobk Jun 19, 2017
7205060
Update README.md
dirk-pieterse Jun 19, 2017
fa0d115
Update README.md
dirk-pieterse Jun 19, 2017
4f48e14
Update README.md
viterobk Jun 19, 2017
dc9e8a5
Merge branch 'master' into fix-dependencies
dxbykov Jun 19, 2017
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
2 changes: 1 addition & 1 deletion packages/dx-react-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"rollup-watch": "^3.2.2"
},
"dependencies": {
"@devexpress/dx-core": "^1.0.0-alpha.3",
"@devexpress/dx-core": "1.0.0-alpha.3",
"prop-types": "^15.5.8",
"react": "^15.5.4"
}
Expand Down
9 changes: 5 additions & 4 deletions packages/dx-react-demos/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@
"output": "../../shippable/testresults/dx-react-grid-demos.xml"
},
"dependencies": {
"@devexpress/dx-react-grid": "^1.0.0-alpha.3",
"@devexpress/dx-react-grid-bootstrap3": "^1.0.0-alpha.3",
"@devexpress/dx-react-grid-material-ui": "^1.0.0-alpha.3",
"@devexpress/dx-react-core": "1.0.0-alpha.3",
"@devexpress/dx-react-grid": "1.0.0-alpha.3",
"@devexpress/dx-react-grid-bootstrap3": "1.0.0-alpha.3",
"@devexpress/dx-react-grid-material-ui": "1.0.0-alpha.3",
"core-js": "^2.4.1",
"material-ui": "^1.0.0-alpha.14",
"material-ui-icons": "^1.0.0-alpha.3",
"material-ui-icons": "1.0.0-alpha.3",
"prop-types": "^15.5.8",
"react": "^15.5.4",
"react-bootstrap": "^0.31.0",
Expand Down
11 changes: 8 additions & 3 deletions packages/dx-react-grid-bootstrap3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ A template suite used to customize React Grid with the Bootstrap3 rendering.

## Installation

Install the package and its dependencies:
Install the main dx-react-grid package and its templates for Bootstrap 3:

```
npm i @devexpress/dx-react-grid --save
npm i @devexpress/dx-react-grid-bootstrap3 --save
npm i --save @devexpress/dx-react-grid @devexpress/dx-react-grid-bootstrap3
```

**Note:** The packages mentioned above have peer dependencies that should be installed manually. Use the following command to install them.

```
npm i --save @devexpress/dx-react-core
```

Add the required modules to your project:
Expand Down
14 changes: 7 additions & 7 deletions packages/dx-react-grid-bootstrap3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"output": "../../shippable/testresults/dx-react-grid-bootstrap3.xml"
},
"devDependencies": {
"@devexpress/dx-testing": "^1.0.0-alpha.3",
"@devexpress/dx-grid-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-grid": "^1.0.0-alpha.3",
"@devexpress/dx-testing": "1.0.0-alpha.3",
"@devexpress/dx-grid-core": "1.0.0-alpha.3",
"@devexpress/dx-react-core": "1.0.0-alpha.3",
"@devexpress/dx-react-grid": "1.0.0-alpha.3",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-jest": "^19.0.0",
Expand Down Expand Up @@ -93,9 +93,9 @@
"prop-types": "^15.5.8"
},
"peerDependencies": {
"@devexpress/dx-grid-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-grid": "^1.0.0-alpha.3",
"@devexpress/dx-grid-core": "1.0.0-alpha.3",
"@devexpress/dx-react-core": "1.0.0-alpha.3",
"@devexpress/dx-react-grid": "1.0.0-alpha.3",
"react": "^15.5.4",
"react-bootstrap": "^0.31.0"
}
Expand Down
11 changes: 8 additions & 3 deletions packages/dx-react-grid-material-ui/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ A template suite used to customize React Grid with the Material UI rendering.

## Installation

Install the package and its dependencies:
Install the main dx-react-grid package and its templates for Material UI:

```
npm i @devexpress/dx-react-grid --save
npm i @devexpress/dx-react-grid-material-ui --save
npm i --save @devexpress/dx-react-grid @devexpress/dx-react-grid-material-ui
```

**Note:** The packages mentioned above have peer dependencies that should be installed manually. Use the following command to install them.

```
npm i --save @devexpress/dx-react-core
```

Add the required modules to your project:
Expand Down
18 changes: 9 additions & 9 deletions packages/dx-react-grid-material-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"output": "../../shippable/testresults/dx-react-grid-material-ui.xml"
},
"devDependencies": {
"@devexpress/dx-testing": "^1.0.0-alpha.3",
"@devexpress/dx-grid-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-grid": "^1.0.0-alpha.3",
"@devexpress/dx-testing": "1.0.0-alpha.3",
"@devexpress/dx-grid-core": "1.0.0-alpha.3",
"@devexpress/dx-react-core": "1.0.0-alpha.3",
"@devexpress/dx-react-grid": "1.0.0-alpha.3",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-jest": "^19.0.0",
Expand All @@ -83,7 +83,7 @@
"jss-preset-default": "^2.0.0",
"jss-theme-reactor": "^0.11.1",
"material-ui": "^1.0.0-alpha.14",
"material-ui-icons": "^1.0.0-alpha.3",
"material-ui-icons": "1.0.0-alpha.3",
"react": "^15.5.4",
"react-bootstrap": "^0.31.0",
"react-dom": "^15.5.4",
Expand All @@ -100,11 +100,11 @@
"prop-types": "^15.5.8"
},
"peerDependencies": {
"@devexpress/dx-grid-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-grid": "^1.0.0-alpha.3",
"@devexpress/dx-grid-core": "1.0.0-alpha.3",
"@devexpress/dx-react-core": "1.0.0-alpha.3",
"@devexpress/dx-react-grid": "1.0.0-alpha.3",
"material-ui": "^1.0.0-alpha.14",
"material-ui-icons": "^1.0.0-alpha.3",
"material-ui-icons": "1.0.0-alpha.3",
"react": "^15.5.4"
}
}
6 changes: 6 additions & 0 deletions packages/dx-react-grid/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ Install the Grid Bootstrap3 components package:
npm i @devexpress/dx-react-grid-bootstrap3 --save
```

**Note:** The packages mentioned above have peer dependencies that should be installed manually. Use the following command to install them.

```
npm i --save @devexpress/dx-react-core
```

Make sure that Bootstrap styles are linked to the page. If you have not yet configured Bootstrap for your project, check the [following link](http://getbootstrap.com/getting-started/#download).

#### Add a Grid to your app:
Expand Down
8 changes: 7 additions & 1 deletion packages/dx-react-grid/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,18 @@ npm i @devexpress/dx-react-grid --save
```
This package does not contain visual components. In the examples below, the DevExtreme React Grid Bootstrap3 package is used to render visual components.

Install the Grid Bootstrap3 components package:
Install the Grid Bootstrap 3 components package:

```
npm i @devexpress/dx-react-grid-bootstrap3 --save
```

**Note:** The packages mentioned above have peer dependencies that should be installed manually. Use the following command to install them.

```
npm i --save @devexpress/dx-react-core
```

Make sure that Bootstrap styles are linked to the page. If you have not yet configured Bootstrap for your project, check the [following link](http://getbootstrap.com/getting-started/#download).

### Polyfills
Expand Down
7 changes: 4 additions & 3 deletions packages/dx-react-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
"output": "../../shippable/testresults/dx-react-grid.xml"
},
"devDependencies": {
"@devexpress/dx-testing": "^1.0.0-alpha.3",
"@devexpress/dx-react-core": "1.0.0-alpha.3",
"@devexpress/dx-testing": "1.0.0-alpha.3",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-jest": "^19.0.0",
Expand Down Expand Up @@ -83,11 +84,11 @@
"rollup-watch": "^3.2.2"
},
"dependencies": {
"@devexpress/dx-grid-core": "^1.0.0-alpha.3",
"@devexpress/dx-react-core": "^1.0.0-alpha.3",
"@devexpress/dx-grid-core": "1.0.0-alpha.3",
"prop-types": "^15.5.8"
},
"peerDependencies": {
"@devexpress/dx-react-core": "1.0.0-alpha.3",
"react": "^15.5.4"
}
}