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_emqx_for_test.yaml

@@ -15,13 +15,12 @@ jobs:
       OTP_VSN: '26.2.5-3'
       ELIXIR_VSN: '1.15.7'
 
-
     steps:
       - name: checkout emqx code
         uses: actions/checkout@v3
         with:
           repository: emqx/emqx
-          ref: release-58
+          ref: release-59
 
       - name: build and export to Docker
         id: build
@@ -31,7 +30,7 @@ jobs:
       - name: export docker image
         run: |
           docker save $_EMQX_DOCKER_IMAGE_TAG | gzip > $EMQX_NAME-docker.tar.gz
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: '${{ env.EMQX_NAME }}-docker'
           path: '${{ env.EMQX_NAME }}-docker.tar.gz'

.github/workflows/build_enterprise_package.yaml

@@ -3,26 +3,28 @@ name: build enterprise package
 on:
   pull_request:
     branches:
-      - 'enterprise'
+      - '**enterprise**'
       - 'dev/e/*'
   push:
     branches:
-      - 'enterprise'
+      - '**enterprise**'
       - 'dev/e/*'
   workflow_call:
 
 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:enterprise
+          pnpm install
+          pnpm build:enterprise
       - name: create package
         run: |
           touch dist/version
@@ -31,7 +33,7 @@ jobs:
           PACKAGE_NAME=$(echo ${GITHUB_REF##*/}) # Extract tag from GITHUB_REF
           zip -rq emqx-enterprise-dashboard-$PACKAGE_NAME.zip ./dist
           echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: emqx-enterprise-dashboard
           path: dist/

.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
@@ -31,7 +33,7 @@ jobs:
           PACKAGE_NAME=$(echo ${GITHUB_REF##*/}) # Extract tag from GITHUB_REF
           zip -rq emqx-dashboard-$PACKAGE_NAME.zip ./dist
           echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: emqx-dashboard
           path: dist/

.github/workflows/check_newest_schema.yaml

@@ -8,15 +8,15 @@ on:
         type: string
 
 env:
-  IS_CI: "true"
+  IS_CI: 'true'
   EMQX_NAME: ${{ inputs.emqx-name }}
 
 jobs:
   check_schema:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ env.EMQX_NAME }}-docker
           path: /tmp
@@ -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
@@ -53,7 +59,7 @@ jobs:
 
       - name: upload schemas
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: newest-schemas
           path: ./src/types/schemas/*.ts

.github/workflows/check_package_version.yaml

@@ -8,15 +8,15 @@ on:
         type: string
 
 env:
-  IS_CI: "true"
+  IS_CI: 'true'
   EMQX_NAME: ${{ inputs.emqx-name }}
 
 jobs:
   check_package_version:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ env.EMQX_NAME }}-docker
           path: /tmp
@@ -35,13 +35,16 @@ jobs:
       - name: checkout dashboard code
         uses: actions/checkout@v3
 
+      - name: Install pnpm
+        run: npm install -g pnpm
+
       - 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/project_test.yaml

@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - 'dev/*'
-      - 'enterprise'
+      - '**enterprise**'
 
 jobs:
   set_version:

.github/workflows/tag.yaml

@@ -15,7 +15,7 @@ jobs:
     - name: check branch and set output
       id: set-output
       run: |
-        if [[ "${{ github.base_ref }}" == enterprise ]]; then
+        if [[ "${{ github.ref_name }}" == e* ]]; then
           echo "emqx-name=emqx-enterprise" >> "$GITHUB_OUTPUT"
         else
           echo "emqx-name=emqx" >> "$GITHUB_OUTPUT"
@@ -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

.prettierignore

@@ -1,5 +1,8 @@
 # Ignore files:
 /src/assets/fonts
 /src/assets/iconfont
+/src/auto-imports.d.ts
+/src/components.d.ts
+/src/types/schemas/*
 # Ignore all HTML files:
 *.html

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.