diff --git a/api/requirements.txt b/api/requirements.txt index e7b2889ba..e36e59f16 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,7 +1,7 @@ captcha~=0.5.0 celery~=5.3.6 coverage~=7.4.1 -cryptography~=42.0.1 +cryptography~=42.0.2 Django~=5.0.1 django-cors-headers~=4.3.1 djangorestframework~=3.14.0 @@ -12,7 +12,7 @@ django-prometheus~=2.3.1 dnspython~=2.5.0 httpretty~=1.0.5 # 1.1 breaks tests. Does not run in production, so stick to it. pyotp~=2.9.0 -psycopg~=3.1.17 +psycopg~=3.1.18 psl-dns~=1.1.0 pylibmc~=1.6.3 pyyaml~=6.0.1 diff --git a/www/webapp/.eslintrc.cjs b/www/webapp/.eslintrc.cjs index a3e7cb51f..740b95c73 100644 --- a/www/webapp/.eslintrc.cjs +++ b/www/webapp/.eslintrc.cjs @@ -17,6 +17,7 @@ module.exports = { // 'plugin:vue/recommended', 'plugin:vuetify/base', 'plugin:import/recommended', + 'plugin:vue-scoped-css/recommended', // vue2 'eslint:recommended', ], settings: { @@ -37,6 +38,8 @@ module.exports = { 'vue/no-deprecated-filter': 'warn', // Preparation for vue3 'vue/no-deprecated-v-on-number-modifiers': 'warn', // Preparation for vue3 'vue/no-deprecated-html-element-is': 'warn', // Preparation for vue3 + 'vue-scoped-css/enforce-style-type': 'off', + 'vue-scoped-css/no-deprecated-deep-combinator': 'warn', // Preparation for vue3 'vue/match-component-file-name': ['error', {'extensions': ['vue'], 'shouldMatchCase': true}], }, ignorePatterns: ['**/src/modules/**/*'], diff --git a/www/webapp/package.json b/www/webapp/package.json index 2fbbcf573..e27733cc5 100644 --- a/www/webapp/package.json +++ b/www/webapp/package.json @@ -31,6 +31,7 @@ "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.27.5", "eslint-plugin-vue": "^9.15.1", + "eslint-plugin-vue-scoped-css": "^2.6.1", "eslint-plugin-vuetify": "^1.1.0", "sass": "~1.32.13", "unplugin-vue-components": "^0.26.0", diff --git a/www/webapp/src/components/Field/RecordList.vue b/www/webapp/src/components/Field/RecordList.vue index 44dff3d68..5a15de4f5 100644 --- a/www/webapp/src/components/Field/RecordList.vue +++ b/www/webapp/src/components/Field/RecordList.vue @@ -161,7 +161,7 @@ export default { }; diff --git a/www/webapp/src/views/CrudList.vue b/www/webapp/src/views/CrudList.vue index 9c5891cf7..ba8bd2f7d 100644 --- a/www/webapp/src/views/CrudList.vue +++ b/www/webapp/src/views/CrudList.vue @@ -702,29 +702,29 @@ export default { diff --git a/www/webapp/src/views/CrudListRecord.vue b/www/webapp/src/views/CrudListRecord.vue index b05ea470d..a480a0fd5 100644 --- a/www/webapp/src/views/CrudListRecord.vue +++ b/www/webapp/src/views/CrudListRecord.vue @@ -124,38 +124,38 @@ export default {