Merge pull request #470 from skyclouds2001/dev

Dev
skyclouds2001 · Mar 26, 2024 · f5ad9b7 · f5ad9b7
2 parents 0516cae + 613d19d
commit f5ad9b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
         with:
           version: 8.10.0
       - uses: actions/setup-node@v4
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
         with:
           version: 8.10.0
       - uses: actions/setup-node@v4

diff --git a/lint-staged.config.js b/lint-staged.config.js
@@ -1,4 +1,4 @@
 module.exports = {
-  '*.{js,jsx,ts,tsx,vue}': ['eslint --fix'],
-  '*.{js,jsx,ts,tsx,vue,html,json,md,css,scss}': ['prettier --write'],
+  '*.{js,jsx,ts,tsx}': ['eslint --fix'],
+  '*.{js,jsx,ts,tsx,html,json,md,css}': ['prettier --write'],
 }
diff --git a/vite-react-template-sky b/vite-react-template-sky
diff --git a/vite-vue-template-sky b/vite-vue-template-sky
+1 −1		.eslintrc.cjs
+32 −8		.github/dependabot.yml
+32 −23		.github/workflows/ci.yml
+1 −6		.stylelintrc.js
+4 −4		README.md
+6 −1		index.html
+2 −2		lint-staged.config.js
+22 −25		package.json
+3 −3		playwright.config.ts
+1,204 −1,636		pnpm-lock.yaml
+8 −2		postcss.config.js
+0 −0		src/views/home/index.module.css
+1 −1		src/views/home/index.tsx
+1 −1		tailwind.config.ts
+1 −1		tests/e2e/index.spec.ts
+14 −1		vercel.json
+3 −3		vite.config.ts
+5 −2		vitest.config.ts