diff --git a/package.json b/package.json index 1f357a62b3..6b2aa45ad0 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "eslint-formatter-friendly": "7.0.0", "eslint-plugin-import": "2.23.4", "eslint-plugin-jest": "24.3.6", - "eslint-plugin-prettier-internal-rules": "link:scripts/tools/eslint-plugin-prettier-internal-rules", + "eslint-plugin-prettier-internal-rules": "file:./scripts/tools/eslint-plugin-prettier-internal-rules", "eslint-plugin-react": "7.24.0", "eslint-plugin-regexp": "0.12.1", "eslint-plugin-unicorn": "33.0.1", diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js index ddff4cb0fd..ad5cc2cc15 100644 --- a/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js +++ b/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js @@ -37,6 +37,11 @@ module.exports = { }, create(context) { const fileName = context.getFilename(); + // [prettierx]: support npm dev install + const parentDir = path.basename(path.resolve(__dirname, "..")); + const isLinked = parentDir !== "node_modules"; + const projectRoot = isLinked ? "../../.." : "../.."; + const ignored = new Map( context.options.map((option) => { if (typeof option === "string") { @@ -44,7 +49,8 @@ module.exports = { } const { file, functions } = option; return [ - path.join(__dirname, "../../..", file), + // [prettierx]: support npm dev install + path.join(__dirname, projectRoot, file), functions ? new Set(functions) : true, ]; }) diff --git a/tests/integration/env.js b/tests/integration/env.js index 6d3eb472c2..7fc8472a36 100644 --- a/tests/integration/env.js +++ b/tests/integration/env.js @@ -3,10 +3,12 @@ const path = require("path"); const isProduction = process.env.NODE_ENV === "production"; const { PRETTIER_DIR } = process.env; -const { bin } = require(path.join(PRETTIER_DIR, "package.json")); +// [prettierx] get fork package name from package.json +const { bin, name } = require(path.join(PRETTIER_DIR, "package.json")); const prettierCli = path.join( PRETTIER_DIR, - typeof bin === "object" ? bin.prettier : bin + // [prettierx] use fork package name from package.json + typeof bin === "object" ? bin[name] : bin ); const thirdParty = isProduction diff --git a/yarn.lock b/yarn.lock index cdc4711401..6fab9efadd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2927,9 +2927,8 @@ eslint-plugin-jest@24.3.6: dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" -"eslint-plugin-prettier-internal-rules@link:scripts/tools/eslint-plugin-prettier-internal-rules": - version "0.0.0" - uid "" +"eslint-plugin-prettier-internal-rules@file:./scripts/tools/eslint-plugin-prettier-internal-rules": + version "1.0.3" eslint-plugin-react@7.24.0: version "7.24.0"