Merge branch 'main' into coverage-enhancements

aws-amplify · Dec 23, 2020 · 375a6d2 · 375a6d2
2 parents 7254144 + c21e58a
commit 375a6d2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/packages/amplify-ui-components/.eslintrc.js b/packages/amplify-ui-components/.eslintrc.js
@@ -31,5 +31,10 @@ module.exports = {
     '@typescript-eslint/no-explicit-any': 0,
     '@typescript-eslint/no-unused-vars': 0,
     '@typescript-eslint/camelcase': 0,
+    '@typescript-eslint/no-inferrable-types': 0,
+    '@typescript-eslint/explicit-module-boundary-types': 0,
+    '@typescript-eslint/no-empty-function': 0,
+    '@typescript-eslint/ban-ts-comment': 0,
+    '@typescript-eslint/ban-types': 0
   },
 };
diff --git a/packages/amplify-ui-components/package.json b/packages/amplify-ui-components/package.json
@@ -59,13 +59,13 @@
     "@types/puppeteer": "1.19.1",
     "@types/webpack": "^4.4.35",
     "@types/webpack-env": "^1.14.0",
-    "@typescript-eslint/eslint-plugin": "^1.12.0",
+    "@typescript-eslint/eslint-plugin": "^4.11.0",
     "@typescript-eslint/parser": "^1.12.0",
     "babel-loader": "^8.0.6",
     "concurrently": "^5.0.0",
-    "eslint": "^5.16.0",
-    "eslint-config-prettier": "^4.3.0",
-    "eslint-plugin-prettier": "^3.1.0",
+    "eslint": "^7.16.0",
+    "eslint-config-prettier": "^7.1.0",
+    "eslint-plugin-prettier": "^3.3.0",
     "eslint-plugin-react": "^7.19.0",
     "husky": "^2.4.1",
     "jest": "24.9.0",

diff --git a/packages/amplify-ui-components/src/common/storage-helpers.ts b/packages/amplify-ui-components/src/common/storage-helpers.ts
@@ -62,7 +62,7 @@ export const getStorageObject = async (
 
 const readFileAsync = (blob: Blob) => {
   return new Promise((resolve, reject) => {
-    let reader = new FileReader();
+    const reader = new FileReader();
 
     reader.onload = () => {
       resolve(reader.result as string);
@@ -95,7 +95,7 @@ export const getTextSource = async (
       identityId,
     });
     logger.debug(textSrc);
-    let text = (await readFileAsync(textSrc['Body'])) as string;
+    const text = (await readFileAsync(textSrc['Body'])) as string;
     return text;
   } catch (error) {
     throw new Error(error);

diff --git a/packages/amplify-ui-components/src/components/amplify-auth-fields/amplify-auth-fields.tsx b/packages/amplify-ui-components/src/components/amplify-auth-fields/amplify-auth-fields.tsx
@@ -27,7 +27,7 @@ export class AmplifyAuthFields {
   @Prop() formFields: FormFieldTypes | string[];
 
   private constructFormFieldOptions(formFields: FormFieldTypes | string[]) {
-    let content = [];
+    const content = [];
 
     if (formFields === undefined) return '';
 

diff --git a/packages/amplify-ui-components/src/components/amplify-input/amplify-input.spec.ts b/packages/amplify-ui-components/src/components/amplify-input/amplify-input.spec.ts
@@ -27,7 +27,7 @@ describe('amplify-input spec:', () => {
         html: `<div></div>`,
       });
 
-      let cmp = page.doc.createElement('amplify-input');
+      const cmp = page.doc.createElement('amplify-input');
       (cmp as any).inputProps = {
         autocomplete: 'off',
         min: '3',
@@ -62,7 +62,7 @@ describe('amplify-input spec:', () => {
     });
 
     it('`formSubmit` should be defined', () => {
-      expect(input.formSubmit).toBeDefined()
+      expect(input.formSubmit).toBeDefined();
     });
   });
 });
diff --git a/...lify-ui-components/src/components/amplify-select-mfa-type/amplify-select-mfa-type.spec.ts b/...lify-ui-components/src/components/amplify-select-mfa-type/amplify-select-mfa-type.spec.ts
@@ -33,7 +33,7 @@ describe('amplify-select-mfa-type spec:', () => {
         html: `<div></div>`,
       });
 
-      let component = page.doc.createElement('amplify-select-mfa-type');
+      const component = page.doc.createElement('amplify-select-mfa-type');
       (component as any).MFATypes = {
         SMS: true,
         Optional: true,

diff --git a/packages/amplify-ui-components/src/components/amplify-select/amplify-select.tsx b/packages/amplify-ui-components/src/components/amplify-select/amplify-select.tsx
@@ -48,7 +48,7 @@ export class AmplifySelect {
   private contructSelectOptions(opts: SelectOptionsString | SelectOptionsNumber) {
     this.isSelectedOptionValid(this.selected);
 
-    let content = [];
+    const content = [];
     opts.forEach((opt: SelectOptionString | SelectOptionNumber) => {
       content.push(
         <option value={opt.value} selected={opt.value === this.selected}>