diff --git a/barker/pyproject.toml b/barker/pyproject.toml index 7f004a9..e602650 100644 --- a/barker/pyproject.toml +++ b/barker/pyproject.toml @@ -11,9 +11,9 @@ fastapi = "^0.63.0" python-jose = {extras = ["cryptography"], version = "^3.2.0"} passlib = {extras = ["bcrypt"], version = "^1.7.4"} psycopg2-binary = "^2.8.6" -SQLAlchemy = "^1.4.0" +SQLAlchemy = "^1.4.11" python-multipart = "^0.0.5" -PyJWT = "^1.7.1" +PyJWT = "^2.0.1" alembic = "^1.5.7" itsdangerous = "^1.1.0" python-dotenv = "^0.14.0" @@ -23,10 +23,10 @@ arq = "^0.19.1" aiohttp = "^3.7.4" [tool.poetry.dev-dependencies] -flake8 = "^3.9.0" +flake8 = "^3.9.1" black = "^20.8b1" isort = {extras = ["toml"], version = "^5.7.0"} -pre-commit = "^2.11.1" +pre-commit = "^2.12.1" mypy = "^0.812" [build-system] diff --git a/bookie/.eslintrc.json b/bookie/.eslintrc.json index a6f18b5..13a7750 100644 --- a/bookie/.eslintrc.json +++ b/bookie/.eslintrc.json @@ -17,7 +17,8 @@ }, "extends": [ "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" + "plugin:@angular-eslint/template/process-inline-templates", + "plugin:@angular-eslint/recommended--extra" ], "plugins": [ "import" diff --git a/bookie/angular.json b/bookie/angular.json index c1b9f34..4fa0ee7 100644 --- a/bookie/angular.json +++ b/bookie/angular.json @@ -123,5 +123,7 @@ } } }, - "defaultProject": "bookie" -} + "defaultProject": "bookie", + "cli": { + "defaultCollection": "@angular-eslint/schematics" + }} diff --git a/bookie/karma.conf.js b/bookie/karma.conf.js index a71f775..eede65a 100644 --- a/bookie/karma.conf.js +++ b/bookie/karma.conf.js @@ -9,10 +9,16 @@ module.exports = function (config) { require('karma-jasmine'), require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), + require('karma-coverage'), require('@angular-devkit/build-angular/plugins/karma') ], client: { + jasmine: { + // you can add configuration options for Jasmine here + // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html + // for example, you can disable the random execution with `random: false` + // or set a specific seed with `seed: 4321` + }, clearContext: false // leave Jasmine Spec Runner output visible in browser }, jasmineHtmlReporter: { diff --git a/bookie/package.json b/bookie/package.json index 35b6620..3813328 100644 --- a/bookie/package.json +++ b/bookie/package.json @@ -14,54 +14,54 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.2.6", - "@angular/cdk": "^11.2.5", - "@angular/common": "^11.2.6", - "@angular/compiler": "^11.2.6", - "@angular/core": "^11.2.6", + "@angular/animations": "^11.2.11", + "@angular/cdk": "^11.2.10", + "@angular/common": "^11.2.11", + "@angular/compiler": "^11.2.11", + "@angular/core": "^11.2.11", "@angular/flex-layout": "^11.0.0-beta.33", - "@angular/forms": "^11.2.6", - "@angular/material": "^11.2.5", - "@angular/material-moment-adapter": "^11.2.5", - "@angular/platform-browser": "^11.2.6", - "@angular/platform-browser-dynamic": "^11.2.6", - "@angular/router": "^11.2.6", - "mathjs": "^9.3.0", + "@angular/forms": "^11.2.11", + "@angular/material": "^11.2.10", + "@angular/material-moment-adapter": "^11.2.10", + "@angular/platform-browser": "^11.2.11", + "@angular/platform-browser-dynamic": "^11.2.11", + "@angular/router": "^11.2.11", + "mathjs": "^9.3.2", "moment": "^2.29.1", - "rxjs": "^6.6.6", + "rxjs": "^6.6.7", "tslib": "^2.1.0", "zone.js": "^0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1102.5", - "@angular-eslint/builder": "^2.0.0", - "@angular-eslint/eslint-plugin": "^2.0.0", - "@angular-eslint/eslint-plugin-template": "^2.0.0", - "@angular-eslint/schematics": "^2.0.2", - "@angular-eslint/template-parser": "^2.0.0", - "@angular/cli": "^11.2.5", - "@angular/compiler-cli": "^11.2.6", - "@angular/language-service": "^11.2.6", - "@types/jasmine": "~3.6.7", + "@angular-devkit/build-angular": "~0.1102.10", + "@angular-eslint/builder": "^4.0.0", + "@angular-eslint/eslint-plugin": "^4.0.0", + "@angular-eslint/eslint-plugin-template": "^4.0.0", + "@angular-eslint/schematics": "^4.0.0", + "@angular-eslint/template-parser": "^4.0.0", + "@angular/cli": "^11.2.10", + "@angular/compiler-cli": "^11.2.11", + "@angular/language-service": "^11.2.11", + "@types/jasmine": "~3.6.9", "@types/mathjs": "^6.0.11", - "@types/node": "^14.14.35", - "@typescript-eslint/eslint-plugin": "4.18.0", - "@typescript-eslint/parser": "4.18.0", - "eslint": "^7.22.0", + "@types/node": "^14.14.41", + "@typescript-eslint/eslint-plugin": "4.22.0", + "@typescript-eslint/parser": "4.22.0", + "eslint": "^7.24.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^32.3.0", + "eslint-plugin-jsdoc": "^32.3.1", "eslint-plugin-prefer-arrow": "1.2.3", - "husky": "^5.1.3", - "jasmine-core": "^3.6.0", - "jasmine-spec-reporter": "^6.0.0", - "karma": "^6.2.0", + "husky": "^6.0.0", + "jasmine-core": "^3.7.1", + "jasmine-spec-reporter": "^7.0.0", + "karma": "^6.3.2", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "^4.0.0", "karma-jasmine-html-reporter": "^1.5.0", "lint-staged": "^10.5.4", "prettier": "^2.2.1", - "standard-version": "^9.1.1", + "standard-version": "^9.2.0", "ts-node": "^9.1.1", "typescript": "~4.1.5" }, diff --git a/bookie/src/polyfills.ts b/bookie/src/polyfills.ts index 955e1ce..9aa5da8 100644 --- a/bookie/src/polyfills.ts +++ b/bookie/src/polyfills.ts @@ -18,7 +18,9 @@ * BROWSER POLYFILLS */ -/** IE11 requires the following for NgClass support on SVG elements */ +/** + * IE11 requires the following for NgClass support on SVG elements + */ // import 'classlist.js'; // Run `npm install --save classlist.js`. /** @@ -55,7 +57,8 @@ /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js/dist/zone'; // Included with Angular CLI. +import 'zone.js/dist/zone'; // Included with Angular CLI. + /*************************************************************************************************** * APPLICATION IMPORTS diff --git a/bookie/src/test.ts b/bookie/src/test.ts index e103ada..50193eb 100644 --- a/bookie/src/test.ts +++ b/bookie/src/test.ts @@ -4,22 +4,21 @@ import 'zone.js/dist/zone-testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, - platformBrowserDynamicTesting, + platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; declare const require: { - context( - path: string, - deep?: boolean, - filter?: RegExp, - ): { + context(path: string, deep?: boolean, filter?: RegExp): { keys(): string[]; (id: string): T; }; }; // First, initialize the Angular testing environment. -getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); // Then we find all the tests. const context = require.context('./', true, /\.spec\.ts$/); // And load the modules. diff --git a/bookie/tsconfig.json b/bookie/tsconfig.json index 1561830..3240f7a 100644 --- a/bookie/tsconfig.json +++ b/bookie/tsconfig.json @@ -22,6 +22,7 @@ ] }, "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true