Skip to content

Commit

Permalink
kurone-kito/add-the-lint-staged-configurationからのプルリクエスト#57をマージする
Browse files Browse the repository at this point in the history
v0.8.1: Added the lint-staged configuration and maintenance updates
  • Loading branch information
kurone-kito authored Nov 12, 2023
2 parents e4c03a1 + 72739e2 commit 9933326
Show file tree
Hide file tree
Showing 35 changed files with 2,435 additions and 4,512 deletions.
4 changes: 2 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ $RECYCLE.BIN/
# yarn v2
.yarn/
yarn.lock
*.pro

### Others ###
### Text ###
*.md
LICENSE
6 changes: 3 additions & 3 deletions .github/workflows/push-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
git config --global core.autocrlf false
git config --global core.eol lf
- name: Stages the pushed branch
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Prepare the Node.js version ${{ matrix.node-version }} environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: ${{ !env.ACT && 'yarn' || '' }}
node-version: ${{ matrix.node-version }}
- name: Enable the corepack because of the Yarn 3
- name: Enable the corepack because of the Yarn berry
run: corepack enable
- env:
HUSKY: 0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Stages the pushed branch
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Prepare the Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
cache: ${{ !env.ACT && 'yarn' || '' }}
node-version-file: .node-version
- name: Enable the corepack because of the Yarn 3
- name: Enable the corepack because of the Yarn berry
run: corepack enable
- env:
HUSKY: 0
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ $RECYCLE.BIN/
# Built files
packages/cspell-config/cspell.config.json
packages/eslint-config-*/.eslintrc.json
packages/lint-staged-config/lint-staged.config.json
packages/prettier-config/.prettierrc.json

### Others ###
# Text
### Text ###
packages/**/LICENSE
1 change: 1 addition & 0 deletions .lintstagedrc.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from '@kurone-kito/lint-staged-config/.lintstagedrc.json' assert { type: 'json' };
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"**/.yarn/unplugged/**": true,
"**/packages/**/*.tsbuildinfo": true
},
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
"prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
"search.exclude": {
"**/.pnp.*": true,
"**/.yarn": true
Expand Down
52 changes: 0 additions & 52 deletions .yarn/plugins/@yarnpkg/plugin-constraints.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-engines.cjs

This file was deleted.

541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

550 changes: 0 additions & 550 deletions .yarn/plugins/@yarnpkg/plugin-version.cjs

This file was deleted.

28 changes: 0 additions & 28 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.4.cjs

This file was deleted.

20 changes: 20 additions & 0 deletions .yarn/sdks/eslint/lib/unsupported-api.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);

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 eslint/use-at-your-own-risk
require(absPnpApiPath).setup();
}
}

// Defer to the real eslint/use-at-your-own-risk your application uses
module.exports = absRequire(`eslint/use-at-your-own-risk`);
12 changes: 10 additions & 2 deletions .yarn/sdks/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"name": "eslint",
"version": "8.52.0-sdk",
"version": "8.53.0-sdk",
"main": "./lib/api.js",
"type": "commonjs"
"type": "commonjs",
"bin": {
"eslint": "./bin/eslint.js"
},
"exports": {
"./package.json": "./package.json",
".": "./lib/api.js",
"./use-at-your-own-risk": "./lib/unsupported-api.js"
}
}
20 changes: 20 additions & 0 deletions .yarn/sdks/prettier/bin/prettier.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);

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 prettier/bin/prettier.cjs
require(absPnpApiPath).setup();
}
}

// Defer to the real prettier/bin/prettier.cjs your application uses
module.exports = absRequire(`prettier/bin/prettier.cjs`);
File renamed without changes.
5 changes: 3 additions & 2 deletions .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "prettier",
"version": "3.0.3-sdk",
"main": "./index.js",
"type": "commonjs"
"main": "./index.cjs",
"type": "commonjs",
"bin": "./bin/prettier.cjs"
}
6 changes: 3 additions & 3 deletions .yarn/sdks/typescript/lib/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);

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

// Defer to the real typescript/lib/typescript.js your application uses
module.exports = absRequire(`typescript/lib/typescript.js`);
// Defer to the real typescript your application uses
module.exports = absRequire(`typescript`);
6 changes: 5 additions & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
"name": "typescript",
"version": "5.2.2-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
"type": "commonjs",
"bin": {
"tsc": "./bin/tsc",
"tsserver": "./bin/tsserver"
}
}
20 changes: 4 additions & 16 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,12 @@
compressionLevel: mixed

enableGlobalCache: false

npmPublishAccess: public

npmScopes:
kurone-kito:
npmAuthToken: "${NPM_TOKEN:-invalid_token}"
npmRegistryServer: "https://registry.npmjs.com"

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-constraints.cjs
spec: "@yarnpkg/plugin-constraints"
- path: .yarn/plugins/@yarnpkg/plugin-engines.cjs
spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
spec: "@yarnpkg/plugin-version"
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

pnpEnableEsmLoader: true

yarnPath: .yarn/releases/yarn-3.6.4.cjs
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ My configuration for the ESLint / Prettier / TypeScript
- [`packages/cspell-config`](packages/cspell-config/README.md): My CSpell configuration for general projects.
- [`packages/eslint-config-base`](packages/eslint-config-base/README.md): My ESLint configuration for general projects.
- [`packages/eslint-config-react`](packages/eslint-config-base/README.md): My ESLint configuration for React projects.
- [`packages/lint-staged-config`](packages/lint-staged-config/README.md): My lint-staged configuration for general projects.
- [`packages/prettier-config`](packages/prettier-config/README.md): My Prettier configuration for general projects.
- [`packages/typescript-config`](packages/typescript-config/README.md): My TypeScript configuration for general projects.

Expand Down
3 changes: 0 additions & 3 deletions constraints.pro

This file was deleted.

37 changes: 19 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "@kurone-kito/lints-config",
"version": "0.8.0",
"version": "0.8.1",
"private": true,
"description": "My configuration for the ESLint / Prettier / TypeScript",
"keywords": [
"config",
"cspell",
"eslint",
"eslintconfig",
"lint-staged",
"prettier",
"typescript"
],
Expand Down Expand Up @@ -38,54 +39,54 @@
"lint:prettier:check": "yarn run prettier -cu",
"lint:prettier:fix": "yarn run prettier -uw",
"prettier": "prettier --cache --log-level=warn \"$@\" \"./**/*\"",
"publish": "yarn workspaces foreach --no-private -t -j 1 npm publish",
"publish": "yarn workspaces foreach --no-private -tA -j 1 npm publish",
"start": "yarn run sub -j unlimited run start",
"sub": "yarn workspaces foreach --no-private -ipv",
"sub": "yarn workspaces foreach --no-private -ipvA",
"test": "yarn run lint"
},
"prettier": "@kurone-kito/prettier-config",
"devDependencies": {
"@commitlint/cli": "^18.0.0",
"@commitlint/config-conventional": "^18.0.0",
"@cspell/cspell-types": "^7.3.8",
"@cspell/eslint-plugin": "^7.3.8",
"@commitlint/cli": "^18.4.1",
"@commitlint/config-conventional": "^18.4.0",
"@cspell/cspell-types": "^8.0.0",
"@cspell/eslint-plugin": "^8.0.0",
"@kurone-kito/cspell-config": "workspace:*",
"@kurone-kito/eslint-config-base": "workspace:*",
"@kurone-kito/eslint-config-react": "workspace:*",
"@kurone-kito/lint-staged-config": "workspace:*",
"@kurone-kito/prettier-config": "workspace:*",
"@kurone-kito/typescript-config": "workspace:*",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"@yarnpkg/sdks": "^3.0.0-rc.53",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"@yarnpkg/sdks": "^3.0.0",
"aicommits": "^1.11.0",
"concurrently": "^8.2.2",
"cspell": "^7.3.8",
"eslint": "^8.52.0",
"cspell": "^8.0.0",
"eslint": "^8.53.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
"eslint-formatter-codeframe": "^7.32.1",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-editorconfig": "^4.0.3",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jsdoc": "^46.8.2",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jsdoc": "^46.9.0",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-lodash": "^7.4.0",
"eslint-plugin-markdown": "^3.0.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-yaml": "^0.5.0",
"husky": "^8.0.3",
"lint-staged": "^15.0.2",
"lint-staged": "^15.1.0",
"prettier": "^3.0.3",
"rimraf": "^5.0.5",
"typescript": "~5.2.2",
"typescript-eslint-language-service": "^5.0.5"
},
"packageManager": "yarn@3.6.4",
"packageManager": "yarn@4.0.1",
"engines": {
"node": ">=18",
"yarn": ">=2.4.3"
"node": ">=18"
},
"publishConfig": {
"access": "public"
Expand Down
7 changes: 7 additions & 0 deletions packages/cspell-config/cspell.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ dictionaries:
- bash
- companies
- cpp
- docker
- en_US
- en-gb
- filetypes
- fullstack
- git
- misc
- node
Expand All @@ -30,8 +33,12 @@ ignoreRegExpList:
- '@[a-zA-Z0-9_-]+/'
words:
- aicommits
- fuga
- hoge
- kito
- Kuroné
- lintstagedrc
- piyo
- noconflict
useGitignore: true
version: '0.2'
7 changes: 4 additions & 3 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.8.0",
"version": "0.8.1",
"description": "My CSpell configuration for general projects",
"keywords": [
"config",
Expand All @@ -13,6 +13,7 @@
"url": "https://github.com/kurone-kito/lints-config.git",
"directory": "packages/cspell-config"
},
"license": "MIT",
"author": "kurone-kito <[email protected]> (https://kit.black/)",
"type": "module",
"exports": {
Expand Down Expand Up @@ -40,10 +41,10 @@
"prepack": "conc -m 1 \"yarn:clean\" \"yarn:build\""
},
"devDependencies": {
"@cspell/cspell-types": "^7.3.8",
"@cspell/cspell-types": "^8.0.0",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"cspell": "^7.3.8",
"cspell": "^8.0.0",
"js-yaml": "^4.1.0",
"rimraf": "^5.0.5"
},
Expand Down
15 changes: 8 additions & 7 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.8.0",
"version": "0.8.1",
"description": "My ESLint configuration for general Node.js projects",
"keywords": [
"config",
Expand All @@ -15,6 +15,7 @@
"url": "https://github.com/kurone-kito/lints-config.git",
"directory": "packages/eslint-config-base"
},
"license": "MIT",
"author": "kurone-kito <[email protected]> (https://kit.black/)",
"type": "module",
"exports": {
Expand All @@ -36,21 +37,21 @@
},
"prettier": "@kurone-kito/prettier-config",
"devDependencies": {
"@cspell/eslint-plugin": "^7.3.8",
"@cspell/eslint-plugin": "^8.0.0",
"@kurone-kito/prettier-config": "workspace:*",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"eslint": "^8.52.0",
"eslint": "^8.53.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
"eslint-formatter-codeframe": "^7.32.1",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-editorconfig": "^4.0.3",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jsdoc": "^46.8.2",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jsdoc": "^46.9.0",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-lodash": "^7.4.0",
"eslint-plugin-markdown": "^3.0.1",
Expand Down
Loading

0 comments on commit 9933326

Please sign in to comment.