From bd63d49c522d98900c9a3db96735967a20be2c9c Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Wed, 23 Oct 2019 11:23:35 +0100 Subject: [PATCH 1/7] Release 22.0.0 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ebb1f88..eab7acf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-grid-react-example", - "version": "21.0.0", + "version": "22.0.0", "description": "Example Reach applicaiton using ag-Grid.", "main": "dist/ag-grid-react-example.js", "scripts": { @@ -64,7 +64,7 @@ "@ag-community/grid-core": "^21.0.0", "@ag-community/grid-all-modules": "^21.0.0", "@ag-enterprise/grid-all-modules": "^21.0.0", - "ag-grid-react": "~21.2.0", + "ag-grid-react": "~22.0.0", "bootstrap": "4.3.1", "d3": "4.9.1", "lodash": "4.17.11", @@ -74,4 +74,4 @@ "react-router-dom": "5.0.0", "redux": "4.0.1" } -} +} \ No newline at end of file From fcc2bfffcd06ec971f942e442de55c5cf634eb8c Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Fri, 25 Oct 2019 11:11:08 +0100 Subject: [PATCH 2/7] Merge branch 'latest' into b22.0.0 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 51d1745..7437824 100644 --- a/package.json +++ b/package.json @@ -61,10 +61,10 @@ "webpack-dev-server": "3.4.1" }, "dependencies": { - "@ag-community/grid-core": "~22.0.0", - "@ag-community/grid-all-modules": "~22.0.0", - "@ag-enterprise/grid-all-modules": "~22.0.0", - "@ag-community/grid-react": "~22.0.0", + "@ag-community/grid-all-modules": "^22.0.0", + "@ag-community/grid-core": "^22.0.0", + "@ag-community/grid-react": "^22.0.0", + "@ag-enterprise/grid-all-modules": "^22.0.0", "bootstrap": "4.3.1", "d3": "4.9.1", "lodash": "4.17.11", From 1cf70a551e0fbc1de8c4eb5d5f7c94ddef16e045 Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Fri, 25 Oct 2019 12:41:54 +0100 Subject: [PATCH 3/7] Merge branch 'latest' into b22.0.0 --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7437824..c07786f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-grid-react-example", - "version": "22.0.0", + "version": "22.0.0-beta.0", "description": "Example Reach applicaiton using ag-Grid.", "main": "dist/ag-grid-react-example.js", "scripts": { @@ -61,10 +61,10 @@ "webpack-dev-server": "3.4.1" }, "dependencies": { - "@ag-community/grid-all-modules": "^22.0.0", - "@ag-community/grid-core": "^22.0.0", - "@ag-community/grid-react": "^22.0.0", - "@ag-enterprise/grid-all-modules": "^22.0.0", + "@ag-community/grid-all-modules": "^22.0.0-beta.0", + "@ag-community/grid-core": "^22.0.0-beta.0", + "@ag-community/grid-react": "^22.0.0-beta.0", + "@ag-enterprise/grid-all-modules": "^22.0.0-beta.0", "bootstrap": "4.3.1", "d3": "4.9.1", "lodash": "4.17.11", From 6ad4493357de86debfbfea24e1f6458e46e2e4c6 Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Mon, 4 Nov 2019 20:25:39 +0000 Subject: [PATCH 4/7] AG-1329 Rename packages to new scopes (@ag-grid-community & @ag-grid-enterprise) --- config/webpack.config.examples.js | 4 ++-- config/webpack.config.large.js | 2 +- config/webpack.config.trader.js | 2 +- package.json | 8 ++++---- src-examples/index.js | 4 ++-- .../RichGridDeclarativeExample.jsx | 6 +++--- .../simpleReduxDynamicComponentExample/GridComponent.jsx | 2 +- src-examples/simpleReduxHooksExample/GridComponent.jsx | 2 +- src-large-data/index.js | 4 ++-- src-large-data/largeGrid.jsx | 6 +++--- src-trader-dashboard/components/FxQuoteMatrix.jsx | 2 +- src-trader-dashboard/components/PriceChangesGrid.jsx | 2 +- src-trader-dashboard/components/TopMoversGrid.jsx | 2 +- ts-tests/InvalidGridProperty.tsx | 2 +- ts-tests/SimpleFunctionalGrid.tsx | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/config/webpack.config.examples.js b/config/webpack.config.examples.js index ffa41bb..ed2ed00 100644 --- a/config/webpack.config.examples.js +++ b/config/webpack.config.examples.js @@ -35,8 +35,8 @@ module.exports = { }, resolve: { alias: { - "@ag-community/grid-core/modules": path.resolve('./node_modules/@ag-community/grid-core/dist/es2015/modules'), - "@ag-community/grid-core": path.resolve('./node_modules/@ag-community/grid-core'), + "@ag-grid-community/grid-core/modules": path.resolve('./node_modules/@ag-grid-community/grid-core/dist/es2015/modules'), + "@ag-grid-community/grid-core": path.resolve('./node_modules/@ag-grid-community/grid-core'), "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'), react: path.resolve('./node_modules/react') }, diff --git a/config/webpack.config.large.js b/config/webpack.config.large.js index 2aa7035..128b3ad 100644 --- a/config/webpack.config.large.js +++ b/config/webpack.config.large.js @@ -31,7 +31,7 @@ module.exports = { }, resolve: { alias: { - "@ag-community/grid-core": path.resolve('./node_modules/@ag-community/grid-core'), + "@ag-grid-community/grid-core": path.resolve('./node_modules/@ag-grid-community/grid-core'), "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'), react: path.resolve('./node_modules/react') }, diff --git a/config/webpack.config.trader.js b/config/webpack.config.trader.js index 6251b9c..6401f22 100644 --- a/config/webpack.config.trader.js +++ b/config/webpack.config.trader.js @@ -31,7 +31,7 @@ module.exports = { }, resolve: { alias: { - "@ag-community/grid-core": path.resolve('./node_modules/@ag-community/grid-core'), + "@ag-grid-community/grid-core": path.resolve('./node_modules/@ag-grid-community/grid-core'), "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'), react: path.resolve('./node_modules/react') }, diff --git a/package.json b/package.json index c07786f..a3a3419 100644 --- a/package.json +++ b/package.json @@ -61,10 +61,10 @@ "webpack-dev-server": "3.4.1" }, "dependencies": { - "@ag-community/grid-all-modules": "^22.0.0-beta.0", - "@ag-community/grid-core": "^22.0.0-beta.0", - "@ag-community/grid-react": "^22.0.0-beta.0", - "@ag-enterprise/grid-all-modules": "^22.0.0-beta.0", + "@ag-grid-community/grid-all-modules": "^22.0.0-beta.0", + "@ag-grid-community/grid-core": "^22.0.0-beta.0", + "@ag-grid-community/grid-react": "^22.0.0-beta.0", + "@ag-grid-enterprise/grid-all-modules": "^22.0.0-beta.0", "bootstrap": "4.3.1", "d3": "4.9.1", "lodash": "4.17.11", diff --git a/src-examples/index.js b/src-examples/index.js index a7753fb..5b04b84 100644 --- a/src-examples/index.js +++ b/src-examples/index.js @@ -4,8 +4,8 @@ import React from "react"; import {render} from "react-dom"; import {BrowserRouter} from "react-router-dom"; -import "@ag-community/grid-core/dist/styles/ag-grid.css"; -import "@ag-community/grid-core/dist/styles/ag-theme-balham.css"; +import "@ag-grid-community/grid-core/dist/styles/ag-grid.css"; +import "@ag-grid-community/grid-core/dist/styles/ag-theme-balham.css"; import "../node_modules/bootstrap/dist/css/bootstrap.css"; import App from "./App"; diff --git a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx index 218e22b..df806e7 100644 --- a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx +++ b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx @@ -1,5 +1,5 @@ import React, {Component} from "react"; -import {AgGridColumn, AgGridReact} from "@ag-community/grid-react"; +import {AgGridColumn, AgGridReact} from "@ag-grid-community/grid-react"; import RowDataFactory from "./RowDataFactory"; import DateComponent from "./DateComponent.jsx"; import SkillsCellRenderer from './SkillsCellRenderer.jsx'; @@ -14,10 +14,10 @@ import SortableHeaderComponent from './SortableHeaderComponent.jsx'; import "./RichGridDeclarativeExample.css"; // for community features -// import {AllCommunityModules} from "@ag-community/grid-all-modules"; +// import {AllCommunityModules} from "@ag-grid-community/grid-all-modules"; // for enterprise features -import {AllModules} from "@ag-enterprise/grid-all-modules"; +import {AllModules} from "@ag-grid-enterprise/grid-all-modules"; export default class RichGridDeclarativeExample extends Component { constructor(props) { diff --git a/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx b/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx index ba1b5b4..b699f55 100644 --- a/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx @@ -1,6 +1,6 @@ import React, {Component} from "react"; import {connect} from "react-redux"; -import {AgGridReact} from "@ag-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/grid-react"; import PriceRenderer from "./PriceRenderer"; diff --git a/src-examples/simpleReduxHooksExample/GridComponent.jsx b/src-examples/simpleReduxHooksExample/GridComponent.jsx index 1dc628e..175a6c2 100644 --- a/src-examples/simpleReduxHooksExample/GridComponent.jsx +++ b/src-examples/simpleReduxHooksExample/GridComponent.jsx @@ -1,6 +1,6 @@ import React, {useContext} from "react"; import {Context} from "./store"; -import {AgGridReact} from "@ag-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/grid-react"; /* * This component serves to display the row data (provided by redux) diff --git a/src-large-data/index.js b/src-large-data/index.js index 5d90a7d..9c1db91 100644 --- a/src-large-data/index.js +++ b/src-large-data/index.js @@ -4,8 +4,8 @@ import ReactDOM from 'react-dom'; import React from 'react'; import LargeGrid from './largeGrid.jsx'; -import '@ag-community/grid-core/dist/styles/ag-grid.css'; -import '@ag-community/grid-core/dist/styles/ag-theme-fresh.css'; +import '@ag-grid-community/grid-core/dist/styles/ag-grid.css'; +import '@ag-grid-community/grid-core/dist/styles/ag-theme-fresh.css'; // waiting for dom to load before booting react. we could alternatively // put the index.js reference at the end fo the index.html, but i prefer this way. diff --git a/src-large-data/largeGrid.jsx b/src-large-data/largeGrid.jsx index b182761..2a8998d 100644 --- a/src-large-data/largeGrid.jsx +++ b/src-large-data/largeGrid.jsx @@ -1,12 +1,12 @@ import React, {Component} from 'react'; import SimpleCellRenderer from './simpleCellRenderer.jsx'; -import {AgGridReact} from '@ag-community/grid-react'; +import {AgGridReact} from '@ag-grid-community/grid-react'; // for community features -import {AllCommunityModules} from "@ag-community/grid-all-modules"; +import {AllCommunityModules} from "@ag-grid-community/grid-all-modules"; // for enterprise features -// import {AllModules} from "@ag-enterprise/grid-all-modules"; +// import {AllModules} from "@ag-grid-enterprise/grid-all-modules"; export default class MyApp extends Component { diff --git a/src-trader-dashboard/components/FxQuoteMatrix.jsx b/src-trader-dashboard/components/FxQuoteMatrix.jsx index 8286826..67777f4 100644 --- a/src-trader-dashboard/components/FxQuoteMatrix.jsx +++ b/src-trader-dashboard/components/FxQuoteMatrix.jsx @@ -1,7 +1,7 @@ import React, {Component} from "react"; import {connect} from "react-redux"; -import {AgGridReact} from "@ag-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/grid-react"; class FxQuoteMatrix extends Component { constructor(props) { diff --git a/src-trader-dashboard/components/PriceChangesGrid.jsx b/src-trader-dashboard/components/PriceChangesGrid.jsx index e64b41a..cbb18f5 100644 --- a/src-trader-dashboard/components/PriceChangesGrid.jsx +++ b/src-trader-dashboard/components/PriceChangesGrid.jsx @@ -1,6 +1,6 @@ import React, {Component} from "react"; -import {AgGridReact} from "@ag-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/grid-react"; import map from "lodash/map"; import difference from "lodash/difference"; diff --git a/src-trader-dashboard/components/TopMoversGrid.jsx b/src-trader-dashboard/components/TopMoversGrid.jsx index 47000e0..66336c5 100644 --- a/src-trader-dashboard/components/TopMoversGrid.jsx +++ b/src-trader-dashboard/components/TopMoversGrid.jsx @@ -1,7 +1,7 @@ import React, {Component} from "react"; import {connect} from "react-redux"; -import {AgGridReact} from "@ag-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/grid-react"; class TopMoversGrid extends Component { constructor(props) { diff --git a/ts-tests/InvalidGridProperty.tsx b/ts-tests/InvalidGridProperty.tsx index 502d2a1..8f84a49 100644 --- a/ts-tests/InvalidGridProperty.tsx +++ b/ts-tests/InvalidGridProperty.tsx @@ -1,4 +1,4 @@ import React from 'react'; -import {AgGridReact} from '@ag-community/grid-react'; +import {AgGridReact} from '@ag-grid-community/grid-react'; export const App: React.FunctionComponent = () => ; diff --git a/ts-tests/SimpleFunctionalGrid.tsx b/ts-tests/SimpleFunctionalGrid.tsx index 627853d..4b3d801 100644 --- a/ts-tests/SimpleFunctionalGrid.tsx +++ b/ts-tests/SimpleFunctionalGrid.tsx @@ -1,4 +1,4 @@ import React from 'react'; -import {AgGridReact} from '@ag-community/grid-react'; +import {AgGridReact} from '@ag-grid-community/grid-react'; export const App: React.FunctionComponent = () => ; From 1c1e1bf555ec08be2e2bbf1c435257937910851b Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Tue, 5 Nov 2019 09:18:50 +0000 Subject: [PATCH 5/7] AG-1329 Rename packages to new scopes (@ag-grid-community & @ag-grid-enterprise) --- config/webpack.config.examples.js | 4 ++-- config/webpack.config.large.js | 2 +- config/webpack.config.trader.js | 2 +- package.json | 8 ++++---- src-examples/index.js | 4 ++-- .../RichGridDeclarativeExample.jsx | 6 +++--- .../simpleReduxDynamicComponentExample/GridComponent.jsx | 2 +- src-examples/simpleReduxHooksExample/GridComponent.jsx | 2 +- src-large-data/index.js | 4 ++-- src-large-data/largeGrid.jsx | 6 +++--- src-trader-dashboard/components/FxQuoteMatrix.jsx | 2 +- src-trader-dashboard/components/PriceChangesGrid.jsx | 2 +- src-trader-dashboard/components/TopMoversGrid.jsx | 2 +- ts-tests/InvalidGridProperty.tsx | 2 +- ts-tests/SimpleFunctionalGrid.tsx | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/config/webpack.config.examples.js b/config/webpack.config.examples.js index ed2ed00..57b472c 100644 --- a/config/webpack.config.examples.js +++ b/config/webpack.config.examples.js @@ -35,8 +35,8 @@ module.exports = { }, resolve: { alias: { - "@ag-grid-community/grid-core/modules": path.resolve('./node_modules/@ag-grid-community/grid-core/dist/es2015/modules'), - "@ag-grid-community/grid-core": path.resolve('./node_modules/@ag-grid-community/grid-core'), + "@ag-grid-community/core/modules": path.resolve('./node_modules/@ag-grid-community/core/dist/es2015/modules'), + "@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'), "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'), react: path.resolve('./node_modules/react') }, diff --git a/config/webpack.config.large.js b/config/webpack.config.large.js index 128b3ad..229cc24 100644 --- a/config/webpack.config.large.js +++ b/config/webpack.config.large.js @@ -31,7 +31,7 @@ module.exports = { }, resolve: { alias: { - "@ag-grid-community/grid-core": path.resolve('./node_modules/@ag-grid-community/grid-core'), + "@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'), "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'), react: path.resolve('./node_modules/react') }, diff --git a/config/webpack.config.trader.js b/config/webpack.config.trader.js index 6401f22..845c6a5 100644 --- a/config/webpack.config.trader.js +++ b/config/webpack.config.trader.js @@ -31,7 +31,7 @@ module.exports = { }, resolve: { alias: { - "@ag-grid-community/grid-core": path.resolve('./node_modules/@ag-grid-community/grid-core'), + "@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'), "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'), react: path.resolve('./node_modules/react') }, diff --git a/package.json b/package.json index a3a3419..954b5b8 100644 --- a/package.json +++ b/package.json @@ -61,10 +61,10 @@ "webpack-dev-server": "3.4.1" }, "dependencies": { - "@ag-grid-community/grid-all-modules": "^22.0.0-beta.0", - "@ag-grid-community/grid-core": "^22.0.0-beta.0", - "@ag-grid-community/grid-react": "^22.0.0-beta.0", - "@ag-grid-enterprise/grid-all-modules": "^22.0.0-beta.0", + "@ag-grid-community/all-modules": "^22.0.0-beta.0", + "@ag-grid-community/core": "^22.0.0-beta.0", + "@ag-grid-community/react": "^22.0.0-beta.0", + "@ag-grid-enterprise/all-modules": "^22.0.0-beta.0", "bootstrap": "4.3.1", "d3": "4.9.1", "lodash": "4.17.11", diff --git a/src-examples/index.js b/src-examples/index.js index 5b04b84..101fc60 100644 --- a/src-examples/index.js +++ b/src-examples/index.js @@ -4,8 +4,8 @@ import React from "react"; import {render} from "react-dom"; import {BrowserRouter} from "react-router-dom"; -import "@ag-grid-community/grid-core/dist/styles/ag-grid.css"; -import "@ag-grid-community/grid-core/dist/styles/ag-theme-balham.css"; +import "@ag-grid-community/core/dist/styles/ag-grid.css"; +import "@ag-grid-community/core/dist/styles/ag-theme-balham.css"; import "../node_modules/bootstrap/dist/css/bootstrap.css"; import App from "./App"; diff --git a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx index df806e7..116e942 100644 --- a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx +++ b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx @@ -1,5 +1,5 @@ import React, {Component} from "react"; -import {AgGridColumn, AgGridReact} from "@ag-grid-community/grid-react"; +import {AgGridColumn, AgGridReact} from "@ag-grid-community/react"; import RowDataFactory from "./RowDataFactory"; import DateComponent from "./DateComponent.jsx"; import SkillsCellRenderer from './SkillsCellRenderer.jsx'; @@ -14,10 +14,10 @@ import SortableHeaderComponent from './SortableHeaderComponent.jsx'; import "./RichGridDeclarativeExample.css"; // for community features -// import {AllCommunityModules} from "@ag-grid-community/grid-all-modules"; +// import {AllCommunityModules} from "@ag-grid-community/all-modules"; // for enterprise features -import {AllModules} from "@ag-grid-enterprise/grid-all-modules"; +import {AllModules} from "@ag-grid-enterprise/all-modules"; export default class RichGridDeclarativeExample extends Component { constructor(props) { diff --git a/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx b/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx index b699f55..8609507 100644 --- a/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/GridComponent.jsx @@ -1,6 +1,6 @@ import React, {Component} from "react"; import {connect} from "react-redux"; -import {AgGridReact} from "@ag-grid-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/react"; import PriceRenderer from "./PriceRenderer"; diff --git a/src-examples/simpleReduxHooksExample/GridComponent.jsx b/src-examples/simpleReduxHooksExample/GridComponent.jsx index 175a6c2..30b36d4 100644 --- a/src-examples/simpleReduxHooksExample/GridComponent.jsx +++ b/src-examples/simpleReduxHooksExample/GridComponent.jsx @@ -1,6 +1,6 @@ import React, {useContext} from "react"; import {Context} from "./store"; -import {AgGridReact} from "@ag-grid-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/react"; /* * This component serves to display the row data (provided by redux) diff --git a/src-large-data/index.js b/src-large-data/index.js index 9c1db91..e96ebe7 100644 --- a/src-large-data/index.js +++ b/src-large-data/index.js @@ -4,8 +4,8 @@ import ReactDOM from 'react-dom'; import React from 'react'; import LargeGrid from './largeGrid.jsx'; -import '@ag-grid-community/grid-core/dist/styles/ag-grid.css'; -import '@ag-grid-community/grid-core/dist/styles/ag-theme-fresh.css'; +import '@ag-grid-community/core/dist/styles/ag-grid.css'; +import '@ag-grid-community/core/dist/styles/ag-theme-fresh.css'; // waiting for dom to load before booting react. we could alternatively // put the index.js reference at the end fo the index.html, but i prefer this way. diff --git a/src-large-data/largeGrid.jsx b/src-large-data/largeGrid.jsx index 2a8998d..356deba 100644 --- a/src-large-data/largeGrid.jsx +++ b/src-large-data/largeGrid.jsx @@ -1,12 +1,12 @@ import React, {Component} from 'react'; import SimpleCellRenderer from './simpleCellRenderer.jsx'; -import {AgGridReact} from '@ag-grid-community/grid-react'; +import {AgGridReact} from '@ag-grid-community/react'; // for community features -import {AllCommunityModules} from "@ag-grid-community/grid-all-modules"; +import {AllCommunityModules} from "@ag-grid-community/all-modules"; // for enterprise features -// import {AllModules} from "@ag-grid-enterprise/grid-all-modules"; +// import {AllModules} from "@ag-grid-enterprise/all-modules"; export default class MyApp extends Component { diff --git a/src-trader-dashboard/components/FxQuoteMatrix.jsx b/src-trader-dashboard/components/FxQuoteMatrix.jsx index 67777f4..dfcb187 100644 --- a/src-trader-dashboard/components/FxQuoteMatrix.jsx +++ b/src-trader-dashboard/components/FxQuoteMatrix.jsx @@ -1,7 +1,7 @@ import React, {Component} from "react"; import {connect} from "react-redux"; -import {AgGridReact} from "@ag-grid-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/react"; class FxQuoteMatrix extends Component { constructor(props) { diff --git a/src-trader-dashboard/components/PriceChangesGrid.jsx b/src-trader-dashboard/components/PriceChangesGrid.jsx index cbb18f5..f9d7fa6 100644 --- a/src-trader-dashboard/components/PriceChangesGrid.jsx +++ b/src-trader-dashboard/components/PriceChangesGrid.jsx @@ -1,6 +1,6 @@ import React, {Component} from "react"; -import {AgGridReact} from "@ag-grid-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/react"; import map from "lodash/map"; import difference from "lodash/difference"; diff --git a/src-trader-dashboard/components/TopMoversGrid.jsx b/src-trader-dashboard/components/TopMoversGrid.jsx index 66336c5..fc24890 100644 --- a/src-trader-dashboard/components/TopMoversGrid.jsx +++ b/src-trader-dashboard/components/TopMoversGrid.jsx @@ -1,7 +1,7 @@ import React, {Component} from "react"; import {connect} from "react-redux"; -import {AgGridReact} from "@ag-grid-community/grid-react"; +import {AgGridReact} from "@ag-grid-community/react"; class TopMoversGrid extends Component { constructor(props) { diff --git a/ts-tests/InvalidGridProperty.tsx b/ts-tests/InvalidGridProperty.tsx index 8f84a49..9ded5a0 100644 --- a/ts-tests/InvalidGridProperty.tsx +++ b/ts-tests/InvalidGridProperty.tsx @@ -1,4 +1,4 @@ import React from 'react'; -import {AgGridReact} from '@ag-grid-community/grid-react'; +import {AgGridReact} from '@ag-grid-community/react'; export const App: React.FunctionComponent = () => ; diff --git a/ts-tests/SimpleFunctionalGrid.tsx b/ts-tests/SimpleFunctionalGrid.tsx index 4b3d801..9ff85ba 100644 --- a/ts-tests/SimpleFunctionalGrid.tsx +++ b/ts-tests/SimpleFunctionalGrid.tsx @@ -1,4 +1,4 @@ import React from 'react'; -import {AgGridReact} from '@ag-grid-community/grid-react'; +import {AgGridReact} from '@ag-grid-community/react'; export const App: React.FunctionComponent = () => ; From ff7c46e55351a9b169441413145ca5d8c27803e9 Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Fri, 8 Nov 2019 10:54:47 +0000 Subject: [PATCH 6/7] AG-1329 Add licenses etc to new packages --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 954b5b8..091c992 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-grid-react-example", - "version": "22.0.0-beta.0", + "version": "22.0.0", "description": "Example Reach applicaiton using ag-Grid.", "main": "dist/ag-grid-react-example.js", "scripts": { @@ -61,10 +61,10 @@ "webpack-dev-server": "3.4.1" }, "dependencies": { - "@ag-grid-community/all-modules": "^22.0.0-beta.0", - "@ag-grid-community/core": "^22.0.0-beta.0", - "@ag-grid-community/react": "^22.0.0-beta.0", - "@ag-grid-enterprise/all-modules": "^22.0.0-beta.0", + "@ag-grid-community/all-modules": "~22.0.0", + "@ag-grid-community/core": "~22.0.0", + "@ag-grid-community/react": "~22.0.0", + "@ag-grid-enterprise/all-modules": "~22.0.0", "bootstrap": "4.3.1", "d3": "4.9.1", "lodash": "4.17.11", @@ -74,4 +74,4 @@ "react-router-dom": "5.0.0", "redux": "4.0.1" } -} +} \ No newline at end of file From 5ad3592fed70cb6e48909873009c0593745e609b Mon Sep 17 00:00:00 2001 From: Sean Landsman Date: Mon, 11 Nov 2019 11:22:13 +0000 Subject: [PATCH 7/7] AG-1329 Update examples --- config/webpack.config.examples.js | 4 ++-- package.json | 7 +++---- src-examples/index.js | 6 +++--- .../simpleReduxDynamicComponentExample/HeaderComponent.jsx | 2 -- .../SimpleReduxExample.jsx | 2 -- src-large-data/largeGrid.jsx | 4 ++-- src-trader-dashboard/components/FxQuoteMatrix.jsx | 4 ++++ src-trader-dashboard/components/PriceChangesGrid.jsx | 3 +++ src-trader-dashboard/components/TopMoversGrid.jsx | 3 +++ src-trader-dashboard/index.js | 3 +++ 10 files changed, 23 insertions(+), 15 deletions(-) diff --git a/config/webpack.config.examples.js b/config/webpack.config.examples.js index 57b472c..2a1c779 100644 --- a/config/webpack.config.examples.js +++ b/config/webpack.config.examples.js @@ -35,9 +35,9 @@ module.exports = { }, resolve: { alias: { - "@ag-grid-community/core/modules": path.resolve('./node_modules/@ag-grid-community/core/dist/es2015/modules'), + // "@ag-grid-community/core/modules": path.resolve('./node_modules/@ag-grid-community/core/dist/es2015/modules'), "@ag-grid-community/core": path.resolve('./node_modules/@ag-grid-community/core'), - "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'), + // "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'), react: path.resolve('./node_modules/react') }, extensions: ['.js', '.jsx'] diff --git a/package.json b/package.json index 091c992..fe4ddbd 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ }, "homepage": "http://www.ag-grid.com/", "devDependencies": { + "@ag-grid-community/core": "~22.0.0", "@babel/core": "7.4.4", "@babel/plugin-proposal-class-properties": "7.4.4", "@babel/plugin-proposal-function-bind": "7.2.0", @@ -61,10 +62,8 @@ "webpack-dev-server": "3.4.1" }, "dependencies": { - "@ag-grid-community/all-modules": "~22.0.0", - "@ag-grid-community/core": "~22.0.0", - "@ag-grid-community/react": "~22.0.0", "@ag-grid-enterprise/all-modules": "~22.0.0", + "@ag-grid-community/react": "~22.0.0", "bootstrap": "4.3.1", "d3": "4.9.1", "lodash": "4.17.11", @@ -74,4 +73,4 @@ "react-router-dom": "5.0.0", "redux": "4.0.1" } -} \ No newline at end of file +} diff --git a/src-examples/index.js b/src-examples/index.js index 101fc60..3e0eae7 100644 --- a/src-examples/index.js +++ b/src-examples/index.js @@ -4,14 +4,14 @@ import React from "react"; import {render} from "react-dom"; import {BrowserRouter} from "react-router-dom"; -import "@ag-grid-community/core/dist/styles/ag-grid.css"; -import "@ag-grid-community/core/dist/styles/ag-theme-balham.css"; +import "@ag-grid-enterprise/all-modules/dist/styles/ag-grid.css"; +import "@ag-grid-enterprise/all-modules/dist/styles/ag-theme-balham.css"; import "../node_modules/bootstrap/dist/css/bootstrap.css"; import App from "./App"; // only required when using enterprise features -// import {LicenseManager} from "ag-grid-enterprise/main"; +// import {LicenseManager} from "@ag-grid-enterprise/all-modules"; // LicenseManager.setLicenseKey(""); document.addEventListener('DOMContentLoaded', () => { diff --git a/src-examples/simpleReduxDynamicComponentExample/HeaderComponent.jsx b/src-examples/simpleReduxDynamicComponentExample/HeaderComponent.jsx index 3818688..cd3c5ac 100644 --- a/src-examples/simpleReduxDynamicComponentExample/HeaderComponent.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/HeaderComponent.jsx @@ -1,7 +1,5 @@ import React, {Component} from "react"; import {connect} from "react-redux"; -// take this line out if you do not want to use ag-Grid-Enterprise -// import "ag-grid-enterprise"; import {setCurrency, updateRowData} from "./gridDataActions"; diff --git a/src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx b/src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx index 89b07f0..77cd6ad 100644 --- a/src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx +++ b/src-examples/simpleReduxDynamicComponentExample/SimpleReduxExample.jsx @@ -1,8 +1,6 @@ import React, {Component} from "react"; import {Provider} from "react-redux"; import {createStore} from "redux"; -// take this line out if you do not want to use ag-Grid-Enterprise -// import "ag-grid-enterprise"; import HeaderComponent from "./HeaderComponent"; import GridComponent from "./GridComponent"; diff --git a/src-large-data/largeGrid.jsx b/src-large-data/largeGrid.jsx index 356deba..75dd0ed 100644 --- a/src-large-data/largeGrid.jsx +++ b/src-large-data/largeGrid.jsx @@ -3,7 +3,7 @@ import SimpleCellRenderer from './simpleCellRenderer.jsx'; import {AgGridReact} from '@ag-grid-community/react'; // for community features -import {AllCommunityModules} from "@ag-grid-community/all-modules"; +import {AllModules} from "@ag-grid-enterprise/all-modules"; // for enterprise features // import {AllModules} from "@ag-grid-enterprise/all-modules"; @@ -64,7 +64,7 @@ export default class MyApp extends Component { render() { return (
- +
); } diff --git a/src-trader-dashboard/components/FxQuoteMatrix.jsx b/src-trader-dashboard/components/FxQuoteMatrix.jsx index dfcb187..925b8c4 100644 --- a/src-trader-dashboard/components/FxQuoteMatrix.jsx +++ b/src-trader-dashboard/components/FxQuoteMatrix.jsx @@ -3,6 +3,8 @@ import {connect} from "react-redux"; import {AgGridReact} from "@ag-grid-community/react"; +import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules"; + class FxQuoteMatrix extends Component { constructor(props) { super(props); @@ -71,6 +73,8 @@ class FxQuoteMatrix extends Component { // callbacks getRowNodeId={this.getRowNodeId} + modules={[ClientSideRowModelModule]} + // events onGridReady={this.onGridReady}> diff --git a/src-trader-dashboard/components/PriceChangesGrid.jsx b/src-trader-dashboard/components/PriceChangesGrid.jsx index f9d7fa6..1832441 100644 --- a/src-trader-dashboard/components/PriceChangesGrid.jsx +++ b/src-trader-dashboard/components/PriceChangesGrid.jsx @@ -1,6 +1,7 @@ import React, {Component} from "react"; import {AgGridReact} from "@ag-grid-community/react"; +import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules"; import map from "lodash/map"; import difference from "lodash/difference"; @@ -160,6 +161,8 @@ export default class extends Component { }} rowSelection="single" + modules={[ClientSideRowModelModule]} + // callbacks getRowNodeId={this.getRowNodeId} diff --git a/src-trader-dashboard/components/TopMoversGrid.jsx b/src-trader-dashboard/components/TopMoversGrid.jsx index fc24890..a4faacf 100644 --- a/src-trader-dashboard/components/TopMoversGrid.jsx +++ b/src-trader-dashboard/components/TopMoversGrid.jsx @@ -2,6 +2,7 @@ import React, {Component} from "react"; import {connect} from "react-redux"; import {AgGridReact} from "@ag-grid-community/react"; +import {ClientSideRowModelModule} from "@ag-grid-enterprise/all-modules"; class TopMoversGrid extends Component { constructor(props) { @@ -75,6 +76,8 @@ class TopMoversGrid extends Component { deltaRowDataMode getRowNodeId={this.getRowNodeId} + modules={[ClientSideRowModelModule]} + // events onGridReady={this.onGridReady}> diff --git a/src-trader-dashboard/index.js b/src-trader-dashboard/index.js index 6903025..91d921f 100644 --- a/src-trader-dashboard/index.js +++ b/src-trader-dashboard/index.js @@ -8,6 +8,9 @@ import {Provider} from "react-redux"; import StoreService from './services/StoreService'; import TraderDashboard from "./components/TraderDashboard.jsx"; +import "@ag-grid-enterprise/all-modules/dist/styles/ag-grid.css"; +import "@ag-grid-enterprise/all-modules/dist/styles/ag-theme-fresh.css"; + let store = StoreService.STORE; document.addEventListener('DOMContentLoaded', () => {