You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/12/31 09:28:56 UTC
[incubator-streampipes] branch dev updated: [STREAMPIPES-270]
Update Angular to version 11
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new addedc3 [STREAMPIPES-270] Update Angular to version 11
addedc3 is described below
commit addedc34fe06cc79d0c9a7770bcea8290d2387df
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Thu Dec 31 10:28:41 2020 +0100
[STREAMPIPES-270] Update Angular to version 11
---
ui/package.json | 50 +++++++++++-----------
.../configuration/configuration.component.spec.ts | 8 ++--
.../consul-configs-password.component.spec.ts | 10 ++---
.../consul-service.component.spec.ts | 20 ++++-----
ui/src/tsconfig.app.json | 2 +-
ui/src/tsconfig.spec.json | 2 +-
ui/tsconfig.base.json | 26 -----------
ui/tsconfig.json | 39 ++++++++++-------
ui/tsconfig.spec.json | 2 +-
9 files changed, 71 insertions(+), 88 deletions(-)
diff --git a/ui/package.json b/ui/package.json
index 054ee03..3808ec0 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -17,18 +17,18 @@
"analyze": "webpack-bundle-analyzer dist/stats.json"
},
"dependencies": {
- "@angular/animations": "10.0.9",
- "@angular/cdk": "10.1.3",
- "@angular/common": "10.0.9",
- "@angular/compiler": "10.0.9",
- "@angular/core": "10.0.9",
- "@angular/flex-layout": "^10.0.0-beta.32",
- "@angular/forms": "10.0.9",
- "@angular/material": "10.1.3",
- "@angular/platform-browser": "10.0.9",
- "@angular/platform-browser-dynamic": "10.0.9",
- "@angular/router": "10.0.9",
- "@angular/upgrade": "10.0.9",
+ "@angular/animations": "11.0.5",
+ "@angular/cdk": "11.0.3",
+ "@angular/common": "11.0.5",
+ "@angular/compiler": "11.0.5",
+ "@angular/core": "11.0.5",
+ "@angular/flex-layout": "^11.0.0-beta.33",
+ "@angular/forms": "11.0.5",
+ "@angular/material": "11.0.3",
+ "@angular/platform-browser": "11.0.5",
+ "@angular/platform-browser-dynamic": "11.0.5",
+ "@angular/router": "11.0.5",
+ "@angular/upgrade": "11.0.5",
"@asymmetrik/ngx-leaflet": "6.0.1",
"@ctrl/ngx-codemirror": "3.1.3",
"@danielmoncada/angular-datetime-picker": "10.0.0",
@@ -36,8 +36,8 @@
"@ngx-loading-bar/core": "5.1.0",
"@ngx-loading-bar/http-client": "5.1.0",
"@stomp/ng2-stompjs": "7.2.0",
- "@swimlane/ngx-charts": "13.0.2",
- "angular-datatables": "9.0.2",
+ "@swimlane/ngx-charts": "16.0.0",
+ "angular-datatables": "^10.0.0",
"angular-gridster2": "8.3.0",
"angular-loading-bar": "0.8.0",
"angular-material-icons": "0.4.0",
@@ -81,36 +81,36 @@
"shepherd.js": "2.4.0",
"showdown": "1.9.1",
"systemjs": "0.21.6",
- "tslib": "^2.0.3",
+ "tslib": "^2.0.0",
"zone.js": "0.10.3"
},
"devDependencies": {
"@angular-builders/custom-webpack": "10.0.0",
- "@angular-devkit/build-angular": "^0.1000.8",
- "@angular/cli": "10.0.6",
- "@angular/compiler-cli": "10.0.9",
- "@ngtools/webpack": "^10.2.0",
+ "@angular-devkit/build-angular": "^0.1100.5",
+ "@angular/cli": "11.0.5",
+ "@angular/compiler-cli": "11.0.5",
+ "@ngtools/webpack": "^11.0.5",
"@types/angular": "^1.7.4",
- "@types/jasmine": "^2.8.17",
+ "@types/jasmine": "~3.6.0",
"@types/jqueryui": "^1.12.13",
"@types/leaflet": "^1.5.19",
"@types/node": "^12.19.3",
"@types/rx": "^4.1.2",
"@types/showdown": "1.9.3",
- "codelyzer": "^6.0.1",
+ "codelyzer": "^6.0.0",
"compression-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.1.2",
"css-loader": "^0.28.11",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.6",
"html-webpack-plugin": "^3.2.0",
- "jasmine-core": "~3.5.0",
+ "jasmine-core": "~3.6.0",
"js-yaml": "^3.14.0",
- "karma": "~5.0.0",
+ "karma": "~5.1.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-firefox-launcher": "^1.3.0",
- "karma-jasmine": "~3.3.0",
+ "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-verbose-reporter": "0.0.6",
"mini-css-extract-plugin": "^0.9.0",
@@ -123,7 +123,7 @@
"to-string-loader": "^1.1.5",
"tslint": "~6.1.0",
"tslint-config-prettier": "^1.15.0",
- "typescript": "3.9.7",
+ "typescript": "4.0.5",
"uglifyjs-webpack-plugin": "2.2.0",
"webpack": "4.44.1",
"webpack-bundle-analyzer": "^3.9.0",
diff --git a/ui/src/app/configuration/configuration.component.spec.ts b/ui/src/app/configuration/configuration.component.spec.ts
index 2aae6ce..135ec33 100644
--- a/ui/src/app/configuration/configuration.component.spec.ts
+++ b/ui/src/app/configuration/configuration.component.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {ConfigurationComponent} from './configuration.component';
import {CommonModule} from '@angular/common';
import {FlexLayoutModule} from '@angular/flex-layout';
@@ -29,7 +29,7 @@ describe('ConfigurationComponent', () => {
let fixture: ComponentFixture<ConfigurationComponent>;
let configurationComponent: ConfigurationComponent;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
CommonModule,
@@ -50,11 +50,11 @@ describe('ConfigurationComponent', () => {
configurationComponent = fixture.componentInstance;
}));
- it('should create the component', async(() => {
+ it('should create the component', waitForAsync(() => {
expect(configurationComponent).toBeTruthy();
}));
- it('should get two ConsulServices from service', async(() => {
+ it('should get two ConsulServices from service', waitForAsync(() => {
expect(configurationComponent.consulServices.length).toBe(2);
}));
diff --git a/ui/src/app/configuration/consul-configs-password/consul-configs-password.component.spec.ts b/ui/src/app/configuration/consul-configs-password/consul-configs-password.component.spec.ts
index e074aad..bc424f6 100644
--- a/ui/src/app/configuration/consul-configs-password/consul-configs-password.component.spec.ts
+++ b/ui/src/app/configuration/consul-configs-password/consul-configs-password.component.spec.ts
@@ -17,7 +17,7 @@
*/
import {DebugElement} from '@angular/core';
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {ConsulConfigsPasswordComponent} from './consul-configs-password.component';
import {ConfigurationService} from '../shared/configuration.service'
@@ -46,7 +46,7 @@ describe('ConsulConfigsPasswordComponent', () =>{
let configurationServcie: ConfigurationService;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
configurationServiceStub = {
@@ -89,15 +89,15 @@ describe('ConsulConfigsPasswordComponent', () =>{
}));
- it(`should create`, async(() => {
+ it(`should create`, waitForAsync(() => {
expect(component).toBeTruthy();
}));
- it('should show pw', async(() => {
+ it('should show pw', waitForAsync(() => {
expect(component.password).toBe("*****");
}));
- it(`should click button`, async(() => {
+ it(`should click button`, waitForAsync(() => {
spyOn(component, 'changePw');
let input = fixture.debugElement.nativeElement.querySelector('input');
diff --git a/ui/src/app/configuration/consul-service/consul-service.component.spec.ts b/ui/src/app/configuration/consul-service/consul-service.component.spec.ts
index 2665881..97c44c7 100644
--- a/ui/src/app/configuration/consul-service/consul-service.component.spec.ts
+++ b/ui/src/app/configuration/consul-service/consul-service.component.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {CommonModule} from '@angular/common';
import {FlexLayoutModule} from '@angular/flex-layout';
import {ConsulServiceComponent} from './consul-service.component';
@@ -38,7 +38,7 @@ describe('ConsulServiceComponent', () => {
let fixture: ComponentFixture<TestComponentWrapper>;
let consulServiceComponent: ConsulServiceComponent;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
CommonModule,
@@ -62,34 +62,34 @@ describe('ConsulServiceComponent', () => {
consulServiceComponent = fixture.debugElement.children[0].componentInstance;
}));
- it('should create the component', async(() => {
+ it('should create the component', waitForAsync(() => {
expect(consulServiceComponent).toBeTruthy();
}));
- it('should set header to test1', async(() => {
+ it('should set header to test1', waitForAsync(() => {
expect(fixture.nativeElement.querySelector('h4').innerText).toBe('test1');
}));
- it('should set icon to passing', async(() => {
+ it('should set icon to passing', waitForAsync(() => {
expect(fixture.nativeElement.querySelector('mat-icon').classList).toContain('service-icon-passing');
}));
- it('should not show form before toggled', async(() => {
+ it('should not show form before toggled', waitForAsync(() => {
expect(fixture.nativeElement.querySelector('form')).toBeFalsy();
}));
- it('should show form after toggled', async(() => {
+ it('should show form after toggled', waitForAsync(() => {
consulServiceComponent.toggleConfiguration();
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('form')).toBeTruthy();
}));
- it('should set type of first input to number', async(() => {
+ it('should set type of first input to number', waitForAsync(() => {
consulServiceComponent.toggleConfiguration();
fixture.detectChanges();
expect(fixture.nativeElement.querySelectorAll('input')[0].type).toBe('number');
}));
- it('should set type of second input to text', async(() => {
+ it('should set type of second input to text', waitForAsync(() => {
consulServiceComponent.toggleConfiguration();
fixture.detectChanges();
expect(fixture.nativeElement.querySelectorAll('input')[1].type).toBe('text');
}));
- it('should set type of third input to checkbox', async(() => {
+ it('should set type of third input to checkbox', waitForAsync(() => {
consulServiceComponent.toggleConfiguration();
fixture.detectChanges();
expect(fixture.nativeElement.querySelectorAll('input')[2].type).toBe('checkbox');
diff --git a/ui/src/tsconfig.app.json b/ui/src/tsconfig.app.json
index 3c39f39..7928203 100644
--- a/ui/src/tsconfig.app.json
+++ b/ui/src/tsconfig.app.json
@@ -1,5 +1,5 @@
{
- "extends": "../tsconfig.base.json",
+ "extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
diff --git a/ui/src/tsconfig.spec.json b/ui/src/tsconfig.spec.json
index 3880a9a..5bbe9f1 100644
--- a/ui/src/tsconfig.spec.json
+++ b/ui/src/tsconfig.spec.json
@@ -1,5 +1,5 @@
{
- "extends": "../tsconfig.base.json",
+ "extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"baseUrl": "./",
diff --git a/ui/tsconfig.base.json b/ui/tsconfig.base.json
deleted file mode 100644
index 512e7e8..0000000
--- a/ui/tsconfig.base.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "compileOnSave": false,
- "compilerOptions": {
- "downlevelIteration": true,
- "importHelpers": true,
- "module": "es2020",
- "outDir": "./dist/out-tsc",
- "sourceMap": true,
- "declaration": false,
- "moduleResolution": "node",
- "emitDecoratorMetadata": true,
- "experimentalDecorators": true,
- "target": "es2015",
- "typeRoots": [
- "node_modules/@types"
- ],
- "types": [
- "node"
- ],
- "lib": [
- "es2017",
- "dom"
- ],
- "baseUrl": "./"
- }
-}
\ No newline at end of file
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index 17ef80a..512e7e8 100644
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -1,17 +1,26 @@
-/*
- 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.
-*/
{
- "files": [],
- "references": [
- {
- "path": "./src/tsconfig.app.json"
- },
- {
- "path": "./tsconfig.spec.json"
- }
- ]
+ "compileOnSave": false,
+ "compilerOptions": {
+ "downlevelIteration": true,
+ "importHelpers": true,
+ "module": "es2020",
+ "outDir": "./dist/out-tsc",
+ "sourceMap": true,
+ "declaration": false,
+ "moduleResolution": "node",
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "target": "es2015",
+ "typeRoots": [
+ "node_modules/@types"
+ ],
+ "types": [
+ "node"
+ ],
+ "lib": [
+ "es2017",
+ "dom"
+ ],
+ "baseUrl": "./"
+ }
}
\ No newline at end of file
diff --git a/ui/tsconfig.spec.json b/ui/tsconfig.spec.json
index 1db2e6e..6400fde 100644
--- a/ui/tsconfig.spec.json
+++ b/ui/tsconfig.spec.json
@@ -1,5 +1,5 @@
{
- "extends": "./tsconfig.base.json",
+ "extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": [