Skip to content

Commit

Permalink
Merge pull request #80 from meadmin-cn/release
Browse files Browse the repository at this point in the history
Release 1.1.20
  • Loading branch information
yuntian001 authored Jan 13, 2024
2 parents 9fc8aec + b404dcd commit c1c8689
Show file tree
Hide file tree
Showing 27 changed files with 19,468 additions and 7,952 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ module.exports = {
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-unused-vars': ['warn', { args: 'after-used' }],
'no-undef': 'off', // ts(2304)
'@typescript-eslint/no-duplicate-enum-values': 'off',
'@typescript-eslint/naming-convention': [
'error',
{
selector: 'default',
format: ['camelCase'],
format: ['camelCase', 'PascalCase'],
leadingUnderscore: 'allowSingleOrDouble',
filter: {
// you can expand this regex to add more allowed names
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-node@v2
with:
# 选择要使用的 node 版本
node-version: "16"
node-version: "20"

# 缓存 node_modules
- name: Cache dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-node@v2
with:
# 选择要使用的 node 版本
node-version: "16"
node-version: "20"

# 缓存 node_modules
- name: Cache dependencies
Expand Down
4 changes: 2 additions & 2 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// .prettierrc.js
module.exports = {
// 一行最多 120 字符
printWidth: 120,
// 一行最多 1000 字符 建议不强制换行使用编辑器的查看/自动换行进行展示换行
printWidth: 1000,
// 超出不换行
proseWrap: 'never',
// 使用 2 个空格缩进
Expand Down
29 changes: 28 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@


## [1.1.20](https://github.com/meadmin-cn/meadmin-template/compare/main-1.1.19...main-1.1.20) (2024-01-13)


### 新功能[feat]

* 加上函数式组件调用支持(使用动态组件方式生成组件) ([3e18778](https://github.com/meadmin-cn/meadmin-template/commit/3e18778abc36d8f635e0b79eff5163d2ddfdb074))
* typescript升级到5.2.3,vue-tsc 省级到 1.8.24,vite升级到4.5.1 ([a9c3697](https://github.com/meadmin-cn/meadmin-template/commit/a9c3697b56b1a6d07efe7f34510c9ebed7adf647))


### 其他[chore]

* @vitejs/plugin-vue 版本升级 ([a21ac98](https://github.com/meadmin-cn/meadmin-template/commit/a21ac9832bacde5a37bfbc1de9b4da65f76f9a4b))
* 修改git hooks node版本 ([e7fe3bc](https://github.com/meadmin-cn/meadmin-template/commit/e7fe3bc95eb3e12acbb336ce6d77d13f1c06bdff))
* 优化prettierrc 的换行规则 ([4cd1ad4](https://github.com/meadmin-cn/meadmin-template/commit/4cd1ad4dbe887e8d2d29c3e2ad39624e49185223))
* template-release v1.1.20 ([655b6b2](https://github.com/meadmin-cn/meadmin-template/commit/655b6b26979fbb5118a4ba4f99692c1dd5d04974))
* vite版本升级到vite5 ([2ef5ed0](https://github.com/meadmin-cn/meadmin-template/commit/2ef5ed0ac0955c677dbdfa4f731ed7fb4f5c3b49))


### 样式更改[style]

* 忽略esclint错误规则 ([fb5b903](https://github.com/meadmin-cn/meadmin-template/commit/fb5b90362303cb08ba8c679855790b0b72e00e4e))


### 重构[refactor]

* 升级 vue、typescript、eslint 相关依赖版本 ([03374ff](https://github.com/meadmin-cn/meadmin-template/commit/03374ff9ad21e148608d2381323c295b87e7133b))

## [1.1.19](https://github.com/meadmin-cn/meadmin-template/compare/main-1.1.18...main-1.1.19) (2023-12-03)


Expand Down Expand Up @@ -972,4 +999,4 @@
* realease 发版分支修复 ([f7636ea](https://github.com/meadmin-cn/meadmin-template/commit/f7636eaa0d2c55a23d266c831a3dd74b4931fa79))
* release tag name 添加 ([7155a2a](https://github.com/meadmin-cn/meadmin-template/commit/7155a2a9f494cf613ffa23e45ed260d4bb24e862))
* release tag修复 ([209e1d9](https://github.com/meadmin-cn/meadmin-template/commit/209e1d97a8b525a903406d3aa9310684ff7ad02d))
* release配置修改 ([4bc22c3](https://github.com/meadmin-cn/meadmin-template/commit/4bc22c359da581cd6270dcbd04eb2fdc177a9e64))
* release配置修改 ([4bc22c3](https://github.com/meadmin-cn/meadmin-template/commit/4bc22c359da581cd6270dcbd04eb2fdc177a9e64))
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Me-admin template
## 简介
Me-admin template是一个免费开源的中后台模板,基于vue3、vite4、 pinia、 element-plus构建,开箱即用,本项目的开源协议为最宽松的MIT协议,使用无任何限制,本项目采用最新技术栈,可以作为项目的启动模版,以帮助你快速搭建企业级中后台,也是一个很好的学习项目。
**已升级vue3.3 + vite 4.3, vite4.3确实快了不少**
Me-admin template是一个免费开源的中后台模板,基于vue3、vite5、 pinia、 element-plus构建,开箱即用,本项目的开源协议为最宽松的MIT协议,使用无任何限制,本项目采用最新技术栈,可以作为项目的启动模版,以帮助你快速搭建企业级中后台,也是一个很好的学习项目。
**已升级vue3.3 + vite 5, vite5 确实快了不少**

开源不易,如果能帮到您,麻烦在[Github](https://github.com/meadmin-cn/meadmin-template)中点个star。

Expand Down Expand Up @@ -39,7 +39,7 @@ Me-admin template是一个免费开源的中后台模板,基于vue3、vite4、 p

## 快速开始

nodejs版本建议>=16.15.1
nodejs版本建议>=20.10.0

- clone 代码
```
Expand Down
4 changes: 2 additions & 2 deletions README_EN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Me-admin template
## Introduction
Me-admin template is a free open source admin template, built on VUE3, Vite4, Pinia, and Element-Plus, right out of the box.
Me-admin template is a free open source admin template, built on VUE3, Vite5, Pinia, and Element-Plus, right out of the box.

**English** | [中文](./README.md)

Expand Down Expand Up @@ -34,7 +34,7 @@ Me-admin template is a free open source admin template, built on VUE3, Vite4, Pi

## Install and use

nodejs version >= 16.15.1
nodejs version >= 20.10.0

- clone code
```
Expand Down
28 changes: 27 additions & 1 deletion TEMPLATE-CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@


## [1.1.20](https://github.com/meadmin-cn/meadmin-template/compare/template-1.1.19...template-1.1.20) (2024-01-13)


### 新功能[feat]

* 加上函数式组件调用支持(使用动态组件方式生成组件) ([3e18778](https://github.com/meadmin-cn/meadmin-template/commit/3e18778abc36d8f635e0b79eff5163d2ddfdb074))
* typescript升级到5.2.3,vue-tsc 省级到 1.8.24,vite升级到4.5.1 ([a9c3697](https://github.com/meadmin-cn/meadmin-template/commit/a9c3697b56b1a6d07efe7f34510c9ebed7adf647))


### 其他[chore]

* @vitejs/plugin-vue 版本升级 ([a21ac98](https://github.com/meadmin-cn/meadmin-template/commit/a21ac9832bacde5a37bfbc1de9b4da65f76f9a4b))
* 修改git hooks node版本 ([e7fe3bc](https://github.com/meadmin-cn/meadmin-template/commit/e7fe3bc95eb3e12acbb336ce6d77d13f1c06bdff))
* 优化prettierrc 的换行规则 ([4cd1ad4](https://github.com/meadmin-cn/meadmin-template/commit/4cd1ad4dbe887e8d2d29c3e2ad39624e49185223))
* vite版本升级到vite5 ([2ef5ed0](https://github.com/meadmin-cn/meadmin-template/commit/2ef5ed0ac0955c677dbdfa4f731ed7fb4f5c3b49))


### 样式更改[style]

* 忽略esclint错误规则 ([fb5b903](https://github.com/meadmin-cn/meadmin-template/commit/fb5b90362303cb08ba8c679855790b0b72e00e4e))


### 重构[refactor]

* 升级 vue、typescript、eslint 相关依赖版本 ([03374ff](https://github.com/meadmin-cn/meadmin-template/commit/03374ff9ad21e148608d2381323c295b87e7133b))

## [1.1.19](https://github.com/meadmin-cn/meadmin-template/compare/template-1.1.18...template-1.1.19) (2023-12-03)


Expand Down Expand Up @@ -705,4 +731,4 @@
* eslintrc 配置错误修复 ([a28bc4e](https://github.com/meadmin-cn/meadmin-template/commit/a28bc4e309aa35f63f1a21c0f666405326e3e5f7))
* git actions 错误修复 ([346b30e](https://github.com/meadmin-cn/meadmin-template/commit/346b30e28a5514bbfe79173576242f61ab37f511))
* vue keepAlive不支持清除无绑定输入框缓存,demo更新 ([64859ff](https://github.com/meadmin-cn/meadmin-template/commit/64859ff9c182b52f181e56b3ad807b88632ae134))
* vue route 不支持json格式化 ([52d1b36](https://github.com/meadmin-cn/meadmin-template/commit/52d1b36068b9167c0b828d07c67d16af67f242e7))
* vue route 不支持json格式化 ([52d1b36](https://github.com/meadmin-cn/meadmin-template/commit/52d1b36068b9167c0b828d07c67d16af67f242e7))
Loading

0 comments on commit c1c8689

Please sign in to comment.