Skip to content

Commit 293b379

Browse files
zhiyuanzmjzhiyuanzmj
committed
chore: fix lint
1 parent 989a151 commit 293b379

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2623
-4095
lines changed

‎.vscode/settings.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"eslint.experimental.useFlatConfig": true
2+
"editor.codeActionsOnSave": {
3+
"source.fixAll.eslint": "explicit",
4+
"source.fixAll.stylelint": "explicit"
5+
}
36
}

‎eslint.config.js

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import { sxzz } from '@sxzz/eslint-config'
22

3-
export default sxzz([
4-
{
5-
rules: {
6-
'unicorn/filename-case': 'off',
7-
'import/no-default-export': 'off',
8-
'unused-imports/no-unused-vars': 'warn',
9-
'unicorn/no-new-array': 'off',
3+
export default sxzz()
4+
.removeRules(
5+
'unicorn/filename-case',
6+
'import/no-default-export',
7+
'unicorn/no-new-array',
8+
)
9+
.append([
10+
{
11+
name: 'warn',
12+
rules: {
13+
'unused-imports/no-unused-vars': 'warn',
14+
},
1015
},
11-
},
12-
{
13-
ignores: ['**/patched'],
14-
},
15-
])
16+
])

‎package.json

+12-16
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,28 @@
2222
"scripts": {
2323
"dev": "pnpm run --filter=\"./packages/*\" --parallel dev",
2424
"build": "pnpm run --filter=\"./packages/*\" build",
25-
"typecheck": "tsc --noEmit",
25+
"typecheck": "tsmc --noEmit",
2626
"lint": "eslint .",
2727
"play": "npm -C playground run dev",
2828
"test": "vitest",
2929
"release": "bumpp -r --all -x 'pnpm run changelog'",
3030
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
3131
},
3232
"devDependencies": {
33-
"@antfu/eslint-config": "^2.21.2",
34-
"@changesets/changelog-github": "^0.5.0",
35-
"@changesets/cli": "^2.27.7",
36-
"@sxzz/eslint-config": "^3.13.0",
37-
"@types/node": "^20.14.9",
38-
"bumpp": "^9.4.1",
39-
"chalk": "^5.3.0",
33+
"@antfu/eslint-config": "^4.8.1",
34+
"@changesets/changelog-github": "^0.5.1",
35+
"@changesets/cli": "^2.28.1",
36+
"@sxzz/eslint-config": "^6.0.2",
37+
"@ts-macro/tsc": "^0.1.24",
38+
"@types/node": "^22.13.10",
39+
"@vue-macros/reactivity-transform": "3.0.0-beta.4",
40+
"bumpp": "^10.0.3",
4041
"conventional-changelog-cli": "^5.0.0",
41-
"eslint": "^9.6.0",
42-
"fast-glob": "^3.3.2",
43-
"nodemon": "^3.1.4",
44-
"rimraf": "^5.0.7",
42+
"eslint": "^9.22.0",
4543
"tsup": "^8.4.0",
46-
"typescript": "^5.7.0",
47-
"unplugin": "^1.11.0",
44+
"typescript": "^5.8.2",
4845
"unplugin-raw": "^0.4.4",
49-
"vite": "^6.0.0",
50-
"vitest": "^1.6.0"
46+
"vite": "catalog:"
5147
},
5248
"pnpm": {
5349
"overrides": {

‎packages/babel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@babel/core": "catalog:",
5959
"@babel/parser": "catalog:",
6060
"@babel/plugin-syntax-jsx": "^7.25.9",
61-
"@babel/traverse": "^7.26.8",
61+
"@babel/traverse": "^7.26.9",
6262
"@babel/types": "catalog:",
6363
"@vue-jsx-vapor/compiler": "workspace:*",
6464
"source-map-js": "^1.2.1"

‎packages/babel/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import { parse } from '@babel/parser'
12
// @ts-ignore
23
import _SyntaxJSX from '@babel/plugin-syntax-jsx'
3-
import { parse } from '@babel/parser'
44
import { transformJSX } from './transform'
55
import { isConditionalExpression, isJSXElement } from './utils'
6+
import type { Visitor } from '@babel/core'
67
import type { VisitNodeFunction } from '@babel/traverse'
78
import type { JSXElement, JSXFragment, Node } from '@babel/types'
89
import type { CompilerOptions } from '@vue-jsx-vapor/compiler'
9-
import type { Visitor } from '@babel/core'
1010

1111
const SyntaxJSX = _SyntaxJSX.default || _SyntaxJSX
1212

‎packages/babel/src/transform.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { compile } from '@vue-jsx-vapor/compiler'
21
import { parse } from '@babel/parser'
3-
import { SourceMapConsumer } from 'source-map-js'
42
import _traverse, { type VisitNodeFunction } from '@babel/traverse'
3+
import { compile } from '@vue-jsx-vapor/compiler'
4+
import { SourceMapConsumer } from 'source-map-js'
55
import { isJSXElement } from './utils'
66
import type { Options } from '.'
77
import type { JSXElement, JSXFragment } from '@babel/types'

‎packages/babel/test/interop.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { describe, expect, test } from 'vitest'
21
import { transformSync } from '@babel/core'
2+
import { describe, expect, test } from 'vitest'
33
import jsx from '../src/index'
44

55
describe('transform', () => {

‎packages/babel/test/transform.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { describe, expect, test } from 'vitest'
21
import { transformSync } from '@babel/core'
2+
import { describe, expect, test } from 'vitest'
33
import jsx from '../src/index'
44

55
describe('transform', () => {

‎packages/compiler/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"@babel/types": "catalog:",
6060
"@vue/compiler-dom": "catalog:",
6161
"@vue/compiler-vapor": "catalog:",
62-
"@vue/shared": "catalog:"
62+
"@vue/shared": "catalog:",
63+
"vitest": "catalog:"
6364
}
6465
}

‎packages/compiler/src/compile.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
import { extend, isString } from '@vue/shared'
1+
import { parse } from '@babel/parser'
22
import {
3-
type VaporCodegenResult as BaseVaporCodegenResult,
43
generate,
4+
type VaporCodegenResult as BaseVaporCodegenResult,
55
} from '@vue/compiler-vapor'
6-
import { parse } from '@babel/parser'
6+
import { extend, isString } from '@vue/shared'
77
import {
8+
IRNodeTypes,
9+
type HackOptions,
10+
type RootIRNode,
11+
type RootNode,
12+
} from './ir'
13+
14+
import {
15+
transform,
816
type DirectiveTransform,
917
type NodeTransform,
10-
transform,
1118
} from './transform'
12-
13-
import { transformElement } from './transforms/transformElement'
1419
import { transformChildren } from './transforms/transformChildren'
20+
import { transformElement } from './transforms/transformElement'
1521
import { transformTemplateRef } from './transforms/transformTemplateRef'
1622
import { transformText } from './transforms/transformText'
1723
import { transformVBind } from './transforms/vBind'
24+
import { transformVFor } from './transforms/vFor'
25+
import { transformVHtml } from './transforms/vHtml'
26+
import { transformVIf } from './transforms/vIf'
27+
import { transformVModel } from './transforms/vModel'
1828
import { transformVOn } from './transforms/vOn'
29+
import { transformVOnce } from './transforms/vOnce'
30+
import { transformVShow } from './transforms/vShow'
1931
import { transformVSlot } from './transforms/vSlot'
2032
import { transformVSlots } from './transforms/vSlots'
21-
import { transformVModel } from './transforms/vModel'
22-
import { transformVShow } from './transforms/vShow'
23-
import { transformVHtml } from './transforms/vHtml'
24-
import {
25-
type HackOptions,
26-
IRNodeTypes,
27-
type RootIRNode,
28-
type RootNode,
29-
} from './ir'
30-
import { transformVFor } from './transforms/vFor'
31-
import { transformVOnce } from './transforms/vOnce'
32-
import { transformVIf } from './transforms/vIf'
33-
import type { CompilerOptions as BaseCompilerOptions } from '@vue/compiler-dom'
3433
import type { ExpressionStatement, JSXElement, JSXFragment } from '@babel/types'
34+
import type { CompilerOptions as BaseCompilerOptions } from '@vue/compiler-dom'
3535

3636
export { generate }
3737

‎packages/compiler/src/ir/component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { SimpleExpressionNode } from '@vue/compiler-dom'
2-
import type { IRFor } from '@vue/compiler-vapor'
31
import type { DirectiveTransformResult } from '../transform'
42
import type { BlockIRNode } from './index'
3+
import type { SimpleExpressionNode } from '@vue/compiler-dom'
4+
import type { IRFor } from '@vue/compiler-vapor'
55

66
// props
77
export interface IRProp extends Omit<DirectiveTransformResult, 'value'> {

‎packages/compiler/src/ir/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import type { DirectiveTransform, NodeTransform } from '../transform'
2+
import type { IRProp, IRProps, IRSlots } from './component'
3+
14
import type { JSXFragment, Node } from '@babel/types'
25
import type {
36
CompoundExpressionNode,
47
DirectiveNode,
58
SimpleExpressionNode,
69
} from '@vue/compiler-dom'
7-
810
import type { Prettify } from '@vue/shared'
9-
import type { DirectiveTransform, NodeTransform } from '../transform'
10-
import type { IRProp, IRProps, IRSlots } from './component'
1111

1212
export * from './component'
1313

‎packages/compiler/src/transform.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import {
2+
defaultOnError,
3+
defaultOnWarn,
24
type TransformOptions as BaseTransformOptions,
35
type CommentNode,
46
type CompilerCompatOptions,
57
type SimpleExpressionNode,
6-
defaultOnError,
7-
defaultOnWarn,
88
} from '@vue/compiler-dom'
9-
import { EMPTY_OBJ, NOOP, extend, isArray, isString } from '@vue/shared'
9+
import { EMPTY_OBJ, extend, isArray, isString, NOOP } from '@vue/shared'
1010
import {
11-
type BlockIRNode,
1211
DynamicFlag,
12+
IRNodeTypes,
13+
type BlockIRNode,
1314
type HackOptions,
1415
type IRDynamicInfo,
15-
IRNodeTypes,
1616
type IRSlots,
1717
type OperationNode,
1818
type RootIRNode,

‎packages/compiler/src/transforms/expression.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { isStaticNode } from '@vue/compiler-dom'
22
import { DynamicFlag, IRNodeTypes, type OperationNode } from '../ir'
3+
import { transformNode, type TransformContext } from '../transform'
34
import { resolveExpression } from '../utils'
4-
import { type TransformContext, transformNode } from '../transform'
55
import { createBranch } from './utils'
66
import type { ConditionalExpression, LogicalExpression } from '@babel/types'
77

‎packages/compiler/src/transforms/transformChildren.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { DynamicFlag, type IRDynamicInfo, IRNodeTypes } from '../ir/index'
1+
import { DynamicFlag, IRNodeTypes, type IRDynamicInfo } from '../ir/index'
22
import {
3+
transformNode,
34
type NodeTransform,
45
type TransformContext,
5-
transformNode,
66
} from '../transform'
77
import { isJSXComponent, isTemplate } from '../utils'
88
import type { Node } from '@babel/types'

‎packages/compiler/src/transforms/transformElement.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { extend, isBuiltInDirective, isVoidTag, makeMap } from '@vue/shared'
21
import {
3-
type SimpleExpressionNode,
42
isValidHTMLNesting,
3+
type SimpleExpressionNode,
54
} from '@vue/compiler-dom'
5+
import { extend, isBuiltInDirective, isVoidTag, makeMap } from '@vue/shared'
66
import {
77
DynamicFlag,
88
IRDynamicPropsKind,
@@ -18,13 +18,13 @@ import {
1818
resolveExpression,
1919
resolveSimpleExpression,
2020
} from '../utils'
21-
import { EMPTY_EXPRESSION } from './utils'
22-
import type { JSXAttribute, JSXElement, JSXSpreadAttribute } from '@babel/types'
2321
import type {
2422
DirectiveTransformResult,
2523
NodeTransform,
2624
TransformContext,
2725
} from '../transform'
26+
import { EMPTY_EXPRESSION } from './utils'
27+
import type { JSXAttribute, JSXElement, JSXSpreadAttribute } from '@babel/types'
2828

2929
export const isReservedProp = /* #__PURE__ */ makeMap(
3030
// the leading comma is intentional so empty string "" is also included

‎packages/compiler/src/transforms/transformText.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
2-
type BlockIRNode,
32
DynamicFlag,
43
IRNodeTypes,
4+
type BlockIRNode,
55
type RootNode,
66
} from '../ir'
77
import {
@@ -12,11 +12,11 @@ import {
1212
resolveExpression,
1313
resolveJSXText,
1414
} from '../utils'
15+
import type { NodeTransform, TransformContext } from '../transform'
1516
import {
1617
processConditionalExpression,
1718
processLogicalExpression,
1819
} from './expression'
19-
import type { NodeTransform, TransformContext } from '../transform'
2020
import type {
2121
JSXElement,
2222
JSXExpressionContainer,
@@ -68,7 +68,7 @@ export const transformText: NodeTransform = (node, context) => {
6868
function processTextLike(context: TransformContext<JSXExpressionContainer>) {
6969
const nexts = context.parent!.node.children?.slice(context.index)
7070
const idx = nexts.findIndex((n) => !isTextLike(n))
71-
const nodes = (idx > -1 ? nexts.slice(0, idx) : nexts) as Array<TextLike>
71+
const nodes = (idx !== -1 ? nexts.slice(0, idx) : nexts) as Array<TextLike>
7272

7373
const values = createTextLikeExpressions(nodes, context)
7474
if (!values.length) {
@@ -130,10 +130,8 @@ function isAllTextLike(children: Node[]): children is TextLike[] {
130130
function isTextLike(node: Node): node is TextLike {
131131
return (
132132
(node.type === 'JSXExpressionContainer' &&
133-
!(
134-
node.expression.type === 'ConditionalExpression' ||
135-
node.expression.type === 'LogicalExpression'
136-
)) ||
133+
node.expression.type !== 'ConditionalExpression' &&
134+
node.expression.type !== 'LogicalExpression') ||
137135
node.type === 'JSXText'
138136
)
139137
}

‎packages/compiler/src/transforms/utils.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { createSimpleExpression } from '@vue/compiler-dom'
21
import {
3-
type Expression,
4-
type JSXElement,
5-
type JSXFragment,
62
jsxClosingFragment,
73
jsxExpressionContainer,
84
jsxFragment,
95
jsxOpeningFragment,
6+
type Expression,
7+
type JSXElement,
8+
type JSXFragment,
109
} from '@babel/types'
10+
import { createSimpleExpression } from '@vue/compiler-dom'
1111
import {
12-
type BlockIRNode,
1312
DynamicFlag,
13+
type BlockIRNode,
1414
type IRDynamicInfo,
1515
type IRNodeTypes,
1616
} from '../ir/index'

‎packages/compiler/src/transforms/vBind.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { camelize, extend } from '@vue/shared'
22
import { resolveExpression, resolveSimpleExpression } from '../utils'
3-
import { isReservedProp } from './transformElement'
43
import type { DirectiveTransform } from '../transform'
4+
import { isReservedProp } from './transformElement'
55

66
export const transformVBind: DirectiveTransform = (dir, node, context) => {
77
const { name, value, loc } = dir

‎packages/compiler/src/transforms/vFor.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
import {
2-
ErrorCodes,
3-
type SimpleExpressionNode,
42
createCompilerError,
3+
ErrorCodes,
54
isConstantNode,
5+
type SimpleExpressionNode,
66
} from '@vue/compiler-dom'
77
import { DynamicFlag, IRNodeTypes } from '../ir'
8+
import {
9+
createStructuralDirectiveTransform,
10+
type NodeTransform,
11+
type TransformContext,
12+
} from '../transform'
813
import {
914
findProp,
1015
isJSXComponent,
@@ -13,11 +18,6 @@ import {
1318
resolveExpressionWithFn,
1419
resolveLocation,
1520
} from '../utils'
16-
import {
17-
type NodeTransform,
18-
type TransformContext,
19-
createStructuralDirectiveTransform,
20-
} from '../transform'
2121
import { createBranch } from './utils'
2222
import type { JSXAttribute, JSXElement } from '@babel/types'
2323

0 commit comments

Comments
 (0)