Merge branch 'b15.0.0'

This commit is contained in:
Alberto
2017-12-18 10:55:49 +01:00

View File

@@ -1,6 +1,6 @@
{
"name": "ag-grid-react-example",
"version": "14.2.0",
"version": "15.0.0",
"description": "Example Reach applicaiton using ag-Grid.",
"main": "dist/ag-grid-react-example.js",
"scripts": {
@@ -9,7 +9,7 @@
"large": "webpack-dev-server --content-base src-large-data/ --config config/webpack.config.large.js --progress --colors --hot --inline",
"clean": "rimraf dist",
"mkdirs": "mkdirp dist/trader/dist dist/examples/dist",
"copy-examples": "ncp images dist/examples/images && ncp src/index.html dist/examples/index.html && ncp dist/react-examples.js dist/examples/dist/react-examples.js && ncp src dist/examples/src",
"copy-examples": "ncp src-examples/images dist/examples/images && ncp src-examples/index.html dist/examples/index.html && ncp dist/react-examples.js dist/examples/dist/react-examples.js && ncp src-examples/ dist/examples/src",
"copy-trader": "ncp src-trader-dashboard/index.html dist/trader/index.html && ncp dist/react-trader.js dist/trader/dist/react-trader.js",
"copy": "npm run copy-examples && npm run copy-trader",
"build-large": "webpack --config config/webpack.config.large.js --progress --profile --bail",
@@ -58,9 +58,9 @@
"typescript": "2.3.x"
},
"dependencies": {
"ag-grid": "^14.0.0",
"ag-grid-enterprise": "^14.0.0",
"ag-grid-react": "^14.0.0",
"ag-grid": "^15.x",
"ag-grid-enterprise": "^15.x",
"ag-grid-react": "^15.x",
"bootstrap": "3.3.7",
"d3": "4.9.1",
"file-loader": "0.11.1",