Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/batch-submitter/.prettierrc.json
2 changes: 1 addition & 1 deletion packages/batch-submitter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
1 change: 0 additions & 1 deletion packages/batch-submitter/prettier-config.json

This file was deleted.

1 change: 1 addition & 0 deletions packages/contracts/.prettierrc.json
2 changes: 1 addition & 1 deletion packages/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/contracts/prettier-config.json

This file was deleted.

1 change: 1 addition & 0 deletions packages/core-utils/.prettierrc.json
2 changes: 1 addition & 1 deletion packages/core-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 0 additions & 1 deletion packages/core-utils/prettier-config.json

This file was deleted.

1 change: 1 addition & 0 deletions packages/data-transport-layer/.prettierrc.json
2 changes: 1 addition & 1 deletion packages/data-transport-layer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/data-transport-layer/prettier-config.json

This file was deleted.

1 change: 1 addition & 0 deletions packages/hardhat-ovm/.prettierrc.json
2 changes: 1 addition & 1 deletion packages/hardhat-ovm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion packages/hardhat-ovm/prettier-config.json

This file was deleted.

1 change: 1 addition & 0 deletions packages/message-relayer/.prettierrc.json
2 changes: 1 addition & 1 deletion packages/message-relayer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/message-relayer/prettier-config.json

This file was deleted.

1 change: 1 addition & 0 deletions packages/smock/.prettierrc.json
2 changes: 1 addition & 1 deletion packages/smock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 0 additions & 1 deletion packages/smock/prettier-config.json

This file was deleted.

2 changes: 1 addition & 1 deletion tslint.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down