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 CVEs #119

Merged
merged 5 commits into from
Jul 9, 2024
Merged

Fix CVEs #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e4d44f
cherry-pick CVE fixes
bmo-at-a9s Oct 23, 2023
c7f8a47
add moment import
markdboyd Jul 9, 2024
2242995
merge in main
markdboyd Jul 9, 2024
1891263
copy over necessary code updates
markdboyd Jul 9, 2024
28f1f3a
add frontend core files
markdboyd Jul 9, 2024
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
102 changes: 19 additions & 83 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 @@ -80,9 +78,7 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false,
Expand All @@ -98,7 +94,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 @@ -157,7 +152,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 Down Expand Up @@ -186,9 +181,7 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
Expand Down Expand Up @@ -221,18 +214,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 @@ -243,7 +224,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 @@ -261,18 +242,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 All @@ -283,7 +252,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 @@ -296,18 +265,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 @@ -318,7 +275,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 @@ -336,18 +293,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 @@ -358,7 +303,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 @@ -376,17 +321,21 @@
"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",
}
}
},
"kubernetes": {
"root": "src/frontend/packages/kubernetes",
"sourceRoot": "src/frontend/packages/kubernetes/src",
"projectType": "library",
"prefix": "lib",
"architect": {
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": [
"src/tsconfig.json"
],
"tslintConfig": "src/frontend/packages/cf-autoscaler/tslint.json",
"files": [
"src/frontend/packages/cf-autoscaler/src/**/*.ts"
]
"main": "src/frontend/packages/kubernetes/src/test.ts",
"tsConfig": "src/frontend/packages/kubernetes/tsconfig.spec.json",
"karmaConfig": "src/frontend/packages/kubernetes/karma.conf.js"
}
}
}
Expand All @@ -404,23 +353,10 @@
"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