diff --git a/prettier-config.json b/.prettierrc.json similarity index 100% rename from prettier-config.json rename to .prettierrc.json diff --git a/integration-tests/package.json b/integration-tests/package.json index 6f9d6e0fd0c49..54342c86c6a98 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -8,7 +8,7 @@ "scripts": { "lint": "yarn lint:fix && yarn lint:check", "lint:check": "tslint --format stylish --project .", - "lint:fix": "prettier --config ./prettier-config.json --write 'test/**/*.ts'", + "lint:fix": "prettier --config ./.prettierrc.json --write 'test/**/*.ts'", "build:integration": "./scripts/build.sh", "build:contracts": "hardhat compile", "build:contracts:ovm": "hardhat compile --network optimism", diff --git a/packages/batch-submitter/.prettierrc.json b/packages/batch-submitter/.prettierrc.json new file mode 120000 index 0000000000000..e69c69c2f4cea --- /dev/null +++ b/packages/batch-submitter/.prettierrc.json @@ -0,0 +1 @@ +../../.prettierrc.json \ No newline at end of file diff --git a/packages/batch-submitter/package.json b/packages/batch-submitter/package.json index b46befd10e27c..b63ebdb12c995 100644 --- a/packages/batch-submitter/package.json +++ b/packages/batch-submitter/package.json @@ -14,7 +14,7 @@ "clean": "rimraf cache/ dist/ ./tsconfig.build.tsbuildinfo", "lint": "yarn lint:fix && yarn lint:check", "lint:check": "tslint --format stylish --project .", - "lint:fix": "prettier --config prettier-config.json --write \"hardhat.config.ts\" \"{src,exec,test}/**/*.ts\"", + "lint:fix": "prettier --config .prettierrc.json --write \"hardhat.config.ts\" \"{src,exec,test}/**/*.ts\"", "test": "hardhat test --show-stack-traces" }, "keywords": [ diff --git a/packages/batch-submitter/prettier-config.json b/packages/batch-submitter/prettier-config.json deleted file mode 120000 index e9de01cf0ce01..0000000000000 --- a/packages/batch-submitter/prettier-config.json +++ /dev/null @@ -1 +0,0 @@ -../../prettier-config.json \ No newline at end of file diff --git a/packages/contracts/.prettierrc.json b/packages/contracts/.prettierrc.json new file mode 120000 index 0000000000000..e69c69c2f4cea --- /dev/null +++ b/packages/contracts/.prettierrc.json @@ -0,0 +1 @@ +../../.prettierrc.json \ No newline at end of file diff --git a/packages/contracts/package.json b/packages/contracts/package.json index a245505117c59..7520285854e50 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -32,7 +32,7 @@ "lint": "yarn run lint:typescript", "lint:typescript": "tslint --format stylish --project .", "lint:fix": "yarn run lint:fix:typescript", - "lint:fix:typescript": "prettier --config prettier-config.json --write \"hardhat.config.ts\" \"{src,test}/**/*.ts\"", + "lint:fix:typescript": "prettier --config .prettierrc.json --write \"hardhat.config.ts\" \"{src,test}/**/*.ts\"", "clean": "rm -rf ./dist ./artifacts ./artifacts-ovm ./cache ./cache-ovm ./tsconfig.build.tsbuildinfo", "deploy": "./bin/deploy.ts && yarn generate-markdown", "serve": "./bin/serve_dump.sh", diff --git a/packages/contracts/prettier-config.json b/packages/contracts/prettier-config.json deleted file mode 120000 index e9de01cf0ce01..0000000000000 --- a/packages/contracts/prettier-config.json +++ /dev/null @@ -1 +0,0 @@ -../../prettier-config.json \ No newline at end of file diff --git a/packages/core-utils/.prettierrc.json b/packages/core-utils/.prettierrc.json new file mode 120000 index 0000000000000..e69c69c2f4cea --- /dev/null +++ b/packages/core-utils/.prettierrc.json @@ -0,0 +1 @@ +../../.prettierrc.json \ No newline at end of file diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json index 4b056e69e0196..5870ab323678f 100644 --- a/packages/core-utils/package.json +++ b/packages/core-utils/package.json @@ -14,7 +14,7 @@ "build": "tsc -p tsconfig.build.json", "clean": "rimraf dist/ ./tsconfig.build.tsbuildinfo", "lint": "tslint --format stylish --project .", - "lint:fix": "prettier --config prettier-config.json --write '{src,test}/**/*.ts'", + "lint:fix": "prettier --config .prettierrc.json --write '{src,test}/**/*.ts'", "test": "ts-mocha test/**/*.spec.ts" }, "devDependencies": { diff --git a/packages/core-utils/prettier-config.json b/packages/core-utils/prettier-config.json deleted file mode 120000 index e9de01cf0ce01..0000000000000 --- a/packages/core-utils/prettier-config.json +++ /dev/null @@ -1 +0,0 @@ -../../prettier-config.json \ No newline at end of file diff --git a/packages/data-transport-layer/.prettierrc.json b/packages/data-transport-layer/.prettierrc.json new file mode 120000 index 0000000000000..e69c69c2f4cea --- /dev/null +++ b/packages/data-transport-layer/.prettierrc.json @@ -0,0 +1 @@ +../../.prettierrc.json \ No newline at end of file diff --git a/packages/data-transport-layer/package.json b/packages/data-transport-layer/package.json index 28eb06f7b86b0..860c33dc8664d 100644 --- a/packages/data-transport-layer/package.json +++ b/packages/data-transport-layer/package.json @@ -12,7 +12,7 @@ "clean:db": "rimraf ./db", "lint": "yarn run lint:fix && yarn run lint:check", "lint:check": "tslint --format stylish --project .", - "lint:fix": "prettier --config prettier-config.json --write \"{src,exec,test}/**/*.ts\"", + "lint:fix": "prettier --config .prettierrc.json --write \"{src,exec,test}/**/*.ts\"", "start": "ts-node ./src/services/run.ts", "start:local": "ts-node ./src/services/run.ts | pino-pretty", "test": "hardhat --config test/config/hardhat.config.ts test", diff --git a/packages/data-transport-layer/prettier-config.json b/packages/data-transport-layer/prettier-config.json deleted file mode 120000 index e9de01cf0ce01..0000000000000 --- a/packages/data-transport-layer/prettier-config.json +++ /dev/null @@ -1 +0,0 @@ -../../prettier-config.json \ No newline at end of file diff --git a/packages/hardhat-ovm/.prettierrc.json b/packages/hardhat-ovm/.prettierrc.json new file mode 120000 index 0000000000000..e69c69c2f4cea --- /dev/null +++ b/packages/hardhat-ovm/.prettierrc.json @@ -0,0 +1 @@ +../../.prettierrc.json \ No newline at end of file diff --git a/packages/hardhat-ovm/package.json b/packages/hardhat-ovm/package.json index 2beaf6f88447d..26b503455facc 100644 --- a/packages/hardhat-ovm/package.json +++ b/packages/hardhat-ovm/package.json @@ -12,7 +12,7 @@ "build": "tsc -p tsconfig.build.json", "lint": "yarn run lint:fix && yarn run lint:check", "lint:check": "tslint --format stylish --project .", - "lint:fix": "prettier --config prettier-config.json --write \"{src,test}/**/*.ts\"" + "lint:fix": "prettier --config .prettierrc.json --write \"{src,test}/**/*.ts\"" }, "dependencies": { "node-fetch": "^2.6.1" diff --git a/packages/hardhat-ovm/prettier-config.json b/packages/hardhat-ovm/prettier-config.json deleted file mode 120000 index e9de01cf0ce01..0000000000000 --- a/packages/hardhat-ovm/prettier-config.json +++ /dev/null @@ -1 +0,0 @@ -../../prettier-config.json \ No newline at end of file diff --git a/packages/message-relayer/.prettierrc.json b/packages/message-relayer/.prettierrc.json new file mode 120000 index 0000000000000..e69c69c2f4cea --- /dev/null +++ b/packages/message-relayer/.prettierrc.json @@ -0,0 +1 @@ +../../.prettierrc.json \ No newline at end of file diff --git a/packages/message-relayer/package.json b/packages/message-relayer/package.json index 4f0ffabec8c68..dc38fe49421db 100644 --- a/packages/message-relayer/package.json +++ b/packages/message-relayer/package.json @@ -14,7 +14,7 @@ "clean": "rimraf dist/ ./tsconfig.build.tsbuildinfo", "lint": "yarn lint:fix && yarn lint:check", "lint:check": "tslint --format stylish --project .", - "lint:fix": "prettier --config prettier-config.json --write \"{src,exec,test}/**/*.ts\"" + "lint:fix": "prettier --config .prettierrc.json --write \"{src,exec,test}/**/*.ts\"" }, "keywords": [ "optimism", diff --git a/packages/message-relayer/prettier-config.json b/packages/message-relayer/prettier-config.json deleted file mode 120000 index e9de01cf0ce01..0000000000000 --- a/packages/message-relayer/prettier-config.json +++ /dev/null @@ -1 +0,0 @@ -../../prettier-config.json \ No newline at end of file diff --git a/packages/smock/.prettierrc.json b/packages/smock/.prettierrc.json new file mode 120000 index 0000000000000..e69c69c2f4cea --- /dev/null +++ b/packages/smock/.prettierrc.json @@ -0,0 +1 @@ +../../.prettierrc.json \ No newline at end of file diff --git a/packages/smock/package.json b/packages/smock/package.json index 01dbebba084bc..4af08e6201288 100644 --- a/packages/smock/package.json +++ b/packages/smock/package.json @@ -12,7 +12,7 @@ "test": "hardhat test --show-stack-traces", "lint": "yarn lint:fix && yarn lint:check", "lint:check": "tslint --format stylish --project .", - "lint:fix": "prettier --config ./prettier-config.json --write \"hardhat.config.ts\" \"{src,test}/**/*.ts\"", + "lint:fix": "prettier --config ./.prettierrc.json --write \"hardhat.config.ts\" \"{src,test}/**/*.ts\"", "clean": "rimraf ./artifacts ./cache ./dist ./tsconfig.build.tsbuildinfo" }, "peerDependencies": { diff --git a/packages/smock/prettier-config.json b/packages/smock/prettier-config.json deleted file mode 120000 index e9de01cf0ce01..0000000000000 --- a/packages/smock/prettier-config.json +++ /dev/null @@ -1 +0,0 @@ -../../prettier-config.json \ No newline at end of file diff --git a/tslint.base.json b/tslint.base.json index 626cb3efec3fb..350b4196a46ac 100644 --- a/tslint.base.json +++ b/tslint.base.json @@ -27,7 +27,7 @@ "variable-name": false, "no-focused-test": true, "array-type": false, - "prettier": [true, "./prettier-config.json"] + "prettier": [true, "./.prettierrc.json"] }, "linterOptions": { "exclude": [