Skip to content

Commit

Permalink
迁移到 4.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hooray committed Sep 5, 2024
1 parent 68b45bd commit f0ff733
Show file tree
Hide file tree
Showing 91 changed files with 10,016 additions and 9,294 deletions.
2 changes: 2 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ VITE_APP_TITLE = Fantastic-admin 基础版
VITE_APP_API_BASEURL = /
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
# 是否禁用开发者工具,可防止被调试
VITE_APP_DISABLE_DEVTOOL = false

# 是否开启代理
VITE_OPEN_PROXY = false
Expand Down
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
# 应用配置面板
VITE_APP_SETTING = true
VITE_APP_SETTING = false
# 页面标题
VITE_APP_TITLE = Fantastic-admin 基础版
# 接口请求地址,会设置到 axios 的 baseURL 参数上
VITE_APP_API_BASEURL = /
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
# 是否禁用开发者工具,可防止被调试
VITE_APP_DISABLE_DEVTOOL = false

# 是否在打包时启用 Mock
VITE_BUILD_MOCK = true
# 是否在打包时生成 sourcemap
VITE_BUILD_SOURCEMAP = false
# 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip,brotli
# 是否在打包后生成存档,支持 zip 和 tar
VITE_BUILD_ARCHIVE =
20 changes: 11 additions & 9 deletions .github/workflows/deploy-example-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,38 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# “最近更新时间” 等 git 日志相关信息,需要拉取全部提交记录
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
# 选择要使用的 node 版本
node-version: 18
node-version: 20
# registry-url: https://registry.npmmirror.com/

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
name: Install pnpm
id: pnpm-install
with:
version: 8
version: 9
run_install: false

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- uses: actions/cache@v3
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install antfu/ni
run: npm i -g @antfu/ni

Expand All @@ -51,7 +53,7 @@ jobs:
run: nr build:example

- name: deploy
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
Expand Down
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"eslint.experimental.useFlatConfig": true,
"eslint.useFlatConfig": true,
"prettier.enable": false,
"editor.formatOnSave": false,
"editor.codeActionsOnSave": {
Expand Down
5 changes: 4 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ export default antfu(
rules: {
'eslint-comments/no-unlimited-disable': 'off',
'curly': ['error', 'all'],
'antfu/consistent-list-newline': 'off',
'ts/no-unused-expressions': ['error', {
allowShortCircuit: true,
allowTernary: true,
}],
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="browsers">
<a href="https://www.microsoft.com/edge" target="_blank" class="browser">
<img class="browser-icon" src="/browser_upgrade/edge.png" />
<div class="browser-name">Mircosoft Edge</div>
<div class="browser-name">Microsoft Edge</div>
</a>
<a href="https://www.google.cn/chrome/" target="_blank" class="browser">
<img class="browser-icon" src="/browser_upgrade/chrome.png" />
Expand Down
112 changes: 58 additions & 54 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"type": "module",
"version": "4.7.0",
"version": "4.11.0",
"engines": {
"node": "^18.0.0 || ^20.0.0"
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"scripts": {
"dev": "vite",
Expand All @@ -21,84 +21,88 @@
"release": "bumpp"
},
"dependencies": {
"@headlessui/vue": "^1.7.19",
"@imengyu/vue3-context-menu": "^1.3.9",
"@vueuse/core": "^10.9.0",
"@vueuse/integrations": "^10.9.0",
"axios": "^1.6.8",
"dayjs": "^1.11.10",
"@headlessui/vue": "^1.7.22",
"@imengyu/vue3-context-menu": "^1.4.2",
"@vueuse/components": "^11.0.3",
"@vueuse/core": "^11.0.3",
"@vueuse/integrations": "^11.0.3",
"axios": "^1.7.7",
"dayjs": "^1.11.13",
"defu": "^6.1.4",
"eruda": "^3.0.1",
"disable-devtool": "^0.3.7",
"eruda": "^3.2.3",
"floating-vue": "5.2.2",
"hotkeys-js": "^3.13.7",
"lodash-es": "^4.17.21",
"mitt": "^3.0.1",
"mockjs": "^1.1.0",
"nprogress": "^0.2.0",
"overlayscrollbars": "^2.6.1",
"overlayscrollbars-vue": "^0.5.8",
"overlayscrollbars": "^2.10.0",
"overlayscrollbars-vue": "^0.5.9",
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.1.7",
"qs": "^6.12.0",
"path-to-regexp": "^7.1.0",
"pinia": "^2.2.2",
"qs": "^6.13.0",
"scule": "^1.3.0",
"tdesign-vue-next": "^1.9.3",
"tdesign-vue-next": "^1.9.9",
"vconsole": "^3.15.1",
"vue": "^3.4.21",
"vue": "^3.4.38",
"vue-m-message": "^4.0.2",
"vue-router": "^4.3.0"
"vue-router": "^4.4.3"
},
"devDependencies": {
"@antfu/eslint-config": "2.11.6",
"@iconify/json": "^2.2.196",
"@iconify/vue": "^4.1.1",
"@stylistic/stylelint-config": "^1.0.1",
"@antfu/eslint-config": "2.24.1",
"@iconify/json": "^2.2.243",
"@iconify/vue": "^4.1.2",
"@stylistic/stylelint-config": "^2.0.0",
"@types/lodash-es": "^4.17.12",
"@types/mockjs": "^1.0.10",
"@types/nprogress": "^0.2.3",
"@types/path-browserify": "^1.0.2",
"@types/qs": "^6.9.14",
"@unocss/eslint-plugin": "^0.58.8",
"@vitejs/plugin-legacy": "^5.3.2",
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"@types/path-browserify": "^1.0.3",
"@types/qs": "^6.9.15",
"@unocss/eslint-plugin": "^0.62.3",
"@vitejs/plugin-legacy": "^5.4.2",
"@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"archiver": "^7.0.1",
"autoprefixer": "^10.4.19",
"boxen": "^7.1.1",
"bumpp": "^9.4.0",
"cz-git": "^1.9.1",
"eslint": "^8.57.0",
"autoprefixer": "^10.4.20",
"boxen": "^8.0.1",
"bumpp": "^9.5.2",
"cz-git": "^1.9.4",
"eslint": "^9.9.1",
"esno": "^4.7.0",
"fs-extra": "^11.2.0",
"http-server": "^14.1.1",
"inquirer": "^9.2.17",
"lint-staged": "^15.2.2",
"npm-run-all": "^4.1.5",
"picocolors": "^1.0.0",
"inquirer": "^10.1.8",
"lint-staged": "^15.2.9",
"npm-run-all2": "^6.2.2",
"picocolors": "^1.0.1",
"plop": "^4.0.1",
"sass": "^1.72.0",
"postcss": "^8.4.42",
"postcss-nested": "^6.2.0",
"sass": "^1.77.8",
"simple-git-hooks": "^2.11.1",
"stylelint": "^16.3.1",
"stylelint-config-recess-order": "^5.0.0",
"stylelint-config-standard-scss": "^13.0.0",
"stylelint": "^16.9.0",
"stylelint-config-recess-order": "^5.1.0",
"stylelint-config-standard-scss": "^13.1.0",
"stylelint-config-standard-vue": "^1.0.0",
"stylelint-scss": "^6.2.1",
"svgo": "^3.2.0",
"terser": "^5.30.0",
"typescript": "^5.4.3",
"unocss": "^0.58.8",
"unplugin-auto-import": "^0.17.5",
"unplugin-turbo-console": "^1.5.1",
"unplugin-vue-components": "^0.26.0",
"vite": "^5.2.7",
"stylelint-scss": "^6.5.1",
"svgo": "^3.3.2",
"typescript": "^5.5.4",
"unocss": "^0.62.3",
"unocss-preset-scrollbar": "^0.3.1",
"unplugin-auto-import": "^0.18.2",
"unplugin-turbo-console": "^1.10.1",
"unplugin-vue-components": "^0.27.4",
"vite": "^5.4.2",
"vite-plugin-banner": "^0.7.1",
"vite-plugin-compression2": "^1.0.0",
"vite-plugin-compression2": "^1.2.0",
"vite-plugin-fake-server": "^2.1.1",
"vite-plugin-pages": "^0.32.1",
"vite-plugin-pages": "^0.32.3",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-vue-devtools": "^7.0.25",
"vite-plugin-vue-meta-layouts": "^0.4.2",
"vue-tsc": "^2.0.7"
"vite-plugin-vue-devtools": "^7.3.9",
"vite-plugin-vue-meta-layouts": "^0.4.3",
"vue-tsc": "^2.1.4"
},
"simple-git-hooks": {
"pre-commit": "pnpm lint-staged",
Expand Down
4 changes: 2 additions & 2 deletions plop-templates/component/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ defineOptions({
</div>
</template>

<style lang="scss" scoped>
// 样式
<style scoped>
/* 样式 */
</style>
4 changes: 2 additions & 2 deletions plop-templates/page/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ defineOptions({
</div>
</template>

<style lang="scss" scoped>
// 样式
<style scoped>
/* 样式 */
</style>
Loading

0 comments on commit f0ff733

Please sign in to comment.