Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into provide-all-config
Browse files Browse the repository at this point in the history
  • Loading branch information
ldrick committed May 3, 2019
2 parents d91badc + f029dba commit 8a947ea
Show file tree
Hide file tree
Showing 7 changed files with 1,179 additions and 986 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/eslint-plugin-tslint.md
Expand Up @@ -2,7 +2,7 @@
name: '@typescript-eslint/eslint-plugin-tslint'
about: Report an issue with the '@typescript-eslint/eslint-plugin-tslint' package
title: ''
labels: 'package: @typescript-eslint/eslint-plugin-tslint, triage'
labels: 'package: eslint-plugin-tslint, triage'
assignees: ''
---

Expand Down
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/eslint-plugin-typescript.md
Expand Up @@ -16,6 +16,16 @@ If you ignore it, we're just going to respond asking you to fill it out, which w
The more relevant information you can include, the faster we can find the issue and fix it without asking you for more info.
-->

<!--
Are you opening an issue because the rule you're trying to use is not found?
🚨 STOP 🚨 𝗦𝗧𝗢𝗣 🚨 𝑺𝑻𝑶𝑷 🚨
1) Check the releases log: https://github.com/typescript-eslint/typescript-eslint/releases
- If the rule isn't listed there, then chances are it hasn't been released to the main npm tag yet.
2) Try installing the `canary` tag: `npm i @typescript-eslint/eslint-plugin@canary`.
- The canary tag is built for every commit to master, so it contains the bleeding edge build.
3) If ESLint still can't find the rule, then consider reporting an issue.
-->

**Repro**

<!--
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Expand Up @@ -6,3 +6,4 @@
**/.vscode
**/.nyc_output
packages/eslint-plugin-tslint/tests/test-tslint-rules-directory/alwaysFailRule.js
.github
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -60,6 +60,7 @@
"@types/node": "^10.12.2",
"@types/semver": "^5.5.0",
"all-contributors-cli": "^6.0.0",
"babel-code-frame": "^6.26.0",
"cz-conventional-changelog": "2.1.0",
"eslint": "^5.12.1",
"eslint-plugin-eslint-plugin": "^2.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin-tslint/tests/index.spec.ts
Expand Up @@ -119,7 +119,7 @@ ruleTester.run('tslint/config', rules.config, {
errors: [
{
message:
"Operands of '+' operation must either be both strings or both numbers, consider using template literals (tslint:restrict-plus-operands)",
'Operands of \'+\' operation must either be both strings or both numbers, but found 1 + "2". Consider using template literals. (tslint:restrict-plus-operands)',
},
],
},
Expand Down Expand Up @@ -174,7 +174,7 @@ describe('tslint/error', () => {

expect(console.warn).toHaveBeenCalledWith(
expect.stringContaining(
'No valid rules have been specified for TypeScript files',
'Tried to lint <input> but found no valid, enabled rules for this file type and file path in the resolved configuration.',
),
);
jest.resetAllMocks();
Expand Down
Expand Up @@ -16668,7 +16668,7 @@ Object {
},
"childScopes": Array [],
"functionExpressionScope": false,
"isStrict": true,
"isStrict": false,
"references": Array [],
"throughReferences": Array [],
"type": "function",
Expand Down

0 comments on commit 8a947ea

Please sign in to comment.