Skip to content

Commit 9d69c49

Browse files
tomgao365tomgao365
committed
chore: update deps and use eslint@9
1 parent 94def5b commit 9d69c49

34 files changed

+2094
-1788
lines changed

‎.eslintignore

-14
This file was deleted.

‎.eslintrc.cjs

-7
This file was deleted.

‎.husky/commit-msg

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
3-
. "$(dirname "$0")/common.sh"
4-
52
pnpm commitlint --edit $1

‎.husky/common.sh

-9
This file was deleted.

‎.husky/pre-commit

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
3-
. "$(dirname "$0")/common.sh"
4-
52
pnpm lint-staged

‎env.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ExtensionContext, Webview } from 'vscode';
1+
import type { ExtensionContext, Webview } from 'vscode';
22
// Make this a module
33
export {};
44
declare global {

‎eslint.config.cjs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
const eslint = require('@tomjs/eslint');
2+
3+
/**
4+
* @type {import('eslint').Linter.Config}
5+
*/
6+
module.exports = [
7+
...eslint.configs.node.map(s => ({
8+
...s,
9+
ignores: ['src/webview/client.ts'],
10+
})),
11+
...eslint.configs.browser.map(s => ({
12+
...s,
13+
ignores: ['src/webview/client.ts'],
14+
})),
15+
];

‎examples/react/.eslintrc.cjs

-7
This file was deleted.

‎examples/react/eslint.config.cjs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
const eslint = require('@tomjs/eslint');
2+
3+
module.exports = [...eslint.configs.react];

‎examples/react/extension/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { commands, ExtensionContext } from 'vscode';
1+
import type { ExtensionContext } from 'vscode';
2+
import { commands } from 'vscode';
23
import { MainPanel } from './views/panel';
34

45
export function activate(context: ExtensionContext) {

‎examples/react/extension/views/helper.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Disposable, ExtensionContext, Webview, window } from 'vscode';
1+
import type { Disposable, ExtensionContext, Webview } from 'vscode';
2+
import { window } from 'vscode';
23

34
export class WebviewHelper {
45
public static setupHtml(webview: Webview, context: ExtensionContext) {

‎examples/react/extension/views/panel.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Disposable, ExtensionContext, ViewColumn, WebviewPanel, window } from 'vscode';
1+
import type { Disposable, ExtensionContext, WebviewPanel } from 'vscode';
2+
import { ViewColumn, window } from 'vscode';
23
import { WebviewHelper } from './helper';
34

45
export class MainPanel {

‎examples/react/package.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,11 @@
3131
"devDependencies": {
3232
"@tomjs/tsconfig": "^1.7.1",
3333
"@tomjs/vite-plugin-vscode": "workspace:^",
34-
"@types/node": "18.19.55",
3534
"@types/react": "^18.3.3",
3635
"@types/react-dom": "^18.3.0",
3736
"@types/vscode": "^1.93.0",
3837
"@types/vscode-webview": "^1.57.5",
3938
"@vitejs/plugin-react": "^4.3.3",
40-
"@vitejs/plugin-react-swc": "^3.7.0",
41-
"cross-env": "^7.0.3",
42-
"typescript": "~5.5.4",
43-
"vite": "5.4.8"
39+
"@vitejs/plugin-react-swc": "^3.7.0"
4440
}
4541
}

‎examples/react/src/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { useState } from 'react';
21
import { VSCodeButton, VSCodeTextField } from '@vscode/webview-ui-toolkit/react';
2+
import { useState } from 'react';
33
import { vscode } from './utils/vscode';
44

55
import './App.css';

‎examples/react/vite.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineConfig } from 'vite';
21
import vscode from '@tomjs/vite-plugin-vscode';
32
import react from '@vitejs/plugin-react-swc';
3+
import { defineConfig } from 'vite';
44

55
// https://vitejs.dev/config/
66
export default defineConfig({

‎examples/vue-import/.eslintrc.cjs

-7
This file was deleted.

‎examples/vue-import/eslint.config.cjs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
const eslint = require('@tomjs/eslint');
2+
3+
module.exports = [...eslint.configs.vue];

‎examples/vue-import/extension/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { commands, ExtensionContext } from 'vscode';
1+
import type { ExtensionContext } from 'vscode';
2+
import { commands } from 'vscode';
23
import { MainPanel, MainPanel2 } from './views';
34

45
export function activate(context: ExtensionContext) {

‎examples/vue-import/extension/views/helper.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Disposable, ExtensionContext, Webview, window } from 'vscode';
1+
import type { Disposable, ExtensionContext, Webview } from 'vscode';
2+
import { window } from 'vscode';
23

34
export class WebviewHelper {
45
public static setupHtml(webview: Webview, context: ExtensionContext) {

‎examples/vue-import/extension/views/panel.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Disposable, ExtensionContext, ViewColumn, WebviewPanel, window } from 'vscode';
1+
import type { Disposable, ExtensionContext, WebviewPanel } from 'vscode';
2+
import { ViewColumn, window } from 'vscode';
23
import { WebviewHelper } from './helper';
34

45
export class MainPanel {

‎examples/vue-import/extension/views/panel2.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Disposable, ExtensionContext, ViewColumn, WebviewPanel, window } from 'vscode';
1+
import type { Disposable, ExtensionContext, WebviewPanel } from 'vscode';
2+
import { ViewColumn, window } from 'vscode';
23
import { WebviewHelper } from './helper';
34

45
export class MainPanel2 {

‎examples/vue-import/package.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@
3434
},
3535
"devDependencies": {
3636
"@tomjs/vite-plugin-vscode": "workspace:^",
37-
"@types/node": "18.19.55",
3837
"@types/vscode": "^1.75.0",
39-
"@types/vscode-webview": "^1.57.5",
40-
"@vitejs/plugin-vue": "^5.1.4",
41-
"cross-env": "^7.0.3",
42-
"typescript": "~5.3.3",
43-
"vite": "5.4.8",
44-
"vue-tsc": "^2.1.6"
38+
"@types/vscode-webview": "^1.57.5"
4539
}
4640
}

‎examples/vue-import/vite.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import path from 'node:path';
2-
import { defineConfig } from 'vite';
32
import vscode from '@tomjs/vite-plugin-vscode';
43
import vue from '@vitejs/plugin-vue';
4+
import { defineConfig } from 'vite';
55

66
// https://vitejs.dev/config/
77
export default defineConfig({

‎examples/vue/.eslintrc.cjs

-7
This file was deleted.

‎examples/vue/eslint.config.cjs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
const eslint = require('@tomjs/eslint');
2+
3+
module.exports = [...eslint.configs.vue];

‎examples/vue/extension/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { commands, ExtensionContext } from 'vscode';
1+
import type { ExtensionContext } from 'vscode';
2+
import { commands } from 'vscode';
23
import { MainPanel } from './views/panel';
34

45
export function activate(context: ExtensionContext) {

‎examples/vue/extension/views/helper.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Disposable, ExtensionContext, Webview, window } from 'vscode';
1+
import type { Disposable, ExtensionContext, Webview } from 'vscode';
2+
import { window } from 'vscode';
23

34
export class WebviewHelper {
45
public static setupHtml(webview: Webview, context: ExtensionContext) {

‎examples/vue/extension/views/panel.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Disposable, ExtensionContext, ViewColumn, WebviewPanel, window } from 'vscode';
1+
import type { Disposable, ExtensionContext, WebviewPanel } from 'vscode';
2+
import { ViewColumn, window } from 'vscode';
23
import { WebviewHelper } from './helper';
34

45
export class MainPanel {

‎examples/vue/package.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@
3030
},
3131
"devDependencies": {
3232
"@tomjs/vite-plugin-vscode": "workspace:^",
33-
"@types/node": "18.19.55",
3433
"@types/vscode": "^1.75.0",
35-
"@types/vscode-webview": "^1.57.5",
36-
"@vitejs/plugin-vue": "^5.1.4",
37-
"cross-env": "^7.0.3",
38-
"typescript": "~5.5.2",
39-
"vite": "5.4.8",
40-
"vue-tsc": "^2.1.6"
34+
"@types/vscode-webview": "^1.57.5"
4135
}
4236
}

‎examples/vue/vite.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { defineConfig } from 'vite';
21
import vscode from '@tomjs/vite-plugin-vscode';
32
import vue from '@vitejs/plugin-vue';
3+
import { defineConfig } from 'vite';
44

55
// https://vitejs.dev/config/
66
export default defineConfig({

‎package.json

+23-20
Original file line numberDiff line numberDiff line change
@@ -66,43 +66,46 @@
6666
"build": "pnpm clean && tsup",
6767
"clean": "rimraf ./dist",
6868
"lint": "run-s lint:eslint lint:stylelint lint:prettier",
69-
"lint:eslint": "eslint \"{src,scripts,examples}/**/*.ts\" *.{cjs,ts} --fix --cache",
69+
"lint:eslint": "eslint \"{src,scripts,examples}/**/*.{tsx,cjs,ts,vue}\" *.{cjs,ts} --fix --cache",
7070
"lint:stylelint": "stylelint \"examples/**/*.{css,scss,less,vue,html}\" --fix --cache",
7171
"lint:prettier": "prettier --write .",
72-
"prepare": "husky install",
72+
"prepare": "husky",
7373
"prepublishOnly": "pnpm build"
7474
},
7575
"dependencies": {
76-
"@tomjs/node": "^2.2.0",
77-
"dayjs": "^1.11.10",
76+
"@tomjs/node": "^2.2.3",
77+
"dayjs": "^1.11.13",
7878
"execa": "^5.1.1",
7979
"kolorist": "^1.8.0",
8080
"lodash.clonedeep": "^4.5.0",
8181
"lodash.merge": "^4.6.2",
82-
"node-html-parser": "^6.1.12",
82+
"node-html-parser": "^6.1.13",
8383
"tsup": "7.2.0"
8484
},
8585
"devDependencies": {
86-
"@commitlint/cli": "^18.4.4",
87-
"@tomjs/commitlint": "^2.1.2",
88-
"@tomjs/eslint": "^1.2.2",
89-
"@tomjs/prettier": "^1.1.1",
90-
"@tomjs/stylelint": "^2.2.0",
91-
"@tomjs/tsconfig": "^1.3.0",
86+
"@commitlint/cli": "^19.6.0",
87+
"@tomjs/commitlint": "^3.3.0",
88+
"@tomjs/eslint": "^4.1.0",
89+
"@tomjs/prettier": "^1.4.1",
90+
"@tomjs/stylelint": "^2.6.1",
91+
"@tomjs/tsconfig": "^1.7.1",
9292
"@types/lodash.clonedeep": "^4.5.9",
9393
"@types/lodash.merge": "^4.6.9",
94-
"@types/node": "18.19.55",
94+
"@types/node": "18.19.67",
95+
"@vitejs/plugin-vue": "^5.1.4",
9596
"cross-env": "^7.0.3",
96-
"eslint": "^8.56.0",
97-
"husky": "^8.0.3",
98-
"lint-staged": "^15.2.0",
97+
"eslint": "^9.16.0",
98+
"globals": "^15.13.0",
99+
"husky": "^9.1.7",
100+
"lint-staged": "^15.2.10",
99101
"npm-run-all": "^4.1.5",
100-
"prettier": "^3.2.2",
101-
"rimraf": "^5.0.5",
102-
"stylelint": "^16.1.0",
103-
"tsx": "^4.7.0",
102+
"prettier": "^3.4.2",
103+
"rimraf": "^6.0.1",
104+
"stylelint": "^16.11.0",
105+
"tsx": "^4.19.2",
104106
"typescript": "~5.3.3",
105-
"vite": "5.4.8"
107+
"vite": "^5.4.11",
108+
"vue-tsc": "^2.1.10"
106109
},
107110
"peerDependencies": {
108111
"vite": ">=2"

0 commit comments

Comments
 (0)