[pull] main from Milkdown:main

.github/workflows/ci.yml

@@ -40,9 +40,6 @@ jobs:
       - name: Run lint
         run: pnpm test:lint --format github
 
-      - name: Run eslint
-        run: pnpm test:eslint
-
   unit:
     runs-on: ubuntu-latest
     needs: install-deps

.lintstagedrc.json

@@ -1,3 +1,4 @@
 {
-  "**/*.{js,ts,tsx,json,yaml,yml,md}": ["oxlint -c .oxlintrc.json --fix"]
+  "**/*.{js,ts,tsx,json,yaml,yml,md}": ["oxlint -c .oxlintrc.json --fix"],
+  "*": "oxfmt --no-error-on-unmatched-pattern"
 }

.oxfmtrc.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 80,
+  "sortImports": {
+    "groups": [
+      "type-import",
+      ["value-builtin", "value-external"],
+      "type-internal",
+      "value-internal",
+      ["type-parent", "type-sibling", "type-index"],
+      ["value-parent", "value-sibling", "value-index"],
+      "unknown"
+    ]
+  },
+  "ignorePatterns": [
+    "pnpm-lock.yaml",
+    "**/storybook-static",
+    "**/lib",
+    "**/.storybook",
+    "**/tests/data/*.md",
+    "**/templates/*.md"
+  ]
+}

.oxlintrc.json

@@ -1,5 +1,9 @@
 {
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
   "plugins": ["import", "typescript", "unicorn", "promise"],
+  "options": {
+    "typeAware": true
+  },
   "rules": {
     "no-console": ["error", { "allow": ["warn", "error"] }],
     "for-direction": "error",
@@ -111,6 +115,8 @@
         "allowDeclarations": true
       }
     ],
-    "typescript/no-unnecessary-type-constraint": "error"
+    "typescript/no-unnecessary-type-constraint": "error",
+    "typescript/restrict-template-expressions": "off",
+    "typescript/no-base-to-string": "off"
   }
 }

dev/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@milkdown/dev",
+  "version": "0.0.0",
   "private": true,
   "type": "module",
-  "version": "0.0.0",
   "exports": {
     ".": {
       "import": "./lib/index.js",

dev/src/exec.ts

@@ -8,8 +8,12 @@ export function exec(
   { silent }: { silent: boolean } = { silent: false }
 ): string {
   const logger = new Logger(tag)
-  !silent && logger.info(cmd)
+  if (!silent) {
+    logger.info(cmd)
+  }
   const result = execSync(cmd, { encoding: 'utf8' }).trim()
-  !silent && logger.log(result)
+  if (!silent) {
+    logger.log(result)
+  }
   return result
 }

dev/src/generate.ts

@@ -1,6 +1,6 @@
 import { applyEdits, modify } from 'jsonc-parser'
 import { readFileSync, writeFileSync } from 'node:fs'
-import { type BuiltInParserName, format } from 'prettier'
+import { format } from 'oxfmt'
 
 import type { Package } from './package'
 import type { Path } from './path'
@@ -30,14 +30,17 @@ export class Generator {
   }
 
   generateWorkspaceFiles = async () => {
-    const filesToGenerate: [
-      Path,
-      (prev: string) => string,
-      BuiltInParserName?,
-    ][] = [
+    const filesToGenerate: [Path, (prev: string) => string][] = [
       [this.workspace.join('tsconfig.json'), this.genProjectTsConfig, 'json'],
+      [
+        this.workspace.join('tsconfig.legacy.json'),
+        this.genPackageTsConfig.bind(this, this.workspace.getPackage('tvh')),
+        'json',
+      ],
       ...this.workspace.packages
         .filter((p) => p.isTsProject)
+        // This legacy is handled by tvh's tsconfig.legacy.json
+        .filter((p) => p.name !== 'tvh')
         .map(
           (p) =>
             [
@@ -48,22 +51,21 @@ export class Generator {
         ),
     ]
 
-    for (const [path, content, formatter] of filesToGenerate) {
+    for (const [path, content] of filesToGenerate) {
       this.logger.info(`Generating: ${path}`)
       const previous = readFileSync(path.value, 'utf-8')
       let file = content(previous)
-      if (formatter) {
-        file = await this.format(file, formatter)
-      }
+      file = await this.format(path.value, file)
       writeFileSync(path.value, file)
     }
   }
 
-  format = (content: string, parser: BuiltInParserName) => {
+  format = async (path: string, content: string) => {
     const config = JSON.parse(
-      readFileSync(this.workspace.join('.prettierrc').value, 'utf-8')
+      readFileSync(this.workspace.join('.oxfmtrc.json').value, 'utf-8')
     )
-    return format(content, { parser, ...config })
+    const output = await format(path, content, config)
+    return output.code
   }
 
   genProjectTsConfig = (prev: string) => {
@@ -72,9 +74,13 @@ export class Generator {
       modify(
         prev,
         ['references'],
-        this.workspace.packages
-          .filter((p) => p.isTsProject)
-          .map((p) => ({ path: p.path.relativePath })),
+        [
+          { path: './tsconfig.legacy.json' },
+          ...this.workspace.packages
+            .filter((p) => p.isTsProject)
+            .filter((p) => p.name !== 'tvh')
+            .map((p) => ({ path: p.path.relativePath })),
+        ],
         {}
       )
     )

docs/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@milkdown/docs",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "description": "Auto generated docs for Milkdown",
-  "scripts": {
-    "build": "tsx -C import ./src/index.ts"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/Milkdown/milkdown.git"
   },
+  "scripts": {
+    "build": "tsx -C import ./src/index.ts"
+  },
   "devDependencies": {
     "@milkdown/dev": "workspace:*",
     "@types/fs-extra": "^11.0.4",

e2e/shim.d.ts

@@ -1,4 +1,5 @@
 /* oxlint-disable no-var */
+/// <reference types="node" />
 /// <reference types="vite/client" />
 
 import type { Editor, commandsCtx } from '@milkdown/core'

e2e/src/crepe/main.ts

@@ -1,7 +1,6 @@
 import { Crepe } from '@milkdown/crepe'
 import '@milkdown/crepe/theme/common/style.css'
 import '@milkdown/crepe/theme/frame.css'
-
 import { setup } from '../utils'
 
 setup(async () => {

e2e/src/main.ts

@@ -3,6 +3,7 @@ import { createApp, defineComponent, h } from 'vue'
 import './style.css'
 import { cases } from './data'
 
+// oxlint-disable-next-line no-unused-expressions
 h
 
 const App = defineComponent({

e2e/src/multi-editor/main.ts

@@ -6,9 +6,7 @@ import { nord } from '@milkdown/theme-nord'
 import { callCommand } from '@milkdown/utils'
 
 import { setup } from '../utils'
-
 import '@milkdown/theme-nord/style.css'
-
 import '../style.css'
 
 setup(() => {

e2e/src/plugin-automd/main.ts

@@ -6,9 +6,7 @@ import { markInputRules as GFMMarkInputRules, gfm } from '@milkdown/preset-gfm'
 import { nord } from '@milkdown/theme-nord'
 
 import { setup } from '../utils'
-
 import '@milkdown/theme-nord/style.css'
-
 import '../style.css'
 
 setup(() => {

e2e/src/plugin-listener/main.ts

@@ -4,9 +4,7 @@ import { commonmark } from '@milkdown/preset-commonmark'
 import { nord } from '@milkdown/theme-nord'
 
 import { setup } from '../utils'
-
 import '@milkdown/theme-nord/style.css'
-
 import '../style.css'
 
 setup(() => {

e2e/src/preset-commonmark/main.ts

@@ -10,9 +10,7 @@ import { nord } from '@milkdown/theme-nord'
 import { callCommand } from '@milkdown/utils'
 
 import { setup } from '../utils'
-
 import '@milkdown/theme-nord/style.css'
-
 import '../style.css'
 
 setup(() => {

e2e/src/preset-gfm/main.ts

@@ -5,9 +5,7 @@ import { gfm } from '@milkdown/preset-gfm'
 import { nord } from '@milkdown/theme-nord'
 
 import { setup } from '../utils'
-
 import '@milkdown/theme-nord/style.css'
-
 import '../style.css'
 
 setup(() => {

e2e/tests/crepe/table.pom.ts

@@ -1,6 +1,6 @@
 import type { Page } from '@playwright/test'
 
-import { focusEditor } from 'tests/misc'
+import { focusEditor } from '../../tests/misc'
 
 export class TablePageObjectModel {
   constructor(

e2e/tests/crepe/table.spec.ts

@@ -1,6 +1,11 @@
 import { expect, test } from '@playwright/test'
-import { focusEditor, getMarkdown, paste, waitNextFrame } from 'tests/misc'
 
+import {
+  focusEditor,
+  getMarkdown,
+  paste,
+  waitNextFrame,
+} from '../../tests/misc'
 import { TablePageObjectModel } from './table.pom'
 
 test.beforeEach(async ({ page }) => {

e2e/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "rootDir": ".",
     "outDir": "lib",
     "jsx": "preserve",