Skip to content
This repository has been archived by the owner on Mar 29, 2024. It is now read-only.

Commit

Permalink
Partial upgrade to angular@15
Browse files Browse the repository at this point in the history
  • Loading branch information
ppacher committed May 16, 2023
1 parent 04fe1ef commit f4c9468
Show file tree
Hide file tree
Showing 12 changed files with 6,713 additions and 3,053 deletions.
18 changes: 0 additions & 18 deletions modules/portmaster/.browserslistrc

This file was deleted.

9,631 changes: 6,694 additions & 2,937 deletions modules/portmaster/package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions modules/portmaster/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^14.0.5",
"@angular/cdk": "^14.0.4",
"@angular/common": "^14.0.5",
"@angular/compiler": "^14.0.5",
"@angular/core": "^14.0.5",
"@angular/forms": "^14.0.5",
"@angular/localize": "^14.0.5",
"@angular/platform-browser": "^14.0.5",
"@angular/platform-browser-dynamic": "^14.0.5",
"@angular/router": "^14.0.5",
"@angular/animations": "^16.0.1",
"@angular/cdk": "^15.2.9",
"@angular/common": "^16.0.1",
"@angular/compiler": "^16.0.1",
"@angular/core": "^15.2.9",
"@angular/forms": "^16.0.1",
"@angular/localize": "^16.0.1",
"@angular/platform-browser": "^16.0.1",
"@angular/platform-browser-dynamic": "^16.0.1",
"@angular/router": "^16.0.1",
"@fortawesome/angular-fontawesome": "^0.11.1",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-brands-svg-icons": "^6.1.1",
Expand All @@ -48,14 +48,14 @@
},
"devDependencies": {
"@angular-builders/custom-webpack": "^14.0.0",
"@angular-devkit/build-angular": "^14.0.5",
"@angular-devkit/build-angular": "^15.2.8",
"@angular-eslint/builder": "14.0.2",
"@angular-eslint/eslint-plugin": "14.0.2",
"@angular-eslint/eslint-plugin-template": "14.0.2",
"@angular-eslint/schematics": "14.0.2",
"@angular-eslint/template-parser": "14.0.2",
"@angular/cli": "^14.0.5",
"@angular/compiler-cli": "^14.0.5",
"@angular/cli": "^15.2.8",
"@angular/compiler-cli": "^16.0.1",
"@fullhuman/postcss-purgecss": "^4.1.3",
"@types/chrome": "^0.0.193",
"@types/d3": "^7.4.0",
Expand All @@ -77,15 +77,15 @@
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^14.0.3",
"ng-packagr": "^15.2.2",
"postcss-import": "^14.1.0",
"postcss-loader": "^7.0.1",
"postcss-scss": "^4.0.4",
"protractor": "~7.0.0",
"tailwindcss": "^3.1.6",
"ts-node": "^10.8.2",
"tslint": "~6.1.0",
"typescript": "4.8",
"typescript": "4.9",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-ext-reloader": "^1.1.9",
"zip-a-folder": "^1.1.5"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,8 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
<T>(id: string): T;
keys(): string[];
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().forEach(context);
16 changes: 0 additions & 16 deletions modules/portmaster/projects/safing/portmaster-api/.browserslistrc

This file was deleted.

12 changes: 0 additions & 12 deletions modules/portmaster/projects/safing/portmaster-api/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,8 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
<T>(id: string): T;
keys(): string[];
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().forEach(context);
12 changes: 0 additions & 12 deletions modules/portmaster/projects/safing/ui/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,9 @@ import {
import 'zone.js';
import 'zone.js/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
keys(): string[];
<T>(id: string): T;
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: true } },
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
1 change: 0 additions & 1 deletion modules/portmaster/projects/safing/ui/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/lib",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
Expand Down
2 changes: 1 addition & 1 deletion modules/portmaster/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const routes: Routes = [
];

@NgModule({
imports: [RouterModule.forRoot(routes, { anchorScrolling: 'enabled', relativeLinkResolution: 'legacy' })],
imports: [RouterModule.forRoot(routes, { anchorScrolling: 'enabled' })],
exports: [RouterModule]
})
export class AppRoutingModule { }
11 changes: 0 additions & 11 deletions modules/portmaster/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,8 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
keys(): string[];
<T>(id: string): T;
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
);
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
5 changes: 3 additions & 2 deletions modules/portmaster/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2020",
"target": "ES2022",
"module": "es2020",
"lib": [
"es2018",
Expand All @@ -31,7 +31,8 @@
"types": [
"./src/electron-app.d.ts",
"chrome"
]
],
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"strictInjectionParameters": true,
Expand Down

0 comments on commit f4c9468

Please sign in to comment.