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

Commit 286285c

Browse files
committed
Merge 31.0.0
2 parents 4ed9128 + 20309bb commit 286285c

File tree

9 files changed

+67
-119
lines changed

9 files changed

+67
-119
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
.settings/
1919

2020
# misc
21+
/.angular/cache
2122
/.sass-cache
2223
/connect.lock
2324
/coverage/*

angular.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,5 @@
9797
}
9898
}
9999
}
100-
},
101-
"defaultProject": "ag-grid-angular-cli-example"
100+
}
102101
}

package.json

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ag-grid-angular-cli-example",
3-
"version": "30.1.0",
3+
"version": "31.0.0",
44
"description": "AG Grid Angular Example Using Angular CLI",
55
"license": "MIT",
66
"repository": {
@@ -10,44 +10,43 @@
1010
"author": "Sean Landsman <sean@thelandsmans.com>",
1111
"scripts": {
1212
"start": "NODE_OPTIONS=--openssl-legacy-provider ng serve --port 8080",
13-
"build": "NODE_OPTIONS=\"--openssl-legacy-provider --max-old-space-size=8192\" ng build --aot && npm run hash",
13+
"build": "NODE_OPTIONS=\"--openssl-legacy-provider --max-old-space-size=8192\" ng build --aot",
1414
"build-prod": "npm run build",
15-
"hash": "sh ./hashDirectory.sh > .hash",
1615
"lint": "tslint \"src/**/*.ts\""
1716
},
1817
"private": true,
1918
"dependencies": {
20-
"@ag-grid-community/angular": "~30.1.0",
21-
"@ag-grid-community/core": "~30.1.0",
22-
"@ag-grid-community/client-side-row-model": "~30.1.0",
23-
"@ag-grid-enterprise/core": "~30.1.0",
24-
"@ag-grid-enterprise/menu": "~30.1.0",
25-
"@ag-grid-enterprise/side-bar": "~30.1.0",
26-
"@ag-grid-enterprise/column-tool-panel": "~30.1.0",
27-
"@ag-grid-enterprise/filter-tool-panel": "~30.1.0",
28-
"@ag-grid-enterprise/row-grouping": "~30.1.0",
29-
"@ag-grid-enterprise/set-filter": "~30.1.0",
30-
"@ag-grid-enterprise/status-bar": "~30.1.0",
31-
"@ag-grid-enterprise/range-selection": "~30.1.0",
32-
"@ag-grid-enterprise/charts": "~30.1.0",
33-
"@ag-grid-community/styles": "~30.1.0",
34-
"@angular/animations": "~12.2.0",
35-
"@angular/common": "~12.2.0",
36-
"@angular/compiler": "~12.2.0",
37-
"@angular/core": "~12.2.0",
38-
"@angular/forms": "~12.2.0",
39-
"@angular/platform-browser": "~12.2.0",
40-
"@angular/platform-browser-dynamic": "~12.2.0",
41-
"@angular/router": "~12.2.0",
19+
"@ag-grid-community/angular": "~31.0.0",
20+
"@ag-grid-community/core": "~31.0.0",
21+
"@ag-grid-community/client-side-row-model": "~31.0.0",
22+
"@ag-grid-enterprise/core": "~31.0.0",
23+
"@ag-grid-enterprise/menu": "~31.0.0",
24+
"@ag-grid-enterprise/side-bar": "~31.0.0",
25+
"@ag-grid-enterprise/column-tool-panel": "~31.0.0",
26+
"@ag-grid-enterprise/filter-tool-panel": "~31.0.0",
27+
"@ag-grid-enterprise/row-grouping": "~31.0.0",
28+
"@ag-grid-enterprise/set-filter": "~31.0.0",
29+
"@ag-grid-enterprise/status-bar": "~31.0.0",
30+
"@ag-grid-enterprise/range-selection": "~31.0.0",
31+
"@ag-grid-enterprise/charts": "~31.0.0",
32+
"@ag-grid-community/styles": "~31.0.0",
33+
"@angular/animations": "^14.3.0",
34+
"@angular/common": "^14.3.0",
35+
"@angular/compiler": "^14.3.0",
36+
"@angular/core": "^14.3.0",
37+
"@angular/forms": "^14.3.0",
38+
"@angular/platform-browser": "^14.3.0",
39+
"@angular/platform-browser-dynamic": "^14.3.0",
40+
"@angular/router": "^14.3.0",
4241
"bootstrap": "4.5.0",
4342
"rxjs": "~6.6.0",
4443
"tslib": "^2.3.0",
4544
"zone.js": "~0.11.4"
4645
},
4746
"devDependencies": {
48-
"@angular-devkit/build-angular": "~12.2.17",
49-
"@angular/cli": "~12.2.17",
50-
"@angular/compiler-cli": "~12.2.0",
47+
"@angular-devkit/build-angular": "^14.2.12",
48+
"@angular/cli": "^14.2.12",
49+
"@angular/compiler-cli": "^14.3.0",
5150
"@types/jasmine": "~3.8.0",
5251
"@types/node": "^12.11.1",
5352
"jasmine-core": "~3.8.0",
@@ -56,6 +55,6 @@
5655
"karma-coverage": "~2.0.3",
5756
"karma-jasmine": "~4.0.0",
5857
"karma-jasmine-html-reporter": "~1.7.0",
59-
"typescript": "~4.3.5"
58+
"typescript": "~4.7.4"
6059
}
6160
}

src/app/rich-grid-example/rich-grid.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ <h1>Rich Grid Example</h1>
1515
</span>
1616
<span style="float: right">
1717
Column API:
18-
<button (click)="this.columnApi.setColumnVisible('country', false)" class="btn btn-primary">Hide Country Column</button>
19-
<button (click)="this.columnApi.setColumnVisible('country', true)" class="btn btn-primary">Show Country Column</button>
18+
<button (click)="this.api.setColumnVisible('country', false)" class="btn btn-primary">Hide Country Column</button>
19+
<button (click)="this.api.setColumnVisible('country', true)" class="btn btn-primary">Show Country Column</button>
2020
</span>
2121
</div>
2222
</div>

src/app/rich-grid-example/rich-grid.component.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, ViewEncapsulation } from '@angular/core';
22
// for enterprise features
3-
import { ColumnApi, GridApi, Module, ColDef, ColGroupDef, GridReadyEvent, CellClickedEvent, CellDoubleClickedEvent, CellContextMenuEvent, ICellRendererParams } from '@ag-grid-community/core';
3+
import { GridApi, Module, ColDef, ColGroupDef, GridReadyEvent, CellClickedEvent, CellDoubleClickedEvent, CellContextMenuEvent, ICellRendererParams } from '@ag-grid-community/core';
44
import { ClientSideRowModelModule } from "@ag-grid-community/client-side-row-model";
55
import { MenuModule } from '@ag-grid-enterprise/menu';
66
import { SideBarModule } from '@ag-grid-enterprise/side-bar';
@@ -53,18 +53,16 @@ export class RichGridComponent {
5353
];
5454

5555
public api!: GridApi;
56-
public columnApi!: ColumnApi;
5756

5857
constructor() {
5958
this.defaultColDef = {
60-
resizable: true,
61-
sortable: true,
6259
filter: true,
6360
floatingFilter: true,
6461
headerComponent: 'sortableHeaderComponent',
6562
headerComponentParams: {
6663
menuIcon: 'fa-bars'
67-
}
64+
},
65+
cellDataType: false,
6866
};
6967

7068
this.components = {
@@ -216,8 +214,6 @@ export class RichGridComponent {
216214
console.log('onGridReady');
217215

218216
this.api = params.api;
219-
this.columnApi = params.columnApi;
220-
221217
this.api.sizeColumnsToFit();
222218

223219
this.calculateRowCount();

src/polyfills.ts

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,55 +8,46 @@
88
* file.
99
*
1010
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
11-
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
12-
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
11+
* automatically update themselves. This includes recent versions of Safari, Chrome (including
12+
* Opera), Edge on the desktop, and iOS and Chrome on mobile.
1313
*
14-
* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
14+
* Learn more in https://angular.io/guide/browser-support
1515
*/
1616

1717
/***************************************************************************************************
1818
* BROWSER POLYFILLS
1919
*/
2020

21-
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
22-
import 'core-js/es/symbol';
23-
import 'core-js/es/object';
24-
import 'core-js/es/function';
25-
import 'core-js/es/parse-int';
26-
import 'core-js/es/parse-float';
27-
import 'core-js/es/number';
28-
import 'core-js/es/math';
29-
import 'core-js/es/string';
30-
import 'core-js/es/date';
31-
import 'core-js/es/array';
32-
import 'core-js/es/regexp';
33-
import 'core-js/es/map';
34-
import 'core-js/es/set';
35-
/** Evergreen browsers require these. **/
36-
import 'core-js/es/reflect';
21+
/**
22+
* By default, zone.js will patch all possible macroTask and DomEvents
23+
* user can disable parts of macroTask/DomEvents patch by setting following flags
24+
* because those flags need to be set before `zone.js` being loaded, and webpack
25+
* will put import in the top of bundle, so user need to create a separate file
26+
* in this directory (for example: zone-flags.ts), and put the following flags
27+
* into that file, and then add the following code before importing zone.js.
28+
* import './zone-flags';
29+
*
30+
* The flags allowed in zone-flags.ts are listed here.
31+
*
32+
* The following flags will work for all browsers.
33+
*
34+
* (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
35+
* (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
36+
* (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
37+
*
38+
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
39+
* with the following flag, it will bypass `zone.js` patch for IE/Edge
40+
*
41+
* (window as any).__Zone_enable_cross_context_check = true;
42+
*
43+
*/
3744

3845
/***************************************************************************************************
39-
* Zone JS is required by Angular itself.
46+
* Zone JS is required by default for Angular itself.
4047
*/
41-
import 'zone.js/dist/zone'; // Included with Angular CLI.
42-
43-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
44-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
45-
46-
/** IE10 and IE11 requires the following to support `@angular/animation`. */
47-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
48-
49-
50-
/** ALL Firefox browsers require the following to support `@angular/animation`. **/
51-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
48+
import 'zone.js'; // Included with Angular CLI.
5249

5350

5451
/***************************************************************************************************
5552
* APPLICATION IMPORTS
5653
*/
57-
58-
/**
59-
* Date, currency, decimal and percent pipes.
60-
* Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
61-
*/
62-
// import 'intl'; // Run `npm install --save intl`.

src/test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ __karma__.loaded = function () {
2020
// First, initialize the Angular testing environment.
2121
getTestBed().initTestEnvironment(
2222
BrowserDynamicTestingModule,
23-
platformBrowserDynamicTesting()
23+
platformBrowserDynamicTesting(), {
24+
teardown: { destroyAfterEach: false }
25+
}
2426
);
2527
// Then we find all the tests.
2628
const context = require.context('./', true, /\.spec\.ts$/);

src/tsconfig.app.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"experimentalDecorators": true,
1515
"moduleResolution": "node",
1616
"importHelpers": true,
17-
"target": "es2017",
17+
"target": "es2020",
1818
"module": "es2020",
1919
"lib": [
2020
"es2018",

0 commit comments

Comments
 (0)