Skip to content

Commit

Permalink
bump dependencies and enable ag-grid enterprise for local development (
Browse files Browse the repository at this point in the history
…#3322)

* bump dependencies

* query: enable enterprise grid for local development
  • Loading branch information
akphi committed Jul 8, 2024
1 parent 8aa8324 commit bfd99bc
Show file tree
Hide file tree
Showing 9 changed files with 353 additions and 341 deletions.
6 changes: 6 additions & 0 deletions .changeset/itchy-glasses-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@finos/legend-vscode-extension-dependencies': patch
'@finos/legend-extension-dsl-data-quality': patch
'@finos/eslint-plugin-legend-studio': patch
'@finos/legend-art': patch
---
8 changes: 8 additions & 0 deletions .changeset/shy-rivers-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@finos/legend-vscode-extension-dependencies': patch
'@finos/legend-extension-dsl-data-quality': patch
'@finos/legend-application-repl': patch
'@finos/eslint-plugin-legend-studio': patch
'@finos/legend-lego': patch
'@finos/legend-art': patch
---
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"eslint": "8.57.0",
"fs-extra": "11.2.0",
"husky": "9.0.11",
"inquirer": "9.3.4",
"inquirer": "10.0.0",
"jest": "29.7.0",
"lint-staged": "15.2.7",
"micromatch": "4.0.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"dependencies": {
"@babel/core": "7.24.7",
"@babel/eslint-parser": "7.24.7",
"@typescript-eslint/eslint-plugin": "7.15.0",
"@typescript-eslint/parser": "7.15.0",
"@typescript-eslint/eslint-plugin": "7.16.0",
"@typescript-eslint/parser": "7.16.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-prettier": "5.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/legend-art/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"react-select": "4.3.1",
"react-window": "1.8.10",
"remark-gfm": "4.0.0",
"tailwind-merge": "2.3.0"
"tailwind-merge": "2.4.0"
},
"devDependencies": {
"@finos/legend-dev-utils": "workspace:*",
Expand Down
8 changes: 4 additions & 4 deletions packages/legend-extension-dsl-data-quality/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@finos/legend-storage": "workspace:*",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"mobx": "6.12.3",
"mobx": "6.13.0",
"mobx-react-lite": "4.0.7",
"react": "18.3.1",
"react-dnd": "16.0.1",
Expand All @@ -67,9 +67,9 @@
"eslint": "8.57.0",
"jest": "29.7.0",
"npm-run-all": "4.1.5",
"rimraf": "5.0.7",
"sass": "1.77.4",
"typescript": "5.4.5"
"rimraf": "5.0.8",
"sass": "1.77.6",
"typescript": "5.5.3"
},
"peerDependencies": {
"react": "^18.0.0"
Expand Down
13 changes: 6 additions & 7 deletions packages/legend-lego/src/data-grid/DataGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
* limitations under the License.
*/

import {
AgGridReact,
type AgReactUiProps,
type AgGridReactProps,
} from '@ag-grid-community/react';
import { AgGridReact, type AgGridReactProps } from '@ag-grid-community/react';
import { ClientSideRowModelModule } from '@ag-grid-community/client-side-row-model';
import { CsvExportModule } from '@ag-grid-community/csv-export';
import { ClipboardModule } from '@ag-grid-enterprise/clipboard';
Expand Down Expand Up @@ -67,7 +63,7 @@ export const allModules = communityModules.concat(enterpriseModules);
declare const AG_GRID_LICENSE: string;

export function DataGrid<TData = unknown>(
props: AgGridReactProps<TData> | AgReactUiProps<TData>,
props: AgGridReactProps<TData>,
): JSX.Element {
if (AG_GRID_LICENSE) {
LicenseManager.setLicenseKey(AG_GRID_LICENSE);
Expand All @@ -81,7 +77,10 @@ export function DataGrid<TData = unknown>(
// See https://github.com/ag-grid/ag-grid/issues/2588
suppressBrowserResizeObserver={true}
{...props}
modules={AG_GRID_LICENSE ? allModules : communityModules}
// NOTE: for test, we don't want to handle the error messages outputed by ag-grid so
// we disable enterprise features for now
// eslint-disable-next-line no-process-env
modules={process.env.NODE_ENV === 'test' ? communityModules : allModules}
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/legend-vscode-extension-dependencies/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"eslint": "8.57.0",
"npm-run-all": "4.1.5",
"rimraf": "5.0.8",
"rollup": "4.18.0",
"rollup": "4.18.1",
"rollup-plugin-flow": "1.1.1",
"rollup-plugin-import-css": "3.5.0",
"typescript": "5.5.3"
Expand Down
Loading

0 comments on commit bfd99bc

Please sign in to comment.