Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"mode": "pre",
"tag": "next",
"initialVersions": {
"@kitql-old/all-in": "0.9.6",
"create-kitql": "0.1.7",
"create-kitql-kit-routes": "0.0.1",
"create-kitql-sveltekit-remult": "0.0.1",
"@kitql/eslint-config": "0.3.7",
"@kitql/handles": "0.2.0",
"@kitql/helpers": "0.8.10",
"@kitql/internals": "0.9.9",
"vite-plugin-kit-routes": "0.6.10",
"vite-plugin-stripper": "0.5.4",
"vite-plugin-watch-and-run": "1.7.1",
"website": "1.1.2"
},
"changesets": []
}
5 changes: 5 additions & 0 deletions .changeset/thick-ducks-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kitql/eslint-config': minor
---

Bump to eslint 9 and prettier 3
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"@vitest/coverage-v8": "2.0.5",
"esbuild": "0.23.1",
"nx": "19.6.1",
"prettier": "3.3.3",
"rimraf": "5.0.0"
}
}
3 changes: 0 additions & 3 deletions packages/create-kitql/.eslintrc.cjs

This file was deleted.

3 changes: 3 additions & 0 deletions packages/create-kitql/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import kitql from '@kitql/eslint-config'

export default [...kitql]
1 change: 0 additions & 1 deletion packages/eslint-config/.eslintrc.cjs

This file was deleted.

2 changes: 1 addition & 1 deletion packages/eslint-config/.prettierrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ module.exports = {
'',
'^[./]', // inside
],
importOrderSeparation: true,
// importOrderSeparation: true,
}
15 changes: 8 additions & 7 deletions packages/eslint-config/cmd.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env node
import { spawn, spawnSync } from 'child_process'
import fs from 'fs'
import { spawn, spawnSync } from 'node:child_process'
import fs from 'node:fs'
import { Option, program } from 'commander'

import { Log, red } from '@kitql/helpers'
Expand Down Expand Up @@ -38,8 +38,8 @@ const findFileOrUp = (fileName) => {
process.exit(1)
}

let pathPrettierIgnore = findFileOrUp('.prettierignore')
let pathPrettierCjs = findFileOrUp('.prettierrc.cjs')
const pathPrettierIgnore = findFileOrUp('.prettierignore')
const pathPrettierCjs = findFileOrUp('.prettierrc.cjs')

const format = options_cli.format ?? false
const glob = options_cli.glob ?? '.'
Expand Down Expand Up @@ -72,7 +72,7 @@ const cmdPrettier =
if (verbose) {
log.info(cmdPrettier)
}
let result_prettier = spawn(cmdPrettier, {
const result_prettier = spawn(cmdPrettier, {
shell: true,
cwd: process.cwd(),
stdio: 'pipe',
Expand Down Expand Up @@ -108,7 +108,7 @@ function esLintRun(code) {
preToUse +
`eslint` +
// ignore?
` --ignore-path ${pathPrettierIgnore}` +
` --ignore-pattern ${pathPrettierIgnore}` +
// format or not
`${format ? ' --fix' : ''}` +
// exec
Expand All @@ -118,7 +118,7 @@ function esLintRun(code) {
log.info(cmdEsLint)
}

let result_eslint = spawnSync(cmdEsLint, {
const result_eslint = spawnSync(cmdEsLint, {
shell: true,
cwd: process.cwd(),
stdio: 'inherit',
Expand Down Expand Up @@ -166,5 +166,6 @@ result_prettier.on('close', (data) => {
if (verbose) {
log.info(`close`, data)
}

esLintRun(data)
})
60 changes: 60 additions & 0 deletions packages/eslint-config/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import js from '@eslint/js'
import svelte from 'eslint-plugin-svelte'
import globals from 'globals'
import ts from 'typescript-eslint'

/** @type {import('eslint').Linter.Config[]} */
export default [
js.configs.recommended,
...ts.configs.recommended,
...svelte.configs['flat/recommended'],
{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},
},
},
{
files: ['**/*.svelte'],
languageOptions: {
parserOptions: {
parser: ts.parser,
},
},
},
{
ignores: ['build/', '.svelte-kit/', 'dist/'],
},
{
rules: {
'no-console': [
'error',
{
allow: ['info', 'warn', 'error', 'time', 'timeEnd', 'dir'],
},
],
'@typescript-eslint/no-unused-vars': [
'warn',
{
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
caughtErrorsIgnorePattern: '^(_.*|e|error)$',
},
],
'@typescript-eslint/no-require-imports': 'off',
'@typescript-eslint/ban-ts-ignore': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/no-unused-expressions': 'off',
'@typescript-eslint/no-empty-object-type': 'off',

'no-undef': 'off',
'svelte/no-at-html-tags': 'off',
'no-inner-declarations': 'off',
'svelte/no-inner-declarations': 'off',
},
},
]
52 changes: 0 additions & 52 deletions packages/eslint-config/index.cjs

This file was deleted.

109 changes: 53 additions & 56 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,55 @@
{
"name": "@kitql/eslint-config",
"description": "opinionated linting and formatting for projects",
"keywords": [
"cli",
"eslint",
"eslint-config"
],
"version": "0.3.7",
"license": "MIT",
"type": "module",
"repository": {
"type": "git",
"url": "https://github.com/jycouet/kitql",
"directory": "packages/eslint-config",
"homepage": "https://github.com/jycouet/kitql/tree/main/packages/eslint-config"
},
"bin": {
"kitql-lint": "./cmd.js"
},
"main": "index.cjs",
"scripts": {
"lint": "node ./cmd.js --verbose -p none",
"format": "node ./cmd.js -f",
"lint:example": "kitql-lint",
"format:example": "kitql-lint --format"
},
"dependencies": {
"@kitql/helpers": "workspace:*",
"@theguild/eslint-config": "^0.11.1",
"@theguild/prettier-config": "2.0.2",
"@typescript-eslint/eslint-plugin": "7.7.0",
"@typescript-eslint/parser": "7.7.0",
"@vue/compiler-sfc": "3.4.7",
"commander": "^12.0.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-svelte": "2.43.0",
"eslint-plugin-unused-imports": "3.2.0",
"prettier": "3.2.4",
"prettier-plugin-sh": "0.14.0",
"prettier-plugin-svelte": "3.2.2",
"prettier-plugin-tailwindcss": "0.5.7",
"svelte": "4.2.19",
"typescript": "5.4.2"
},
"sideEffects": false,
"publishConfig": {
"access": "public"
},
"files": [
"index.cjs",
"cmd.sh",
"cmd.js",
".eslintrc.cjs",
".prettierrc.cjs"
]
"name": "@kitql/eslint-config",
"version": "0.3.7",
"type": "module",
"description": "opinionated linting and formatting for projects",
"repository": {
"type": "git",
"url": "https://github.com/jycouet/kitql",
"directory": "packages/eslint-config",
"homepage": "https://github.com/jycouet/kitql/tree/main/packages/eslint-config"
},
"license": "MIT",
"bin": {
"kitql-lint": "./cmd.js"
},
"main": "eslint.config.js",
"files": [
".prettierrc.cjs",
"cmd.js",
"cmd.sh",
"eslint.config.js"
],
"keywords": [
"cli",
"eslint",
"eslint-config"
],
"scripts": {
"format": "node ./cmd.js -f",
"format:example": "kitql-lint --format",
"lint": "node ./cmd.js --verbose -p none",
"lint:example": "kitql-lint"
},
"peerDependencies": {
"prettier": "^3.3.3"
},
"dependencies": {
"@eslint/js": "^9.10.0",
"@kitql/helpers": "workspace:*",
"@theguild/prettier-config": "2.0.7",
"@types/eslint": "9.6.1",
"commander": "12.1.0",
"eslint": "9.10.0",
"eslint-plugin-svelte": "2.43.0",
"globals": "15.9.0",
"prettier": "3.3.3",
"prettier-plugin-svelte": "3.2.6",
"prettier-plugin-tailwindcss": "0.6.6",
"typescript-eslint": "8.5.0"
},
"publishConfig": {
"access": "public"
},
"sideEffects": false
}
3 changes: 0 additions & 3 deletions packages/handles/.eslintrc.cjs

This file was deleted.

3 changes: 3 additions & 0 deletions packages/handles/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import kitql from '@kitql/eslint-config'

export default [...kitql]
Loading