From d97184880ceac6215ce50916a29f4cb01bbfc63f Mon Sep 17 00:00:00 2001 From: fragosti Date: Wed, 6 Jun 2018 11:10:06 -0700 Subject: Use CLI for exclude --- packages/base-contract/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/contract-wrappers/tslint.json | 5 +---- packages/contracts/package.json | 2 +- packages/contracts/tslint.json | 3 --- packages/fill-scenarios/tslint.json | 5 +---- 6 files changed, 5 insertions(+), 14 deletions(-) (limited to 'packages') diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index d51362040..cb27e9efa 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -17,7 +17,7 @@ "run_mocha": "mocha lib/test/**/*_test.js --bail --exit", "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", - "lint": "tslint --project .", + "lint": "tslint --project . --exclude **/src/contract_wrappers/**/*", "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "license": "Apache-2.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index d5ec86fc6..de50fa305 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -15,7 +15,7 @@ "build": "yarn pre_build && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "pre_build": "run-s generate_contract_wrappers update_test_artifacts update_compact_artifacts", "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", - "lint": "tslint --project .", + "lint": "tslint --project . --exclude **/src/contract_wrappers/**/* --exclude **/lib/**/*", "test:circleci": "run-s test:coverage", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", diff --git a/packages/contract-wrappers/tslint.json b/packages/contract-wrappers/tslint.json index 1b88c370c..ffaefe83a 100644 --- a/packages/contract-wrappers/tslint.json +++ b/packages/contract-wrappers/tslint.json @@ -1,6 +1,3 @@ { - "extends": ["@0xproject/tslint-config"], - "linterOptions": { - "exclude": ["src/contract_wrappers/generated/*"] - } + "extends": ["@0xproject/tslint-config"] } diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 3b9fda227..2cd87431c 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -23,7 +23,7 @@ "clean": "shx rm -rf lib src/contract_wrappers/generated", "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", - "lint": "tslint --project .", + "lint": "tslint --project . --exclude **/src/contract_wrappers/**/* --exclude **/lib/**/*", "coverage:report:text": "istanbul report text", "coverage:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", diff --git a/packages/contracts/tslint.json b/packages/contracts/tslint.json index 216da0653..1ab924e47 100644 --- a/packages/contracts/tslint.json +++ b/packages/contracts/tslint.json @@ -2,8 +2,5 @@ "extends": ["@0xproject/tslint-config"], "rules": { "custom-no-magic-numbers": false - }, - "linterOptions": { - "exclude": ["src/contract_wrappers/generated/*"] } } diff --git a/packages/fill-scenarios/tslint.json b/packages/fill-scenarios/tslint.json index 052613ddc..ffaefe83a 100644 --- a/packages/fill-scenarios/tslint.json +++ b/packages/fill-scenarios/tslint.json @@ -1,6 +1,3 @@ { - "extends": ["@0xproject/tslint-config"], - "linterOptions": { - "exclude": ["src/generated_contract_wrappers/*"] - } + "extends": ["@0xproject/tslint-config"] } -- cgit v1.2.3