Merge pull request element-plus#18513 from element-plus/dev

D2M
tuhaojia · Oct 11, 2024 · 700d125 · 700d125
2 parents ab8c762 + fb8c6fd
commit 700d125
Show file tree

Hide file tree

Showing 54 changed files with 944 additions and 519 deletions.
diff --git a/.github/workflows/lint-commit-message.yml b/.github/workflows/lint-commit-message.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/pr-docs-build.yml b/.github/workflows/pr-docs-build.yml
@@ -13,13 +13,11 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18]
+        node-version: [20]
         os: [ubuntu-latest, windows-latest]
         include:
-          - node-version: 18
+          - node-version: 20
             node-name: LTS
-          # - node-version: 18
-          #   node-name: Current
 
       fail-fast: false
 

diff --git a/.github/workflows/publish-build-product.yml b/.github/workflows/publish-build-product.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/publish-docs-deploy-manual.yml b/.github/workflows/publish-docs-deploy-manual.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/publish-docs-deploy.yml b/.github/workflows/publish-docs-deploy.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/publish-npm-nightly.yml b/.github/workflows/publish-npm-nightly.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache
@@ -58,7 +58,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: 20
           registry-url: https://registry.npmjs.com/
 
       - name: Setup pnpm

diff --git a/.github/workflows/publish-npm.yml b/.github/workflows/publish-npm.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://registry.npmjs.com/
 
       - name: Get pnpm store directory
@@ -57,7 +57,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://registry.npmjs.com/
 
       - name: Setup pnpm

diff --git a/.github/workflows/publish-pr-commit-pkg.yml b/.github/workflows/publish-pr-commit-pkg.yml
@@ -21,7 +21,7 @@ jobs:
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'pnpm'
 
       - name: Setup pnpm

diff --git a/.github/workflows/publish-size-report.yml b/.github/workflows/publish-size-report.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/staging-docs.yml b/.github/workflows/staging-docs.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/test-ssr.yml b/.github/workflows/test-ssr.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Get pnpm store directory
         id: pnpm-cache
@@ -57,12 +57,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18, 20]
+        node-version: [20, 22]
         include:
-          - node-version: 18
-            node-name: LTS
           - node-version: 20
-            node-name: LTS-20
+            node-name: LTS
+          - node-version: 22
+            node-name: Current
 
     steps:
       - uses: actions/checkout@v4

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,4 +1,32 @@
 ## Changelog
+
+### 2.8.5
+
+_2024-10-11_
+
+#### Features
+
+- I18n update germany translations (#18447 by @MaikoTan)
+- Components [mention] explicit export dropdownVisible (#18460 by @SorrowX)
+- Components [select & select-v2] explicit export `selectedLabel` (#18350 by @warmthsea)
+
+#### Bug fixes
+
+- Play dayjs cahce miss (#18381 by @makedopamine)
+- Theme-chalk upgrade SASS version and fix deprecated color function (#18376 by @lvzhenbo)
+- Components [transfer] render the option's label correctly when there's only an empty comment in the default slot (#18416 by @LoTwT)
+- Components [table] cancel layout update when component unmount (#18440 by @btea)
+- Hooks [lockscreen] compatible with document non-existence (#18445 by @btea)
+- Components [mention] native event triggered twice (#18453 by @SorrowX)
+- Components [select] use `blur` in the tooltip slot has no effect (#18335 by @warmthsea)
+- Hooks rendering multiple popper container DOM in SSR/SSG (#18482 by @tolking)
+- Components [select] the blur not triggered when click the outside (#18478 by @tolking)
+- Components [table] the last column shuld not allow drag (#18444 by @btea)
+
+#### Refactors
+
+- Components [badge] show-zero implement (#18360 by @warmthsea)
+- Docs remove Vite (#18383 by @makedopamine)
 
 ### 2.8.4
 

diff --git a/docs/.vitepress/config/index.mts b/docs/.vitepress/config/index.mts
@@ -7,8 +7,9 @@ import { head } from './head'
 import { nav } from './nav'
 import { mdPlugin } from './plugins'
 import { sidebars } from './sidebars'
+import { getViteConfig } from './vite'
 
-import type { UserConfig } from 'vitepress'
+import type { UserConfigFn } from 'vitepress'
 
 const buildTransformers = () => {
   const transformer = () => {
@@ -46,63 +47,66 @@ languages.forEach((lang) => {
   }
 })
 
-const config: UserConfig = {
-  title: 'Element Plus',
-  description: 'A Vue 3 based component library for designers and developers',
-  lastUpdated: true,
-  head,
-  themeConfig: {
-    repo: REPO_PATH,
-    docsBranch: REPO_BRANCH,
-    docsDir: docsDirName,
+const setupConfig: UserConfigFn<any> = (configEnv) => {
+  const config = {
+    title: 'Element Plus',
+    description: 'A Vue 3 based component library for designers and developers',
+    lastUpdated: true,
+    head,
+    themeConfig: {
+      repo: REPO_PATH,
+      docsBranch: REPO_BRANCH,
+      docsDir: docsDirName,
 
-    editLinks: true,
-    editLinkText: 'Edit this page on GitHub',
+      editLinks: true,
+      editLinkText: 'Edit this page on GitHub',
 
-    logo: '/images/element-plus-logo.svg',
-    logoSmall: '/images/element-plus-logo-small.svg',
-    sidebars,
-    nav,
-    agolia: {
-      apiKey: '99caf32e743ba77d78b095b763b8e380',
-      appId: 'ZM3TI8AKL4',
+      logo: '/images/element-plus-logo.svg',
+      logoSmall: '/images/element-plus-logo-small.svg',
+      sidebars,
+      nav,
+      agolia: {
+        apiKey: '99caf32e743ba77d78b095b763b8e380',
+        appId: 'ZM3TI8AKL4',
+      },
+      features,
+      langs: languages,
     },
-    features,
-    langs: languages,
-  },
-
-  locales,
-
-  markdown: {
-    config: (md) => mdPlugin(md),
-  },
-
-  vue: {
-    template: {
-      compilerOptions: {
-        hoistStatic: false,
-        directiveTransforms: buildTransformers(),
+    locales,
+    vite: getViteConfig(configEnv),
+    markdown: {
+      config: (md) => mdPlugin(md),
+    },
+    vue: {
+      template: {
+        compilerOptions: {
+          hoistStatic: false,
+          directiveTransforms: buildTransformers(),
+        },
       },
     },
-  },
 
-  postRender(context) {
-    // Inject the teleport markup
-    if (context.teleports) {
-      const body = Object.entries(context.teleports).reduce(
-        (all, [key, value]) => {
-          if (key.startsWith('#el-popper-container-')) {
-            return `${all}<div id="${key.slice(1)}">${value}</div>`
-          }
-          return all
-        },
-        context.teleports.body || ''
-      )
+    postRender(context) {
+      // Inject the teleport markup
+      if (context.teleports) {
+        const body = Object.entries(context.teleports).reduce(
+          (all, [key, value]) => {
+            if (key.startsWith('#el-popper-container-')) {
+              return `${all}<div id="${key.slice(1)}">${value}</div>`
+            }
+            return all
+          },
+          context.teleports.body || ''
+        )
 
-      context.teleports = { ...context.teleports, body }
-    }
+        context.teleports = { ...context.teleports, body }
+      }
+
+      return context
+    },
+  }
 
-    return context
-  },
+  return config
 }
-export default config
+
+export default setupConfig