Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

internal/lint-configs/eslint-config/src/configs/javascript.ts

@@ -104,6 +104,8 @@ export async function javascript(): Promise<Linter.Config[]> {
         'keyword-spacing': 'off',
         'no-control-regex': 'error',
         'no-empty-function': 'off',
+        'no-octal': 'error',
+        'no-octal-escape': 'error',
         'no-restricted-properties': [
           'error',
           {
@@ -136,8 +138,32 @@ export async function javascript(): Promise<Linter.Config[]> {
           'TSEnumDeclaration[const=true]',
           'TSExportAssignment',
         ],
+        'no-undef-init': 'error',
         'no-undef': 'off',
         'no-unreachable-loop': 'error',
+        'object-shorthand': [
+          'error',
+          'always',
+          {
+            avoidQuotes: true,
+            ignoreConstructors: false,
+          },
+        ],
+        'one-var': ['error', { initialized: 'never' }],
+        'prefer-arrow-callback': [
+          'error',
+          {
+            allowNamedFunctions: false,
+            allowUnboundThis: true,
+          },
+        ],
+        'prefer-regex-literals': [
+          'error',
+          {
+            disallowRedundantWrapping: true,
+          },
+        ],
+        'spaced-comment': 'error',
         'space-before-function-paren': 'off',
 
         'unused-imports/no-unused-imports': 'error',

internal/lint-configs/oxlint-config/src/configs/javascript.ts

@@ -46,13 +46,12 @@ const javascript: OxlintConfig = {
     'no-empty': ['error', { allowEmptyCatch: true }],
     'no-fallthrough': 'error',
     'no-new-func': 'error',
-    'no-new-object': 'error',
-    'no-new-symbol': 'error',
+    'no-object-constructor': 'error',
+    'no-new-native-nonconstructor': 'error',
     'no-labels': ['error', { allowLoop: false, allowSwitch: false }],
     'no-lone-blocks': 'error',
     'no-multi-str': 'error',
-    'no-octal': 'error',
-    'no-octal-escape': 'error',
+    'no-nonoctal-decimal-escape': 'error',
     'no-proto': 'error',
     'no-prototype-builtins': 'error',
     'no-redeclare': ['error', { builtinGlobals: false }],
@@ -69,7 +68,6 @@ const javascript: OxlintConfig = {
     ],
     'no-template-curly-in-string': 'error',
     'no-throw-literal': 'error',
-    'no-undef-init': 'error',
     'no-unused-expressions': [
       'error',
       {
@@ -98,15 +96,6 @@ const javascript: OxlintConfig = {
     'no-useless-computed-key': 'error',
     'no-useless-constructor': 'error',
     'no-useless-return': 'error',
-    'object-shorthand': [
-      'error',
-      'always',
-      {
-        avoidQuotes: true,
-        ignoreConstructors: false,
-      },
-    ],
-    'one-var': ['error', { initialized: 'never' }],
     'prefer-const': [
       'error',
       {
@@ -114,25 +103,11 @@ const javascript: OxlintConfig = {
         ignoreReadBeforeAssign: true,
       },
     ],
-    'eslint/prefer-arrow-callback': [
-      'error',
-      {
-        allowNamedFunctions: false,
-        allowUnboundThis: true,
-      },
-    ],
     'prefer-exponentiation-operator': 'error',
     'prefer-promise-reject-errors': 'error',
-    'eslint/prefer-regex-literals': [
-      'error',
-      {
-        disallowRedundantWrapping: true,
-      },
-    ],
     'prefer-rest-params': 'error',
     'prefer-spread': 'error',
     'prefer-template': 'error',
-    'spaced-comment': 'error',
     'symbol-description': 'error',
     'unicode-bom': ['error', 'never'],
     'use-isnan': [

internal/lint-configs/oxlint-config/src/configs/test.ts

@@ -17,6 +17,7 @@ const test: OxlintConfig = {
     'vitest/no-import-node-test': 'error',
     'vitest/prefer-hooks-in-order': 'error',
     'vitest/prefer-lowercase-title': 'error',
+    'vitest/require-mock-type-parameters': 'off',
   },
 };