diff --git a/.env b/.env
index 562258a..d9f3a78 100644
--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@ VITE_PORT = 8848
# title
VITE_TITLE = vue-pure-admin
# version
-VITE_VERSION = 2.1.0
+VITE_VERSION = 2.6.0
# open
VITE_OPEN = false
diff --git a/.env.development b/.env.development
index 562258a..d9f3a78 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,7 @@ VITE_PORT = 8848
# title
VITE_TITLE = vue-pure-admin
# version
-VITE_VERSION = 2.1.0
+VITE_VERSION = 2.6.0
# open
VITE_OPEN = false
diff --git a/.gitignore b/.gitignore
index 139565d..653107a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,10 @@ dist-ssr
*.local
.eslintcache
+yarn.lock
npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+.pnpm-error.log*
+.pnpm-debug.log
tests/**/coverage/
# Editor directories and files
@@ -15,4 +16,4 @@ tests/**/coverage/
*.suo
*.ntvs*
*.njsproj
-*.sln
\ No newline at end of file
+*.sln
diff --git a/.husky/common.sh b/.husky/common.sh
index 9d5129b..5f0540b 100644
--- a/.husky/common.sh
+++ b/.husky/common.sh
@@ -3,7 +3,7 @@ command_exists () {
command -v "$1" >/dev/null 2>&1
}
-# Workaround for Windows 10, Git Bash and Yarn
+# Workaround for Windows 10, Git Bash and Pnpm
if command_exists winpty && test -t 1; then
exec < /dev/tty
fi
diff --git a/.husky/lintstagedrc.js b/.husky/lintstagedrc.js
index 3fafdff..b7be4a7 100644
--- a/.husky/lintstagedrc.js
+++ b/.husky/lintstagedrc.js
@@ -1,10 +1,10 @@
module.exports = {
- "*.{js,jsx,ts,tsx}": ["eslint --fix", "prettier --write"],
- "{!(package)*.json,*.code-snippets,.!(browserslist)*rc}": [
- "prettier --write--parser json"
- ],
- "package.json": ["prettier --write"],
- "*.vue": ["eslint --fix", "prettier --write", "stylelint --fix"],
- "*.{vue,css,scss,postcss,less}": ["stylelint --fix", "prettier --write"],
- "*.md": ["prettier --write"]
+ // "*.{js,jsx,ts,tsx}": ["eslint --fix", "prettier --write"],
+ // "{!(package)*.json,*.code-snippets,.!(browserslist)*rc}": [
+ // "prettier --write--parser json"
+ // ],
+ // "package.json": ["prettier --write"],
+ "*.vue": ["eslint --fix", "prettier --write", "stylelint --fix"]
+ // "*.{vue,css,scss,postcss,less}": ["stylelint --fix", "prettier --write"],
+ // "*.md": ["prettier --write"]
};
diff --git a/.markdownlint.json b/.markdownlint.json
new file mode 100644
index 0000000..d628d44
--- /dev/null
+++ b/.markdownlint.json
@@ -0,0 +1,11 @@
+{
+ "default": true,
+ "MD003": false,
+ "MD033": false,
+ "MD013": false,
+ "MD001": false,
+ "MD025": false,
+ "MD024": false,
+ "MD007": { "indent": 4 },
+ "no-hard-tabs": false
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..73b2b9a
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,49 @@
+{
+ // You should install these plugins:
+ // ESLint
+ // Prettier - Code formatter
+ // stylelint
+ // vscode-icons
+ // TypeScript Vue Plugin (Volar)
+ // Vue Language Features (Volar)
+ "terminal.integrated.rendererType": "dom",
+ "editor.formatOnType": true,
+ "editor.formatOnSave": true,
+ "javascript.updateImportsOnFileMove.enabled": "always",
+ "[vue]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[javascript]": {
+ "editor.defaultFormatter": "vscode.typescript-language-features"
+ },
+ "editor.tabSize": 2,
+ "editor.formatOnPaste": true,
+ "files.autoSave": "afterDelay",
+ "git.confirmSync": false,
+ "workbench.startupEditor": "newUntitledFile",
+ "editor.suggestSelection": "first",
+ "editor.acceptSuggestionOnCommitCharacter": false,
+ "css.lint.propertyIgnoredDueToDisplay": "ignore",
+ // Prevent inline styles from being automatically formatted to all lowercase
+ "editor.quickSuggestions": {
+ "other": true,
+ "comments": true,
+ "strings": true
+ },
+ // Automatically fix some syntax errors of ts
+ "tslint.autoFixOnSave": true,
+ "files.associations": {
+ // Specifies the location of snippets in the suggestion widget
+ "editor.snippetSuggestions": "top"
+ },
+ "[css]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "cSpell.userWords": ["sourcemap", "vite"],
+ "editor.codeActionsOnSave": {
+ "source.fixAll.eslint": true
+ },
+ "volar.tsPlugin": true,
+ "typescript.tsdk": "node_modules/typescript/lib",
+ "i18n-ally.localesPaths": ["src/plugins/i18n"]
+}
diff --git a/.vscode/vue3.0.code-snippets b/.vscode/vue3.0.code-snippets
new file mode 100644
index 0000000..fdab05b
--- /dev/null
+++ b/.vscode/vue3.0.code-snippets
@@ -0,0 +1,22 @@
+{
+ "Vue3.0快速生成模板": {
+ "prefix": "Vue3.0",
+ "body": [
+ "",
+ "\t
Pure-Admin
+