Skip to content

Commit

Permalink
kurone-kito/cumulative-updatesからプルリクエスト#87をマージする
Browse files Browse the repository at this point in the history
v0.13.0: Cumulative updates
  • Loading branch information
kurone-kito authored Jul 16, 2024
2 parents fcfb23a + 50a8e8c commit 3ba52c7
Show file tree
Hide file tree
Showing 21 changed files with 672 additions and 547 deletions.
6 changes: 3 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# vim: set ft=sh :

if [ ! -e packages/prettier-config/.prettierrc.json ]; then
echo 'ERROR: Prettier config not found.' 1>&2
echo 'Please run "yarn install && yarn run build" in the project root directory before committing.' 1>&2
exit 1
corepack enable
corepack up
yarn run build
fi

yarn exec lint-staged
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.20.3
18.20.4
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
18.20.3
18.20.4
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.3 ref:v18.20.3 lts-hydrogen lts latest system
nodejs 18.20.4 ref:v18.20.3 lts-hydrogen lts latest system
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"recommendations": [
"arcanis.vscode-zipfs",
"davidanson.vscode-markdownlint",
"dbaeumer.vscode-eslint",
"editorconfig.editorconfig",
"esbenp.prettier-vscode",
Expand Down
14 changes: 14 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
{
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.expand": false,
"explorer.fileNesting.patterns": {
"*": "${capture}.meta, ${capture}.md5",
"*.md": "${capture}.*.md",
"*.yml": "${capture}.json",
".eslintrc*": ".eslintignore",
".gitattributes": ".gitignore",
".markdownlint.*": ".markdownlint-cli2.*",
".pnp.loader.mjs": ".pnp.cjs",
".tool-versions": ".node-version, .nvmrc",
"package.json": ".yarnrc.yml, yarn.lock",
"tsconfig.json": "${capture}.tsbuildinfo"
},
"eslint.nodePath": ".yarn/sdks",
"eslint.workingDirectories": [
{
Expand Down
2 changes: 1 addition & 1 deletion .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "3.3.2-sdk",
"version": "3.3.3-sdk",
"main": "./index.cjs",
"type": "commonjs",
"bin": "./bin/prettier.cjs"
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.5-sdk",
"version": "5.5.3-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kurone-kito/lints-config",
"version": "0.12.0",
"version": "0.13.0",
"private": true,
"description": "My configuration for the ESLint / Prettier / TypeScript",
"keywords": [
Expand Down Expand Up @@ -28,7 +28,7 @@
"scripts": {
"build": "yarn run sub run build",
"clean": "conc \"yarn:clean:*\"",
"clean:root": "rimraf -g node_modules/.cache \"*.tgz\" \"*.tsbuildinfo\"",
"clean:root": "rimraf -g \"*.tgz\" \"*.tsbuildinfo\" node_modules/.cache",
"clean:sub": "yarn run sub run clean",
"postinstall": "husky",
"lint": "conc -m 1 \"yarn:lint:*:check\"",
Expand All @@ -52,8 +52,8 @@
"devDependencies": {
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@cspell/cspell-types": "^8.9.0",
"@cspell/eslint-plugin": "^8.9.0",
"@cspell/cspell-types": "^8.10.4",
"@cspell/eslint-plugin": "^8.10.4",
"@kurone-kito/commitlint-config": "workspace:^",
"@kurone-kito/cspell-config": "workspace:^",
"@kurone-kito/eslint-config-base": "workspace:^",
Expand All @@ -62,11 +62,11 @@
"@kurone-kito/markdownlint-config": "workspace:^",
"@kurone-kito/prettier-config": "workspace:^",
"@kurone-kito/typescript-config": "workspace:^",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@yarnpkg/sdks": "^3.1.3",
"concurrently": "^8.2.2",
"cspell": "^8.9.0",
"cspell": "^8.10.4",
"eslint": "^8.57.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -75,24 +75,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.12",
"eslint-plugin-jsdoc": "^48.7.0",
"eslint-plugin-json": "^4.0.0",
"eslint-plugin-markdown": "^5.0.0",
"eslint-plugin-markdown": "^5.1.0",
"eslint-plugin-markdownlint": "^0.6.0",
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-oxlint": "^0.4.0",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-yaml": "^1.0.0",
"eslint-plugin-oxlint": "^0.5.0",
"eslint-plugin-react": "^7.34.4",
"eslint-plugin-yaml": "^1.0.3",
"husky": "^9.0.11",
"lint-staged": "^15.2.7",
"markdownlint-cli2": "^0.13.0",
"oxlint": "^0.4.4",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "~5.4.5",
"oxlint": "^0.6.0",
"prettier": "^3.3.3",
"rimraf": "^5.0.9",
"typescript": "~5.5.3",
"typescript-eslint-language-service": "^5.0.5"
},
"packageManager": "yarn@4.3.0+sha512.1606bef7c84bc7d83b8576063de2fd08f7d69f9939015bed800f9585a002390268ecc777e9feeba7e26e9556aef6beaad4806968db2182ab5dd3e955ab3b9a0b",
"packageManager": "yarn@4.3.1+sha512.af78262d7d125afbfeed740602ace8c5e4405cd7f4735c08feb327286b2fdb2390fbca01589bfd1f50b1240548b74806767f5a063c94b67e431aabd0d86f7774",
"engines": {
"node": ">=18"
},
Expand Down
8 changes: 4 additions & 4 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.12.0",
"version": "0.13.0",
"description": "My commitlint configuration for general projects",
"keywords": [
"commitlint",
Expand Down Expand Up @@ -30,16 +30,16 @@
"scripts": {
"build": "conc \"yarn:build:*\"",
"build:json": "js-yaml .commitlintrc.yml > .commitlintrc.json",
"build:license": "cpy \"../../LICENSE\" \"commitlint-config/LICENSE\"",
"clean": "rimraf -g LICENSE .commitlintrc.json \"*.tgz\"",
"build:license": "cpy --flat ../../LICENSE .",
"clean": "rimraf -g \"*.tgz\" .commitlintrc.json LICENSE",
"prepack": "conc -m 1 \"yarn:clean\" \"yarn:build\""
},
"devDependencies": {
"@commitlint/config-conventional": "^19.2.2",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"js-yaml": "^4.1.0",
"rimraf": "^5.0.7"
"rimraf": "^5.0.9"
},
"peerDependenciesMeta": {
"@commitlint/config-conventional": {
Expand Down
5 changes: 4 additions & 1 deletion packages/cspell-config/cspell.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ dictionaries:
- companies
- cpp
- csharp
- css
- docker
- dotnet
- en_US
- en-gb
- eo
- filetypes
- fonts
- fsharp
- fullstack
- git
- html
Expand All @@ -20,6 +22,7 @@ dictionaries:
- node
- npm
- powershell
- php
- shell
- softwareTerms
- typescript
Expand All @@ -28,7 +31,6 @@ features:
weighted-suggestions: true
globRoot: ${cwd}
id: kurone-kito
language: en,eo,ja
ignorePaths:
- .*ignore
- .git
Expand All @@ -42,6 +44,7 @@ ignorePaths:
ignoreRegExpList:
# Ignore the scope name of the packages.
- '@[a-zA-Z0-9_-]+/'
language: en,eo,ja
useGitignore: true
version: '0.2'
words:
Expand Down
12 changes: 6 additions & 6 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.12.0",
"version": "0.13.0",
"description": "My CSpell configuration for general projects",
"keywords": [
"config",
Expand Down Expand Up @@ -35,17 +35,17 @@
"scripts": {
"build": "conc \"yarn:build:*\"",
"build:json": "js-yaml cspell.config.yml > cspell.config.json",
"build:license": "cpy \"../../LICENSE\" \"cspell-config/LICENSE\"",
"clean": "rimraf -g LICENSE cspell.config.json \"*.tgz\"",
"build:license": "cpy --flat ../../LICENSE .",
"clean": "rimraf -g \"*.tgz\" cspell.config.json LICENSE",
"prepack": "conc -m 1 \"yarn:clean\" \"yarn:build\""
},
"devDependencies": {
"@cspell/cspell-types": "^8.9.0",
"@cspell/cspell-types": "^8.10.4",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"cspell": "^8.9.0",
"cspell": "^8.10.4",
"js-yaml": "^4.1.0",
"rimraf": "^5.0.7"
"rimraf": "^5.0.9"
},
"peerDependenciesMeta": {
"@cspell/cspell-types": {
Expand Down
26 changes: 13 additions & 13 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.12.0",
"version": "0.13.0",
"description": "My ESLint configuration for general Node.js projects",
"keywords": [
"config",
Expand Down Expand Up @@ -30,16 +30,16 @@
"scripts": {
"build": "conc \"yarn:build:*\"",
"build:json": "js-yaml .eslintrc.yml > .eslintrc.json",
"build:license": "cpy \"../../LICENSE\" \"eslint-config-base/LICENSE\"",
"clean": "rimraf -g .eslintcache .eslintrc.json LICENSE \"*.tgz\" \"*.tsbuildinfo\"",
"build:license": "cpy --flat ../../LICENSE .",
"clean": "rimraf -g \"*.tgz\" \"*.tsbuildinfo\" .eslintcache .eslintrc.json LICENSE",
"prepack": "conc -m 1 \"yarn:clean\" \"yarn:build\""
},
"prettier": "@kurone-kito/prettier-config",
"devDependencies": {
"@cspell/eslint-plugin": "^8.9.0",
"@cspell/eslint-plugin": "^8.10.4",
"@kurone-kito/prettier-config": "workspace:^",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"eslint": "^8.57.0",
Expand All @@ -50,17 +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.12",
"eslint-plugin-jsdoc": "^48.7.0",
"eslint-plugin-json": "^4.0.0",
"eslint-plugin-markdown": "^5.0.0",
"eslint-plugin-markdown": "^5.1.0",
"eslint-plugin-markdownlint": "^0.6.0",
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-oxlint": "^0.4.0",
"eslint-plugin-yaml": "^1.0.0",
"eslint-plugin-oxlint": "^0.5.0",
"eslint-plugin-yaml": "^1.0.3",
"js-yaml": "^4.1.0",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "~5.4.5"
"prettier": "^3.3.3",
"rimraf": "^5.0.9",
"typescript": "~5.5.3"
},
"peerDependencies": {
"@cspell/eslint-plugin": ">=6.x.x",
Expand Down
30 changes: 15 additions & 15 deletions packages/eslint-config-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kurone-kito/eslint-config-react",
"version": "0.12.0",
"version": "0.13.0",
"description": "My ESLint configuration for React projects",
"keywords": [
"config",
Expand Down Expand Up @@ -31,19 +31,19 @@
"scripts": {
"build": "conc \"yarn:build:*\"",
"build:json": "js-yaml .eslintrc.yml > .eslintrc.json",
"build:license": "cpy \"../../LICENSE\" \"eslint-config-react/LICENSE\"",
"clean": "rimraf -g .eslintcache .eslintrc.json LICENSE \"*.tgz\" \"*.tsbuildinfo\"",
"build:license": "cpy --flat ../../LICENSE .",
"clean": "rimraf -g \"*.tgz\" \"*.tsbuildinfo\" .eslintcache .eslintrc.json LICENSE",
"prepack": "conc -m 1 \"yarn:clean\" \"yarn:build\""
},
"prettier": "@kurone-kito/prettier-config",
"dependencies": {
"@kurone-kito/eslint-config-base": "workspace:^"
},
"devDependencies": {
"@cspell/eslint-plugin": "^8.9.0",
"@cspell/eslint-plugin": "^8.10.4",
"@kurone-kito/prettier-config": "workspace:^",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"eslint": "^8.57.0",
Expand All @@ -54,21 +54,21 @@
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-editorconfig": "^4.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.2.12",
"eslint-plugin-jsdoc": "^48.7.0",
"eslint-plugin-json": "^4.0.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-markdown": "^5.0.0",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-markdown": "^5.1.0",
"eslint-plugin-markdownlint": "^0.6.0",
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-oxlint": "^0.4.0",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-oxlint": "^0.5.0",
"eslint-plugin-react": "^7.34.4",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-yaml": "^1.0.0",
"eslint-plugin-yaml": "^1.0.3",
"js-yaml": "^4.1.0",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "~5.4.5"
"prettier": "^3.3.3",
"rimraf": "^5.0.9",
"typescript": "~5.5.3"
},
"peerDependencies": {
"@cspell/eslint-plugin": ">=6.x.x",
Expand Down
3 changes: 2 additions & 1 deletion packages/lint-staged-config/lint-staged.config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'*':
- cspell lint --no-must-find-files --no-progress --show-suggestions -u
- eslint --cache --cache-location node_modules/.cache/eslint/ --cache-strategy=content -f codeframe
- eslint --cache --cache-location node_modules/.cache/eslint/ --cache-strategy=content --fix -f codeframe
- oxlint --fix
- prettier --cache --log-level=warn -uw
8 changes: 4 additions & 4 deletions packages/lint-staged-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kurone-kito/lint-staged-config",
"version": "0.12.0",
"version": "0.13.0",
"description": "My lint-staged configuration for general projects",
"keywords": [
"config",
Expand Down Expand Up @@ -33,15 +33,15 @@
"scripts": {
"build": "conc \"yarn:build:*\"",
"build:json": "js-yaml lint-staged.config.yml > lint-staged.config.json",
"build:license": "cpy \"../../LICENSE\" \"lint-staged-config/LICENSE\"",
"clean": "rimraf -g LICENSE lint-staged.config.json \"*.tgz\"",
"build:license": "cpy --flat ../../LICENSE .",
"clean": "rimraf -g \"*.tgz\" LICENSE lint-staged.config.json",
"prepack": "conc -m 1 \"yarn:clean\" \"yarn:build\""
},
"devDependencies": {
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"js-yaml": "^4.1.0",
"rimraf": "^5.0.7"
"rimraf": "^5.0.9"
},
"peerDependencies": {
"cspell": ">=5.7.x",
Expand Down
Loading

0 comments on commit 3ba52c7

Please sign in to comment.