From ab283848b88e54483d1d38dfc4096d86faa86c4c Mon Sep 17 00:00:00 2001 From: Yongmin Hong Date: Tue, 25 Jun 2024 16:06:14 +0900 Subject: [PATCH] CI(npm): Refer local directory as file path Summary: Avoid updating local pkgs. Also add `prefer-dedupe=true` on `.npmrc`. Signed-off-by: Yongmin Hong Test Plan: `npm ci`. Reviewers: O1 revi & automations, revi Reviewed By: O1 revi & automations, revi Differential Revision: https://issuetracker.revi.xyz/D428 --- .npmrc | 6 ++- npm/eslint-config/package.json | 2 +- npm/prettier-config/README.md | 8 +++- npm/prettier-config/package.json | 2 +- npm/prettier-config/prettier.config.js | 8 +++- package-lock.json | 56 ++++++++------------------ package.json | 4 +- 7 files changed, 36 insertions(+), 50 deletions(-) diff --git a/.npmrc b/.npmrc index 601c99b..0356aa6 100644 --- a/.npmrc +++ b/.npmrc @@ -1,8 +1,10 @@ +# Moral attribution: Copyright 2024 GitHub +# SPDX-License-Identifier: MIT # For 15-25% faster npm install # https://www.peterbe.com/plog/benchmarking-npm-install-with-or-without-audit # Also we have Dependabot alerts configured in the GitHub repo. -# Moral attribution: Copyright 2024 GitHub -# SPDX-License-Identifier: MIT # See also D375 audit=false fund=false +# Prefer deduplication +prefer-dedupe=true diff --git a/npm/eslint-config/package.json b/npm/eslint-config/package.json index a947059..baf579d 100644 --- a/npm/eslint-config/package.json +++ b/npm/eslint-config/package.json @@ -11,7 +11,7 @@ "globals": "15.6.0" }, "devDependencies": { - "@revi/prettier-config": "0.0.2", + "@revi/prettier-config": "../prettier-config", "@types/eslint__js": "8.42.3", "@types/eslint-config-prettier": "6.11.3", "prettier": "3.3.2" diff --git a/npm/prettier-config/README.md b/npm/prettier-config/README.md index df547d3..e69d7c1 100644 --- a/npm/prettier-config/README.md +++ b/npm/prettier-config/README.md @@ -48,11 +48,15 @@ ## Config }, { files: [ - '.devcontainer/devcontainer.json', + '**.hujson', '.devcontainer.json', '.devcontainer/*/devcontainer.json', + '.devcontainer/devcontainer.json', '.vscode/*.json', - '**.hujson', + '**/jsconfig.json', + '**/jsconfig.*.json', + '**/tsconfig.json', + '**/tsconfig.*.json', 'jsconfig.json', 'jsconfig.*.json', 'tsconfig.json', diff --git a/npm/prettier-config/package.json b/npm/prettier-config/package.json index 4d28749..72bc4dd 100644 --- a/npm/prettier-config/package.json +++ b/npm/prettier-config/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package.json", "name": "@revi/prettier-config", - "version": "0.0.6", + "version": "0.0.7", "author": { "name": "revi", "email": "revi@omglol.email", diff --git a/npm/prettier-config/prettier.config.js b/npm/prettier-config/prettier.config.js index abe6462..cdf1d77 100644 --- a/npm/prettier-config/prettier.config.js +++ b/npm/prettier-config/prettier.config.js @@ -48,11 +48,15 @@ const config = { }, { files: [ - '.devcontainer/devcontainer.json', + '**.hujson', '.devcontainer.json', '.devcontainer/*/devcontainer.json', + '.devcontainer/devcontainer.json', '.vscode/*.json', - '**.hujson', + '**/jsconfig.json', + '**/jsconfig.*.json', + '**/tsconfig.json', + '**/tsconfig.*.json', 'jsconfig.json', 'jsconfig.*.json', 'tsconfig.json', diff --git a/package-lock.json b/package-lock.json index 6909540..80ada17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,8 @@ "npm/prettier-config" ], "devDependencies": { - "@revi/eslint-config": "0.0.4", - "@revi/prettier-config": "0.0.5", + "@revi/eslint-config": "./npm/eslint-config", + "@revi/prettier-config": "./npm/prettier-config", "csslint": "1.0.5", "eslint": "9.5.0", "eslint-config-wikimedia": "0.28.2", @@ -1235,8 +1235,8 @@ "version": "9.1.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", - "dev": true, "license": "MIT", + "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -1989,12 +1989,12 @@ } }, "node_modules/espree": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.0.1.tgz", - "integrity": "sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", + "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.11.3", + "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^4.0.0" }, @@ -3826,10 +3826,9 @@ "version": "0.0.4", "license": "Apache-2.0", "devDependencies": { - "@revi/prettier-config": "0.0.2", + "@revi/prettier-config": "../prettier-config", "@types/eslint__js": "8.42.3", "@types/eslint-config-prettier": "6.11.3", - "eslint-config-prettier": "9.1.0", "prettier": "3.3.2" }, "funding": { @@ -3838,26 +3837,13 @@ "peerDependencies": { "@eslint/js": "^8.0.0 || ^9.0.0", "eslint": "^8.0.0 || ^9.0.0", - "eslint-config-prettier": "^9.1.0", + "eslint-config-prettier": "9.1.0", "globals": "15.6.0" } }, - "npm/eslint-config/node_modules/@revi/prettier-config": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@revi/prettier-config/-/prettier-config-0.0.2.tgz", - "integrity": "sha512-uusTuawhAcxsIJrQ0skhm2MFQEN1xaH7PMkcQxns8ytD9KDdt5Ma9lfRCy7ahYdEKtev0v95vtq5nbkewRXstg==", - "dev": true, - "license": "Apache-2.0", - "funding": { - "url": "https://github.com/sponsors/revi" - }, - "peerDependencies": { - "prettier": "^3.3.2" - } - }, "npm/prettier-config": { "name": "@revi/prettier-config", - "version": "0.0.5", + "version": "0.0.7", "license": "Apache-2.0", "funding": { "url": "https://github.com/sponsors/revi" @@ -4116,20 +4102,10 @@ "@revi/eslint-config": { "version": "file:npm/eslint-config", "requires": { - "@revi/prettier-config": "0.0.2", + "@revi/prettier-config": "../prettier-config", "@types/eslint__js": "8.42.3", "@types/eslint-config-prettier": "6.11.3", - "eslint-config-prettier": "9.1.0", "prettier": "3.3.2" - }, - "dependencies": { - "@revi/prettier-config": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@revi/prettier-config/-/prettier-config-0.0.2.tgz", - "integrity": "sha512-uusTuawhAcxsIJrQ0skhm2MFQEN1xaH7PMkcQxns8ytD9KDdt5Ma9lfRCy7ahYdEKtev0v95vtq5nbkewRXstg==", - "dev": true, - "requires": {} - } } }, "@revi/prettier-config": { @@ -4709,7 +4685,7 @@ "version": "9.1.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", - "dev": true, + "peer": true, "requires": {} }, "eslint-config-wikimedia": { @@ -5186,11 +5162,11 @@ "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==" }, "espree": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.0.1.tgz", - "integrity": "sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", + "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", "requires": { - "acorn": "^8.11.3", + "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^4.0.0" } diff --git a/package.json b/package.json index 8d6ac08..0ec1276 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "name": "@revi/scripts", "private": true, "devDependencies": { - "@revi/eslint-config": "0.0.4", - "@revi/prettier-config": "0.0.5", + "@revi/eslint-config": "./npm/eslint-config", + "@revi/prettier-config": "./npm/prettier-config", "csslint": "1.0.5", "eslint": "9.5.0", "eslint-config-wikimedia": "0.28.2",