Skip to content

Commit

Permalink
fix: security patches
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiasbaldi committed Sep 10, 2020
1 parent 453aa90 commit 46e9eed
Show file tree
Hide file tree
Showing 8 changed files with 1,041 additions and 1,436 deletions.
2 changes: 1 addition & 1 deletion client/e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "commonjs",
Expand Down
2,345 changes: 985 additions & 1,360 deletions client/package-lock.json

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,45 +14,45 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~10.0.11",
"@angular/common": "~10.0.11",
"@angular/compiler": "~10.0.11",
"@angular/core": "~10.0.11",
"@angular/forms": "~10.0.11",
"@angular/localize": "^10.0.11",
"@angular/platform-browser": "~10.0.11",
"@angular/platform-browser-dynamic": "~10.0.11",
"@angular/router": "~10.0.11",
"@angular/animations": "~10.1.1",
"@angular/common": "~10.1.1",
"@angular/compiler": "~10.1.1",
"@angular/core": "~10.1.1",
"@angular/forms": "~10.1.1",
"@angular/localize": "^10.1.1",
"@angular/platform-browser": "~10.1.1",
"@angular/platform-browser-dynamic": "~10.1.1",
"@angular/router": "~10.1.1",
"@ng-bootstrap/ng-bootstrap": "^7.0.0",
"clipboard": "^2.0.6",
"core-js": "^3.6.5",
"ngx-image-cropper": "^3.2.1",
"ngx-toastr": "^13.0.0",
"rxjs": "~6.6.2",
"rxjs": "~6.6.3",
"tslib": "^2.0.1",
"zone.js": "~0.11.1",
"snyk": "^1.381.2"
"snyk": "^1.393.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.7",
"@angular/cli": "~10.0.7",
"@angular/compiler-cli": "~10.0.11",
"@angular/language-service": "~10.0.11",
"@types/jasmine": "^3.5.13",
"@angular-devkit/build-angular": "~0.1001.0",
"@angular/cli": "~10.1.0",
"@angular/compiler-cli": "~10.1.1",
"@angular/language-service": "~10.1.1",
"@types/jasmine": "^3.5.14",
"@types/jasminewd2": "~2.0.8",
"@types/node": "^14.6.0",
"@types/node": "^14.10.0",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.2",
"karma": "~5.1.1",
"karma": "~5.2.2",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.5.4",
"protractor": "~7.0.0",
"ts-node": "^9.0.0",
"tslint": "~6.1.3",
"typescript": "^3.9.7"
"typescript": "^4.0.2"
},
"snyk": true
}
2 changes: 1 addition & 1 deletion client/src/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": []
Expand Down
2 changes: 1 addition & 1 deletion client/src/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"types": [
Expand Down
27 changes: 0 additions & 27 deletions client/tsconfig.base.json

This file was deleted.

41 changes: 24 additions & 17 deletions client/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"files": [],
"references": [
{
"path": "./src/tsconfig.app.json"
},
{
"path": "./src/tsconfig.spec.json"
},
{
"path": "./e2e/tsconfig.e2e.json"
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2020",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2018",
"dom"
],
"paths": {
"core-js/es7/reflect": [
"node_modules/core-js/proposals/reflect-metadata"
]
}
}
]
}
20 changes: 10 additions & 10 deletions server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stjorna",
"version": "2.6.0",
"version": "2.6.1",
"description": "STJÓRNA product management",
"main": "server.js",
"scripts": {
Expand All @@ -25,28 +25,28 @@
"cron": "^1.8.2",
"excel4node": "^1.7.2",
"express": "^4.17.1",
"express-winston": "^4.0.3",
"jimp": "^0.12.1",
"express-winston": "^4.0.5",
"jimp": "^0.16.1",
"jsonwebtoken": "^8.5.1",
"lowdb": "^1.0.0",
"moment": "^2.27.0",
"piwik-tracker": "^1.1.2",
"sharp": "^0.25.4",
"snyk": "^1.330.0",
"sharp": "^0.26.0",
"snyk": "^1.393.0",
"uniqid": "^5.2.0",
"util": "^0.12.3",
"winston": "^3.2.1"
"winston": "^3.3.3"
},
"devDependencies": {
"apidoc": "^0.22.1",
"apidoc": "^0.25.0",
"chai": "^4.2.0",
"chai-http": "^4.3.0",
"codacy-coverage": "^3.4.0",
"mocha": "^7.2.0",
"mocha-junit-reporter": "^1.23.3",
"mocha": "^8.1.3",
"mocha-junit-reporter": "^2.0.0",
"mocha-multi-reporters": "^1.1.7",
"nodemon": "2.0.4",
"nyc": "^15.0.1",
"nyc": "^15.1.0",
"request": "^2.88.2",
"rimraf": "^3.0.2"
},
Expand Down

0 comments on commit 46e9eed

Please sign in to comment.