diff --git a/luthor/pyproject.toml b/luthor/pyproject.toml index 3ecee5b..0ce12fe 100644 --- a/luthor/pyproject.toml +++ b/luthor/pyproject.toml @@ -6,15 +6,15 @@ authors = ["tanshu "] [tool.poetry.dependencies] python = "^3.8" -uvicorn = "^0.12.3" -fastapi = "^0.62.0" +uvicorn = {extras = ["standard"], version = "^0.13.3"} +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.3.20" +SQLAlchemy = "^1.3.22" python-multipart = "^0.0.5" PyJWT = "^1.7.1" -alembic = "^1.4.3" +alembic = "^1.5.2" itsdangerous = "^1.1.0" python-dotenv = "^0.14.0" pydantic = {extras = ["dotenv"], version = "^1.7.3"} @@ -23,7 +23,7 @@ starlette = "^0.13.6" [tool.poetry.dev-dependencies] flake8 = "^3.8.4" black = "^20.8b1" -isort = "^5.6.2" +isort = {extras = ["toml"], version = "^5.7.0"} pre-commit = "^2.9.3" [build-system] diff --git a/otis/.editorconfig b/otis/.editorconfig index e89330a..59d9a3a 100644 --- a/otis/.editorconfig +++ b/otis/.editorconfig @@ -8,6 +8,9 @@ indent_size = 2 insert_final_newline = true trim_trailing_whitespace = true +[*.ts] +quote_type = single + [*.md] max_line_length = off trim_trailing_whitespace = false diff --git a/otis/.eslintrc.json b/otis/.eslintrc.json index 8931adf..354a261 100644 --- a/otis/.eslintrc.json +++ b/otis/.eslintrc.json @@ -16,19 +16,13 @@ "createDefaultProgram": true }, "extends": [ - "plugin:@angular-eslint/ng-cli-compat", - "plugin:@angular-eslint/ng-cli-compat--formatting-add-on", + "plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates" ], + "plugins": [ + "import" + ], "rules": { - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ], "@angular-eslint/directive-selector": [ "error", { @@ -37,6 +31,14 @@ "style": "camelCase" } ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "app", + "style": "kebab-case" + } + ], "@typescript-eslint/lines-between-class-members": [ "error", "always", @@ -51,14 +53,9 @@ "newlines-between": "always" } ], - "@typescript-eslint/naming-convention": [ - "off" - ], "@typescript-eslint/no-explicit-any": [ "error" - ], - "no-shadow": "off", - "@typescript-eslint/no-shadow": "error" + ] } }, { diff --git a/otis/package.json b/otis/package.json index ddca1d5..287127b 100644 --- a/otis/package.json +++ b/otis/package.json @@ -14,18 +14,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.0.8", - "@angular/cdk": "^11.0.3", - "@angular/common": "^11.0.8", - "@angular/compiler": "^11.0.8", - "@angular/core": "^11.0.8", + "@angular/animations": "^11.1.0", + "@angular/cdk": "^11.1.0", + "@angular/common": "^11.1.0", + "@angular/compiler": "^11.1.0", + "@angular/core": "^11.1.0", "@angular/flex-layout": "^11.0.0-beta.33", - "@angular/forms": "^11.0.8", - "@angular/material": "^11.0.3", - "@angular/material-moment-adapter": "^11.0.3", - "@angular/platform-browser": "^11.0.8", - "@angular/platform-browser-dynamic": "^11.0.8", - "@angular/router": "^11.0.8", + "@angular/forms": "^11.1.0", + "@angular/material": "^11.1.0", + "@angular/material-moment-adapter": "^11.1.0", + "@angular/platform-browser": "^11.1.0", + "@angular/platform-browser-dynamic": "^11.1.0", + "@angular/router": "^11.1.0", "jspdf": "^2.3.0", "jspdf-autotable": "^3.5.13", "moment": "^2.29.1", @@ -34,27 +34,27 @@ "zone.js": "^0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1100.6", - "@angular-eslint/builder": "1.0.0", - "@angular-eslint/eslint-plugin": "1.0.0", - "@angular-eslint/eslint-plugin-template": "1.0.0", - "@angular-eslint/schematics": "1.0.0", - "@angular-eslint/template-parser": "1.0.0", - "@angular/cli": "^11.0.6", - "@angular/compiler-cli": "^11.0.8", - "@angular/language-service": "^11.0.8", - "@types/jasmine": "~3.6.2", - "@types/node": "^14.14.20", - "@typescript-eslint/eslint-plugin": "^4.13.0", - "@typescript-eslint/parser": "^4.13.0", - "eslint": "^7.17.0", + "@angular-devkit/build-angular": "~0.1101.1", + "@angular-eslint/builder": "^1.1.0", + "@angular-eslint/eslint-plugin": "^1.1.0", + "@angular-eslint/eslint-plugin-template": "^1.1.0", + "@angular-eslint/schematics": "^1.1.0", + "@angular-eslint/template-parser": "^1.1.0", + "@angular/cli": "^11.1.1", + "@angular/compiler-cli": "^11.1.0", + "@angular/language-service": "^11.1.0", + "@types/jasmine": "~3.6.3", + "@types/node": "^14.14.22", + "@typescript-eslint/eslint-plugin": "^4.14.0", + "@typescript-eslint/parser": "^4.14.0", + "eslint": "^7.18.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jsdoc": "^31.0.3", + "eslint-plugin-jsdoc": "^31.2.2", "eslint-plugin-prefer-arrow": "1.2.2", - "husky": "^4.3.7", + "husky": "^4.3.8", "jasmine-core": "^3.6.0", "jasmine-spec-reporter": "^6.0.0", - "karma": "^5.2.3", + "karma": "^6.0.1", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "^4.0.0", @@ -63,7 +63,7 @@ "prettier": "^2.2.1", "standard-version": "^9.1.0", "ts-node": "^9.1.1", - "typescript": "~4.0.5" + "typescript": "^4.1.3" }, "husky": { "hooks": { diff --git a/otis/tsconfig.json b/otis/tsconfig.json index 1561830..3240f7a 100644 --- a/otis/tsconfig.json +++ b/otis/tsconfig.json @@ -22,6 +22,7 @@ ] }, "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true