Merge pull request #27 from suyuan32/dev

chore:  upgrade vben to v2.10.0

.browserslistrc

@@ -0,0 +1,4 @@
+> 1%
+last 2 versions
+not dead
+not ie 11

.env

@@ -1,8 +1,2 @@
-# port
-VITE_PORT = 3100
-
 # spa-title
-VITE_GLOB_APP_TITLE = Simple Admin
-
-# spa shortname
-VITE_GLOB_APP_SHORT_NAME = Simple_Admin
+VITE_GLOB_APP_TITLE = Simple Admin

.env.analyze

@@ -0,0 +1,23 @@
+# Whether to open mock
+VITE_USE_MOCK = true
+
+# public path
+VITE_PUBLIC_PATH = /
+
+# Whether to enable gzip or brotli compression
+# Optional: gzip | brotli | none
+# If you need multiple forms, you can use `,` to separate
+VITE_BUILD_COMPRESS = 'none'
+
+
+# Basic interface address SPA
+VITE_GLOB_API_URL=/basic-api
+
+# File upload address， optional
+# It can be forwarded by nginx or write the actual address directly
+VITE_GLOB_UPLOAD_URL=/upload
+
+# Interface prefix
+VITE_GLOB_API_URL_PREFIX=
+
+VITE_ENABLE_ANALYZE = true

.env.development

@@ -4,10 +4,6 @@ VITE_USE_MOCK = false
 # public path
 VITE_PUBLIC_PATH = /
 
-# Cross-domain proxy, you can configure multiple
-# Please note that no line breaks
-VITE_PROXY = [["/sys-api","http://localhost:9100"],["/file-manager","http://localhost:9102"], ["/mms-api","http://localhost:9104"]]
-
 VITE_BUILD_COMPRESS = 'none'
 
 # Delete console
@@ -17,7 +13,7 @@ VITE_DROP_CONSOLE = false
 VITE_GLOB_API_URL=
 
 # File upload address， optional
-VITE_GLOB_UPLOAD_URL=/upload
+VITE_GLOB_UPLOAD_URL=/fms-api/upload
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=

.env.production

@@ -13,7 +13,7 @@ VITE_DROP_CONSOLE = false
 VITE_GLOB_API_URL=
 
 # File upload address， optional
-VITE_GLOB_UPLOAD_URL=/upload
+VITE_GLOB_UPLOAD_URL=/fms-api/upload
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=

.env.test

@@ -17,11 +17,11 @@ VITE_BUILD_COMPRESS = 'none'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 # Basic interface address SPA
-VITE_GLOB_API_URL=/basic-api
+VITE_GLOB_API_URL=/sys-api
 
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=/upload
+VITE_GLOB_UPLOAD_URL=/fms-api/upload
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=

.eslintrc.js

@@ -1,77 +1,4 @@
 module.exports = {
   root: true,
-  env: {
-    browser: true,
-    node: true,
-    es6: true,
-  },
-  parser: 'vue-eslint-parser',
-  parserOptions: {
-    parser: '@typescript-eslint/parser',
-    ecmaVersion: 2020,
-    sourceType: 'module',
-    jsxPragma: 'React',
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  extends: [
-    'plugin:vue/vue3-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
-  ],
-  rules: {
-    'vue/script-setup-uses-vars': 'error',
-    '@typescript-eslint/ban-ts-ignore': 'off',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-var-requires': 'off',
-    '@typescript-eslint/no-empty-function': 'off',
-    'vue/custom-event-name-casing': 'off',
-    'no-use-before-define': 'off',
-    '@typescript-eslint/no-use-before-define': 'off',
-    '@typescript-eslint/ban-ts-comment': 'off',
-    '@typescript-eslint/ban-types': 'off',
-    '@typescript-eslint/no-non-null-assertion': 'off',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/no-unused-vars': [
-      'error',
-      {
-        argsIgnorePattern: '^_',
-        varsIgnorePattern: '^_',
-      },
-    ],
-    'no-unused-vars': [
-      'error',
-      {
-        argsIgnorePattern: '^_',
-        varsIgnorePattern: '^_',
-      },
-    ],
-    'space-before-function-paren': 'off',
-
-    'vue/attributes-order': 'off',
-    'vue/one-component-per-file': 'off',
-    'vue/html-closing-bracket-newline': 'off',
-    'vue/max-attributes-per-line': 'off',
-    'vue/multiline-html-element-content-newline': 'off',
-    'vue/singleline-html-element-content-newline': 'off',
-    'vue/attribute-hyphenation': 'off',
-    'vue/require-default-prop': 'off',
-    'vue/require-explicit-emits': 'off',
-    'vue/html-self-closing': [
-      'error',
-      {
-        html: {
-          void: 'always',
-          normal: 'never',
-          component: 'always',
-        },
-        svg: 'always',
-        math: 'always',
-      },
-    ],
-    'vue/multi-word-component-names': 'off',
-    'vue/no-reserved-component-names': 'off',
-  },
+  extends: ['@vben'],
 };

.husky/pre-commit

@@ -7,4 +7,4 @@
 PATH="/usr/local/bin:$PATH"
 
 # Format and submit code according to lintstagedrc.js configuration
-npm run lint:lint-staged
+# npm run lint

.npmrc

@@ -0,0 +1,7 @@
+public-hoist-pattern[]=husky
+public-hoist-pattern[]=*eslint*
+public-hoist-pattern[]=*prettier*
+public-hoist-pattern[]=lint-staged
+public-hoist-pattern[]=*stylelint*
+public-hoist-pattern[]=@commitlint/cli
+public-hoist-pattern[]=@vben/eslint-config

.prettierignore

@@ -1,9 +1,12 @@
-/dist/*
+dist
 .local
 .output.js
-/node_modules/**
+node_modules
 
 **/*.svg
 **/*.sh
 
-/public/*
+public
+.npmrc
+
+internal/**/dist

prettier.config.js → .prettierrc.js

@@ -7,4 +7,13 @@ module.exports = {
   proseWrap: 'never',
   htmlWhitespaceSensitivity: 'strict',
   endOfLine: 'auto',
+  plugins: ['prettier-plugin-packagejson'],
+  overrides: [
+    {
+      files: '.*rc',
+      options: {
+        parser: 'json',
+      },
+    },
+  ],
 };

.stylelintignore

@@ -1,3 +1,2 @@
-/dist/*
-/public/*
-public/*
+dist
+public

.stylelintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ['@vben/stylelint-config'],
+};

tests/server/package.json → apps/test-server/package.json

@@ -3,34 +3,34 @@
   "version": "1.0.0",
   "license": "MIT",
   "scripts": {
-    "start": "nodemon",
-    "build": "rimraf ./dist && tsup ./index.ts --dts --format cjs,esm  ",
+    "compile": "rimraf ./dist && tsup ./index.ts --dts --format cjs,esm  ",
     "prod": "npx pm2 start ecosystem.config.js --env production",
     "restart": "pm2 restart ecosystem.config.js --env production",
+    "start": "nodemon",
     "stop": "npx pm2 stop ecosystem.config.js"
   },
   "dependencies": {
-    "fs-extra": "^10.0.1",
-    "koa": "^2.13.4",
-    "koa-body": "^4.2.0",
-    "koa-bodyparser": "^4.3.0",
+    "fs-extra": "^11.1.1",
+    "koa": "^2.14.1",
+    "koa-body": "^6.0.1",
+    "koa-bodyparser": "^4.4.0",
     "koa-route": "^3.2.0",
-    "koa-router": "^10.1.1",
+    "koa-router": "^12.0.0",
     "koa-static": "^5.0.0",
-    "koa-websocket": "^6.0.0",
+    "koa-websocket": "^7.0.0",
     "koa2-cors": "^2.0.6"
   },
   "devDependencies": {
-    "@types/koa": "^2.13.4",
+    "@types/koa": "^2.13.6",
     "@types/koa-bodyparser": "^5.0.2",
     "@types/koa-router": "^7.4.4",
-    "@types/node": "^17.0.21",
-    "nodemon": "^2.0.15",
-    "pm2": "^5.2.0",
-    "rimraf": "^3.0.2",
-    "ts-node": "^10.7.0",
-    "tsconfig-paths": "^3.14.0",
-    "tsup": "^5.12.1",
-    "typescript": "^4.6.2"
+    "@types/node": "^18.15.11",
+    "nodemon": "^2.0.22",
+    "pm2": "^5.3.0",
+    "rimraf": "^4.4.1",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.2.0",
+    "tsup": "^6.7.0",
+    "typescript": "^5.0.3"
   }
 }

apps/test-server/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "@vben/ts-config/node-server.json",
+  "compilerOptions": {
+    "noImplicitAny": false
+  }
+}