From 7ba3de2e289900aa6c92723b1ca1c47cf2423abe Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Tue, 17 Mar 2020 13:18:23 +0200 Subject: [PATCH] chore: fix lint issues --- .eslintrc.js | 4 ++++ package.json | 2 +- src/components/PayloadSamples/Example.tsx | 7 ++++++- src/components/PayloadSamples/styled.elements.ts | 3 --- src/components/SecuritySchemes/SecuritySchemes.tsx | 8 ++++++-- src/components/SideMenu/SideMenu.tsx | 2 +- src/components/__tests__/DiscriminatorDropdown.test.tsx | 1 + src/services/__tests__/OpenAPIParser.test.ts | 1 + src/services/__tests__/models/FieldModel.test.ts | 4 ++-- src/services/__tests__/models/Schema.test.ts | 1 + src/utils/__tests__/openapi.test.ts | 8 ++++---- 11 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 959a9d64..589424a6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,6 +7,7 @@ module.exports = { parserOptions: { project: 'tsconfig.json', sourceType: 'module', + createDefaultProgram: true, ecmaFeatures: { jsx: true, }, @@ -37,6 +38,9 @@ module.exports = { 'react-dom/*', 'core-js/**', 'memoize-one/**', + 'unfetch/**', + 'raf/polyfill', + '**/fixtures/**', // for tests ], }, ], diff --git a/package.json b/package.json index 93fdaac0..9f88f8bd 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "stats": "webpack --env.standalone --json --profile --mode=production > stats.json", "prettier": "prettier --write \"cli/index.ts\" \"src/**/*.{ts,tsx}\"", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1", - "lint": "eslint src/**/*.{js,ts,tsx}", + "lint": "eslint 'src/**/*.{js,ts,tsx}'", "benchmark": "node ./benchmark/benchmark.js", "start:demo": "webpack-dev-server --hot --config demo/webpack.config.ts --mode=development", "compile:cli": "tsc custom.d.ts cli/index.ts --target es6 --module commonjs --types yargs", diff --git a/src/components/PayloadSamples/Example.tsx b/src/components/PayloadSamples/Example.tsx index acf447eb..18a3cfd8 100644 --- a/src/components/PayloadSamples/Example.tsx +++ b/src/components/PayloadSamples/Example.tsx @@ -29,7 +29,12 @@ export function ExternalExample({ example, mimeType }: ExampleProps) { return ( Error loading external example:
- + {example.externalValueUrl} diff --git a/src/components/PayloadSamples/styled.elements.ts b/src/components/PayloadSamples/styled.elements.ts index ee2f4a74..944db934 100644 --- a/src/components/PayloadSamples/styled.elements.ts +++ b/src/components/PayloadSamples/styled.elements.ts @@ -1,6 +1,3 @@ -// @ts-ignore -import Dropdown from 'react-dropdown'; - import { transparentize } from 'polished'; import styled from '../../styled-components'; diff --git a/src/components/SecuritySchemes/SecuritySchemes.tsx b/src/components/SecuritySchemes/SecuritySchemes.tsx index 7f11eeed..91fac68e 100644 --- a/src/components/SecuritySchemes/SecuritySchemes.tsx +++ b/src/components/SecuritySchemes/SecuritySchemes.tsx @@ -97,7 +97,7 @@ export class SecurityDefs extends React.PureComponent { scheme.http.scheme === 'bearer' && scheme.http.bearerFormat && ( Bearer format - "{scheme.http.bearerFormat}" + "{scheme.http.bearerFormat}" ), ] @@ -105,7 +105,11 @@ export class SecurityDefs extends React.PureComponent { Connect URL - + {scheme.openId.connectUrl} diff --git a/src/components/SideMenu/SideMenu.tsx b/src/components/SideMenu/SideMenu.tsx index 34643054..386fed07 100644 --- a/src/components/SideMenu/SideMenu.tsx +++ b/src/components/SideMenu/SideMenu.tsx @@ -25,7 +25,7 @@ export class SideMenu extends React.Component<{ menu: MenuStore; className?: str > - + Documentation Powered by ReDoc diff --git a/src/components/__tests__/DiscriminatorDropdown.test.tsx b/src/components/__tests__/DiscriminatorDropdown.test.tsx index 284baeac..6c02d1c6 100644 --- a/src/components/__tests__/DiscriminatorDropdown.test.tsx +++ b/src/components/__tests__/DiscriminatorDropdown.test.tsx @@ -1,3 +1,4 @@ +/* eslint-disable import/no-internal-modules */ /* tslint:disable:no-implicit-dependencies */ import { shallow } from 'enzyme'; diff --git a/src/services/__tests__/OpenAPIParser.test.ts b/src/services/__tests__/OpenAPIParser.test.ts index df2f9f16..b79f61b4 100644 --- a/src/services/__tests__/OpenAPIParser.test.ts +++ b/src/services/__tests__/OpenAPIParser.test.ts @@ -8,6 +8,7 @@ describe('Models', () => { let parser; test('should hoist oneOfs when mergin allOf', () => { + // eslint-disable-next-line @typescript-eslint/no-var-requires const spec = require('./fixtures/oneOfHoist.json'); parser = new OpenAPIParser(spec, undefined, opts); expect(parser.mergeAllOf(spec.components.schemas.test)).toMatchSnapshot(); diff --git a/src/services/__tests__/models/FieldModel.test.ts b/src/services/__tests__/models/FieldModel.test.ts index f86827dd..f4fa424b 100644 --- a/src/services/__tests__/models/FieldModel.test.ts +++ b/src/services/__tests__/models/FieldModel.test.ts @@ -6,9 +6,9 @@ const opts = new RedocNormalizedOptions({}); describe('Models', () => { describe('FieldModel', () => { - let parser; + // eslint-disable-next-line @typescript-eslint/no-var-requires const spec = require('../fixtures/fields.json'); - parser = new OpenAPIParser(spec, undefined, opts); + const parser = new OpenAPIParser(spec, undefined, opts); test('basic field details', () => { const field = new FieldModel( diff --git a/src/services/__tests__/models/Schema.test.ts b/src/services/__tests__/models/Schema.test.ts index ed75fce6..460ca7c1 100644 --- a/src/services/__tests__/models/Schema.test.ts +++ b/src/services/__tests__/models/Schema.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-var-requires */ import { SchemaModel } from '../../models/Schema'; import { OpenAPIParser } from '../../OpenAPIParser'; import { RedocNormalizedOptions } from '../../RedocNormalizedOptions'; diff --git a/src/utils/__tests__/openapi.test.ts b/src/utils/__tests__/openapi.test.ts index ab222682..94fb1e0c 100644 --- a/src/utils/__tests__/openapi.test.ts +++ b/src/utils/__tests__/openapi.test.ts @@ -640,7 +640,7 @@ describe('Utils', () => { describe('OpenAPI sortByRequired', () => { it('should equal to the old data when all items have no required props', () => { - let fields = [ + const fields = [ { name: 'loginName', required: false, @@ -694,7 +694,7 @@ describe('Utils', () => { }); it('other item should be the same order when some of items are required', () => { - let fields = [ + const fields = [ { name: 'loginName', required: true, @@ -744,7 +744,7 @@ describe('Utils', () => { required: false, }, ]; - let sortedFields = [ + const sortedFields = [ { name: 'loginName', required: true, @@ -798,7 +798,7 @@ describe('Utils', () => { }); it('should the order of required items is as same as the order parameter ', () => { - let fields = [ + const fields = [ { name: 'loginName', required: true,