Skip to content

Commit

Permalink
chore: update angular to version 10
Browse files Browse the repository at this point in the history
  • Loading branch information
Hristijan Dimitrieski authored and Hristijan Dimitrieski committed Oct 9, 2020
1 parent 2c877d4 commit ed21be3
Show file tree
Hide file tree
Showing 7 changed files with 5,365 additions and 6,372 deletions.
11,629 changes: 5,307 additions & 6,322 deletions package-lock.json

Large diffs are not rendered by default.

84 changes: 43 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,53 +20,55 @@
},
"private": false,
"dependencies": {
"@angular/animations": "~9.1.2",
"@angular/common": "~9.1.2",
"@angular/compiler": "~9.1.2",
"@angular/core": "~9.1.2",
"@angular/forms": "~9.1.2",
"@angular/platform-browser": "~9.1.2",
"@angular/platform-browser-dynamic": "~9.1.2",
"@ngrx/store": "^9.1.0",
"@ngrx/store-devtools": "^9.1.0",
"@angular/animations": "~10.1.5",
"@angular/common": "~10.1.5",
"@angular/compiler": "~10.1.5",
"@angular/core": "~10.1.5",
"@angular/forms": "~10.1.5",
"@angular/localize": "^10.1.5",
"@angular/platform-browser": "~10.1.5",
"@angular/platform-browser-dynamic": "~10.1.5",
"@ngrx/store": "^10.0.1",
"@ngrx/store-devtools": "^10.0.1",
"core-js": "^3.6.5",
"ramda": "^0.26.1",
"rxjs": "~6.5.5",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
"ramda": "^0.27.1",
"rxjs": "~6.6.3",
"tslib": "^2.0.0",
"zone.js": "~0.11.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.901.1",
"@angular-devkit/build-ng-packagr": "~0.901.1",
"@angular/cli": "~9.1.1",
"@angular/compiler-cli": "~9.1.2",
"@angular/language-service": "~9.1.2",
"@commitlint/cli": "^8.1.0",
"@commitlint/config-conventional": "^8.1.0",
"@commitlint/prompt": "^8.1.0",
"@ng-bootstrap/ng-bootstrap": "^6.0.2",
"@types/jasmine": "~3.3.13",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"coveralls": "^3.0.5",
"ejs": "^2.6.2",
"globby": "^10.0.1",
"husky": "^3.0.4",
"jasmine-core": "~3.4.0",
"@angular-devkit/build-angular": "~0.1001.6",
"@angular-devkit/build-ng-packagr": "~0.1001.6",
"@angular/cli": "~10.1.6",
"@angular/compiler-cli": "~10.1.5",
"@angular/language-service": "~10.1.5",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@commitlint/prompt": "^11.0.0",
"@ng-bootstrap/ng-bootstrap": "^7.0.0",
"@types/jasmine": "~3.5.14",
"@types/jasminewd2": "~2.0.8",
"@types/node": "^14.11.8",
"bootstrap": "^4.5.2",
"codelyzer": "^6.0.1",
"coveralls": "^3.1.0",
"ejs": "^3.1.5",
"globby": "^11.0.1",
"husky": "^4.3.0",
"jasmine-core": "~3.5.0",
"jasmine-marbles": "^0.6.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.2.0",
"karma-chrome-launcher": "~3.0.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"material-design-icons": "^3.0.1",
"ng-packagr": "^9.0.0",
"ng-packagr": "^10.1.0",
"npm-run-all": "^4.1.5",
"ts-node": "~8.3.0",
"tslint": "~5.18.0",
"typescript": "^3.8.3"
"ts-node": "~9.0.0",
"tslint": "~6.1.0",
"typescript": "^4.0.3"
},
"repository": {
"type": "git",
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions projects/data-grid-demo/src/polyfills.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/** *************************************************************************************************
* Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
*/
import '@angular/localize/init';

/**
* This file includes polyfills needed by Angular and is loaded before the app.
* You can add your own extra polyfills to this file.
Expand Down
9 changes: 5 additions & 4 deletions projects/data-grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"name": "ngrx-data-grid",
"version": "1.9.0",
"peerDependencies": {
"@angular/common": "~9.1.2",
"@angular/core": "~9.1.2",
"@ngrx/store": "^9.1.0"
"@angular/common": "~10.1.5",
"@angular/core": "~10.1.5",
"@ngrx/store": "^10.0.1"
},
"dependencies": {
"ramda": "^0.26.1"
"ramda": "^0.27.1",
"tslib": "^2.0.0"
},
"repository": {
"type": "git",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { DynamicGridHeaderItemComponent } from './dynamic-grid-header-item.component';
import { FilterType } from '../../models';
import { FilteringOptions, SortType } from '../../models';

describe('DynamicGridHeaderItemComponent', () => {
let component: DynamicGridHeaderItemComponent;
Expand Down Expand Up @@ -37,16 +37,16 @@ describe('DynamicGridHeaderItemComponent', () => {
component.onApplySort();

// then
expect(component.sortGrid.emit).toHaveBeenCalledWith({sortType: 'DESC', columnId: 'id-0'});
expect(component.sortGrid.emit).toHaveBeenCalledWith({sortType: SortType.Descending, columnId: 'id-0'});
});

it('should emit event when filter is applied', () => {
// when
const condition: any = {option: 'Contains', value: 'test'};
const condition: any = {option: FilteringOptions.Contains, value: 'test'};
component.onApplyFilter(condition);

// then
expect(component.filterGrid.emit).toHaveBeenCalledWith({columnId: 'id-0', option: 'Contains', value: 'test'});
expect(component.filterGrid.emit).toHaveBeenCalledWith({columnId: 'id-0', option: FilteringOptions.Contains, value: 'test'});
});

it('should set filterExpanded to true if the filter is expanded', () => {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "esnext",
"module": "es2020",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
Expand Down

0 comments on commit ed21be3

Please sign in to comment.