Skip to content

Commit 2073f4b

Browse files
Merge pull request #1094 from skyclouds2001/dev
Release v1.3.0
2 parents 1d4dd01 + a59f746 commit 2073f4b

19 files changed

+274
-256
lines changed

.all-contributorsrc

+2-13
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"projectOwner": "skyclouds2001",
44
"repoType": "github",
55
"repoHost": "https://github.com",
6-
"files": [
7-
"README.md"
8-
],
6+
"files": ["README.md"],
97
"imageSize": 100,
108
"commit": false,
119
"commitConvention": "angular",
@@ -19,16 +17,7 @@
1917
"name": "skyclouds2001",
2018
"avatar_url": "https://avatars.githubusercontent.com/u/95597335?v=4",
2119
"profile": "https://github.com/skyclouds2001",
22-
"contributions": [
23-
"code",
24-
"design",
25-
"doc",
26-
"ideas",
27-
"infra",
28-
"maintenance",
29-
"review",
30-
"test"
31-
]
20+
"contributions": ["code", "design", "doc", "ideas", "infra", "maintenance", "review", "test"]
3221
}
3322
]
3423
}

.eslintrc.cjs

-64
This file was deleted.

.github/workflows/labeler.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Label for PR content
2020
uses: actions/labeler@v5
2121
with:
22-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
22+
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
labeler-size:
2424
if: github.repository == 'skyclouds2001/vite-vue-template-sky'
2525
timeout-minutes: 60
@@ -41,7 +41,7 @@ jobs:
4141
xl_label: size/xl
4242
fail_if_xl: false
4343
message_if_xl: ''
44-
files_to_ignore: 'package-lock.json *.lock'
44+
files_to_ignore: 'package-lock.json yarn.lock pnpm-lock.yaml'
4545
label-rebase-needed:
4646
if: github.repository == 'skyclouds2001/vite-vue-template-sky'
4747
timeout-minutes: 60
@@ -51,6 +51,6 @@ jobs:
5151
uses: eps1lon/actions-label-merge-conflict@v3
5252
with:
5353
dirtyLabel: merge conflicts
54-
repoToken: "${{ secrets.GITHUB_TOKEN }}"
55-
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
56-
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
54+
repoToken: ${{ secrets.GITHUB_TOKEN }}
55+
commentOnDirty: 'This pull request has conflicts, please resolve those before we can evaluate the pull request.'
56+
commentOnClean: 'Conflicts have been resolved. A maintainer will review the pull request shortly.'

.husky/commit-msg

-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/usr/bin/env sh
2-
. "$(dirname -- "$0")/_/husky.sh"
3-
41
npx --no -- commitlint --edit ${1}

.husky/pre-commit

-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/usr/bin/env sh
2-
. "$(dirname -- "$0")/_/husky.sh"
3-
41
npx lint-staged

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

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)
5+
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
56
![NPM Type Definitions](https://img.shields.io/npm/types/chalk)
67
![Github Created At](https://img.shields.io/github/created-at/skyclouds2001/vite-vue-template-sky)
78
![GitHub last commit](https://img.shields.io/github/last-commit/skyclouds2001/vite-vue-template-sky)

commitlint.config.js

-3
This file was deleted.

commitlint.config.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import type { UserConfig } from '@commitlint/types'
2+
3+
export default {
4+
extends: ['@commitlint/config-conventional'],
5+
} satisfies UserConfig

eslint.config.js

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
import js from '@eslint/js'
2+
import globals from 'globals'
3+
// import standard from 'eslint-config-standard'
4+
import prettier from 'eslint-config-prettier'
5+
import vueParser from 'vue-eslint-parser'
6+
import vuePlugin from 'eslint-plugin-vue'
7+
import nodePlugin from 'eslint-plugin-n'
8+
import promisePlugin from 'eslint-plugin-promise'
9+
// import importPlugin from 'eslint-plugin-import'
10+
import jsdocPlugin from 'eslint-plugin-jsdoc'
11+
import jsxA11yPlugin from 'eslint-plugin-jsx-a11y'
12+
import vitestPlugin from 'eslint-plugin-vitest'
13+
// import playwrightPlugin from 'eslint-plugin-playwright'
14+
// import testingLibraryPlugin from 'eslint-plugin-testing-library'
15+
import typescript from 'typescript-eslint'
16+
17+
export default [
18+
js.configs.recommended,
19+
...typescript.configs.recommended,
20+
...typescript.configs.stylistic,
21+
...vuePlugin.configs['flat/recommended'],
22+
nodePlugin.configs['flat/recommended'],
23+
promisePlugin.configs['flat/recommended'],
24+
// importPlugin.flatConfigs.recommended,
25+
// importPlugin.flatConfigs.typescript,
26+
jsdocPlugin.configs['flat/recommended-typescript'],
27+
jsxA11yPlugin.flatConfigs.recommended,
28+
prettier,
29+
{
30+
name: 'custom',
31+
files: ['**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx,vue}'],
32+
ignores: [],
33+
languageOptions: {
34+
ecmaVersion: 'latest',
35+
sourceType: 'module',
36+
globals: {
37+
...globals.es2025,
38+
...globals.browser,
39+
...globals.worker,
40+
...globals.serviceworker,
41+
...globals.node,
42+
...globals.commonjs,
43+
},
44+
parser: vueParser,
45+
parserOptions: {
46+
parser: typescript.parser,
47+
ecmaFeatures: {
48+
globalReturn: false,
49+
impliedStrict: true,
50+
jsx: true,
51+
},
52+
vueFeatures: {
53+
filter: false,
54+
interpolationAsNonHTML: true,
55+
styleCSSVariableInjection: true,
56+
customMacros: [],
57+
},
58+
},
59+
},
60+
linterOptions: {
61+
noInlineConfig: false,
62+
reportUnusedDisableDirectives: 'warn',
63+
},
64+
plugins: {},
65+
rules: {
66+
// ...standard.rules,
67+
'n/no-missing-import': 'off',
68+
'n/no-missing-require': 'off',
69+
},
70+
settings: {
71+
'import/resolver': {
72+
typescript: {
73+
alwaysTryTypes: true,
74+
directory: 'tsconfig.json',
75+
},
76+
node: true,
77+
},
78+
},
79+
},
80+
{
81+
name: 'custom-test-unit',
82+
files: ['**/tests/unit/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}'],
83+
settings: {
84+
vitest: {
85+
typecheck: true,
86+
},
87+
},
88+
...vitestPlugin.configs.recommended,
89+
},
90+
{
91+
name: 'custom-test-component',
92+
files: ['**/tests/components/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}'],
93+
settings: {
94+
vitest: {
95+
typecheck: true,
96+
},
97+
},
98+
...vitestPlugin.configs.recommended,
99+
// ...testingLibraryPlugin.configs['flat/vue'],
100+
},
101+
{
102+
name: 'custom-test-e2e',
103+
files: ['**/tests/e2e/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}'],
104+
// ...playwrightPlugin.configs.recommended,
105+
},
106+
]

package.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vite-vue-template-sky",
33
"private": true,
4-
"version": "1.2.0",
4+
"version": "1.3.0",
55
"description": "an opinionated vite starter template for vue",
66
"keywords": [
77
"template",
@@ -47,7 +47,7 @@
4747
],
4848
"main": "src/main.ts",
4949
"type": "module",
50-
"packageManager": "pnpm@9.5.0",
50+
"packageManager": "pnpm@9.9.0",
5151
"engines": {
5252
"node": ">=18.13.0",
5353
"npm": ">=9.6.0",
@@ -61,7 +61,7 @@
6161
"lint": "pnpm lint:eslint && pnpm lint:prettier && pnpm lint:stylelint && pnpm lint:markdownlint && pnpm lint:type",
6262
"lint:eslint": "eslint --fix .",
6363
"lint:prettier": "prettier --write .",
64-
"lint:stylelint": "stylelint --fix",
64+
"lint:stylelint": "stylelint --fix \"**/*.{vue,css}\"",
6565
"lint:markdownlint": "markdownlint --fix **/*.md",
6666
"lint:type": "vue-tsc --noEmit",
6767
"test": "pnpm test:unit && pnpm test:e2e",
@@ -89,6 +89,8 @@
8989
"@changesets/cli": "^2.27.7",
9090
"@commitlint/cli": "^19.4.1",
9191
"@commitlint/config-conventional": "^19.4.1",
92+
"@commitlint/types": "^19.0.3",
93+
"@eslint/js": "^9.9.1",
9294
"@iconify/vue": "^4.1.2",
9395
"@playwright/test": "^1.46.1",
9496
"@tailwindcss/aspect-ratio": "^0.4.2",
@@ -97,10 +99,7 @@
9799
"@tailwindcss/typography": "^0.5.15",
98100
"@testing-library/vue": "^8.1.0",
99101
"@types/lodash-es": "^4.17.12",
100-
"@types/mockjs": "^1.0.10",
101102
"@types/node": "^22.5.2",
102-
"@typescript-eslint/eslint-plugin": "^8.3.0",
103-
"@typescript-eslint/parser": "^8.3.0",
104103
"@vitejs/plugin-legacy": "^5.4.2",
105104
"@vitejs/plugin-vue": "^5.1.3",
106105
"@vitejs/plugin-vue-jsx": "^4.0.1",
@@ -114,7 +113,7 @@
114113
"eslint-config-prettier": "^9.1.0",
115114
"eslint-config-standard": "^17.1.0",
116115
"eslint-import-resolver-typescript": "^3.6.3",
117-
"eslint-plugin-import": "^2.29.1",
116+
"eslint-plugin-import": "^2.30.0",
118117
"eslint-plugin-jsdoc": "^50.2.2",
119118
"eslint-plugin-jsx-a11y": "^6.9.0",
120119
"eslint-plugin-n": "^17.10.2",
@@ -123,6 +122,7 @@
123122
"eslint-plugin-testing-library": "^6.3.0",
124123
"eslint-plugin-vitest": "^0.5.4",
125124
"eslint-plugin-vue": "^9.27.0",
125+
"globals": "^15.9.0",
126126
"husky": "^9.1.5",
127127
"is-ci": "^3.0.1",
128128
"jsdom": "^25.0.0",
@@ -134,7 +134,6 @@
134134
"postcss-import": "^16.1.0",
135135
"postcss-load-config": "^6.0.1",
136136
"postcss-preset-env": "^10.0.2",
137-
"postcss-url": "^10.1.3",
138137
"prettier": "^3.3.3",
139138
"prettier-plugin-tailwindcss": "^0.6.6",
140139
"rimraf": "^6.0.1",
@@ -145,11 +144,13 @@
145144
"stylelint-config-standard-vue": "^1.0.0",
146145
"tailwindcss": "^3.4.10",
147146
"typescript": "^5.5.4",
147+
"typescript-eslint": "^8.4.0",
148148
"unplugin-element-plus": "^0.8.0",
149149
"vite": "^5.4.2",
150150
"vite-plugin-checker": "^0.7.2",
151151
"vite-plugin-pwa": "^0.20.2",
152152
"vitest": "^2.0.5",
153+
"vue-eslint-parser": "^9.4.3",
153154
"vue-tsc": "^2.1.4"
154155
}
155156
}

0 commit comments

Comments
 (0)