diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 12f4d47..584f87c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -19,7 +19,6 @@ jobs: registry-url: https://registry.npmjs.org - run: pnpm install - - run: pnpm install-cli - run: pnpm lint - run: pnpm test - run: pnpm build diff --git a/eslint.config.ts b/eslint.config.ts index 551b2f7..847f88d 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -1 +1,5 @@ -export { default } from '@moeru/eslint-config' +import { defineConfig } from '@moeru/eslint-config' + +export default defineConfig({}, { + ignores: ['packages/eslint-config/src/moeru-lint.js'], +}) diff --git a/package.json b/package.json index 07b9222..9a7d59e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "build:packages": "pnpm -rF \"./packages/*\" build", "bump": "bumpp", "dev": "pnpm -rF @moeru/std-docs dev", - "install-cli": "pnpm -rF @moeru/eslint-config build && pnpm i", "lint": "moeru-lint --flag unstable_native_nodejs_ts_config", "test": "pnpm -r test" }, diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index e3f344f..fa4410a 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -23,10 +23,11 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "bin": { - "moeru-lint": "./dist/bin/moeru-lint.js" + "moeru-lint": "./src/moeru-lint.js" }, "files": [ - "dist" + "dist", + "src/moeru-lint.js" ], "scripts": { "build": "pkgroll" diff --git a/packages/eslint-config/src/bin/moeru-lint.ts b/packages/eslint-config/src/moeru-lint.js similarity index 90% rename from packages/eslint-config/src/bin/moeru-lint.ts rename to packages/eslint-config/src/moeru-lint.js index 764b438..028ad79 100644 --- a/packages/eslint-config/src/bin/moeru-lint.ts +++ b/packages/eslint-config/src/moeru-lint.js @@ -1,12 +1,9 @@ #!/usr/bin/env node -/* eslint-disable sonarjs/no-os-command-from-path */ -/* eslint-disable no-console */ -/* eslint-disable @masknet/no-top-level */ import { spawn } from 'node:child_process' import { parseArgs } from 'node:util' -import { version } from '../../package.json' +import pkg from '../package.json' with { type: 'json' } const { positionals, values } = parseArgs({ allowPositionals: true, @@ -51,7 +48,7 @@ const { positionals, values } = parseArgs({ }) if (values.version) { - console.info(version) + console.info(pkg.version) } else if (values.help) { console.info('Usage: moeru-lint [--fix] [--flag ]') diff --git a/tsconfig.lib.json b/tsconfig.lib.json index 1749049..3f0eb4c 100644 --- a/tsconfig.lib.json +++ b/tsconfig.lib.json @@ -1,5 +1,9 @@ { "extends": "@moeru/tsconfig", + "compilerOptions": { + "allowJs": true, + "checkJs": true + }, "include": [ "packages/**/src", "packages/**/test"