Skip to content

Commit 8d2d0f9

Browse files
authored
Update Angular 13
- Update Angular 13 - Update test reporter - Update Angular Material - Update config - Resolves #1784 - Remove Material 13
1 parent ab7b8a2 commit 8d2d0f9

10 files changed

+3157
-3702
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ui/dist
1111
ui/tmp
1212
ui/out-tsc
1313
ui/.c9/
14+
ui/.angular/
1415

1516
ui/.sass-cache
1617
ui/connect.lock

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</developer>
6969
</developers>
7070
<prerequisites>
71-
<maven>3.1.0</maven>
71+
<maven>3.8.3</maven>
7272
</prerequisites>
7373
<build>
7474
<resources>
@@ -80,7 +80,7 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-compiler-plugin</artifactId>
83-
<version>3.6.2</version>
83+
<version>3.8.1</version>
8484
<configuration>
8585
<source>1.8</source>
8686
<target>1.8</target>
@@ -101,7 +101,7 @@
101101
<goal>install-node-and-npm</goal>
102102
</goals>
103103
<configuration>
104-
<nodeVersion>v14.17.4</nodeVersion>
104+
<nodeVersion>v14.18.0</nodeVersion>
105105
</configuration>
106106
</execution>
107107
<execution>

ui/package-lock.json

+3,113-3,661
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/package.json

+19-18
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222
},
2323
"private": true,
2424
"dependencies": {
25-
"@angular/animations": "12.2.3",
26-
"@angular/common": "12.2.3",
27-
"@angular/compiler": "12.2.3",
28-
"@angular/core": "12.2.3",
29-
"@angular/forms": "12.2.3",
30-
"@angular/platform-browser": "12.2.3",
31-
"@angular/platform-browser-dynamic": "12.2.3",
32-
"@angular/router": "12.2.3",
25+
"@angular/animations": "13.0.1",
26+
"@angular/cdk": "^13.0.1",
27+
"@angular/common": "13.0.1",
28+
"@angular/compiler": "13.0.1",
29+
"@angular/core": "13.0.1",
30+
"@angular/forms": "13.0.1",
31+
"@angular/platform-browser": "13.0.1",
32+
"@angular/platform-browser-dynamic": "13.0.1",
33+
"@angular/router": "13.0.1",
3334
"@cds/core": "5.5.2",
3435
"@clr/angular": "12.0.4",
3536
"@clr/icons": "4.0.14",
@@ -52,15 +53,15 @@
5253
"zone.js": "~0.11.4"
5354
},
5455
"devDependencies": {
55-
"@angular-devkit/build-angular": "12.2.3",
56-
"@angular-eslint/builder": "12.0.0",
57-
"@angular-eslint/eslint-plugin": "12.0.0",
58-
"@angular-eslint/eslint-plugin-template": "12.0.0",
56+
"@angular-devkit/build-angular": "13.0.2",
57+
"@angular-eslint/builder": "12.6.1",
58+
"@angular-eslint/eslint-plugin": "12.6.1",
59+
"@angular-eslint/eslint-plugin-template": "12.6.1",
5960
"@angular-eslint/schematics": "12.3.1",
60-
"@angular-eslint/template-parser": "12.0.0",
61-
"@angular/cli": "12.2.3",
62-
"@angular/compiler-cli": "12.2.3",
63-
"@angular/language-service": "12.2.3",
61+
"@angular-eslint/template-parser": "12.6.1",
62+
"@angular/cli": "13.0.2",
63+
"@angular/compiler-cli": "13.0.1",
64+
"@angular/language-service": "13.0.1",
6465
"@compodoc/compodoc": "1.0.4",
6566
"@types/backbone": "1.4.10",
6667
"@types/codemirror": "0.0.91",
@@ -86,7 +87,7 @@
8687
"karma": "6.3.4",
8788
"karma-browserstack-launcher": "1.5.1",
8889
"karma-chrome-launcher": "3.1.0",
89-
"karma-coverage-istanbul-reporter": "3.0.3",
90+
"karma-coverage": "^2.0.3",
9091
"karma-edge-launcher": "0.4.2",
9192
"karma-firefox-launcher": "1.3.0",
9293
"karma-jasmine": "3.3.1",
@@ -100,7 +101,7 @@
100101
"protractor-docker-plugin": "file:protractor-docker-plugin",
101102
"shelljs": "0.8.4",
102103
"ts-node": "8.8.1",
103-
"typescript": "4.3.5",
104+
"typescript": "4.4.4",
104105
"webpack-bundle-analyzer": "3.6.1"
105106
},
106107
"napa-config": {

ui/src/app/manage/tools/tools.component.html

+9-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ <h1>Tools</h1>
66
<ng-template>
77
<div>
88
<clr-icon shape="angle" style="transform: rotate(90deg)"></clr-icon>
9-
<a href="{{ baseApiUrl }}#" (click)="run('export-stream')">Export stream(s): Create a JSON file with the selected streams</a>
9+
<a href="{{ baseApiUrl }}#" (click)="run('export-stream')"
10+
>Export stream(s): Create a JSON file with the selected streams</a
11+
>
1012
</div>
1113
<div [appRole]="['ROLE_CREATE']">
1214
<clr-icon shape="angle" style="transform: rotate(90deg)"></clr-icon>
13-
<a href="{{ baseApiUrl }}#" (click)="run('import-stream')">Import stream(s): Import streams from a JSON file</a>
15+
<a href="{{ baseApiUrl }}#" (click)="run('import-stream')"
16+
>Import stream(s): Import streams from a JSON file</a
17+
>
1418
</div>
1519
</ng-template>
1620
</app-view-card>
@@ -33,7 +37,9 @@ <h1>Tools</h1>
3337
<ng-template>
3438
<div>
3539
<clr-icon shape="angle" style="transform: rotate(90deg)"></clr-icon>
36-
<a href="{{ baseApiUrl }}#" (click)="run('export-task')">Export task(s): Create a JSON file with the selected tasks</a>
40+
<a href="{{ baseApiUrl }}#" (click)="run('export-task')"
41+
>Export task(s): Create a JSON file with the selected tasks</a
42+
>
3743
</div>
3844
<div [appRole]="['ROLE_CREATE']">
3945
<clr-icon shape="angle" style="transform: rotate(90deg)"></clr-icon>

ui/src/karma.conf.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@ module.exports = function (config) {
1313
require('karma-safari-launcher'),
1414
require('karma-jasmine-html-reporter'),
1515
require('karma-spec-reporter'),
16-
require('karma-coverage-istanbul-reporter'),
16+
require('karma-coverage'),
1717
require('@angular-devkit/build-angular/plugins/karma')
1818
],
1919
client:{
2020
clearContext: false // leave Jasmine Spec Runner output visible in browser
2121
},
22-
coverageIstanbulReporter: {
23-
dir: require('path').join(__dirname, '../coverage'),
24-
reports: ['html', 'lcovonly'],
25-
fixWebpackSourcePaths: true
22+
23+
// optionally, configure the reporter
24+
coverageReporter: {
25+
type : 'html',
26+
dir : '../coverage/'
2627
},
27-
reporters: ['spec', 'progress', 'kjhtml'],
28+
reporters: ['spec', 'progress', 'coverage', 'kjhtml'],
2829
specReporter: {
2930
maxLogLines: 5,
3031
suppressErrorSummary: false,

ui/src/polyfills.ts

-10
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,9 @@
3030
**/
3131
// import 'core-js/es6/array';
3232

33-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
34-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
35-
3633
/** IE10 and IE11 requires the following for the Reflect API. */
3734
// import 'core-js/es6/reflect';
3835

39-
/**
40-
* Web Animations `@angular/platform-browser/animations`
41-
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
42-
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
43-
**/
44-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
45-
4636
/**
4737
* By default, zone.js will patch all possible macroTask and DomEvents
4838
* user can disable parts of macroTask/DomEvents patch by setting following flags

ui/src/test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ declare const require: {
1616
};
1717

1818
// First, initialize the Angular testing environment.
19-
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
19+
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
20+
teardown: { destroyAfterEach: false }
21+
});
2022
// Then we find all the tests.
2123
const context = require.context('./', true, /\.spec\.ts$/);
2224
// And load the modules.

ui/src/tsconfig.app.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
4+
"skipLibCheck": true,
45
"outDir": "../out-tsc/app",
56
"types": []
67
},

ui/src/tsconfig.spec.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
4+
"skipLibCheck": true,
45
"outDir": "../out-tsc/spec",
56
"types": [
67
"jasmine",

0 commit comments

Comments
 (0)