Sync code from refs/heads/dev/1.11.0 to enterprise

.eslintrc.js → .eslintrc.cjs

@@ -2,24 +2,27 @@ module.exports = {
   root: true,
   env: {
     node: true,
+    es2022: true,
   },
   extends: [
     'plugin:vue/vue3-essential',
     'eslint:recommended',
     '@vue/typescript/recommended',
     '@vue/prettier',
-    '@vue/prettier/@typescript-eslint',
+    '@vue/eslint-config-typescript',
   ],
   parserOptions: {
-    ecmaVersion: 2020,
+    ecmaVersion: 2022,
   },
   ignorePatterns: ['dist', 'node_modules', '/src/assets/fonts', '/src/assets/iconfont'],
   rules: {
+    // FIXME:FIXME:FIXME: can not get node env now
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-empty-function': 'off',
     '@typescript-eslint/no-empty-function': [1],
     '@typescript-eslint/no-explicit-any': 'off',
+    'vue/multi-word-component-names': 'off',
   },
   overrides: [
     {

.github/workflows/build_enterprise_package.yaml

@@ -21,8 +21,8 @@ jobs:
         run: apt-get update && apt-get install -y zip
       - name: build
         run: |
-          yarn
-          yarn build:enterprise
+          pnpm install
+          pnpm build:enterprise
       - name: create package
         run: |
           touch dist/version

.github/workflows/build_oss_package.yaml

@@ -14,15 +14,17 @@ on:
 jobs:
   build:
     runs-on: ubuntu-20.04
-    container: node:16.20
+    container: node:20.17
     steps:
       - uses: actions/checkout@v2
+      - name: Install pnpm
+        run: npm install -g pnpm
       - name: install zip
         run: apt-get update && apt-get install -y zip
       - name: build
         run: |
-          yarn
-          yarn build
+          pnpm install
+          pnpm build
       - name: create package
         run: |
           touch dist/version

.github/workflows/check_newest_schema.yaml

@@ -34,17 +34,23 @@ jobs:
 
       - name: checkout dashboard code
         uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20.17'
 
       - name: run script that checks schemas
         run: |
-          yarn
-          yarn orval
+          npm install -g pnpm
+          pnpm install
+          pnpm orval
 
       - name: check for changes
         run: |
           git_diff=$(git diff)
           if [ -n "$git_diff" ]; then
-            git diff
+            git diff src/types/schemas
             echo "Detected differences in the repository. Uploading mismatched schemas."
             exit 1
           else

.github/workflows/check_package_version.yaml

@@ -37,11 +37,11 @@ jobs:
 
       - name: install dep
         run: |
-          yarn
+          pnpm install
 
       - name: run script that checks the version of the package
         run: |
-          node ./scripts/checkPackageVersion.js
+          node ./scripts/checkPackageVersion.cjs
 
       - name: check for script errors
         if: ${{ failure() }}

.github/workflows/tag.yaml

@@ -56,9 +56,17 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.AUTH_APP_ID }}
+          private-key: ${{ secrets.AUTH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
       - name: Create PR in emqx/emqx
         env:
-          GH_TOKEN: ${{ secrets.CI_GITHUB_TOKEN_EMQX_RW }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
           EMQX_NAME: emqx
           VERSION: ${{ github.ref_name }}
         run: |
@@ -74,9 +82,17 @@ jobs:
     if: (github.ref == 'refs/heads/enterprise') || startsWith(github.ref, 'refs/tags/e')
     runs-on: ubuntu-latest
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.AUTH_APP_ID }}
+          private-key: ${{ secrets.AUTH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
       - name: Create PR in emqx/emqx
         env:
-          GH_TOKEN: ${{ secrets.CI_GITHUB_TOKEN_EMQX_RW }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
           EMQX_NAME: emqx-enterprise
           VERSION: ${{ github.ref_name }}
         run: |

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

.nvmrc

@@ -1 +1 @@
-16
+20

README.md

@@ -79,31 +79,31 @@ To set up for local development, follow these steps:
 2. Install the dependencies:
 
     ```shell
-    yarn
+    pnpm install
     ```
 
 3. To start the development server, run:
 
     ```shell
-    yarn serve
+    pnpm dev
     ```
 
 4. For production compilation and minification:
 
     ```shell
-    yarn build
+    pnpm build
     ```
 
 5. Lint and fix files:
 
     ```shell
-    yarn lint
+    pnpm lint
     ```
 
    Or, format the code with Prettier:
 
     ```shell
-    yarn format
+    pnpm format
     ```
 
 ## ☁️ Development with Cloud Host
@@ -125,11 +125,11 @@ To set up for development with a cloud host:
 3. Start the development server:
 
     ```shell
-    yarn serve
+    pnpm serve
     ```
 
 ## ⚙️ Vue.js Customize Configuration
 
-Refer to the [Configuration Reference](https://cli.vuejs.org/config/) for more information.
+Refer to the [Configuring Vite](https://vitejs.dev/config/#configuring-vite) for more information.
 
 After the completion of setup, the CI will run automatically and deploy upon successful execution.

index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" href="/favicon.ico" />
+    <title>EMQX Dashboard</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>

orval.config.ts

@@ -1,8 +1,10 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const { camelCase } = require('lodash')
-const filterTargetSchema = require('./scripts/transformer/filterTagsSchema.js')
+import { camelCase } from 'lodash'
+import { loadEnv } from 'vite'
+import filterTargetSchema from './scripts/transformer/filterTagsSchema.js'
 
-const baseURL = process.env.HOST_URL || 'http://localhost:18083'
+const envVariables = loadEnv('development', process.cwd(), '')
+const baseURL = envVariables.HOST_URL || 'http://localhost:18083'
 const swaggerURL = `${baseURL}/api-docs/swagger.json`
 
 const tagArr = [
@@ -59,10 +61,10 @@ const configs = tagArr.reduce((obj: Record<string, any>, tag: string) => {
       override: { header: false },
     },
     hooks: {
-      afterAllFilesWrite: ['prettier --write', `yarn remove-orval-client ${filePath}`],
+      afterAllFilesWrite: ['prettier --write', `pnpm remove-orval-client ${filePath}`],
     },
   }
   return obj
 }, {})
 
-module.exports = configs
+export default configs

package.json

@@ -1,94 +1,92 @@
 {
   "name": "emqx-dashboard5",
-  "version": "5.8.1",
+  "version": "5.8.4",
   "private": true,
+  "type": "module",
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "serve:enterprise": "VUE_APP_VERSION=enterprise vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "build:enterprise": "VUE_APP_VERSION=enterprise vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
+    "dev": "vite",
+    "dev:enterprise": "VITE_APP_VERSION=enterprise vite",
+    "build": "vite build",
+    "build:enterprise": "VITE_APP_VERSION=enterprise vite build",
+    "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
     "format": "prettier --write \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\" \"src/**/*.vue\" \"src/**/*.scss\"",
     "escape": "node ./scripts/escapeI18N.js",
     "checkI18n": "node ./scripts/checkUselessI18n.js",
     "remove-orval-client": "node ./scripts/removeOrvalClient.js",
-    "orval:api": "source ./.env.development.local && yarn orval --input $HOST_URL\\api-docs/swagger.json",
-    "orval:local": "yarn orval --input ./swagger.json"
+    "orval:api": "source ./.env.development.local && pnpm orval --input $HOST_URL\\api-docs/swagger.json",
+    "orval:local": "pnpm orval --input ./swagger.json",
+    "prepare": "husky"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^1.1.0",
-    "@emqx/shared-ui-i18n": "~0.0.25",
+    "@emqx/shared-ui-i18n": "~0.0.35",
     "@emqx/shared-ui-utils": "^0.0.14",
     "@highlightjs/vue-plugin": "^2.1.0",
     "@vue-flow/core": "^1.20.1",
     "axios": "^1.4.0",
     "compare-versions": "^6.0.0-rc.3",
     "copy-to-clipboard": "^3.3.1",
     "crypto-js": "^4.1.1",
+    "dayjs": "^1.11.13",
     "echarts": "^5.2.1",
-    "element-plus": "~2.3.0",
+    "element-plus": "^2.8.3",
     "github-markdown-css": "^5.7.0",
     "highlight.js": "10.7.3",
     "hocon-parser": "^1.0.1",
     "js-base64": "^3.7.2",
     "json-to-avro": "^1.1.1",
     "lodash": "^4.17.21",
     "marked": "^4.0.9",
-    "moment": "^2.29.1",
     "monaco-editor": "^0.30.0",
     "mqtt": "^4.2.8",
     "nprogress": "^0.2.0",
     "qs": "^6.12.1",
     "sortablejs": "^1.14.0",
-    "vue": "~3.2.16",
+    "vite-plugin-node-polyfills": "^0.22.0",
+    "vue": "^3.2.16",
     "vue-i18n": "^9.2.0-beta.19",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0",
     "xss": "^1.0.14"
   },
   "devDependencies": {
     "@types/crypto-js": "^4.1.1",
-    "@types/jest": "^29.5.4",
     "@types/lodash": "^4.14.191",
     "@types/marked": "^4.0.1",
+    "@types/nprogress": "^0.2.3",
     "@types/sortablejs": "^1.10.7",
     "@types/utf8": "^3.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.18.0",
-    "@typescript-eslint/parser": "^4.18.0",
-    "@vue/babel-plugin-jsx": "^1.1.1",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-plugin-router": "~4.5.0",
-    "@vue/cli-plugin-typescript": "~4.5.0",
-    "@vue/cli-plugin-vuex": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-typescript": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@vitejs/plugin-vue": "^5.0.0",
+    "@vitejs/plugin-vue-jsx": "^4.0.0",
+    "@vue/eslint-config-prettier": "^9.0.0",
+    "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^2.0.0-0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-prettier": "^3.3.1",
-    "eslint-plugin-vue": "^7.0.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-vue": "^9.28.0",
     "esm": "^3.2.25",
-    "husky": "^7.0.4",
-    "jest": "^29.6.4",
-    "lint-staged": "^12.1.7",
-    "monaco-editor-webpack-plugin": "^6.0.0",
+    "husky": "^9.1.5",
+    "lint-staged": "^15.2.10",
     "orval": "^6.17.0",
-    "prettier": "^2.2.1",
+    "prettier": "^3.3.3",
     "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
-    "typescript": "~4.1.5",
-    "webpack": "^4.36.0"
+    "typescript": "~5.5.4",
+    "vite": "^5.0.0"
   },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
     }
   },
   "lint-staged": {
-    "*.{vue,js,scss}": [
-      "prettier --write \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.vue\" \"src/**/*.scss\""
+    "*.{js,ts,vue}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.scss": [
+      "prettier --write"
     ]
   }
-}
+}