Skip to content

Commit bfe601a

Browse files
committed
fix: js&tsx
1 parent b38b48d commit bfe601a

File tree

10 files changed

+41
-30
lines changed

10 files changed

+41
-30
lines changed

.eslintrc.cjs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,12 @@ module.exports = {
104104
},
105105
// Node scripts
106106
{
107-
files: ['scripts/**', './*.{js,ts}', 'packages/**/index.js'],
107+
files: [
108+
'scripts/**',
109+
'./*.{js,ts}',
110+
'packages/*/*.js',
111+
'packages/vue/*/*.js',
112+
],
108113
rules: {
109114
'no-restricted-globals': 'off',
110115
'no-restricted-syntax': ['error', banConstEnum],

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"size-esm-runtime": "node scripts/build.js vue -f esm-bundler-runtime",
1414
"size-esm": "node scripts/build.js runtime-dom runtime-core reactivity shared -f esm-bundler",
1515
"check": "tsc --incremental --noEmit",
16-
"lint": "eslint --cache --ext .ts .",
16+
"lint": "eslint --cache --ext .js,.ts,.tsx .",
1717
"format": "prettier --write --cache .",
1818
"format-check": "prettier --check --cache .",
1919
"test": "vitest",

packages/dts-test/componentInstance.test-d.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {
2+
type ComponentInstance,
3+
type ComponentPublicInstance,
4+
type FunctionalComponent,
25
defineComponent,
3-
FunctionalComponent,
4-
ComponentPublicInstance,
5-
ComponentInstance,
66
ref,
77
} from 'vue'
8-
import { expectType, describe } from './utils'
8+
import { describe, expectType } from './utils'
99

1010
describe('defineComponent', () => {
1111
const CompSetup = defineComponent({

packages/dts-test/defineComponent.test-d.tsx

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import {
2-
Component,
3-
defineComponent,
4-
PropType,
5-
ref,
6-
reactive,
2+
type Component,
3+
type ComponentOptions,
4+
type ComponentPublicInstance,
5+
type PropType,
6+
type SetupContext,
7+
type Slots,
8+
type SlotsType,
9+
type VNode,
710
createApp,
8-
ComponentPublicInstance,
9-
ComponentOptions,
10-
SetupContext,
11+
defineComponent,
1112
h,
12-
SlotsType,
13-
Slots,
14-
VNode,
13+
reactive,
14+
ref,
1515
withKeys,
1616
withModifiers,
1717
} from 'vue'
18-
import { describe, expectType, IsUnion } from './utils'
18+
import { type IsUnion, describe, expectType } from './utils'
1919

2020
describe('with object props', () => {
2121
interface ExpectedProps {
@@ -1505,14 +1505,14 @@ describe('withKeys and withModifiers as pro', () => {
15051505
;<input onKeydown={onKeydown} onClick={onClick} />
15061506
})
15071507

1508-
import {
1509-
DefineComponent,
1510-
ComponentOptionsMixin,
1511-
EmitsOptions,
1512-
VNodeProps,
1508+
import type {
15131509
AllowedComponentProps,
15141510
ComponentCustomProps,
1511+
ComponentOptionsMixin,
1512+
DefineComponent,
1513+
EmitsOptions,
15151514
ExtractPropTypes,
1515+
VNodeProps,
15161516
} from 'vue'
15171517

15181518
// code generated by tsc / vue-tsc, make sure this continues to work

packages/dts-test/functionalComponent.test-d.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { h, Text, FunctionalComponent, Component, VNode } from 'vue'
1+
import {
2+
type Component,
3+
type FunctionalComponent,
4+
Text,
5+
type VNode,
6+
h,
7+
} from 'vue'
28
import { expectType } from './utils'
39

410
// simple function signature

packages/dts-test/tsx.test-d.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// TSX w/ defineComponent is tested in defineComponent.test-d.tsx
2-
import { KeepAlive, Suspense, Fragment, Teleport, VNode } from 'vue'
2+
import { Fragment, KeepAlive, Suspense, Teleport, type VNode } from 'vue'
33
import { expectType } from './utils'
44

55
expectType<VNode>(<div />)

rollup.dts.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @ts-check
22
import assert from 'node:assert/strict'
33
import { parse } from '@babel/parser'
4-
import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
4+
import { existsSync, readFileSync, readdirSync, writeFileSync } from 'node:fs'
55
import MagicString from 'magic-string'
66
import dts from 'rollup-plugin-dts'
77

scripts/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import fs from 'node:fs/promises'
2020
import { existsSync } from 'node:fs'
2121
import path from 'node:path'
2222
import minimist from 'minimist'
23-
import { gzipSync, brotliCompressSync } from 'node:zlib'
23+
import { brotliCompressSync, gzipSync } from 'node:zlib'
2424
import pico from 'picocolors'
2525
import { execa, execaSync } from 'execa'
2626
import { cpus } from 'node:os'

scripts/dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// smaller files and provides better tree-shaking.
66

77
import esbuild from 'esbuild'
8-
import { resolve, relative, dirname } from 'node:path'
8+
import { dirname, relative, resolve } from 'node:path'
99
import { fileURLToPath } from 'node:url'
1010
import { createRequire } from 'node:module'
1111
import minimist from 'minimist'

scripts/verify-commit.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @ts-check
22
import pico from 'picocolors'
3-
import { readFileSync } from 'fs'
4-
import path from 'path'
3+
import { readFileSync } from 'node:fs'
4+
import path from 'node:path'
55

66
const msgPath = path.resolve('.git/COMMIT_EDITMSG')
77
const msg = readFileSync(msgPath, 'utf-8').trim()

0 commit comments

Comments
 (0)