Merge branch 'main' into mockm

Author: wll8

.github/CODEOWNERS

@@ -1,7 +1,14 @@
 # default onwer
-* [email protected]
+* [email protected] [email protected]
 
 # vben core onwer
-/packages/@core/ [email protected]
-/internal/ [email protected]
-/scripts/ [email protected]
+/.github/ [email protected] [email protected]
+/.vscode/ [email protected] [email protected]
+/packages/ [email protected] [email protected]
+/packages/@core/ [email protected] [email protected]
+/internal/ [email protected] [email protected]
+/scripts/ [email protected] [email protected]
+
+# vben team onwer
+apps/ [email protected] [email protected] @vbenjs/team-v5
+docs/ [email protected] [email protected] @vbenjs/team-v5

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -14,8 +14,8 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
-        - Vben Admin Pro
-        - Vben Admin
+        - Vben Admin V5
+        - Vben Admin V2
       default: 0
     validations:
       required: true

.github/workflows/action-build.yml renamed to .github/workflows/build.yml

@@ -1,4 +1,5 @@
-name: Dependabot post-update
+# name: Dependabot post-update
+name: Build detection
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
@@ -14,7 +15,7 @@ concurrency:
 
 jobs:
   post-update:
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    # if: ${{ github.actor == 'dependabot[bot]' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -45,5 +46,4 @@ jobs:
 
       - name: Test and Build
         run: |
-          pnpm run test:unit
           pnpm run build

.github/workflows/deploy.yml

@@ -24,7 +24,14 @@ jobs:
         shell: bash
         run: |
           sed -i  "s#VITE_COMPRESS\s*=.*#VITE_COMPRESS = gzip#g" ./apps/web-antd/.env.production
+          sed -i  "s#VITE_PWA\s*=.*#VITE_PWA = true#g" ./apps/web-antd/.env.production
           cat ./apps/web-antd/.env.production
+          sed -i  "s#VITE_COMPRESS\s*=.*#VITE_COMPRESS = gzip#g" ./apps/web-ele/.env.production
+          sed -i  "s#VITE_PWA\s*=.*#VITE_PWA = true#g" ./apps/web-ele/.env.production
+          cat ./apps/web-ele/.env.production
+          sed -i  "s#VITE_COMPRESS\s*=.*#VITE_COMPRESS = gzip#g" ./apps/web-naive/.env.production
+          sed -i  "s#VITE_PWA\s*=.*#VITE_PWA = true#g" ./apps/web-naive/.env.production
+          cat ./apps/web-naive/.env.production
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4

.lintstagedrc.mjs

@@ -1 +1,20 @@
-export { default } from '@vben/lint-staged-config';
+export default {
+  '*.{js,jsx,ts,tsx}': [
+    'prettier --cache --ignore-unknown  --write',
+    'eslint --cache --fix',
+  ],
+  '*.{scss,less,styl,html,vue,css}': [
+    'prettier --cache --ignore-unknown --write',
+    'stylelint --fix --allow-empty-input',
+  ],
+  '*.md': ['prettier --cache --ignore-unknown --write'],
+  '*.vue': [
+    'prettier --write',
+    'eslint --cache --fix',
+    'stylelint --fix --allow-empty-input',
+  ],
+  '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}': [
+    'prettier --cache --write--parser json',
+  ],
+  'package.json': ['prettier --cache --write'],
+};

.npmrc

@@ -3,7 +3,6 @@ public-hoist-pattern[]=husky
 public-hoist-pattern[]=eslint
 public-hoist-pattern[]=prettier
 public-hoist-pattern[]=prettier-plugin-tailwindcss
-public-hoist-pattern[]=lint-staged
 public-hoist-pattern[]=stylelint
 public-hoist-pattern[]=*postcss*
 public-hoist-pattern[]=@commitlint/*

.vscode/settings.json

@@ -139,8 +139,6 @@
   "typescript.preferences.preferTypeOnlyAutoImports": true,
   "typescript.preferences.includePackageJsonAutoImports": "on",
 
-  // Enable the ESlint flat config support
-  "eslint.experimental.useFlatConfig": true,
   "eslint.validate": [
     "javascript",
     "typescript",

Dockerfile

@@ -21,7 +21,7 @@ RUN echo "Builder Success 🎉"
 FROM nginx:stable-alpine as production
 
 RUN echo "types { application/javascript js mjs; }" > /etc/nginx/conf.d/mjs.conf
-COPY --from=builder /app/apps/antd-view/dist /usr/share/nginx/html
+COPY --from=builder /app/apps/web-antd/dist /usr/share/nginx/html
 
 COPY ./deploy/nginx.conf /etc/nginx/nginx.conf
 

apps/web-ele/src/views/demos/element/index.vue

@@ -25,7 +25,7 @@ function warning() {
 }
 function success() {
   ElMessage.success(
-    "'Cause you walked hand in hand With another man in my place",
+    'Cause you walked hand in hand With another man in my place',
   );
 }
 

cspell.json

@@ -40,6 +40,7 @@
     "nocheck",
     "prefixs",
     "vitepress",
+    "antdv",
     "ependencies",
     "vite",
     "echarts",

docs/src/guide/essentials/styles.md

@@ -72,7 +72,7 @@ const { b, e, is } = useNamespace('menu');
 </template>
 <style lang="scss" scoped>
 // 如果你在应用内使用，这行代码可以省略，已经在所有的应用内全局引入了
-@import (reference) '@vben/styles/global';
+@import '@vben/styles/global';
 @include b('menu') {
   color: black;
 

docs/src/guide/in-depth/ui-framework.md

@@ -14,3 +14,4 @@
 6. 自行适配组件库的主题，与 `Vben Admin` 契合。
 7. 调整 `.env` 内的应用名
 8. 在大仓根目录增加 `dev:xxx` 脚本
+9. 执行 `pnpm install` 安装依赖

docs/src/index.md

@@ -25,28 +25,40 @@ features:
   - icon: 🚀
     title: 最新技术栈
     details: 基于 Vue3、Pinia、Vue Router、TypeScript、等最新技术栈。
+    link: /guide/introduction/quick-start
+    linkText: 快速开始
   - icon: 🦄
     title: 丰富的配置
     details: 企业级中后台前端解决方案，提供丰富的组件和模板以及 N 种偏好设置组合方案。
-    # link: /
-    # linkText: x
+    link: /guide/essentials/settings
+    linkText: 配置文档
   - icon: 🎨
     title: 主题定制
     details: 通过简单的配置，即可实现各种主题切换，满足个性化需求。
+    link: /guide/in-depth/theme
+    linkText: 主题文档
   - icon: 🌐
     title: 国际化
     details: 内置国际化方案，支持多语言切换，满足国际化需求。
+    link: /guide/in-depth/locale
+    linkText: 国际化文档
   - icon: 🔐
     title: 权限管理
     details: 内置权限管理方案，支持多种权限控制方式，满足各种权限需求。
+    link: /guide/in-depth/access
+    linkText: 权限文档
   - title: Vite
     icon:
       src: /logos/vite.svg
     details: 现代化的前端构建工具，快速冷启动，瞬间热更新。
+    link: https://vitejs.dev/
+    linkText: 官方站点
   - title: Shadcn UI
     icon:
       src: /logos/shadcn-ui.svg
     details: 核心基于 Shadcn UI + Tailwindcss，业务可支持任意的 UI 框架。
+    link: https://www.shadcn-vue.com/
+    linkText: 官方站点
   - title: Turbo Repo
     icon:
       src: /logos/turborepo.svg
@@ -55,6 +67,8 @@ features:
     icon:
       src: /logos/nitro.svg
     details: 内置 Mockm Mock 服务，让你的 mock 服务更加强大。
+    link: https://github.com/wll8/mockm
+    linkText: 官方站点
 ---
 
 <!-- <script setup>

internal/lint-configs/commitlint-config/build.config.ts

@@ -1,5 +1,3 @@
-import type { UserConfig } from 'cz-git';
-
 import { execSync } from 'node:child_process';
 
 import { getPackagesSync } from '@vben/node-utils';
@@ -27,7 +25,10 @@ const scopeComplete = execSync('git status --porcelain || true')
   ?.match(/src%%((\w|-)*)/)?.[1]
   ?.replace(/s$/, '');
 
-const userConfig: UserConfig = {
+/**
+ * @type {import('cz-git').UserConfig}
+ */
+const userConfig = {
   extends: ['@commitlint/config-conventional'],
   plugins: ['commitlint-plugin-function-rules'],
   prompt: {
@@ -106,7 +107,7 @@ const userConfig: UserConfig = {
     'function-rules/scope-enum': [
       2, // level: error
       'always',
-      (parsed: { scope: string }) => {
+      (parsed) => {
         if (!parsed.scope || allowedScopes.includes(parsed.scope)) {
           return [true];
         }

internal/lint-configs/commitlint-config/src/index.ts renamed to internal/lint-configs/commitlint-config/index.mjs

@@ -11,20 +11,15 @@
   },
   "license": "MIT",
   "type": "module",
-  "scripts": {
-    "stub": "pnpm unbuild --stub"
-  },
   "files": [
     "dist"
   ],
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "main": "./index.mjs",
+  "module": "./index.mjs",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "default": "./dist/index.mjs"
+      "import": "./index.mjs",
+      "default": "./index.mjs"
     }
   },
   "dependencies": {

internal/lint-configs/commitlint-config/package.json

@@ -43,7 +43,7 @@
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-n": "^17.10.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
-    "eslint-plugin-perfectionist": "^3.0.0",
+    "eslint-plugin-perfectionist": "^3.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-regexp": "^2.6.0",
     "eslint-plugin-unicorn": "^55.0.0",

internal/lint-configs/commitlint-config/tsconfig.json

@@ -1,9 +1,11 @@
 import type { Linter } from 'eslint';
 
-export async function comments(): Promise<Linter.FlatConfig[]> {
+import { interopDefault } from '../util';
+
+export async function comments(): Promise<Linter.Config[]> {
   const [pluginComments] = await Promise.all([
     // @ts-expect-error - no types
-    import('eslint-plugin-eslint-comments'),
+    interopDefault(import('eslint-plugin-eslint-comments')),
   ] as const);
 
   return [

internal/lint-configs/eslint-config/package.json

@@ -1,6 +1,6 @@
 import type { Linter } from 'eslint';
 
-export async function disableds(): Promise<Linter.FlatConfig[]> {
+export async function disableds(): Promise<Linter.Config[]> {
   return [
     {
       files: ['**/__tests__/**/*.?([cm])[jt]s?(x)'],

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

@@ -1,6 +1,6 @@
 import type { Linter } from 'eslint';
 
-export async function ignores(): Promise<Linter.FlatConfig[]> {
+export async function ignores(): Promise<Linter.Config[]> {
   return [
     {
       ignores: [

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

@@ -6,7 +6,7 @@ import js from '@eslint/js';
 import pluginUnusedImports from 'eslint-plugin-unused-imports';
 import globals from 'globals';
 
-export async function javascript(): Promise<Linter.FlatConfig[]> {
+export async function javascript(): Promise<Linter.Config[]> {
   return [
     {
       languageOptions: {

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

@@ -1,14 +1,15 @@
 import type { Linter } from 'eslint';
 
-export async function jsdoc(): Promise<Linter.FlatConfig[]> {
+import { interopDefault } from '../util';
+
+export async function jsdoc(): Promise<Linter.Config[]> {
   const [pluginJsdoc] = await Promise.all([
-    import('eslint-plugin-jsdoc'),
+    interopDefault(import('eslint-plugin-jsdoc')),
   ] as const);
 
   return [
     {
       plugins: {
-        // @ts-expect-error - no types
         jsdoc: pluginJsdoc,
       },
       rules: {

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

@@ -1,9 +1,11 @@
 import type { Linter } from 'eslint';
 
-export async function jsonc(): Promise<Linter.FlatConfig[]> {
+import { interopDefault } from '../util';
+
+export async function jsonc(): Promise<Linter.Config[]> {
   const [pluginJsonc, parserJsonc] = await Promise.all([
-    import('eslint-plugin-jsonc'),
-    import('jsonc-eslint-parser'),
+    interopDefault(import('eslint-plugin-jsonc')),
+    interopDefault(import('jsonc-eslint-parser')),
   ] as const);
 
   return [

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

@@ -1,7 +1,9 @@
 import type { Linter } from 'eslint';
 
-export async function node(): Promise<Linter.FlatConfig[]> {
-  const [pluginNode] = await Promise.all([import('eslint-plugin-n')] as const);
+import { interopDefault } from '../util';
+
+export async function node(): Promise<Linter.Config[]> {
+  const pluginNode = await interopDefault(import('eslint-plugin-n'));
 
   return [
     {

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

@@ -2,7 +2,7 @@ import type { Linter } from 'eslint';
 
 import perfectionistPlugin from 'eslint-plugin-perfectionist';
 
-export async function perfectionist(): Promise<Linter.FlatConfig[]> {
+export async function perfectionist(): Promise<Linter.Config[]> {
   return [
     perfectionistPlugin.configs['recommended-natural'],
     {

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

@@ -1,8 +1,10 @@
 import type { Linter } from 'eslint';
 
-export async function prettier(): Promise<Linter.FlatConfig[]> {
+import { interopDefault } from '../util';
+
+export async function prettier(): Promise<Linter.Config[]> {
   const [pluginPrettier] = await Promise.all([
-    import('eslint-plugin-prettier'),
+    interopDefault(import('eslint-plugin-prettier')),
   ] as const);
   return [
     {

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

@@ -1,8 +1,10 @@
 import type { Linter } from 'eslint';
 
-export async function regexp(): Promise<Linter.FlatConfig[]> {
+import { interopDefault } from '../util';
+
+export async function regexp(): Promise<Linter.Config[]> {
   const [pluginRegexp] = await Promise.all([
-    import('eslint-plugin-regexp'),
+    interopDefault(import('eslint-plugin-regexp')),
   ] as const);
 
   return [