Skip to content
This repository was archived by the owner on Aug 19, 2024. It is now read-only.

Commit 8dd0f96

Browse files
Merge branch 'master' into latest
# Conflicts: # angular-cli/package.json # ngtools_webpack/package.json # systemjs_aot/package.json # webpack/package.json # webpack2/package.json Merge branch 'master' into latest Merge branch 'master' into latest # Conflicts: # package.json
2 parents a64626e + cf0796e commit 8dd0f96

1 file changed

Lines changed: 16 additions & 15 deletions

File tree

package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ag-grid-react-example",
3-
"version": "14.2.0",
3+
"version": "15.0.0",
44
"description": "Example Reach applicaiton using ag-Grid.",
55
"main": "dist/ag-grid-react-example.js",
66
"scripts": {
@@ -38,38 +38,39 @@
3838
},
3939
"homepage": "http://www.ag-grid.com/",
4040
"devDependencies": {
41-
"babel-core": "6.26.x",
41+
"babel-core": "6.24.x",
4242
"babel-loader": "6.4.x",
4343
"babel-preset-es2015": "6.24.x",
4444
"babel-preset-react": "6.24.x",
4545
"babel-preset-stage-0": "6.24.x",
4646
"babel-preset-stage-1": "6.24.x",
47-
"css-loader": "0.28.x",
47+
"css-loader": "0.23.x",
4848
"mkdirp": "0.5.1",
4949
"ncp": "2.0.0",
5050
"prop-types": "15.6.0",
5151
"rimraf": "2.5.x",
52-
"style-loader": "0.19.x",
53-
"webpack": "1.15.x",
54-
"webpack-dev-server": "1.15.x",
52+
"style-loader": "0.13.x",
53+
"webpack": "1.12.x",
54+
"webpack-dev-server": "1.14.x",
5555
"gulp": "3.9.x",
56-
"gulp-typescript": "3.2.x",
56+
"gulp-typescript": "3.1.x",
5757
"merge2": "1.0.x",
58-
"typescript": "2.6.2",
59-
"file-loader": "0.11.1"
58+
"typescript": "2.3.x"
6059
},
6160
"dependencies": {
62-
"ag-grid": "^15.0.0",
63-
"ag-grid-enterprise": "^15.0.0",
64-
"ag-grid-react": "^15.0.0",
61+
"ag-grid": "^15.x",
62+
"ag-grid-enterprise": "^15.x",
63+
"ag-grid-react": "^15.x",
6564
"bootstrap": "3.3.7",
6665
"d3": "4.9.1",
66+
"file-loader": "0.11.1",
6767
"lodash": "4.17.4",
68-
"react": "16.2.x",
69-
"react-dom": "16.2.x",
68+
"react": "16.0.0",
69+
"react-dom": "16.0.0",
7070
"react-dom-factories": "1.0.2",
7171
"react-redux": "5.0.x",
7272
"react-router-dom": "4.2.x",
73-
"redux": "3.7.x"
73+
"redux": "3.6.x",
74+
"url-search-params-polyfill": "1.2.0"
7475
}
7576
}

0 commit comments

Comments
 (0)