Skip to content
Snippets Groups Projects
Commit 7425c971 authored by Karolína Dočkalová Burská's avatar Karolína Dočkalová Burská
Browse files

Merge branch '27-update-to-angular-15' into 'master'

Resolve "Update to Angular 15"

Closes #27

See merge request muni-kypo-crp/frontend-angular/models/kypo-angular-topology-model!34
parents ea20343c a7207cb9
No related branches found
No related tags found
No related merge requests found
image: cypress/browsers:node14.17.0-chrome88-ff89 image: cypress/browsers:node16.13.0-chrome95-ff94
stages: stages:
- codeStyle - codeStyle
......
15.0.0 Update to Angular 15.
14.0.5 Update containers size check 14.0.5 Update containers size check
14.0.4 Fix containers visibility check. 14.0.4 Fix containers visibility check.
14.0.3 Add container field to host node. 14.0.3 Add container field to host node.
......
...@@ -153,5 +153,13 @@ ...@@ -153,5 +153,13 @@
}, },
"cli": { "cli": {
"analytics": false "analytics": false
},
"schematics": {
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
} }
} }
This diff is collapsed.
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
}, },
"private": false, "private": false,
"dependencies": { "dependencies": {
"@angular/common": "^14.0.3", "@angular/common": "^15.2.10",
"@angular/core": "^14.0.3", "@angular/core": "^15.2.10",
"@angular/compiler": "^14.0.3", "@angular/compiler": "^15.2.10",
"@angular/animations": "^14.0.3", "@angular/animations": "^15.2.10",
"@angular/forms": "^14.0.3", "@angular/forms": "^15.2.10",
"@angular/platform-browser": "^14.0.3", "@angular/platform-browser": "^15.2.10",
"@angular/platform-browser-dynamic": "^14.0.3", "@angular/platform-browser-dynamic": "^15.2.10",
"@angular/router": "^14.0.3", "@angular/router": "^15.2.10",
"typescript-collections": "~1.3.3", "typescript-collections": "~1.3.3",
"core-js": "^3.23.2", "core-js": "^3.23.2",
"rxjs": "~7.5.5", "rxjs": "~7.5.5",
...@@ -40,21 +40,21 @@ ...@@ -40,21 +40,21 @@
"zone.js": "~0.11.6" "zone.js": "~0.11.6"
}, },
"devDependencies": { "devDependencies": {
"@angular/compiler-cli": "^14.0.3", "@angular/compiler-cli": "^15.2.10",
"@angular-devkit/architect": "^0.1400.2", "@angular-devkit/architect": "^0.1502.10",
"@angular-devkit/build-angular": "^14.0.2", "@angular-devkit/build-angular": "^15.2.10",
"@angular/language-service": "^14.0.3", "@angular/language-service": "^15.2.10",
"@angular-eslint/builder": "~13.5.0", "@angular-eslint/builder": "~15.2.1",
"@angular-eslint/eslint-plugin": "^13.5.0", "@angular-eslint/eslint-plugin": "^15.2.1",
"@angular-eslint/eslint-plugin-template": "^13.5.0", "@angular-eslint/eslint-plugin-template": "^15.2.1",
"@angular-eslint/schematics": "^13.5.0", "@angular-eslint/schematics": "^15.2.1",
"@angular-eslint/template-parser": "^13.5.0", "@angular-eslint/template-parser": "^15.2.1",
"@typescript-eslint/eslint-plugin": "^5.29.0", "@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.29.0", "@typescript-eslint/parser": "^5.43.0",
"eslint": "^8.18.0", "eslint": "^8.28.0",
"ng-packagr": "^14.0.2", "ng-packagr": "^15.2.2",
"typescript": "~4.7.4", "typescript": "~4.9.5",
"@angular/cli": "^14.0.2", "@angular/cli": "^15.2.10",
"@types/d3": "^7.4.0", "@types/d3": "^7.4.0",
"@types/jasmine": "~4.0.3", "@types/jasmine": "~4.0.3",
"@types/jasminewd2": "~2.0.10", "@types/jasminewd2": "~2.0.10",
......
...@@ -6,13 +6,7 @@ import 'core-js/es7/reflect'; ...@@ -6,13 +6,7 @@ import 'core-js/es7/reflect';
import 'zone.js'; import 'zone.js';
import 'zone.js/testing'; import 'zone.js/testing';
declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }, teardown: { destroyAfterEach: false },
}); });
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"declarationMap": true, "declarationMap": true,
"target": "es2020",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,
"sourceMap": true, "sourceMap": true,
......
...@@ -4,13 +4,7 @@ import 'zone.js/testing'; ...@@ -4,13 +4,7 @@ import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false } teardown: { destroyAfterEach: false }
}); });
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"moduleResolution": "node", "moduleResolution": "node",
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"target": "es2020", "target": "ES2022",
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
"kypo-topology-graph-model/*": [ "kypo-topology-graph-model/*": [
"dist/kypo-topology-graph-model/*" "dist/kypo-topology-graph-model/*"
] ]
} },
"useDefineForClassFields": false
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment