Skip to content

Commit 5bcfc8c

Browse files
committed
ci: add eslint to lint errors not supported by oxlint
1 parent f5c554b commit 5bcfc8c

File tree

291 files changed

+1601
-467
lines changed

Some content is hidden

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

291 files changed

+1601
-467
lines changed

Diff for: .github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ jobs:
3939
- name: Run lint
4040
run: pnpm test:lint --format github
4141

42+
- name: Run eslint
43+
run: pnpm test:eslint
44+
4245
unit:
4346
runs-on: ubuntu-latest
4447
needs: install-deps

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ e2e/cypress/downloads
1818

1919
sitemap.xml
2020

21+
.eslintcache
22+
2123
.env
2224
*.local
2325
*.cache

Diff for: .prettierignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
pnpm-lock.yaml
1+
pnpm-lock.yaml
2+
**/storybook-static
3+
**/lib

Diff for: dev/src/generate.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import { applyEdits, modify } from 'jsonc-parser'
2-
import { Workspace } from './workspace'
3-
import type { Path } from './path'
4-
import { type BuiltInParserName, format } from 'prettier'
52
import { readFileSync, writeFileSync } from 'node:fs'
6-
import { Logger } from './logger'
3+
import { type BuiltInParserName, format } from 'prettier'
4+
75
import type { Package } from './package'
6+
import type { Path } from './path'
7+
8+
import { Logger } from './logger'
9+
import { Workspace } from './workspace'
810

911
export function generateTsConfig() {
1012
const generator = new Generator()
11-
generator.run()
13+
generator.run().catch(console.error)
1214
}
1315

1416
export class Generator {

Diff for: dev/src/package.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { readFileSync } from 'node:fs'
22
import { parse } from 'node:path'
33

4-
import { Path } from './path'
4+
import type { PackageItem } from './pnpm'
55
import type { CommonPackageJsonContent } from './types'
66
import type { Workspace } from './workspace'
7-
import type { PackageItem } from './pnpm'
7+
8+
import { Path } from './path'
89
import { pnpmList } from './pnpm'
910

1011
export function readPackageJson(path: Path): CommonPackageJsonContent {

Diff for: dev/src/vite.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import type { BuildOptions, UserConfig } from 'vite'
2+
13
import { readFileSync } from 'node:fs'
24
import { basename, dirname, resolve } from 'node:path'
35
import { fileURLToPath } from 'node:url'
4-
import type { BuildOptions, UserConfig } from 'vite'
56
import { defineConfig } from 'vite'
67

78
import globalPackageJson from '../../package.json' with { type: 'json' }

Diff for: dev/src/workspace.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import type { CommonPackageJsonContent } from './types'
2+
13
import { Logger } from './logger'
24
import { Package, readPackageJson } from './package'
35
import { ProjectRoot } from './path'
4-
import type { CommonPackageJsonContent } from './types'
56
import { pnpmList } from './pnpm'
67

78
class CircularDependenciesError extends Error {

Diff for: e2e/entry.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { resolve } from 'node:path'
2+
23
import { cases } from './src/data'
34

45
const data = cases.reduce(

Diff for: e2e/playwright.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import process from 'node:process'
21
import { defineConfig, devices } from '@playwright/test'
2+
import process from 'node:process'
33

44
/**
55
* Read environment variables from file.

Diff for: e2e/shim.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/// <reference types="vite/client" />
22

33
import type { Editor } from '@milkdown/core'
4-
import type { EditorView } from '@milkdown/prose/view'
5-
import type { Telemetry } from '@milkdown/ctx'
64
import type { Crepe } from '@milkdown/crepe'
5+
import type { Telemetry } from '@milkdown/ctx'
6+
import type { EditorView } from '@milkdown/prose/view'
77

88
declare global {
99
var __milkdown__: Editor

Diff for: e2e/src/crepe/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ setup(async () => {
1616
globalThis.__afterCrepeCreated__(crepe)
1717
}
1818
return crepe.editor
19-
})
19+
}).catch(console.error)

Diff for: e2e/src/main.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import './style.css'
2+
23
import { c, html } from 'atomico'
4+
35
import { cases } from './data'
46

57
function App() {

Diff for: e2e/src/multi-editor/main.ts

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Editor, rootCtx } from '@milkdown/core'
2-
import { nord } from '@milkdown/theme-nord'
3-
import { commonmark } from '@milkdown/preset-commonmark'
42
import { history } from '@milkdown/plugin-history'
3+
import { commonmark } from '@milkdown/preset-commonmark'
54
import { gfm, insertTableCommand } from '@milkdown/preset-gfm'
5+
import { nord } from '@milkdown/theme-nord'
66
import { callCommand } from '@milkdown/utils'
77

88
import { setup } from '../utils'
@@ -22,11 +22,13 @@ setup(() => {
2222
.use(gfm)
2323
.use(history)
2424
.create()
25-
}).then((editor1) => {
26-
globalThis.commands.addTable = () => {
27-
editor1.action(callCommand(insertTableCommand.key))
28-
}
2925
})
26+
.then((editor1) => {
27+
globalThis.commands.addTable = () => {
28+
editor1.action(callCommand(insertTableCommand.key))
29+
}
30+
})
31+
.catch(console.error)
3032

3133
setup(() => {
3234
return Editor.make()
@@ -39,8 +41,10 @@ setup(() => {
3941
.use(gfm)
4042
.use(history)
4143
.create()
42-
}).then((editor2) => {
43-
globalThis.commands.addTable2 = () => {
44-
editor2.action(callCommand(insertTableCommand.key))
45-
}
4644
})
45+
.then((editor2) => {
46+
globalThis.commands.addTable2 = () => {
47+
editor2.action(callCommand(insertTableCommand.key))
48+
}
49+
})
50+
.catch(console.error)

Diff for: e2e/src/plugin-automd/main.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Editor, rootCtx } from '@milkdown/core'
2-
import { nord } from '@milkdown/theme-nord'
3-
import { listener, listenerCtx } from '@milkdown/plugin-listener'
42
import { automd } from '@milkdown/plugin-automd'
3+
import { listener, listenerCtx } from '@milkdown/plugin-listener'
54
import { commonmark, markInputRules } from '@milkdown/preset-commonmark'
65
import { markInputRules as GFMMarkInputRules, gfm } from '@milkdown/preset-gfm'
6+
import { nord } from '@milkdown/theme-nord'
77

88
import { setup } from '../utils'
99

@@ -16,7 +16,7 @@ setup(() => {
1616
.config((ctx) => {
1717
ctx.set(rootCtx, document.getElementById('app'))
1818
ctx.get(listenerCtx).markdownUpdated((_, markdown) => {
19-
// eslint-disable-next-line no-console
19+
// oxlint-disable-next-line no-console
2020
console.log(markdown)
2121
})
2222
})
@@ -26,4 +26,4 @@ setup(() => {
2626
.use(listener)
2727
.use(automd)
2828
.create()
29-
})
29+
}).catch(console.error)

Diff for: e2e/src/plugin-listener/main.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Editor, defaultValueCtx, rootCtx } from '@milkdown/core'
2-
import { nord } from '@milkdown/theme-nord'
3-
import { commonmark } from '@milkdown/preset-commonmark'
42
import { listener, listenerCtx } from '@milkdown/plugin-listener'
3+
import { commonmark } from '@milkdown/preset-commonmark'
4+
import { nord } from '@milkdown/theme-nord'
55

66
import { setup } from '../utils'
77

@@ -15,12 +15,12 @@ setup(() => {
1515
ctx.set(rootCtx, document.getElementById('app'))
1616
ctx.set(defaultValueCtx, 'test')
1717
ctx.get(listenerCtx).markdownUpdated((_, markdown, prevMarkdown) => {
18-
// eslint-disable-next-line no-console
18+
// oxlint-disable-next-line no-console
1919
console.log(markdown, prevMarkdown)
2020
})
2121
})
2222
.config(nord)
2323
.use(commonmark)
2424
.use(listener)
2525
.create()
26-
})
26+
}).catch(console.error)

Diff for: e2e/src/preset-commonmark/main.ts

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Editor, rootCtx } from '@milkdown/core'
2-
import { nord } from '@milkdown/theme-nord'
2+
import { clipboard } from '@milkdown/plugin-clipboard'
3+
import { history } from '@milkdown/plugin-history'
34
import {
45
commonmark,
56
toggleEmphasisCommand,
67
toggleStrongCommand,
78
} from '@milkdown/preset-commonmark'
8-
import { clipboard } from '@milkdown/plugin-clipboard'
9-
import { history } from '@milkdown/plugin-history'
9+
import { nord } from '@milkdown/theme-nord'
1010
import { callCommand } from '@milkdown/utils'
1111

1212
import { setup } from '../utils'
@@ -27,13 +27,16 @@ setup(() => {
2727
.use(clipboard)
2828
.create()
2929

30-
editor.then((instance) => {
31-
globalThis.commands.toggleStrong = () => {
32-
instance.action(callCommand(toggleStrongCommand.key))
33-
}
34-
globalThis.commands.toggleEmphasis = () => {
35-
instance.action(callCommand(toggleEmphasisCommand.key))
36-
}
37-
})
30+
editor
31+
.then((instance) => {
32+
globalThis.commands.toggleStrong = () => {
33+
instance.action(callCommand(toggleStrongCommand.key))
34+
}
35+
globalThis.commands.toggleEmphasis = () => {
36+
instance.action(callCommand(toggleEmphasisCommand.key))
37+
}
38+
})
39+
.catch(console.error)
40+
3841
return editor
39-
})
42+
}).catch(console.error)

Diff for: e2e/src/preset-gfm/main.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Editor, rootCtx } from '@milkdown/core'
2-
import { nord } from '@milkdown/theme-nord'
3-
import { commonmark } from '@milkdown/preset-commonmark'
42
import { history } from '@milkdown/plugin-history'
3+
import { commonmark } from '@milkdown/preset-commonmark'
54
import { gfm } from '@milkdown/preset-gfm'
5+
import { nord } from '@milkdown/theme-nord'
66

77
import { setup } from '../utils'
88

@@ -21,4 +21,4 @@ setup(() => {
2121
.use(gfm)
2222
.use(history)
2323
.create()
24-
})
24+
}).catch(console.error)

Diff for: e2e/src/utils.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { Editor } from '@milkdown/core'
2+
23
import { editorViewCtx, parserCtx, serializerCtx } from '@milkdown/core'
34
import { Slice } from '@milkdown/prose/model'
45

@@ -33,13 +34,13 @@ export async function setup(createEditor: () => Promise<Editor>) {
3334

3435
const logButton = document.querySelector<HTMLDivElement>('#log')
3536
if (logButton) {
36-
// eslint-disable-next-line no-console
37+
// oxlint-disable-next-line no-console
3738
logButton.onclick = () => console.log(globalThis.__getMarkdown__())
3839
}
3940

4041
const inspectButton = document.querySelector<HTMLDivElement>('#inspect')
4142
if (inspectButton) {
42-
// eslint-disable-next-line no-console
43+
// oxlint-disable-next-line no-console
4344
inspectButton.onclick = () => console.log(globalThis.__inspect__())
4445
}
4546
return editor

Diff for: e2e/tests/command/bold.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, loadFixture, selectAll, setMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/crepe/latex.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/crepe/listener.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor } from '../misc'
34

45
test('listen change before editor is created', async ({ page }) => {

Diff for: e2e/tests/input/blockquote.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/bold.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/bullet-list.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/code-block.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/code-inline.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/heading.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown, waitNextFrame } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/hr.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/italic.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/ordered-list.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/paragraph.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, getMarkdown } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/strike-through.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/table.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor, pressMetaKey } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/input/task-list.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, test } from '@playwright/test'
2+
23
import { focusEditor } from '../misc'
34

45
test.beforeEach(async ({ page }) => {

Diff for: e2e/tests/misc/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { Page } from '@playwright/test'
2+
23
import fs from 'node:fs/promises'
34
import path from 'node:path'
45

0 commit comments

Comments
 (0)