From 1a87c097ab7b5ac216b55fe21157c0c8911adcef Mon Sep 17 00:00:00 2001 From: Eric Schultz <eric@commitchange.com> Date: Thu, 22 Oct 2020 14:33:40 -0500 Subject: [PATCH] Convert from comma-dangle to @typescript-eslint/comma-dangle in eslint --- .eslintrc.js | 3 ++- app/javascript/hooks/useSteps.spec.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 7eaf5062..ee80d336 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -171,7 +171,8 @@ module.exports = { ], "no-trailing-spaces": ["error"], "indent": ["error", "tab", { "SwitchCase": 1 }], // we use tabs for accessibility - "comma-dangle": ["error", "always-multiline"], + "comma-dangle": "off", + "@typescript-eslint/comma-dangle": ["error", "always-multiline"], "@typescript-eslint/no-unused-vars": ['error', { "args": "all", "argsIgnorePattern": "^_" }], }, "settings": { diff --git a/app/javascript/hooks/useSteps.spec.ts b/app/javascript/hooks/useSteps.spec.ts index 2349e3da..1daaf432 100644 --- a/app/javascript/hooks/useSteps.spec.ts +++ b/app/javascript/hooks/useSteps.spec.ts @@ -361,7 +361,7 @@ describe('modify steps', () => { ): [ KeyedStep[], number | undefined, KeyedStepMap<boolean> | undefined, KeyedStepMap<boolean> | undefined, // initial KeyedStep[], //stepChange - number | undefined, KeyedStepMap<boolean>, KeyedStepMap<boolean> //expectations + number | undefined, KeyedStepMap<boolean>, KeyedStepMap<boolean>, //expectations ] { const expectation = { activeStep: props.initial.activeStep || 0,