Skip to content

Commit

Permalink
kurone-kito/cumulative-updatesからプルリクエスト#89をマージする
Browse files Browse the repository at this point in the history
v0.14.0: Cumulative updates
  • Loading branch information
kurone-kito authored Aug 4, 2024
2 parents 3ba52c7 + 01411fa commit cd95137
Show file tree
Hide file tree
Showing 37 changed files with 694 additions and 658 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
extends:
- '@kurone-kito/eslint-config-base'
- '@kurone-kito/eslint-config-base/.eslintrc.yml'
parserOptions:
project:
- './tsconfig.json'
Expand Down
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/.yarn/** linguist-vendored

.coderabbit.yaml export-ignore
.github/** export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.husky/** export-ignore
.coderabbit.yaml export-ignore
.imgbotconfig export-ignore
2 changes: 1 addition & 1 deletion .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ignores:
- .github/CODE_OF_CONDUCT*
- .yarn
- node_modules
- '**/node_modules/**'
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.20.4 ref:v18.20.3 lts-hydrogen lts latest system
nodejs 18.20.4 ref:v18.20.4 lts-hydrogen lts latest system
7 changes: 6 additions & 1 deletion .yarn/sdks/eslint/bin/eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real eslint/bin/eslint.js your application uses
module.exports = absRequire(`eslint/bin/eslint.js`);
module.exports = wrapWithUserWrapper(absRequire(`eslint/bin/eslint.js`));
7 changes: 6 additions & 1 deletion .yarn/sdks/eslint/lib/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real eslint your application uses
module.exports = absRequire(`eslint`);
module.exports = wrapWithUserWrapper(absRequire(`eslint`));
7 changes: 6 additions & 1 deletion .yarn/sdks/eslint/lib/unsupported-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real eslint/use-at-your-own-risk your application uses
module.exports = absRequire(`eslint/use-at-your-own-risk`);
module.exports = wrapWithUserWrapper(absRequire(`eslint/use-at-your-own-risk`));
7 changes: 6 additions & 1 deletion .yarn/sdks/prettier/bin/prettier.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real prettier/bin/prettier.cjs your application uses
module.exports = absRequire(`prettier/bin/prettier.cjs`);
module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
7 changes: 6 additions & 1 deletion .yarn/sdks/prettier/index.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real prettier your application uses
module.exports = absRequire(`prettier`);
module.exports = wrapWithUserWrapper(absRequire(`prettier`));
7 changes: 6 additions & 1 deletion .yarn/sdks/typescript/bin/tsc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real typescript/bin/tsc your application uses
module.exports = absRequire(`typescript/bin/tsc`);
module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));
7 changes: 6 additions & 1 deletion .yarn/sdks/typescript/bin/tsserver
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real typescript/bin/tsserver your application uses
module.exports = absRequire(`typescript/bin/tsserver`);
module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));
7 changes: 6 additions & 1 deletion .yarn/sdks/typescript/lib/tsc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real typescript/lib/tsc.js your application uses
module.exports = absRequire(`typescript/lib/tsc.js`);
module.exports = wrapWithUserWrapper(absRequire(`typescript/lib/tsc.js`));
11 changes: 10 additions & 1 deletion .yarn/sdks/typescript/lib/tsserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,7 +24,15 @@ if (existsSync(absPnpApiPath)) {
}
}

const moduleWrapper = tsserver => {
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

const moduleWrapper = exports => {
return wrapWithUserWrapper(moduleWrapperFn(exports));
};

const moduleWrapperFn = tsserver => {
if (!process.versions.pnp) {
return tsserver;
}
Expand Down
11 changes: 10 additions & 1 deletion .yarn/sdks/typescript/lib/tsserverlibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,7 +24,15 @@ if (existsSync(absPnpApiPath)) {
}
}

const moduleWrapper = tsserver => {
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

const moduleWrapper = exports => {
return wrapWithUserWrapper(moduleWrapperFn(exports));
};

const moduleWrapperFn = tsserver => {
if (!process.versions.pnp) {
return tsserver;
}
Expand Down
7 changes: 6 additions & 1 deletion .yarn/sdks/typescript/lib/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const {pathToFileURL} = require(`url`);
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
const absRequire = createRequire(absPnpApiPath);

const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
Expand All @@ -23,5 +24,9 @@ if (existsSync(absPnpApiPath)) {
}
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;

// Defer to the real typescript your application uses
module.exports = absRequire(`typescript`);
module.exports = wrapWithUserWrapper(absRequire(`typescript`));
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.5.3-sdk",
"version": "5.5.4-sdk",
"main": "./lib/typescript.js",
"type": "commonjs",
"bin": {
Expand Down
19 changes: 19 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,23 @@ npmScopes:
npmAuthToken: "${NPM_TOKEN:-invalid_token}"
npmRegistryServer: "https://registry.npmjs.com"

packageExtensions:
"@commitlint/cli@*":
peerDependencies:
typescript: ">=4.9.5"
"@commitlint/load@*":
dependencies:
"@types/node": "*"
peerDependencies:
typescript: ">=4.9.5"
"@typescript-eslint/utils@*":
peerDependencies:
typescript: ">=4.2.0"
eslint-config-airbnb-typescript@*:
peerDependencies:
eslint-plugin-import: ^2.25.2
eslint-plugin-storybook@*:
peerDependencies:
typescript: ">=4.2.0"

pnpEnableEsmLoader: true
32 changes: 16 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.13.0",
"version": "0.14.0",
"private": true,
"description": "My configuration for the ESLint / Prettier / TypeScript",
"keywords": [
Expand All @@ -26,7 +26,7 @@
]
},
"scripts": {
"build": "yarn run sub run build",
"build": "yarn workspaces foreach --no-private --topological-dev -Aiv run build",
"clean": "conc \"yarn:clean:*\"",
"clean:root": "rimraf -g \"*.tgz\" \"*.tsbuildinfo\" node_modules/.cache",
"clean:sub": "yarn run sub run clean",
Expand All @@ -52,8 +52,8 @@
"devDependencies": {
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@cspell/cspell-types": "^8.10.4",
"@cspell/eslint-plugin": "^8.10.4",
"@cspell/cspell-types": "^8.13.1",
"@cspell/eslint-plugin": "^8.13.1",
"@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.16.1",
"@typescript-eslint/parser": "^7.16.1",
"@yarnpkg/sdks": "^3.1.3",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"@yarnpkg/sdks": "^3.2.0",
"concurrently": "^8.2.2",
"cspell": "^8.10.4",
"cspell": "^8.13.1",
"eslint": "^8.57.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -75,21 +75,21 @@
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-editorconfig": "^4.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.7.0",
"eslint-plugin-jsdoc": "^48.11.0",
"eslint-plugin-json": "^4.0.0",
"eslint-plugin-markdown": "^5.1.0",
"eslint-plugin-markdownlint": "^0.6.0",
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-n": "^17.10.1",
"eslint-plugin-oxlint": "^0.5.0",
"eslint-plugin-react": "^7.34.4",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-yaml": "^1.0.3",
"husky": "^9.0.11",
"lint-staged": "^15.2.7",
"husky": "^9.1.4",
"lint-staged": "^15.2.8",
"markdownlint-cli2": "^0.13.0",
"oxlint": "^0.6.0",
"oxlint": "^0.6.1",
"prettier": "^3.3.3",
"rimraf": "^5.0.9",
"typescript": "~5.5.3",
"rimraf": "^5.0.10",
"typescript": "~5.5.4",
"typescript-eslint-language-service": "^5.0.5"
},
"packageManager": "yarn@4.3.1+sha512.af78262d7d125afbfeed740602ace8c5e4405cd7f4735c08feb327286b2fdb2390fbca01589bfd1f50b1240548b74806767f5a063c94b67e431aabd0d86f7774",
Expand Down
5 changes: 3 additions & 2 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.13.0",
"version": "0.14.0",
"description": "My commitlint configuration for general projects",
"keywords": [
"commitlint",
Expand Down Expand Up @@ -36,10 +36,11 @@
},
"devDependencies": {
"@commitlint/config-conventional": "^19.2.2",
"@kurone-kito/typescript-config": "workspace:^",
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"js-yaml": "^4.1.0",
"rimraf": "^5.0.9"
"rimraf": "^5.0.10"
},
"peerDependenciesMeta": {
"@commitlint/config-conventional": {
Expand Down
5 changes: 4 additions & 1 deletion packages/commitlint-config/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"extends": "../../tsconfig"
"compilerOptions": {
"noEmit": true
},
"extends": "@kurone-kito/typescript-config/tsconfig.json"
}
Loading

0 comments on commit cd95137

Please sign in to comment.