Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix frontend CVEs #40

Merged
merged 32 commits into from
Oct 23, 2023
Merged

Fix frontend CVEs #40

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
22bed72
Update @angular/core via ng update to 11.2.14
bmo-at-a9s Sep 21, 2023
3e8703d
Upgrade @angular/cdk to 11.2.14
bmo-at-a9s Sep 21, 2023
d9b6b30
Update @angular/cli to 11.2.14
bmo-at-a9s Sep 21, 2023
ca7af88
Update @angular/material to 11.2.14
bmo-at-a9s Sep 21, 2023
e6c4571
Update @ngrx/store to v11
bmo-at-a9s Sep 21, 2023
e74cee7
WIP: fix peer dependencies for angular 11
bmo-at-a9s Sep 22, 2023
55ea6cd
Update @angular/core to v12
bmo-at-a9s Sep 22, 2023
9a7ae51
Update @angular/cdk to v12
bmo-at-a9s Sep 22, 2023
d056018
Update @angular/material and @angular/flex-layout to v12, also @ngrx/…
bmo-at-a9s Sep 22, 2023
933cb92
Update @angular/cli to v12
bmo-at-a9s Sep 22, 2023
c5772a5
Update @angular-builders/custom-webpack to v12, replace @cfstratos/aj…
bmo-at-a9s Sep 22, 2023
93f4d3f
change custom SassHandler to handle new WebPack 5 Structure as well
mafolz Sep 22, 2023
4359011
Fix KnownKeys type issues for updated [email protected]
tmeier-a9s Sep 28, 2023
1831263
Remove debug logging
bmo-at-a9s Sep 29, 2023
8266b9f
Remove overrides for angular upgrade
bmo-at-a9s Sep 29, 2023
49435b8
Upgrade to angular v13
bmo-at-a9s Sep 29, 2023
733eaad
Upgrade to angular v14
bmo-at-a9s Oct 2, 2023
5353731
Merge branch 'develop' into feature/INT-3235-angular-cves-redux
bmo-at-a9s Oct 2, 2023
6defd09
Remove references to @cfstratos/ajsf-material
bmo-at-a9s Oct 2, 2023
3be678d
Move code coverage to different tests
bmo-at-a9s Oct 2, 2023
7790c23
WIP: Fix tests, still a lot of warnings
bmo-at-a9s Oct 4, 2023
5d1df92
discontinue use of karma-coverage-instanbul-reporter
bmo-at-a9s Oct 6, 2023
cacead3
Use @cypress/request where possible
bmo-at-a9s Oct 6, 2023
3f47cfd
Upgrade immer
bmo-at-a9s Oct 9, 2023
b2c7b7f
Upgrade @types/karma
bmo-at-a9s Oct 9, 2023
044567c
Update marked; change imports accordingly
bmo-at-a9s Oct 10, 2023
9c1e1d1
Update immer; fix typing for api-request-reducers
bmo-at-a9s Oct 10, 2023
e2de424
update @swimlane/ngx-charts; fix type issues
bmo-at-a9s Oct 10, 2023
88dbf5c
Replace request with maintained fork
bmo-at-a9s Oct 10, 2023
213f2f8
Add npm as engine requirement to make sure overrides work
bmo-at-a9s Oct 10, 2023
e810093
Fix up lockfile
bmo-at-a9s Oct 10, 2023
f84a0a6
Formatting
bmo-at-a9s Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
!.vscode/extensions.json

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
118 changes: 17 additions & 101 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand All @@ -78,9 +76,7 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false,
Expand All @@ -95,7 +91,6 @@
"serve": {
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"aot": true,
"sslCert": "dev-ssl/server.crt",
"proxyConfig": "proxy.conf.js",
"ssl": true,
Expand Down Expand Up @@ -154,7 +149,7 @@
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"preserveSymlinks": true,
"outputPath": "dist/core",
Expand All @@ -168,20 +163,22 @@
},
"configurations": {
"production": {
"budgets": [{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}],
"fileReplacements": [{
"replace": "src/frontend/packages/core/src/environments/environment.ts",
"with": "src/frontend/packages/core/src/environments/environment.prod.ts"
}],
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/frontend/packages/core/src/environments/environment.ts",
"with": "src/frontend/packages/core/src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
Expand Down Expand Up @@ -214,18 +211,6 @@
}
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.json"
],
"tslintConfig": "src/frontend/packages/core/tslint.json",
"files": [
"src/frontend/packages/core/src/**/*.ts"
]
}
}
}
},
Expand All @@ -236,7 +221,7 @@
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "src/frontend/packages/store/tsconfig.lib.json",
"project": "src/frontend/packages/store/ng-package.json"
Expand All @@ -254,18 +239,6 @@
"tsConfig": "src/frontend/packages/store/tsconfig.spec.json",
"karmaConfig": "src/frontend/packages/store/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.json"
],
"tslintConfig": "src/frontend/packages/store/tslint.json",
"files": [
"src/frontend/packages/store/src/**/*.ts"
]
}
}
}
},
Expand Down Expand Up @@ -316,7 +289,7 @@
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "src/frontend/packages/shared/tsconfig.lib.json",
"project": "src/frontend/packages/shared/ng-package.json"
Expand All @@ -329,14 +302,6 @@
"tsConfig": "src/frontend/packages/shared/tsconfig.spec.json",
"karmaConfig": "src/frontend/packages/shared/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["src/tsconfig.json"],
"tslintConfig": "src/frontend/packages/shared/tslint.json",
"files": ["src/frontend/packages/shared/src/**/*.ts"]
}
}
}
},
Expand All @@ -347,7 +312,7 @@
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.json",
"project": "src/frontend/packages/cloud-foundry/ng-package.json"
Expand All @@ -365,18 +330,6 @@
"tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.spec.json",
"karmaConfig": "src/frontend/packages/cloud-foundry/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.json"
],
"tslintConfig": "src/frontend/packages/cloud-foundry/tslint.json",
"files": [
"src/frontend/packages/cloud-foundry/src/**/*.ts"
]
}
}
}
},
Expand All @@ -387,7 +340,7 @@
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.json",
"project": "src/frontend/packages/cf-autoscaler/ng-package.json"
Expand All @@ -405,18 +358,6 @@
"tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.spec.json",
"karmaConfig": "src/frontend/packages/cf-autoscaler/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.json"
],
"tslintConfig": "src/frontend/packages/cf-autoscaler/tslint.json",
"files": [
"src/frontend/packages/cf-autoscaler/src/**/*.ts"
]
}
}
}
},
Expand All @@ -433,18 +374,6 @@
"tsConfig": "src/frontend/packages/kubernetes/tsconfig.spec.json",
"karmaConfig": "src/frontend/packages/kubernetes/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.json"
],
"tslintConfig": "src/frontend/packages/kubernetes/tslint.json",
"files": [
"src/frontend/packages/kubernetes/src/**/*.ts"
]
}
}
}
},
Expand All @@ -461,24 +390,11 @@
"tsConfig": "src/frontend/packages/git/tsconfig.spec.json",
"karmaConfig": "src/frontend/packages/git/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.json"
],
"tslintConfig": "src/frontend/packages/git/tslint.json",
"files": [
"src/frontend/packages/git/src/**/*.ts"
]
}
}
}
}

},
"defaultProject": "stratos",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
Expand Down
18 changes: 8 additions & 10 deletions build/karma.conf.creator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = function (project) {
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('karma-coverage'),
require('karma-spec-reporter'),
require('@angular-devkit/build-angular/plugins/karma'),
require(path.join(repoRoot, 'build/karma.test.reporter.js'))
Expand All @@ -24,16 +24,14 @@ module.exports = function (project) {
random: false
}
},
coverageIstanbulReporter: {
coverageReporter: {
dir: path.join(repoRoot, 'coverage', project),
reports: ['html', 'lcovonly', 'json'],
fixWebpackSourcePaths: true,
'report-config': {
json: {
// Collate all coverage-final files into a single dir for nyc to combine (it can't pick them out from `coverage`)
file: path.join('..', 'nyc', project + '-coverage-final.json')
}
},
subdir: ".",
reporters: [
{ type: 'html' },
{ type: 'json', file: path.join('..', 'nyc', project + '-coverage-final.json')},
{ type: 'lcovonly' }
],
},
reporters: ['spec', 'kjhtml', 'stratos'],
specReporter: {
Expand Down
Loading
Loading