Skip to content

Commit 9b26c98

Browse files
skyclouds2001skyclouds2001
authored
Merge pull request #1100 from skyclouds2001/dev
Release v1.5.0
2 parents d2275f8 + a756043 commit 9b26c98

12 files changed

+1604
-714
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md

+19-9
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,28 @@ A clear and concise description of what you expected to happen.
2323
**Screenshots**
2424
If applicable, add screenshots to help explain your problem.
2525

26-
**Desktop (please complete the following information):**
26+
**Platform (please select one option):**
2727

28-
- OS: [e.g. iOS]
29-
- Browser [e.g. chrome, safari]
30-
- Version [e.g. 22]
28+
- [ ] Desktop
29+
- [ ] Laptop
30+
- [ ] Smartphone
31+
- [ ] Tablet
32+
- [ ] Others: _Please type here_
3133

32-
**Smartphone (please complete the following information):**
34+
**OS (please select one option):**
3335

34-
- Device: [e.g. iPhone6]
35-
- OS: [e.g. iOS8.1]
36-
- Browser [e.g. stock browser, safari]
37-
- Version [e.g. 22]
36+
- [ ] Windows
37+
- [ ] macOS
38+
- [ ] Linux
39+
- [ ] Others: _Please type here_
40+
41+
**Browser (please select one option):**
42+
43+
- [ ] Chrome
44+
- [ ] Firefox
45+
- [ ] Safari
46+
- [ ] Edge
47+
- [ ] Others: _Please type here_
3848

3949
**Additional context**
4050
Add any other context about the problem here.

‎.github/labeler.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
system:
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- .changeset/**
5+
- .github/**
6+
- .husky/**
7+
- deploy/**
8+
- '*'
9+
- '!index.html'
10+
11+
source:
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- public/**
15+
- src/**
16+
- index.html
17+
18+
test:
19+
- changed-files:
20+
- any-glob-to-any-file:
21+
- tests/**

‎.github/workflows/ci.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ permissions:
1313
issues: none
1414
pull-requests: none
1515

16+
concurrency:
17+
group: ci-${{ github.workflow }}-${{ github.event.pull_request.number }}
18+
cancel-in-progress: true
19+
1620
jobs:
1721
lint:
1822
name: Run lint
@@ -21,7 +25,7 @@ jobs:
2125
runs-on: ubuntu-latest
2226
steps:
2327
- name: Checkout
24-
uses: actions/checkout@v4.1.7
28+
uses: actions/checkout@v4.2.0
2529
- name: Install pnpm
2630
uses: pnpm/[email protected]
2731
- name: Install Node.js
@@ -40,7 +44,7 @@ jobs:
4044
runs-on: ubuntu-latest
4145
steps:
4246
- name: Checkout
43-
uses: actions/checkout@v4.1.7
47+
uses: actions/checkout@v4.2.0
4448
- name: Install pnpm
4549
uses: pnpm/[email protected]
4650
- name: Install Node.js
@@ -51,7 +55,7 @@ jobs:
5155
- name: Install dependencies
5256
run: pnpm install --frozen-lockfile
5357
- name: Install playwright browsers
54-
run: pnpm dlx playwright install --with-deps
58+
run: pnpm exec playwright install --with-deps
5559
- name: Run tests
5660
run: pnpm test
5761
- name: Upload test report

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 60
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4.1.7
18+
- uses: actions/checkout@v4.2.0
1919
- uses: softprops/[email protected]
2020
with:
2121
body: |

‎README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
44
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com)
55
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
6+
[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
67
![NPM Type Definitions](https://img.shields.io/npm/types/chalk)
78
![Github Created At](https://img.shields.io/github/created-at/skyclouds2001/vite-vue-template-sky)
89
![GitHub last commit](https://img.shields.io/github/last-commit/skyclouds2001/vite-vue-template-sky)
@@ -41,10 +42,16 @@
4142
![jsDelivr hits (npm)](https://img.shields.io/jsdelivr/npm/hy/%40sky-fly%2Fvite-template)
4243
![GitHub contributors from allcontributors.org](https://img.shields.io/github/all-contributors/skyclouds2001/vite-vue-template-sky)
4344

44-
![Node Current](https://img.shields.io/node/v/%40sky-fly%2Fvite-template)
4545
[![ci](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/ci.yml/badge.svg)](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/ci.yml)
46+
[![CodeQL](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/github-code-scanning/codeql)
47+
[![Dependabot Updates](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/dependabot/dependabot-updates/badge.svg)](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/dependabot/dependabot-updates)
4648
[![labeler](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/labeler.yml/badge.svg)](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/labeler.yml)
49+
[![new contributor](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/new-contributor.yml/badge.svg)](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/new-contributor.yml)
50+
[![project automate](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/project-automate.yml/badge.svg)](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/project-automate.yml)
51+
[![release](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/release.yml/badge.svg)](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/release.yml)
4752
[![stale](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/stale.yml/badge.svg)](https://github.com/skyclouds2001/vite-vue-template-sky/actions/workflows/stale.yml)
53+
54+
![Node Current](https://img.shields.io/node/v/%40sky-fly%2Fvite-template)
4855
[![wakatime](https://wakatime.com/badge/user/bfadeccb-56c3-4aa2-abb0-89cf5f9b89be/project/f55cfd82-5efd-4c1a-b798-fac0f65900f7.svg)](https://wakatime.com/badge/user/bfadeccb-56c3-4aa2-abb0-89cf5f9b89be/project/f55cfd82-5efd-4c1a-b798-fac0f65900f7)
4956

5057
An opinionated vite starter template for Vue.

‎eslint.config.js

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import js from '@eslint/js'
22
import globals from 'globals'
3-
// import standard from 'eslint-config-standard'
4-
import prettier from 'eslint-config-prettier'
3+
import standardConfig from 'eslint-config-standard'
4+
import prettierConfig from 'eslint-config-prettier'
55
import vueParser from 'vue-eslint-parser'
66
import vuePlugin from 'eslint-plugin-vue'
77
import nodePlugin from 'eslint-plugin-n'
88
import promisePlugin from 'eslint-plugin-promise'
9-
// import importPlugin from 'eslint-plugin-import'
9+
import importPlugin from 'eslint-plugin-import'
1010
import jsdocPlugin from 'eslint-plugin-jsdoc'
1111
import jsxA11yPlugin from 'eslint-plugin-jsx-a11y'
1212
import vitestPlugin from 'eslint-plugin-vitest'
13-
// import playwrightPlugin from 'eslint-plugin-playwright'
13+
import playwrightPlugin from 'eslint-plugin-playwright'
1414
// import testingLibraryPlugin from 'eslint-plugin-testing-library'
1515
import typescript from 'typescript-eslint'
1616

@@ -21,11 +21,10 @@ export default [
2121
...vuePlugin.configs['flat/recommended'],
2222
nodePlugin.configs['flat/recommended'],
2323
promisePlugin.configs['flat/recommended'],
24-
// importPlugin.flatConfigs.recommended,
25-
// importPlugin.flatConfigs.typescript,
24+
importPlugin.flatConfigs.recommended,
25+
importPlugin.flatConfigs.typescript,
2626
jsdocPlugin.configs['flat/recommended-typescript'],
2727
jsxA11yPlugin.flatConfigs.recommended,
28-
prettier,
2928
{
3029
name: 'custom',
3130
files: ['**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx,vue}'],
@@ -63,7 +62,7 @@ export default [
6362
},
6463
plugins: {},
6564
rules: {
66-
// ...standard.rules,
65+
...standardConfig.rules,
6766
'n/no-missing-import': 'off',
6867
'n/no-missing-require': 'off',
6968
},
@@ -101,6 +100,11 @@ export default [
101100
{
102101
name: 'custom-test-e2e',
103102
files: ['**/tests/e2e/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}'],
104-
// ...playwrightPlugin.configs.recommended,
103+
...playwrightPlugin.configs['flat/recommended'],
105104
},
105+
{
106+
name: 'custom-ignore',
107+
ignores: ['node_modules/**', 'dist/**', '.{idea,fleet,vscode,git}/**', '*.config.*'],
108+
},
109+
prettierConfig,
106110
]

‎index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<head>
44
<meta charset="UTF-8" />
55
<meta name="application-name" content="vite-vue-template-sky" />
6-
<meta name="author" content="skyclouds2001@gmail.com" />
6+
<meta name="author" content="skyclouds2001@163.com" />
77
<meta name="description" content="an opinionated vite starter template for vue" />
88
<meta name="generator" content="vite" />
9-
<meta name="keywords" content="template,skyclouds2001,vite,vue" />
9+
<meta name="keywords" content="template,vite,vue,typescript" />
1010
<meta name="referrer" content="no-referrer" />
1111
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white" />
1212
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="black" />
1313
<meta name="color-schema" content="normal" />
1414
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover, user-scalable=yes" />
15-
<meta name="creator" content="skyclouds2001@gmail.com" />
15+
<meta name="creator" content="skyclouds2001@163.com" />
1616
<meta name="googlebot" content="index,follow" />
17-
<meta name="publisher" content="skyclouds2001@gmail.com" />
17+
<meta name="publisher" content="skyclouds2001@163.com" />
1818
<meta name="robots" content="index,follow" />
1919
<meta name="renderer" content="webkit" />
2020
<meta name="force-rendering" content="webkit" />

‎package.json

+21-39
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
11
{
22
"name": "vite-vue-template-sky",
33
"private": true,
4-
"version": "1.4.0",
4+
"version": "1.5.0",
55
"description": "an opinionated vite starter template for vue",
66
"keywords": [
77
"template",
8-
"project",
98
"vite",
109
"vue",
11-
"typescript",
12-
"vue router",
13-
"pinia",
14-
"element plus",
15-
"tailwindcss",
16-
"iconify",
17-
"pnpm",
18-
"eslint",
19-
"prettier",
20-
"stylelint",
21-
"commitlint",
22-
"markdownlint",
23-
"lint-staged",
24-
"husky",
25-
"vitest",
26-
"playwright",
27-
"commitizen",
28-
"changeset"
10+
"typescript"
2911
],
3012
"repository": {
3113
"type": "git",
@@ -47,12 +29,12 @@
4729
],
4830
"main": "src/main.ts",
4931
"type": "module",
50-
"packageManager": "pnpm@9.10.0",
32+
"packageManager": "pnpm@9.11.0",
5133
"engines": {
52-
"node": ">=18.13.0",
53-
"npm": ">=9.6.0",
34+
"node": ">=20.0.0",
35+
"npm": ">=10.0.0",
5436
"yarn": ">=1.22.0",
55-
"pnpm": ">=8.4.0"
37+
"pnpm": ">=8.11.0"
5638
},
5739
"scripts": {
5840
"dev": "cross-env NODE_ENV=development vite",
@@ -80,18 +62,18 @@
8062
"dayjs": "^1.11.13",
8163
"element-plus": "^2.8.4",
8264
"lodash-es": "^4.17.21",
83-
"pinia": "^2.2.2",
84-
"vue": "^3.5.10",
85-
"vue-i18n": "^10.0.3",
65+
"pinia": "^2.2.4",
66+
"vue": "^3.5.11",
67+
"vue-i18n": "^10.0.4",
8668
"vue-router": "^4.4.5"
8769
},
8870
"devDependencies": {
8971
"@changesets/changelog-github": "^0.5.0",
90-
"@changesets/cli": "^2.27.8",
72+
"@changesets/cli": "^2.27.9",
9173
"@commitlint/cli": "^19.5.0",
9274
"@commitlint/config-conventional": "^19.5.0",
9375
"@commitlint/types": "^19.5.0",
94-
"@eslint/js": "^9.11.1",
76+
"@eslint/js": "^9.12.0",
9577
"@iconify/vue": "^4.1.2",
9678
"@intlify/unplugin-vue-i18n": "^5.2.0",
9779
"@playwright/test": "^1.47.2",
@@ -107,37 +89,37 @@
10789
"@vitejs/plugin-legacy": "^5.4.2",
10890
"@vitejs/plugin-vue": "^5.1.4",
10991
"@vitejs/plugin-vue-jsx": "^4.0.1",
110-
"@vitest/coverage-v8": "^2.1.1",
111-
"@vitest/ui": "^2.1.1",
92+
"@vitest/coverage-v8": "^2.1.2",
93+
"@vitest/ui": "^2.1.2",
11294
"commitizen": "^4.3.1",
11395
"cross-env": "^7.0.3",
11496
"cssnano": "^7.0.6",
11597
"cz-conventional-changelog": "^3.3.0",
116-
"eslint": "^9.11.1",
98+
"eslint": "^9.12.0",
11799
"eslint-config-prettier": "^9.1.0",
118100
"eslint-config-standard": "^17.1.0",
119101
"eslint-import-resolver-typescript": "^3.6.3",
120-
"eslint-plugin-import": "^2.30.0",
121-
"eslint-plugin-jsdoc": "^50.3.0",
102+
"eslint-plugin-import": "^2.31.0",
103+
"eslint-plugin-jsdoc": "^50.3.1",
122104
"eslint-plugin-jsx-a11y": "^6.10.0",
123105
"eslint-plugin-n": "^17.10.3",
124106
"eslint-plugin-playwright": "^1.6.2",
125107
"eslint-plugin-promise": "^7.1.0",
126108
"eslint-plugin-testing-library": "^6.3.0",
127109
"eslint-plugin-vitest": "^0.5.4",
128110
"eslint-plugin-vue": "^9.28.0",
129-
"globals": "^15.9.0",
111+
"globals": "^15.10.0",
130112
"husky": "^9.1.6",
131113
"is-ci": "^3.0.1",
132114
"jsdom": "^25.0.1",
133115
"lint-staged": "^15.2.10",
134116
"markdownlint": "^0.35.0",
135117
"markdownlint-cli": "^0.42.0",
136118
"only-allow": "^1.2.1",
137-
"pnpm": "9.11.0",
119+
"pnpm": "9.12.0",
138120
"postcss-import": "^16.1.0",
139121
"postcss-load-config": "^6.0.1",
140-
"postcss-preset-env": "^10.0.5",
122+
"postcss-preset-env": "^10.0.6",
141123
"prettier": "^3.3.3",
142124
"prettier-plugin-tailwindcss": "^0.6.8",
143125
"rimraf": "^6.0.1",
@@ -148,12 +130,12 @@
148130
"stylelint-config-standard-vue": "^1.0.0",
149131
"tailwindcss": "^3.4.13",
150132
"typescript": "^5.6.2",
151-
"typescript-eslint": "^8.7.0",
133+
"typescript-eslint": "^8.8.0",
152134
"unplugin-element-plus": "^0.8.0",
153135
"vite": "^5.4.8",
154136
"vite-plugin-checker": "^0.8.0",
155137
"vite-plugin-pwa": "^0.20.5",
156-
"vitest": "^2.1.1",
138+
"vitest": "^2.1.2",
157139
"vue-eslint-parser": "^9.4.3",
158140
"vue-tsc": "^2.1.6"
159141
}

‎playwright.config.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ export default defineConfig({
77
timeout: 5 * 1000,
88
},
99
fullyParallel: true,
10-
forbidOnly: process.env.CI != null,
11-
retries: process.env.CI != null ? 2 : undefined,
12-
workers: process.env.CI != null ? 1 : undefined,
10+
forbidOnly: !!process.env.CI,
11+
retries: process.env.CI ? 2 : 0,
12+
workers: process.env.CI ? 1 : undefined,
1313
reporter: 'html',
1414
use: {
15-
actionTimeout: 0,
1615
baseURL: 'http://localhost:5173',
1716
trace: 'on-first-retry',
1817
},

0 commit comments

Comments
 (0)