diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index 6b8c026a..6ad67a6f 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -13,8 +13,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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 428626da..53e9fa93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,8 +83,8 @@ jobs: node-version: [20] os: - ubuntu-latest - # - macos-latest - # - windows-latest + - macos-latest + - windows-latest steps: - name: Checkout code @@ -109,11 +109,15 @@ jobs: check: name: Check - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} timeout-minutes: 20 strategy: matrix: node-version: [20] + os: + - ubuntu-latest + - macos-latest + - windows-latest steps: - name: Checkout code uses: actions/checkout@v4 @@ -137,6 +141,7 @@ jobs: # From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions - name: Check workflow files + if: runner.os == 'Linux' run: | bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) ./actionlint -color -shellcheck="" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5356b08a..b064a8e0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,7 @@ on: jobs: deploy-push-ftp: name: Deploy Push Ftp - if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') && contains(github.event.head_commit.message, '[deploy]') + if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/draft.yml b/.github/workflows/draft.yml index 0f715f22..39efba44 100644 --- a/.github/workflows/draft.yml +++ b/.github/workflows/draft.yml @@ -12,6 +12,6 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@master + - uses: release-drafter/release-drafter@v6 env: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 9539876a..eede0920 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -53,7 +53,7 @@ jobs: echo "version=${version}" >> $GITHUB_OUTPUT echo "major=${major}" >> $GITHUB_OUTPUT - - uses: release-drafter/release-drafter@master + - uses: release-drafter/release-drafter@v6 with: version: ${{ steps.version.outputs.version }} publish: true diff --git a/.vscode/launch.json b/.vscode/launch.json index 2dd1a9e1..4f1428f2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -3,10 +3,10 @@ "version": "0.2.0", "configurations": [ { - "type": "chrome", // chrome、edge - "name": "vben admin dev", // 调试的名称,可以自定义 + "type": "chrome", + "name": "vben admin antd dev", "request": "launch", - "url": "http://localhost:5173", + "url": "http://localhost:5555", "env": { "NODE_ENV": "development" }, "sourceMaps": true, "webRoot": "${workspaceFolder}/apps/web-antd/src" diff --git a/.vscode/settings.json b/.vscode/settings.json index b46de825..5141a436 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -163,9 +163,7 @@ "yaml": false }, - "cssVariables.lookupFiles": [ - "packages/@vben-core/shared/design/src/**/*.css" - ], + "cssVariables.lookupFiles": ["packages/core/base/design/src/**/*.css"], "i18n-ally.localesPaths": [ "packages/locales/src/langs", diff --git a/docs/src/guide/in-depth/loading.md b/docs/src/guide/in-depth/loading.md index 663cb59d..9d691157 100644 --- a/docs/src/guide/in-depth/loading.md +++ b/docs/src/guide/in-depth/loading.md @@ -24,10 +24,17 @@ VITE_INJECT_APP_LOADING=false - 你可以使用跟`index.html`一样的语法,比如`VITE_APP_TITLE`变量,来获取应用的标题。 - 必须保证有一个`id="__app-loading__"`的元素。 +- 给`id="__app-loading__"`的元素,加一个 `hidden` class。 - 必须保证有一个`style[data-app-loading="inject-css"]`的元素。 ```html{1,4}
diff --git a/docs/src/guide/project/standard.md b/docs/src/guide/project/standard.md index 3faa55b6..3effad2f 100644 --- a/docs/src/guide/project/standard.md +++ b/docs/src/guide/project/standard.md @@ -162,4 +162,4 @@ git hook 一般结合各种 lint,在 git 提交代码的时候进行代码风 ### lint-staged -用于自动修复提交文件风格问题,其配置文件为 `.lintstagedrc.mjs`,其核心配置放在`internal/lint-configs/lint-staged-config`目录下,可以根据项目需求进行修改。 +用于自动修复提交文件风格问题,其配置文件为 `.lintstagedrc.mjs`,可以根据项目需求进行修改。 diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts index 317d69ad..55e38d12 100644 --- a/internal/vite-config/src/config/application.ts +++ b/internal/vite-config/src/config/application.ts @@ -8,7 +8,7 @@ import { findMonorepoRoot } from '@vben/node-utils'; import { defineConfig, loadEnv, mergeConfig } from 'vite'; -import { getDefaultPwaOptions } from '../options'; +import { defaultImportmapOptions, getDefaultPwaOptions } from '../options'; import { loadApplicationPlugins } from '../plugins'; import { loadAndConvertEnv } from '../utils/env'; import { getCommonConfig } from './common'; @@ -31,6 +31,7 @@ function defineApplicationConfig(userConfigPromise?: DefineApplicationOptions) { extraAppConfig: true, html: true, i18n: true, + importmapOptions: defaultImportmapOptions, injectAppLoading: true, injectMetadata: true, isBuild,