Skip to content

Commit

Permalink
Angular 10
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Engelhardt committed Jul 27, 2020
1 parent 571fa2e commit 5228ff4
Show file tree
Hide file tree
Showing 13 changed files with 4,328 additions and 4,407 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": ["jasmine", "jasminewd2", "node"]
}
}
8,572 changes: 4,232 additions & 4,340 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,54 +30,54 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~9.1.0",
"@angular/common": "~9.1.0",
"@angular/compiler": "~9.1.0",
"@angular/core": "~9.1.0",
"@angular/forms": "~9.1.0",
"@angular/platform-browser": "~9.1.0",
"@angular/platform-browser-dynamic": "~9.1.0",
"@angular/router": "~9.1.0",
"@angular/animations": "~10.0.5",
"@angular/common": "~10.0.5",
"@angular/compiler": "~10.0.5",
"@angular/core": "~10.0.5",
"@angular/forms": "~10.0.5",
"@angular/platform-browser": "~10.0.5",
"@angular/platform-browser-dynamic": "~10.0.5",
"@angular/router": "~10.0.5",
"rxjs": "~6.5.5",
"tslib": "^1.10.0",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.901.0",
"@angular-devkit/build-ng-packagr": "~0.901.0",
"@angular/cli": "~9.1.0",
"@angular/compiler-cli": "~9.1.0",
"@angular/language-service": "~9.1.0",
"@angular-devkit/build-angular": "~0.1000.4",
"@angular-devkit/build-ng-packagr": "~0.1000.4",
"@angular/cli": "~10.0.4",
"@angular/compiler-cli": "~10.0.5",
"@angular/language-service": "~10.0.5",
"@swimlane/prettier-config-swimlane": "^3.0.2",
"@types/jasmine": "^3.5.10",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"angular-cli-ghpages": "^0.6.0",
"codelyzer": "^5.1.2",
"codelyzer": "^6.0.0",
"cpx": "^1.5.0",
"cross-env": "^7.0.2",
"husky": "^4.2.4",
"jasmine": "^3.5.0",
"jasmine-core": "^3.5.0",
"jasmine-spec-reporter": "^5.0.1",
"karma": "^5.0.0",
"karma-chrome-launcher": "^3.1.0",
"karma-coverage-istanbul-reporter": "^2.1.1",
"karma-jasmine": "^3.1.1",
"karma-jasmine-html-reporter": "^1.5.3",
"ng-packagr": "^9.0.0",
"jasmine-core": "~3.5.0",
"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": "~3.3.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^10.0.0",
"node-sass": "^4.13.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.0.4",
"pretty-quick": "^2.0.1",
"protractor": "~5.4.0",
"protractor": "~7.0.0",
"scss-bundle": "^3.1.1",
"ts-node": "~7.0.0",
"tslint": "^6.1.1",
"tslint": "~6.1.0",
"tslint-config-prettier": "^1.17.0",
"tslint-config-security": "^1.16.0",
"tslint-config-swimlane": "^5.0.0",
"typescript": "~3.8.3"
"typescript": "~3.9.7"
},
"husky": {
"hooks": {
Expand Down
11 changes: 7 additions & 4 deletions projects/swimlane/ngx-datatable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
"version": "17.1.0",
"description": "ngx-datatable is an Angular table grid component for presenting large and complex data.",
"peerDependencies": {
"@angular/common": "~9.1.0",
"@angular/core": "~9.1.0",
"@angular/platform-browser": "~9.1.0",
"rxjs": "~6.5.5"
"@angular/common": "^10.0.0",
"@angular/core": "^10.0.0",
"@angular/platform-browser": "^10.0.0",
"rxjs": "^6.5.5"
},
"dependencies": {
"tslib": "^2.0.0"
},
"repository": {
"type": "git",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { async, TestBed, ComponentFixture } from '@angular/core/testing';
import { Component, DebugElement } from '@angular/core';
import { Component } from '@angular/core';
import { By } from '@angular/platform-browser';

import { ColumnChangesService } from '../../services/column-changes.service';
Expand Down Expand Up @@ -111,19 +111,19 @@ describe('DataTableColumnDirective', () => {
component.columnName = 'Column A';
fixture.detectChanges();

expect(TestBed.get(ColumnChangesService).onInputChange).not.toHaveBeenCalled();
expect(TestBed.inject(ColumnChangesService).onInputChange).not.toHaveBeenCalled();
});

it('notifies of subsequent changes', () => {
component.columnName = 'Column A';
fixture.detectChanges();

expect(TestBed.get(ColumnChangesService).onInputChange).not.toHaveBeenCalled();
expect(TestBed.inject(ColumnChangesService).onInputChange).not.toHaveBeenCalled();

component.columnName = 'Column B';
fixture.detectChanges();

expect(TestBed.get(ColumnChangesService).onInputChange).toHaveBeenCalled();
expect(TestBed.inject(ColumnChangesService).onInputChange).toHaveBeenCalled();
});
});
});
2 changes: 1 addition & 1 deletion projects/swimlane/ngx-datatable/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/swimlane/ngx-datatable/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../../out-tsc/spec",
"types": ["jasmine", "node"]
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.json",
"extends": "./tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
"types": []
Expand Down
30 changes: 30 additions & 0 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "es2020",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"typeRoots": ["node_modules/@types"],
"lib": ["es2018", "dom"],
"resolveJsonModule": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"paths": {
"@swimlane/ngx-datatable": ["dist/swimlane/ngx-datatable"],
"@swimlane/ngx-datatable/*": ["dist/swimlane/ngx-datatable/*"]
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true,
"strictTemplates": true,
"enableIvy": true
}
}
47 changes: 20 additions & 27 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"typeRoots": ["node_modules/@types"],
"lib": ["es2018", "dom"],
"resolveJsonModule": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"paths": {
"@swimlane/ngx-datatable": ["dist/swimlane/ngx-datatable"],
"@swimlane/ngx-datatable/*": ["dist/swimlane/ngx-datatable/*"]
"files": [],
"references": [
{
"path": "./tsconfig.app.json"
},
{
"path": "./tsconfig.spec.json"
},
{
"path": "./projects/swimlane/ngx-datatable/tsconfig.lib.json"
},
{
"path": "./projects/swimlane/ngx-datatable/tsconfig.spec.json"
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true,
"strictTemplates": true,
"enableIvy": true
}
]
}
2 changes: 1 addition & 1 deletion tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.json",
"extends": "./tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": ["jasmine", "node"]
Expand Down
3 changes: 3 additions & 0 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"extends": ["tslint-config-swimlane/base", "tslint-config-prettier"],
"rules": {
"deprecation": {
"severity": "warning"
},
"no-implicit-dependencies": [false, "dev"],
"no-any": false,
"typedef": true,
Expand Down

0 comments on commit 5228ff4

Please sign in to comment.