Skip to content

Commit

Permalink
chore: remove refs to tslint
Browse files Browse the repository at this point in the history
  • Loading branch information
raymondfeng committed Feb 27, 2019
1 parent 498a811 commit 8ae1074
Show file tree
Hide file tree
Showing 57 changed files with 198 additions and 240 deletions.
4 changes: 2 additions & 2 deletions bin/sync-dev-deps.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ async function syncDevDeps() {

const masterDeps = {
typescript: buildDeps.typescript,
tslint: buildDeps.tslint,
eslint: buildDeps.eslint,
};

// Update typescript & tslint dependencies in individual packages
// Update typescript & eslint dependencies in individual packages
for (const pkg of packages) {
const data = readJsonFile(pkg.manifestLocation);
let modified = false;
Expand Down
2 changes: 1 addition & 1 deletion bin/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
# Running Code Linter -- Requires @loopback/build so it's bootstrapped
if [ $TASK = "code-lint" ]; then
echo "TASK => LINTING CODE"
lerna bootstrap --scope @loopback/build --scope @loopback/tslint-config
lerna bootstrap --scope @loopback/build --scope @loopback/eslint-config
npm run lint

# Commit Message Linter
Expand Down
12 changes: 6 additions & 6 deletions examples/hello-world/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"build:watch": "lb-tsc es2017 --outDir dist --watch",
"clean": "lb-clean *example-hello-world*.tgz dist package api-docs",
"verify": "npm pack && tar xf *example-hello-world*.tgz && tree package && npm run clean",
"lint": "npm run prettier:check && npm run tslint",
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
"lint": "npm run prettier:check && npm run eslint",
"lint:fix": "npm run eslint:fix && npm run prettier:fix",
"prettier:cli": "lb-prettier \"**/*.ts\" \"**/*.js\"",
"prettier:check": "npm run prettier:cli -- -l",
"prettier:fix": "npm run prettier:cli -- --write",
"tslint": "lb-tslint",
"tslint:fix": "npm run tslint -- --fix",
"eslint": "lb-eslint",
"eslint:fix": "npm run eslint -- --fix",
"pretest": "npm run clean && npm run build",
"test": "lb-mocha --allow-console-logs \"dist/__tests__/**/*.js\"",
"posttest": "npm run lint",
Expand All @@ -43,9 +43,9 @@
"devDependencies": {
"@loopback/build": "^1.3.1",
"@loopback/testlab": "^1.0.7",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/node": "^10.11.2",
"tslint": "^5.12.0",
"eslint": "^5.14.1",
"typescript": "^3.3.1"
},
"keywords": [
Expand Down
4 changes: 0 additions & 4 deletions examples/hello-world/tslint.build.json

This file was deleted.

4 changes: 0 additions & 4 deletions examples/hello-world/tslint.json

This file was deleted.

12 changes: 6 additions & 6 deletions examples/log-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"build": "lb-tsc es2017 --outDir dist",
"build:watch": "lb-tsc es2017 --outDir dist --watch",
"clean": "lb-clean *example-log-extension-*.tgz dist package api-docs",
"lint": "npm run prettier:check && npm run tslint",
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
"lint": "npm run prettier:check && npm run eslint",
"lint:fix": "npm run eslint:fix && npm run prettier:fix",
"prettier:cli": "lb-prettier \"**/*.ts\" \"**/*.js\"",
"prettier:check": "npm run prettier:cli -- -l",
"prettier:fix": "npm run prettier:cli -- --write",
"tslint": "lb-tslint",
"tslint:fix": "npm run tslint -- --fix",
"eslint": "lb-eslint",
"eslint:fix": "npm run eslint -- --fix",
"pretest": "npm run clean && npm run build",
"test": "lb-mocha \"dist/__tests__/**/*.js\"",
"posttest": "npm run lint",
Expand All @@ -44,10 +44,10 @@
"devDependencies": {
"@loopback/build": "^1.3.1",
"@loopback/testlab": "^1.0.7",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/debug": "^4.1.0",
"@types/node": "^10.11.2",
"tslint": "^5.12.0",
"eslint": "^5.14.1",
"typescript": "^3.3.1"
},
"dependencies": {
Expand Down
4 changes: 0 additions & 4 deletions examples/log-extension/tslint.build.json

This file was deleted.

4 changes: 0 additions & 4 deletions examples/log-extension/tslint.json

This file was deleted.

12 changes: 6 additions & 6 deletions examples/rpc-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"build": "lb-tsc es2017 --outDir dist",
"build:watch": "lb-tsc es2017 --outDir dist --watch",
"clean": "lb-clean dist",
"lint": "npm run prettier:check && npm run tslint",
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
"lint": "npm run prettier:check && npm run eslint",
"lint:fix": "npm run eslint:fix && npm run prettier:fix",
"prettier:cli": "lb-prettier \"**/*.ts\"",
"prettier:check": "npm run prettier:cli -- -l",
"prettier:fix": "npm run prettier:cli -- --write",
"tslint": "lb-tslint",
"tslint:fix": "npm run tslint -- --fix",
"eslint": "lb-eslint",
"eslint:fix": "npm run eslint -- --fix",
"pretest": "npm run clean && npm run build",
"test": "lb-mocha dist/__tests__/**/*.js",
"posttest": "npm run lint",
Expand All @@ -46,11 +46,11 @@
"devDependencies": {
"@loopback/build": "^1.3.1",
"@loopback/testlab": "^1.0.7",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/express": "^4.11.1",
"@types/node": "^10.11.2",
"@types/p-event": "^1.3.0",
"tslint": "^5.12.0",
"eslint": "^5.14.1",
"typescript": "^3.3.1"
}
}
4 changes: 0 additions & 4 deletions examples/rpc-server/tslint.build.json

This file was deleted.

4 changes: 0 additions & 4 deletions examples/rpc-server/tslint.json

This file was deleted.

12 changes: 6 additions & 6 deletions examples/soap-calculator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"build": "lb-tsc es2017 --outDir dist",
"build:watch": "lb-tsc es2017 --outDir dist --watch",
"clean": "lb-clean *example-soap*.tgz dist package api-docs dist",
"lint": "npm run prettier:check && npm run tslint",
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
"lint": "npm run prettier:check && npm run eslint",
"lint:fix": "npm run eslint:fix && npm run prettier:fix",
"prettier:cli": "lb-prettier \"**/*.ts\" \"**/*.js\"",
"prettier:check": "npm run prettier:cli -- -l",
"prettier:fix": "npm run prettier:cli -- --write",
"tslint": "lb-tslint",
"tslint:fix": "npm run tslint -- --fix",
"eslint": "lb-eslint",
"eslint:fix": "npm run eslint -- --fix",
"pretest": "npm run clean && npm run build",
"test": "lb-mocha \"dist/__tests__/**/*.js\"",
"posttest": "npm run lint",
Expand Down Expand Up @@ -54,12 +54,12 @@
"devDependencies": {
"@loopback/build": "^1.3.1",
"@loopback/testlab": "^1.0.7",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/mocha": "^5.0.0",
"@types/node": "^10.11.2",
"mocha": "^6.0.0",
"source-map-support": "^0.5.5",
"tslint": "^5.12.0",
"eslint": "^5.14.1",
"typescript": "^3.3.1"
}
}
4 changes: 0 additions & 4 deletions examples/soap-calculator/tslint.build.json

This file was deleted.

4 changes: 0 additions & 4 deletions examples/soap-calculator/tslint.json

This file was deleted.

12 changes: 6 additions & 6 deletions examples/todo-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"build": "lb-tsc es2017 --outDir dist",
"build:watch": "lb-tsc es2017 --outDir dist --watch",
"clean": "lb-clean *example-todo-list*.tgz dist package api-docs",
"lint": "npm run prettier:check && npm run tslint",
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
"lint": "npm run prettier:check && npm run eslint",
"lint:fix": "npm run eslint:fix && npm run prettier:fix",
"prettier:cli": "lb-prettier \"**/*.ts\"",
"prettier:check": "npm run prettier:cli -- -l",
"prettier:fix": "npm run prettier:cli -- --write",
"tslint": "lb-tslint",
"tslint:fix": "npm run tslint -- --fix",
"eslint": "lb-eslint",
"eslint:fix": "npm run eslint -- --fix",
"pretest": "npm run build",
"test": "lb-mocha \"dist/__tests__/**/*.js\"",
"test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js && npm run posttest",
Expand Down Expand Up @@ -51,11 +51,11 @@
"@loopback/build": "^1.3.1",
"@loopback/http-caching-proxy": "^1.0.7",
"@loopback/testlab": "^1.0.7",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/lodash": "^4.14.109",
"@types/node": "^10.11.2",
"lodash": "^4.17.10",
"tslint": "^5.12.0",
"eslint": "^5.14.1",
"typescript": "^3.3.1"
},
"keywords": [
Expand Down
4 changes: 0 additions & 4 deletions examples/todo-list/tslint.build.json

This file was deleted.

4 changes: 0 additions & 4 deletions examples/todo-list/tslint.json

This file was deleted.

12 changes: 6 additions & 6 deletions examples/todo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"build": "lb-tsc es2017 --outDir dist",
"build:watch": "lb-tsc es2017 --outDir dist --watch",
"clean": "lb-clean *example-todo*.tgz dist package api-docs",
"lint": "npm run prettier:check && npm run tslint",
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
"lint": "npm run prettier:check && npm run eslint",
"lint:fix": "npm run eslint:fix && npm run prettier:fix",
"prettier:cli": "lb-prettier \"**/*.ts\"",
"prettier:check": "npm run prettier:cli -- -l",
"prettier:fix": "npm run prettier:cli -- --write",
"tslint": "lb-tslint",
"tslint:fix": "npm run tslint -- --fix",
"eslint": "lb-eslint",
"eslint:fix": "npm run eslint -- --fix",
"pretest": "npm run build",
"test": "lb-mocha \"dist/__tests__/**/*.js\"",
"test:dev": "lb-mocha --allow-console-logs dist/__tests__/**/*.js && npm run posttest",
Expand Down Expand Up @@ -51,11 +51,11 @@
"@loopback/build": "^1.3.1",
"@loopback/http-caching-proxy": "^1.0.7",
"@loopback/testlab": "^1.0.7",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/lodash": "^4.14.109",
"@types/node": "^10.11.2",
"lodash": "^4.17.10",
"tslint": "^5.12.0",
"eslint": "^5.14.1",
"typescript": "^3.3.1"
},
"keywords": [
Expand Down
4 changes: 0 additions & 4 deletions examples/todo/tslint.build.json

This file was deleted.

4 changes: 0 additions & 4 deletions examples/todo/tslint.json

This file was deleted.

3 changes: 2 additions & 1 deletion greenkeeper.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"packages/service-proxy/package.json",
"packages/testlab/package.json",
"packages/tslint-config/package.json",
"sandbox/example/package.json"
"sandbox/example/package.json",
"sandbox/sandbox-app.bak/package.json"
]
}
}
Expand Down
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"cz-conventional-changelog": "^2.1.0",
"husky": "^1.3.1",
"lerna": "^3.13.0",
"tslint": "^5.12.0",
"typescript": "^3.3.1"
"typescript": "^3.3.1",
"eslint": "^5.14.1"
},
"scripts": {
"postinstall": "lerna bootstrap && npm run -s update-greenkeeper-json",
Expand All @@ -35,10 +35,8 @@
"coverage:ci": "node packages/build/bin/run-nyc report --reporter=text-lcov | coveralls",
"precoverage": "npm test",
"coverage": "open coverage/index.html",
"lint": "npm run prettier:check && npm run tslint",
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
"tslint": "node packages/build/bin/run-tslint --project tsconfig.json",
"tslint:fix": "npm run tslint -- --fix",
"lint": "npm run prettier:check && npm run eslint",
"lint:fix": "npm run eslint:fix && npm run prettier:fix",
"eslint": "node packages/build/bin/run-eslint .",
"eslint:fix": "npm run eslint -- --fix",
"prettier:cli": "node packages/build/bin/run-prettier \"**/*.ts\" \"**/*.js\" \"**/*.md\"",
Expand Down
2 changes: 1 addition & 1 deletion packages/authentication/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@loopback/build": "^1.3.1",
"@loopback/openapi-spec-builder": "^1.0.7",
"@loopback/testlab": "^1.0.7",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/node": "^10.11.2",
"@types/passport": "^1.0.0",
"@types/passport-http": "^0.3.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/boot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@loopback/openapi-v3": "^1.2.2",
"@loopback/rest": "^1.6.0",
"@loopback/testlab": "^1.0.7",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/node": "^10.11.2"
},
"files": [
Expand Down
Empty file modified packages/build/bin/run-eslint.js
100644 → 100755
Empty file.
6 changes: 1 addition & 5 deletions packages/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"license": "MIT",
"dependencies": {
"@loopback/eslint-config": "^1.0.0-1",
"@loopback/tslint-config": "^2.0.1",
"@loopback/eslint-config": "^1.0.0-1",
"@types/mocha": "^5.0.0",
"@types/node": "^10.11.2",
"@typescript-eslint/eslint-plugin": "^1.4.2",
Expand Down Expand Up @@ -49,9 +49,5 @@
"scripts": {
"test": "npm run mocha",
"mocha": "node bin/run-mocha --timeout 30000 \"test/integration/*.js\""
},
"devDependencies": {
"@loopback/eslint-config": "^1.0.0-1",
"@loopback/tslint-config": "^2.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Run the following command to install the CLI.
--applicationName # Application name
--description # Description for the application
--outdir # Project root directory for the application
--tslint # Enable tslint
--eslint # Enable eslint
--prettier # Enable prettier
--mocha # Enable mocha
--loopbackBuild # Use @loopback/build
Expand All @@ -48,7 +48,7 @@ Run the following command to install the CLI.
--skip-install # Do not automatically install dependencies Default: false
--description # Description for the extension
--outdir # Project root directory for the extension
--tslint # Enable tslint
--eslint # Enable eslint
--prettier # Enable prettier
--mocha # Enable mocha
--loopbackBuild # Use @loopback/build
Expand Down
4 changes: 4 additions & 0 deletions packages/cli/generators/project/templates/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules/
dist/
coverage/
api-docs/

0 comments on commit 8ae1074

Please sign in to comment.