Skip to content
Snippets Groups Projects
Commit ee4f3312 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-2420 OZG-2446 Upgrade Angular, Nx und weitere

 @angular/animations                      12.2.12  →   13.3.6
 @angular/cdk                             12.2.12  →   13.3.6
 @angular/common                          12.2.12  →   13.3.6
 @angular/compiler                        12.2.12  →   13.3.6
 @angular/core                            12.2.12  →   13.3.6
 @angular/forms                           12.2.12  →   13.3.6
 @angular/material                        12.2.12  →   13.3.6
 @angular/material-moment-adapter         12.2.12  →   13.3.6
 @angular/platform-browser                12.2.12  →   13.3.6
 @angular/platform-browser-dynamic        12.2.12  →   13.3.6
 @angular/router                          12.2.12  →   13.3.6
 @nrwl/angular                             13.1.3  →   14.1.4
 angular-oauth2-oidc                       12.1.0  →   13.0.1
 angular-oauth2-oidc-jwks                  12.0.0  →   13.0.1
 zone.js                                   0.11.4  →   0.11.5
 @angular-devkit/build-angular            12.2.12  →   13.3.5
 @angular-eslint/eslint-plugin             12.3.1  →   13.2.1
 @angular-eslint/eslint-plugin-template    12.3.1  →   13.2.1
 @angular-eslint/template-parser           12.3.1  →   13.2.1
 @angular/cli                             12.2.12  →   13.3.5
 @angular/compiler-cli                    12.2.12  →   13.3.6
 @angular/language-service                12.2.12  →   13.3.6
 @nrwl/cli                                 13.1.3  →   14.1.4
 @nrwl/cypress                             13.1.3  →   14.1.4
 @nrwl/eslint-plugin-nx                    13.1.3  →   14.1.4
 @nrwl/jest                                13.1.3  →   14.1.4
 @nrwl/linter                              13.1.3  →   14.1.4
 @nrwl/workspace                           13.1.3  →   14.1.4
 typescript                                 4.3.5  →    4.6.4
 ng-mocks                                  13.0.0  →   13.5.1
 @testing-library/jest-dom                 5.12.0  →   5.16.4

Ausserdem: Unit-Tests für Angular 13 fixen.
parent d32d80bb
No related branches found
No related tags found
No related merge requests found
Showing
with 18650 additions and 18559 deletions
...@@ -14,5 +14,8 @@ module.exports = { ...@@ -14,5 +14,8 @@ module.exports = {
'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment', 'jest-preset-angular/build/serializers/html-comment',
], ],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }, transform: {
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
}; };
import 'jest-preset-angular/setup-jest'; import 'jest-preset-angular/setup-jest';
import '@testing-library/jest-dom'; import '@testing-library/jest-dom';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
getTestBed().resetTestEnvironment();
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: false } }
);
...@@ -14,5 +14,8 @@ module.exports = { ...@@ -14,5 +14,8 @@ module.exports = {
'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment', 'jest-preset-angular/build/serializers/html-comment',
], ],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }, transform: {
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
}; };
@use 'sass:map'; @use 'sass:map';
@use '~@angular/material' as mat; @use '@angular/material' as mat;;
goofy-client-vorgang-search-container { goofy-client-vorgang-search-container {
.search-field { .search-field {
......
@use 'sass:map'; @use 'sass:map';
@use '~@angular/material' as mat; @use '@angular/material' as mat;
@import "variables"; @import "variables";
.dot { .dot {
......
import 'jest-preset-angular/setup-jest'; import 'jest-preset-angular/setup-jest';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
getTestBed().resetTestEnvironment();
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: false } }
);
...@@ -14,5 +14,8 @@ module.exports = { ...@@ -14,5 +14,8 @@ module.exports = {
'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment', 'jest-preset-angular/build/serializers/html-comment',
], ],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }, transform: {
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
}; };
import 'jest-preset-angular/setup-jest'; import 'jest-preset-angular/setup-jest';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
getTestBed().resetTestEnvironment();
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: false } }
);
...@@ -14,5 +14,8 @@ module.exports = { ...@@ -14,5 +14,8 @@ module.exports = {
'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment', 'jest-preset-angular/build/serializers/html-comment',
], ],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }, transform: {
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
}; };
@use 'sass:map'; @use 'sass:map';
@use '~@angular/material' as mat; @use '@angular/material' as mat;
@import "variables"; @import "variables";
.frist { .frist {
......
import 'jest-preset-angular/setup-jest'; import 'jest-preset-angular/setup-jest';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
getTestBed().resetTestEnvironment();
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: false } }
);
...@@ -14,5 +14,8 @@ module.exports = { ...@@ -14,5 +14,8 @@ module.exports = {
'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment', 'jest-preset-angular/build/serializers/html-comment',
], ],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }, transform: {
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
}; };
import 'jest-preset-angular/setup-jest'; import 'jest-preset-angular/setup-jest';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
getTestBed().resetTestEnvironment();
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: false } }
);
...@@ -14,5 +14,8 @@ module.exports = { ...@@ -14,5 +14,8 @@ module.exports = {
'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment', 'jest-preset-angular/build/serializers/html-comment',
], ],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' }, transform: {
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
}; };
@use 'sass:map'; @use 'sass:map';
@use '~@angular/material' as mat; @use '@angular/material' as mat;;
@mixin breadcrumb($theme) { @mixin breadcrumb($theme) {
$color-config: mat.get-color-config($theme); $color-config: mat.get-color-config($theme);
......
@use 'sass:map'; @use 'sass:map';
@use '~@angular/material' as mat; @use '@angular/material' as mat;
@import "variables"; @import "variables";
:host { :host {
......
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon'; import { MatIcon } from '@angular/material/icon';
import { MatTooltip } from '@angular/material/tooltip';
import { ToTrafficLightPipe } from '@goofy-client/tech-shared'; import { ToTrafficLightPipe } from '@goofy-client/tech-shared';
import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage'; import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
import { MockDirective } from 'ng-mocks';
import { WiedervorlageStatusComponent } from './wiedervorlage-status.component'; import { WiedervorlageStatusComponent } from './wiedervorlage-status.component';
import { MockComponent } from 'ng-mocks';
import { MatTooltip } from '@angular/material/tooltip';
const doneIcon: string = '[data-test-class="done-icon"]'; const doneIcon: string = '[data-test-class="done-icon"]';
...@@ -17,7 +17,7 @@ describe('WiedervorlageStatusComponent', () => { ...@@ -17,7 +17,7 @@ describe('WiedervorlageStatusComponent', () => {
declarations: [ declarations: [
WiedervorlageStatusComponent, WiedervorlageStatusComponent,
ToTrafficLightPipe, ToTrafficLightPipe,
MockComponent(MatTooltip), MockDirective(MatTooltip),
MatIcon MatIcon
] ]
}) })
......
import 'jest-preset-angular/setup-jest'; import 'jest-preset-angular/setup-jest';
import '@testing-library/jest-dom' import '@testing-library/jest-dom';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
getTestBed().resetTestEnvironment();
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: false } }
);
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
"npmScope": "goofy-client", "npmScope": "goofy-client",
"tasksRunnerOptions": { "tasksRunnerOptions": {
"default": { "default": {
"runner": "@nrwl/workspace/tasks-runners/default", "runner": "nx/tasks-runners/default",
"options": { "options": {
"cacheableOperations": ["build", "lint", "test", "e2e"] "cacheableOperations": ["build", "lint", "test", "e2e"],
"parallel": 1
} }
} }
}, },
...@@ -53,7 +54,6 @@ ...@@ -53,7 +54,6 @@
"e2eTestRunner": "cypress" "e2eTestRunner": "cypress"
}, },
"@nrwl/angular:library": { "@nrwl/angular:library": {
"style": "scss",
"linter": "eslint", "linter": "eslint",
"unitTestRunner": "jest" "unitTestRunner": "jest"
}, },
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment