Skip to content

Commit

Permalink
Merge pull request #73 from kurone-kito/maintenance
Browse files Browse the repository at this point in the history
v0.11.0: Maintenance updates
  • Loading branch information
kurone-kito authored May 13, 2024
2 parents bd2603a + d632a58 commit 3dd7c13
Show file tree
Hide file tree
Showing 22 changed files with 705 additions and 675 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Language: [🇬🇧](./CONTRIBUTING.md) | [🇯🇵](./CONTRIBUTING.ja.md) | **

---

1. 请注意我们有[行为准则](./CODE_OF_CONDUCT.ja.md),请在与项目的所有互动中遵循。
1. 请注意我们有[行为准则](./CODE_OF_CONDUCT.zh.md),请在与项目的所有互动中遵循。
2. 在为此存储库做出贡献时,请首先在进行更改之前与该存储库的所有者讨论您希望通过问题或任何其他方法进行的更改。
3. 如果您的想法可以通过**小修复显示,请直接使用[拉取请求](https://github.com/kurone-kito/lints-config/pulls)**
- 本版本库有时会在拉取请求和发布之间建立一对一的绑定关系,但这并**不是必须的**。我们欢迎您的拉取请求。
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/push-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
- 18.x
- 20.x
- 21.x
- 22.x
platform:
- os: ubuntu-latest
shell: bash
Expand Down
4 changes: 4 additions & 0 deletions .imgbotconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"compressWiki": true,
"ignoredFiles": ["*.svg"]
}
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.20.1
18.20.2
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
18.20.1
18.20.2
lts/hydrogen
node
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.20.1 ref:v18.20.1 lts-hydrogen lts latest system
nodejs 18.20.2 ref:v18.20.1 lts-hydrogen lts latest system
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"mode": "auto"
}
],
"files.associations": {
".imgbotconfig": "json",
"LICENSE": "plaintext"
},
"files.watcherExclude": {
"**/.eslintcache": true,
"**/.pnp.*": true,
Expand Down
17 changes: 12 additions & 5 deletions .yarn/sdks/typescript/lib/tsserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require typescript/lib/tsserver.js
require(absPnpApiPath).setup();
}
}

const moduleWrapper = tsserver => {
if (!process.versions.pnp) {
return tsserver;
Expand Down Expand Up @@ -214,11 +221,11 @@ const moduleWrapper = tsserver => {
return tsserver;
};

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require typescript/lib/tsserver.js
require(absPnpApiPath).setup();
}
const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10));
// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well.
// Ref https://github.com/microsoft/TypeScript/pull/55326
if (major > 5 || (major === 5 && minor >= 5)) {
moduleWrapper(absRequire(`typescript`));
}

// Defer to the real typescript/lib/tsserver.js your application uses
Expand Down
17 changes: 12 additions & 5 deletions .yarn/sdks/typescript/lib/tsserverlibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require typescript/lib/tsserverlibrary.js
require(absPnpApiPath).setup();
}
}

const moduleWrapper = tsserver => {
if (!process.versions.pnp) {
return tsserver;
Expand Down Expand Up @@ -214,11 +221,11 @@ const moduleWrapper = tsserver => {
return tsserver;
};

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require typescript/lib/tsserverlibrary.js
require(absPnpApiPath).setup();
}
const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10));
// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well.
// Ref https://github.com/microsoft/TypeScript/pull/55326
if (major > 5 || (major === 5 && minor >= 5)) {
moduleWrapper(absRequire(`typescript`));
}

// Defer to the real typescript/lib/tsserverlibrary.js your application uses
Expand Down
2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "5.4.4-sdk",
"version": "5.4.5-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
Expand Down
36 changes: 20 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kurone-kito/lints-config",
"version": "0.10.0",
"version": "0.11.0",
"private": true,
"description": "My configuration for the ESLint / Prettier / TypeScript",
"keywords": [
Expand Down Expand Up @@ -38,6 +38,8 @@
"lint:fix": "conc -m 1 \"yarn:lint:cspell:check\" \"yarn:lint:*:fix\"",
"lint:markdown:check": "markdownlint-cli2 \"**/*.md\"",
"lint:markdown:fix": "markdownlint-cli2 --fix \"**/*.md\"",
"lint:oxlint:check": "oxlint",
"lint:oxlint:fix": "oxlint --fix",
"lint:prettier:check": "yarn run prettier -cu",
"lint:prettier:fix": "yarn run prettier -uw",
"prettier": "prettier --cache --log-level=warn \"$@\" \"./**/*\"",
Expand All @@ -47,10 +49,10 @@
},
"prettier": "@kurone-kito/prettier-config",
"devDependencies": {
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0",
"@cspell/cspell-types": "^8.6.1",
"@cspell/eslint-plugin": "^8.6.1",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@cspell/cspell-types": "^8.8.1",
"@cspell/eslint-plugin": "^8.8.1",
"@kurone-kito/commitlint-config": "workspace:^",
"@kurone-kito/cspell-config": "workspace:^",
"@kurone-kito/eslint-config-base": "workspace:^",
Expand All @@ -59,11 +61,11 @@
"@kurone-kito/markdownlint-config": "workspace:^",
"@kurone-kito/prettier-config": "workspace:^",
"@kurone-kito/typescript-config": "workspace:^",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"@yarnpkg/sdks": "^3.1.0",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@yarnpkg/sdks": "^3.1.2",
"concurrently": "^8.2.2",
"cspell": "^8.6.1",
"cspell": "^8.8.1",
"eslint": "^8.57.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -72,22 +74,24 @@
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-editorconfig": "^4.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.2.3",
"eslint-plugin-jsdoc": "^48.2.4",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-markdown": "^4.0.1",
"eslint-plugin-markdownlint": "^0.5.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-markdown": "^5.0.0",
"eslint-plugin-markdownlint": "^0.6.0",
"eslint-plugin-n": "^17.6.0",
"eslint-plugin-oxlint": "^0.2.9",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-yaml": "^0.5.0",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"markdownlint-cli2": "^0.13.0",
"oxlint": "^0.3.4",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"typescript": "~5.4.4",
"rimraf": "^5.0.7",
"typescript": "~5.4.5",
"typescript-eslint-language-service": "^5.0.5"
},
"packageManager": "yarn@4.1.1+sha256.f3cc0eda8e5560e529c7147565b30faa43b4e472d90e8634d7134a37c7f59781",
"packageManager": "yarn@4.2.2+sha512.c44e283c54e02de9d1da8687025b030078c1b9648d2895a65aab8e64225bfb7becba87e1809fc0b4b6778bbd47a1e2ab6ac647de4c5e383a53a7c17db6c3ff4b",
"engines": {
"node": ">=18"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/commitlint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kurone-kito/commitlint-config",
"version": "0.10.0",
"version": "0.11.0",
"description": "My commitlint configuration for general projects",
"keywords": [
"commitlint",
Expand Down Expand Up @@ -35,11 +35,11 @@
"prepack": "conc -m 1 \"yarn:clean\" \"yarn:build\""
},
"devDependencies": {
"@commitlint/config-conventional": "^19.1.0",
"@commitlint/config-conventional": "^19.2.2",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"js-yaml": "^4.1.0",
"rimraf": "^5.0.5"
"rimraf": "^5.0.7"
},
"peerDependenciesMeta": {
"@commitlint/config-conventional": {
Expand Down
6 changes: 4 additions & 2 deletions packages/cspell-config/cspell.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ words:
- fuga
- hoge
- kito
- Kuroné
- kuron
- kuroné
- lintstagedrc
- piyo
- noconflict
- oxlint
- piyo
8 changes: 4 additions & 4 deletions packages/cspell-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kurone-kito/cspell-config",
"version": "0.10.0",
"version": "0.11.0",
"description": "My CSpell configuration for general projects",
"keywords": [
"config",
Expand Down Expand Up @@ -40,12 +40,12 @@
"prepack": "conc -m 1 \"yarn:clean\" \"yarn:build\""
},
"devDependencies": {
"@cspell/cspell-types": "^8.6.1",
"@cspell/cspell-types": "^8.8.1",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"cspell": "^8.6.1",
"cspell": "^8.8.1",
"js-yaml": "^4.1.0",
"rimraf": "^5.0.5"
"rimraf": "^5.0.7"
},
"peerDependenciesMeta": {
"@cspell/cspell-types": {
Expand Down
3 changes: 2 additions & 1 deletion packages/eslint-config-base/.eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extends:
- plugin:editorconfig/noconflict
- plugin:@cspell/recommended
- plugin:jsdoc/recommended
- plugin:node/recommended
- plugin:n/recommended
- eslint:recommended
- plugin:import/recommended
- plugin:import/typescript
Expand All @@ -18,6 +18,7 @@ extends:
# Because we want to apply the Airbnb rules as much as possible,
# we have placed them closer to the end.
- airbnb-typescript/base
- plugin:oxlint/recommended
- prettier
overrides:
- env:
Expand Down
29 changes: 17 additions & 12 deletions packages/eslint-config-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kurone-kito/eslint-config-base",
"version": "0.10.0",
"version": "0.11.0",
"description": "My ESLint configuration for general Node.js projects",
"keywords": [
"config",
Expand Down Expand Up @@ -36,10 +36,10 @@
},
"prettier": "@kurone-kito/prettier-config",
"devDependencies": {
"@cspell/eslint-plugin": "^8.6.1",
"@cspell/eslint-plugin": "^8.8.1",
"@kurone-kito/prettier-config": "workspace:^",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"eslint": "^8.57.0",
Expand All @@ -50,16 +50,17 @@
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-editorconfig": "^4.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.2.3",
"eslint-plugin-jsdoc": "^48.2.4",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-markdown": "^4.0.1",
"eslint-plugin-markdownlint": "^0.5.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-markdown": "^5.0.0",
"eslint-plugin-markdownlint": "^0.6.0",
"eslint-plugin-n": "^17.6.0",
"eslint-plugin-oxlint": "^0.2.9",
"eslint-plugin-yaml": "^0.5.0",
"js-yaml": "^4.1.0",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"typescript": "~5.4.4"
"rimraf": "^5.0.7",
"typescript": "~5.4.5"
},
"peerDependencies": {
"@cspell/eslint-plugin": ">=6.x.x",
Expand All @@ -77,7 +78,8 @@
"eslint-plugin-json": ">=3.x.x",
"eslint-plugin-markdown": ">=3.x.x",
"eslint-plugin-markdownlint": ">=0.5.x",
"eslint-plugin-node": ">=11.x.x",
"eslint-plugin-n": ">=17.x.x",
"eslint-plugin-oxlint": ">=0.2.x",
"eslint-plugin-yaml": ">=0.5.x"
},
"peerDependenciesMeta": {
Expand Down Expand Up @@ -126,7 +128,10 @@
"eslint-plugin-markdownlint": {
"optional": true
},
"eslint-plugin-node": {
"eslint-plugin-n": {
"optional": true
},
"eslint-plugin-oxlint": {
"optional": true
},
"eslint-plugin-yaml": {
Expand Down
Loading

0 comments on commit 3dd7c13

Please sign in to comment.