xyh 2 lat temu
rodzic
commit
0caf3b43d5

+ 2 - 2
.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   extends: [
-    'proste/typescript.js',
-    'plugin:vue/vue3-recommended',
+    'proste/typescript',
+    'proste/vue',
   ],
   globals: {
     suite: true,

+ 2 - 2
package.json

@@ -11,7 +11,7 @@
     "cypress:run": "cypress run -b chrome",
     "cypress": "cypress open",
     "lint:style": "stylelint packages/app/src *.*.css",
-    "lint:js": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint:js": "eslint . --ext .js,.jsx,.ts,.tsx,.vue",
     "lint:style-fix": "pnpm run lint:style --fix",
     "lint:js-fix": "pnpm run lint:js --fix",
     "prepare": "husky install",
@@ -107,7 +107,7 @@
     "editorconfig": "^1.0.2",
     "eslint": "^8.40.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-config-proste": "^6.1.2",
+    "eslint-config-proste": "^7.0.0",
     "eslint-plugin-cypress": "^2.13.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",

+ 8 - 4
pnpm-lock.yaml

@@ -94,8 +94,8 @@ devDependencies:
     specifier: ^8.8.0
     version: 8.8.0(eslint@8.40.0)
   eslint-config-proste:
-    specifier: ^6.1.2
-    version: 6.1.2(@typescript-eslint/eslint-plugin@5.59.5)(@typescript-eslint/parser@5.59.5)(eslint-plugin-import-newlines@1.3.1)(eslint-plugin-import@2.27.5)(eslint@8.40.0)
+    specifier: ^7.0.0
+    version: 7.0.0(@typescript-eslint/eslint-plugin@5.59.5)(@typescript-eslint/parser@5.59.5)(eslint-plugin-import-newlines@1.3.1)(eslint-plugin-import@2.27.5)(eslint-plugin-vue@9.13.0)(eslint@8.40.0)
   eslint-plugin-cypress:
     specifier: ^2.13.3
     version: 2.13.3(eslint@8.40.0)
@@ -2893,8 +2893,8 @@ packages:
       eslint: 8.40.0
     dev: true
 
-  /eslint-config-proste@6.1.2(@typescript-eslint/eslint-plugin@5.59.5)(@typescript-eslint/parser@5.59.5)(eslint-plugin-import-newlines@1.3.1)(eslint-plugin-import@2.27.5)(eslint@8.40.0):
-    resolution: {integrity: sha512-dL0WvTl6YEm9O2bXNDmLwGqxF3AnyR72juj/Au+OqkQxjQ33uuwlpEEe7cRrj/enfVkUwPltebmf71xVeU6WIw==}
+  /eslint-config-proste@7.0.0(@typescript-eslint/eslint-plugin@5.59.5)(@typescript-eslint/parser@5.59.5)(eslint-plugin-import-newlines@1.3.1)(eslint-plugin-import@2.27.5)(eslint-plugin-vue@9.13.0)(eslint@8.40.0):
+    resolution: {integrity: sha512-jBLmB3zyJTPthGHxrly1IwUKN93qTprpvGWn6OBSFvlpOa6DsXje8W2vN3uMzgErqrnsmY8XzhXbh0cTADi/ig==}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': '>=5.4.0'
       '@typescript-eslint/parser': '>=5.4.0'
@@ -2903,6 +2903,7 @@ packages:
       eslint-plugin-import-newlines: '>=1.3.0'
       eslint-plugin-react: '>=7.27.1'
       eslint-plugin-react-hooks: '>=4.3.0'
+      eslint-plugin-vue: '>=9.13.0'
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
@@ -2912,12 +2913,15 @@ packages:
         optional: true
       eslint-plugin-react-hooks:
         optional: true
+      eslint-plugin-vue:
+        optional: true
     dependencies:
       '@typescript-eslint/eslint-plugin': 5.59.5(@typescript-eslint/parser@5.59.5)(eslint@8.40.0)(typescript@5.0.4)
       '@typescript-eslint/parser': 5.59.5(eslint@8.40.0)(typescript@5.0.4)
       eslint: 8.40.0
       eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.5)(eslint@8.40.0)
       eslint-plugin-import-newlines: 1.3.1(eslint@8.40.0)
+      eslint-plugin-vue: 9.13.0(eslint@8.40.0)
     dev: true
 
   /eslint-import-resolver-node@0.3.7:

+ 1 - 2
src/components/button/Button.vue

@@ -1,4 +1,3 @@
-<!-- eslint-disable vue/prop-name-casing -->
 <script setup lang='ts'>
 import {ElButton} from 'element-plus';
 
@@ -12,7 +11,7 @@ const props = defineProps<Props>();
 </script>
 
 <template>
-  <ElButton class="button-component" :native-type="props.nativeType">
+  <ElButton class="button-component" v-bind="props">
     <slot />
   </ElButton>
 </template>

+ 1 - 1
src/components/login-field/Upload.vue

@@ -35,7 +35,7 @@ const {zoneRef, isOverDropZone} = useDropFile(onUpload);
         'placeholder',
         {'preview-img': !!value}
       ]"
-      :preview-src-list="value ? [value] : void 0"
+      :previewSrcList="value ? [value] : void 0"
     />
     <p class="drap-tip">
       {{t('register.uploadTip')}}<span @click="onUploadClick">

+ 1 - 1
src/pages/login/login-info/index.vue

@@ -91,7 +91,7 @@ const {t} = useI18n();
       <span>{{t('login.forgetPassword')}}</span>
     </div>
 
-    <Button class="login-btn" native-type="submit">
+    <Button class="login-btn" nativeType="submit">
       {{t('login.loginBtnText')}}
     </Button>
   </div>

+ 1 - 1
src/pages/register/content/index.vue

@@ -66,7 +66,7 @@ const {t} = useI18n();
 
     <div class="btn-group">
       <button type="reset">{{t('register.reset')}}</button>
-      <Button native-type="submit">{{t('register.confirm')}}</Button>
+      <Button nativeType="submit">{{t('register.confirm')}}</Button>
     </div>
   </div>
 </template>