Skip to content

Commit

Permalink
Merge branch 'main' into release/v1
Browse files Browse the repository at this point in the history
  • Loading branch information
wenqing committed Jan 3, 2024
2 parents a07488b + 466f029 commit aada4f0
Show file tree
Hide file tree
Showing 5 changed files with 920 additions and 790 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
# Changelog


## v2.0.0

[compare changes](https://github.com/yisibell/vue3-admin-starter/compare/v1.6.0...v2.0.0)

### 🚀 Enhancements

- ⚠️ Update vite to v5 and other deps ([c59045f](https://github.com/yisibell/vue3-admin-starter/commit/c59045f))

#### ⚠️ Breaking Changes

- ⚠️ Update vite to v5 and other deps ([c59045f](https://github.com/yisibell/vue3-admin-starter/commit/c59045f))

### ❤️ Contributors

- Wenqing <wenqing@kerrylan.com>

## v1.6.0

[compare changes](https://github.com/yisibell/vue3-admin-starter/compare/v1.5.2...v1.6.0)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

A vue admin template powered by pnpm + vite + typescript + vue3 + vue-router + pinia + element-plus + axios.

- [Release Notes](./CHANGELOG.md).

# Features

| Development status | Description |
Expand Down Expand Up @@ -29,7 +31,7 @@ A vue admin template powered by pnpm + vite + typescript + vue3 + vue-router + p
- :heavy_check_mark: Styling via **sass**.
- :heavy_check_mark: Using **pinia** for state management.
- :heavy_check_mark: Using **element-plus** ui component libary.
- :heavy_check_mark: **Vue3** + **Vite4**.
- :heavy_check_mark: **Vue3** + **Vite5**.
- :heavy_check_mark: **axios** for http request.
- :heavy_check_mark: **vue-i18n** for internationalization.
- :heavy_check_mark: **vite-plugin-svg4vue** for SVG icons management.
Expand Down Expand Up @@ -66,8 +68,6 @@ $ pnpm build:prod
$ pnpm preview
```

# CHANGE LOG

see [CHANGE LOG](./CHANGELOG.md).


40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue3-admin-starter",
"version": "1.6.0",
"version": "2.0.0",
"description": "A vue admin template powered by vite + typescript + vue3 + vue-router + pinia + element-plus + axios.",
"author": {
"name": "elenh",
Expand Down Expand Up @@ -37,51 +37,51 @@
"release": "changelogen --release && git push --follow-tags"
},
"dependencies": {
"@element-plus/icons-vue": "^2.1.0",
"@element-plus/icons-vue": "^2.3.1",
"@logicflow/core": "^1.2.12",
"@logicflow/extension": "^1.2.13",
"axios": "^1.5.0",
"element-plus": "^2.3.12",
"element-plus": "^2.4.4",
"path-to-regexp": "^6.2.1",
"pathe": "^1.1.1",
"pinia": "^2.1.6",
"pinia-plugin-persistedstate": "^3.2.0",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
"qs": "^6.11.2",
"toolkitcss": "^1.1.1",
"trickling": "^1.12.0",
"vue": "^3.3.4",
"toolkitcss": "^2.1.1",
"trickling": "^1.13.1",
"vue": "^3.3.13",
"vue-i18n": "^9.2.2",
"vue-router": "^4.2.4"
},
"devDependencies": {
"@iconify-json/fa": "^1.1.5",
"@iconify-json/fa": "^1.1.8",
"@rushstack/eslint-patch": "^1.3.3",
"@tsconfig/node18": "^18.2.1",
"@types/jsdom": "^21.1.2",
"@types/node": "^18.17.12",
"@types/qs": "^6.9.7",
"@vitejs/plugin-vue": "^4.3.4",
"@vitejs/plugin-vue": "^4.5.2",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^11.0.3",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/test-utils": "^2.4.1",
"@vue/tsconfig": "^0.4.0",
"changelogen": "^0.5.5",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.48.0",
"eslint-plugin-vue": "^9.17.0",
"eslint-plugin-vue": "^9.19.2",
"jsdom": "^21.1.2",
"npm-run-all": "^4.1.5",
"prettier": "^3.0.3",
"sass": "^1.66.1",
"typescript": "~5.2.2",
"unplugin-auto-import": "^0.16.6",
"typescript": "~5.3.3",
"unplugin-auto-import": "^0.17.2",
"unplugin-element-plus": "^0.8.0",
"unplugin-icons": "^0.16.6",
"unplugin-vue-components": "^0.25.1",
"vite": "^4.4.9",
"vite-plugin-svg4vue": "^2.16.0",
"vitest": "^0.29.8",
"vue-tsc": "^1.8.8"
"unplugin-icons": "^0.18.1",
"unplugin-vue-components": "^0.26.0",
"vite": "^5.0.10",
"vite-plugin-svg4vue": "^3.1.0",
"vitest": "^1.1.0",
"vue-tsc": "^1.8.25"
},
"engines": {
"node": ">=18"
Expand Down
Loading

0 comments on commit aada4f0

Please sign in to comment.