Skip to content

Commit

Permalink
Merge pull request #109 from suyuan32/dev
Browse files Browse the repository at this point in the history
fix: optimize eslint and upgrade deps
  • Loading branch information
suyuan32 authored Sep 14, 2023
2 parents 9c2a18c + 41ac38f commit ae19613
Show file tree
Hide file tree
Showing 31 changed files with 1,002 additions and 1,505 deletions.
36 changes: 17 additions & 19 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: ESLint

on:
push:
branches: ["master", "dev"]
branches: ['master', 'dev']
pull_request:
branches: ["master", "dev"]
branches: ['master', 'dev']
schedule:
- cron: '28 1 * * * 0'
- cron: '0 0 * * Mon'

jobs:
eslint:
Expand All @@ -21,24 +21,22 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Install pnpm
run: npm install -g pnpm

- name: Install ESLint
run: |
pnpm install eslint@8.10.0
pnpm install @microsoft/eslint-formatter-sarif@2.1.7
npm install -g eslint
npm install -g @microsoft/eslint-formatter-sarif
- name: Install dependencies
run: pnpm install

- name: Run ESLint
run: |
pnpx eslint .
--config .eslintrc.js
--ext .js,.jsx,.ts,.tsx
--format @microsoft/eslint-formatter-sarif
--output-file eslint-results.sarif
continue-on-error: true

- name: Upload analysis results to GitHub
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: eslint-results.sarif

- name: Wait for processing
run: echo "Waiting for analysis results to be processed..."
pnpm lint
10 changes: 5 additions & 5 deletions apps/test-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@
},
"dependencies": {
"fs-extra": "^11.1.1",
"koa": "^2.14.1",
"koa": "^2.14.2",
"koa-body": "^6.0.1",
"koa-bodyparser": "^4.4.0",
"koa-bodyparser": "^4.4.1",
"koa-route": "^3.2.0",
"koa-router": "^12.0.0",
"koa-static": "^5.0.0",
"koa-websocket": "^7.0.0",
"koa2-cors": "^2.0.6"
},
"devDependencies": {
"@types/koa": "^2.13.6",
"@types/koa": "^2.13.8",
"@types/koa-bodyparser": "^5.0.2",
"@types/koa-router": "^7.4.4",
"@types/node": "^18.15.11",
"@types/node": "^18.17.15",
"nodemon": "^2.0.22",
"pm2": "^5.3.0",
"rimraf": "^4.4.1",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"tsup": "^6.7.0",
"typescript": "^5.0.3"
"typescript": "^5.2.2"
}
}
2 changes: 1 addition & 1 deletion internal/eslint-config/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
root: true,
extends: ['@vben/eslint-config/strict'],
extends: ['prettier'],
};
2 changes: 1 addition & 1 deletion internal/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"eslint": "^8.48.0",
"eslint": "^8.49.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-prettier": "^4.2.1",
Expand Down
2 changes: 1 addition & 1 deletion internal/stylelint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"postcss": "^8.4.29",
"postcss-html": "^1.5.0",
"postcss-less": "^6.0.0",
"postcss-scss": "^4.0.7",
"postcss-scss": "^4.0.8",
"prettier": "^2.8.8",
"stylelint": "^15.10.3",
"stylelint-config-property-sort-order-smacss": "^9.1.0",
Expand Down
4 changes: 2 additions & 2 deletions internal/ts-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"node-server.json"
],
"dependencies": {
"@types/node": "^18.17.12",
"unplugin-vue-define-options": "^1.3.17",
"@types/node": "^18.17.15",
"unplugin-vue-define-options": "^1.3.18",
"vite": "^4.4.9"
}
}
2 changes: 1 addition & 1 deletion internal/vite-config/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
root: true,
extends: ['@vben/eslint-config/strict'],
extends: ['prettier'],
};
4 changes: 2 additions & 2 deletions internal/vite-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"pkg-types": "^1.0.3",
"rollup-plugin-visualizer": "^5.9.2",
"sass": "^1.66.1",
"unocss": "^0.55.3",
"unplugin-vue-define-options": "^1.3.17",
"unocss": "^0.55.7",
"unplugin-vue-define-options": "^1.3.18",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-dts": "^2.3.0",
"vite-plugin-html": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion mock/_createProductionServer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createProdMockServer } from 'vite-plugin-mock/dist/client';
import { createProdMockServer } from 'vite-plugin-mock/dist/client';

const modules: Record<string, any> = import.meta.glob('./**/*.ts', {
import: 'default',
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
"@axolo/tree-array": "^0.1.0",
"@codemirror/lang-json": "^6.0.1",
"@iconify/iconify": "^3.1.1",
"@logicflow/core": "^1.2.12",
"@logicflow/extension": "^1.2.13",
"@logicflow/core": "^1.2.13",
"@logicflow/extension": "^1.2.14",
"@uponu/vuedraggable": "^4.1.3",
"@vben/hooks": "workspace:*",
"@vue/shared": "^3.3.4",
Expand All @@ -87,7 +87,7 @@
"echarts": "^5.4.3",
"exceljs": "^4.3.0",
"file2md5": "^1.3.0",
"http-status": "^1.6.2",
"http-status": "^1.7.0",
"intro.js": "^7.2.0",
"lodash-es": "^4.17.21",
"mockjs": "^1.1.0",
Expand All @@ -104,29 +104,29 @@
"vditor": "^3.9.5",
"vue": "^3.3.4",
"vue-clipboard3": "^2.0.0",
"vue-codemirror6": "^1.1.26",
"vue-i18n": "^9.2.2",
"vue-codemirror6": "^1.1.27",
"vue-i18n": "^9.4.0",
"vue-json-pretty": "^2.2.4",
"vue-router": "^4.2.4",
"vue-types": "^5.1.1",
"vxe-table": "^4.5.8",
"vxe-table": "^4.5.10",
"vxe-table-plugin-export-xlsx": "^3.0.5",
"xe-utils": "^3.5.12",
"xe-utils": "^3.5.13",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@iconify/json": "^2.2.108",
"@iconify/json": "^2.2.115",
"@purge-icons/generated": "^0.9.0",
"@types/codemirror": "^5.60.9",
"@types/crypto-js": "^4.1.1",
"@types/codemirror": "^5.60.10",
"@types/crypto-js": "^4.1.2",
"@types/intro.js": "^5.1.1",
"@types/lodash-es": "^4.17.8",
"@types/lodash-es": "^4.17.9",
"@types/mockjs": "^1.0.7",
"@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.5.1",
"@types/qs": "^6.9.7",
"@types/qrcode": "^1.5.2",
"@types/qs": "^6.9.8",
"@types/showdown": "^2.0.1",
"@types/sortablejs": "^1.15.2",
"@vben/eslint-config": "workspace:*",
Expand All @@ -146,10 +146,10 @@
"turbo": "^1.10.13",
"typescript": "^5.2.2",
"unbuild": "^1.2.1",
"unplugin-vue-define-options": "^1.3.17",
"unplugin-vue-define-options": "^1.3.18",
"vite": "^4.4.9",
"vite-plugin-mock": "^3.0.0",
"vue-tsc": "^1.8.8"
"vue-tsc": "^1.8.11"
},
"packageManager": "pnpm@8.1.0",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/hooks/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
root: true,
extends: ['@vben/eslint-config/strict'],
extends: ['prettier'],
};
2 changes: 1 addition & 1 deletion packages/hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"dependencies": {
"@vueuse/core": "^9.13.0",
"vue": "^3.2.47"
"vue": "^3.3.4"
},
"devDependencies": {
"@vben/types": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/types/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
root: true,
extends: ['@vben/eslint-config/strict'],
extends: ['prettier'],
};
Loading

0 comments on commit ae19613

Please sign in to comment.