Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: update docs [deploy] #4037

Merged
merged 4 commits into from
Aug 4, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 7 additions & 0 deletions docs/src/guide/in-depth/loading.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}
<style data-app-loading="inject-css">
#__app-loading__.hidden {
pointer-events: none;
visibility: hidden;
opacity: 0;
transition: all 1s ease-out;
}
/* ... */
</style>
<div id="__app-loading__">
Expand Down
2 changes: 1 addition & 1 deletion docs/src/guide/project/standard.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ git hook 一般结合各种 lint,在 git 提交代码的时候进行代码风

### lint-staged

用于自动修复提交文件风格问题,其配置文件为 `.lintstagedrc.mjs`其核心配置放在`internal/lint-configs/lint-staged-config`目录下,可以根据项目需求进行修改。
用于自动修复提交文件风格问题,其配置文件为 `.lintstagedrc.mjs`,可以根据项目需求进行修改。
3 changes: 2 additions & 1 deletion internal/vite-config/src/config/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -31,6 +31,7 @@ function defineApplicationConfig(userConfigPromise?: DefineApplicationOptions) {
extraAppConfig: true,
html: true,
i18n: true,
importmapOptions: defaultImportmapOptions,
injectAppLoading: true,
injectMetadata: true,
isBuild,
Expand Down
Loading