From f4b4416ea52d564bc2dbe543a82084ed98843ccc Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Fri, 30 Jul 2021 10:54:54 +0200
Subject: chore: migrate from tslint to @typescript-eslint (#1706)

- update .eslintrc to work for .js and .ts
- update devDependencies
- lint properly both root /src and nested /packages
- update webhint recommended setting for tsconfig.json to shrink output
- Manage all eslint rules from the repo root
- escape single quotes in scripts to please windows build

Co-authored-by: Vijay A <avijayr@protonmail.com>
---
 uidev/src/app.tsx                      |  2 +-
 uidev/src/stores/stories.ts            |  2 -
 uidev/src/stories/button.stories.tsx   | 72 +++++++++++++++++++---------------
 uidev/src/stories/headline.stories.tsx |  3 --
 uidev/src/stories/infobox.stories.tsx  | 10 ++---
 uidev/src/stories/input.stories.tsx    |  4 +-
 uidev/src/stories/loader.stories.tsx   |  3 --
 uidev/src/stories/select.stories.tsx   |  2 +-
 uidev/src/stories/textarea.stories.tsx |  2 +-
 uidev/src/stories/toggle.stories.tsx   | 19 ++++-----
 uidev/src/withTheme/index.tsx          | 16 ++++----
 uidev/tslint.json                      |  3 --
 12 files changed, 67 insertions(+), 71 deletions(-)
 delete mode 100644 uidev/tslint.json

(limited to 'uidev')

diff --git a/uidev/src/app.tsx b/uidev/src/app.tsx
index 41930e805..ecc7020c1 100644
--- a/uidev/src/app.tsx
+++ b/uidev/src/app.tsx
@@ -5,6 +5,7 @@ import DevTools from 'mobx-react-devtools';
 import React from 'react';
 import injectSheet from 'react-jss';
 
+import { theme, ThemeType } from '@meetfranz/theme';
 import { WithTheme } from './withTheme';
 
 import './stories/badge.stories';
@@ -20,7 +21,6 @@ import './stories/toggle.stories';
 
 import { store } from './stores';
 
-import { theme, ThemeType } from '@meetfranz/theme';
 const defaultTheme = theme(ThemeType.default);
 
 const styles = {
diff --git a/uidev/src/stores/stories.ts b/uidev/src/stores/stories.ts
index 6a98c9fd3..12bacdd59 100644
--- a/uidev/src/stores/stories.ts
+++ b/uidev/src/stores/stories.ts
@@ -1,5 +1,3 @@
-import { store } from './index';
-
 export type StorySectionName = string;
 export type StoryName = string;
 export type StoryComponent = () => JSX.Element;
diff --git a/uidev/src/stories/button.stories.tsx b/uidev/src/stories/button.stories.tsx
index 5c1c9246d..5ca657238 100644
--- a/uidev/src/stories/button.stories.tsx
+++ b/uidev/src/stories/button.stories.tsx
@@ -27,20 +27,18 @@ const styles = {
   },
 };
 
-const createStore = (args?: any) => {
-  return observable(Object.assign({}, defaultProps, args));
-};
+const createStore = (args?: any) => observable({ ...defaultProps, ...args });
 
 const WithStoreButton = observer(({ store }: { store: any }) => (
   <>
     <Button
-      {...Object.assign({}, defaultProps, store)}
+      {...({ ...defaultProps, ...store })}
       onClick={!store.onClick ? () => {
         store.busy = !store.busy;
 
         window.setTimeout(() => {
           store.busy = !store.busy;
-        },                1000);
+        }, 1000);
       } : store.onClick}
     />
   </>
@@ -53,58 +51,69 @@ storiesOf('Button')
   .add('Secondary', () => (
     <WithStoreButton store={createStore({
       buttonType: 'secondary',
-    })} />
+    })}
+    />
   ))
   .add('Success', () => (
     <WithStoreButton store={createStore({
       buttonType: 'success',
-    })} />
+    })}
+    />
   ))
   .add('Warning', () => (
     <WithStoreButton store={createStore({
       buttonType: 'warning',
-    })} />
+    })}
+    />
   ))
   .add('Danger', () => (
     <WithStoreButton store={createStore({
       buttonType: 'danger',
-    })} />
+    })}
+    />
   ))
   .add('Inverted', () => (
     <WithStoreButton store={createStore({
       buttonType: 'inverted',
-    })} />
+    })}
+    />
   ))
   .add('Full width', () => (
     <WithStoreButton store={createStore({
       stretch: true,
-    })} />
+    })}
+    />
   ))
   .add('Disabled', () => (
     <WithStoreButton store={createStore({
       disabled: true,
-    })} />
+    })}
+    />
   ))
   .add('With loader', () => (
     <WithStoreButton store={createStore({
       busy: true,
-    })} />
+    })}
+    />
   ))
   .add('With icon', () => (
     <WithStoreButton store={createStore({
       icon: mdiInformation,
-    })} />
+    })}
+    />
   ))
   .add('As link', () => (
     <WithStoreButton store={createStore({
       href: 'https://meetfranz.com',
-    })} />
+    })}
+    />
   ))
   .add('As link (target=_blank)', () => (
     <WithStoreButton store={createStore({
       href: 'https://meetfranz.com',
       target: '_blank',
-    })} />
+    })}
+    />
   ))
   .add('As link (with onClick)', () => (
     <WithStoreButton store={createStore({
@@ -113,26 +122,27 @@ storiesOf('Button')
         e.preventDefault();
         alert('Click event');
       },
-    })}/>
+    })}
+    />
   ))
   .add('Long multi-line button', () => (
     <WithStoreButton store={createStore({
       label: 'But there is something that I must say to my people, who stand on the warm threshold which leads into the palace of justice: In the process of gaining our rightful place, we must not be guilty of wrongful deeds. Let us not seek to satisfy our thirst for freedom by drinking from the cup of bitterness and hatred. We must forever conduct our struggle on the high plane of dignity and discipline. We must not allow our creative protest to degenerate into physical violence. Again and again, we must rise to the majestic heights of meeting physical force with soul force.',
-    })} />
+    })}
+    />
   ))
   .add('Button with Input', injectSheet(styles)(observer(({ classes }: { classes: Classes }) => (
-      <div className={classes.combinedElements}>
-        <Input showLabel={false} className={classes.input} noMargin />
-        <WithStoreButton store={createStore({})} />
-      </div>
-    )),
-  ))
+    <div className={classes.combinedElements}>
+      <Input showLabel={false} className={classes.input} noMargin />
+      <WithStoreButton store={createStore({})} />
+    </div>
+    ))))
   .add('Icon Button with Input', injectSheet(styles)(observer(({ classes }: { classes: Classes }) => (
-      <div className={classes.combinedElements}>
-        <Input showLabel={false} className={classes.input} noMargin />
-        <WithStoreButton store={createStore({
+    <div className={classes.combinedElements}>
+      <Input showLabel={false} className={classes.input} noMargin />
+      <WithStoreButton store={createStore({
           icon: mdiInformation,
-        })} />
-      </div>
-    )),
-  ));
+        })}
+      />
+    </div>
+    ))));
diff --git a/uidev/src/stories/headline.stories.tsx b/uidev/src/stories/headline.stories.tsx
index f42771cae..320ac832f 100644
--- a/uidev/src/stories/headline.stories.tsx
+++ b/uidev/src/stories/headline.stories.tsx
@@ -1,7 +1,4 @@
-import { observable } from 'mobx';
-import { observer } from 'mobx-react';
 import React from 'react';
-import uuid from 'uuid/v4';
 
 import { H1, H2, H3, H4 } from '@meetfranz/ui';
 import { storiesOf } from '../stores/stories';
diff --git a/uidev/src/stories/infobox.stories.tsx b/uidev/src/stories/infobox.stories.tsx
index b0416b844..fe4aaab06 100644
--- a/uidev/src/stories/infobox.stories.tsx
+++ b/uidev/src/stories/infobox.stories.tsx
@@ -14,14 +14,11 @@ interface IStoreArgs {
   className?: string;
 }
 
-const createStore = (args?: IStoreArgs) => {
-  return observable(Object.assign({
-    type: 'primary',
+const createStore = (args?: IStoreArgs) => observable({ type: 'primary',
     ctaOnClick: () => {
       alert('on click handler');
     },
-  },                              args));
-};
+...args });
 
 const WithStoreInfobox = observer(({ store, children }: { store: any, children: string | React.ReactNode }) => (
   <>
@@ -130,7 +127,8 @@ storiesOf('Infobox')
   .add('With className', () => (
     <WithStoreInfobox store={createStore({
       className: 'franz-is-awesome',
-    })}>
+    })}
+    >
       Welcome to the world of tomorrow
     </WithStoreInfobox>
   ));
diff --git a/uidev/src/stories/input.stories.tsx b/uidev/src/stories/input.stories.tsx
index af5e791d0..889539266 100644
--- a/uidev/src/stories/input.stories.tsx
+++ b/uidev/src/stories/input.stories.tsx
@@ -10,7 +10,7 @@ const defaultProps = () => {
     label: 'Label',
     id: `test-${id}`,
     name: `test-${id}`,
-    onChange: (e: React.ChangeEvent<HTMLInputElement>)  => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
   };
 };
 
@@ -21,7 +21,7 @@ const defaultPasswordProps = () => {
     id: `test-${id}`,
     name: `test-${id}`,
     type: 'password',
-    onChange: (e: React.ChangeEvent<HTMLInputElement>)  => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
   };
 };
 
diff --git a/uidev/src/stories/loader.stories.tsx b/uidev/src/stories/loader.stories.tsx
index 84e813c04..50eb7b9e1 100644
--- a/uidev/src/stories/loader.stories.tsx
+++ b/uidev/src/stories/loader.stories.tsx
@@ -1,7 +1,4 @@
-import { observable } from 'mobx';
-import { observer } from 'mobx-react';
 import React from 'react';
-import uuid from 'uuid/v4';
 
 import { Loader } from '@meetfranz/ui';
 import { storiesOf } from '../stores/stories';
diff --git a/uidev/src/stories/select.stories.tsx b/uidev/src/stories/select.stories.tsx
index 81f7f08a6..51ec6ed88 100644
--- a/uidev/src/stories/select.stories.tsx
+++ b/uidev/src/stories/select.stories.tsx
@@ -282,7 +282,7 @@ const defaultProps = () => {
     },
     actionText: 'Select country',
     // defaultValue: 'AT',
-    onChange: (e: React.ChangeEvent<HTMLInputElement>)  => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
   };
 };
 
diff --git a/uidev/src/stories/textarea.stories.tsx b/uidev/src/stories/textarea.stories.tsx
index c2dd74e24..1ab21820b 100644
--- a/uidev/src/stories/textarea.stories.tsx
+++ b/uidev/src/stories/textarea.stories.tsx
@@ -11,7 +11,7 @@ const defaultProps = () => {
     id: `test-${id}`,
     name: `test-${id}`,
     rows: 5,
-    onChange: (e: React.ChangeEvent<HTMLInputElement>)  => console.log('changed event', e),
+    onChange: (e: React.ChangeEvent<HTMLInputElement>) => console.log('changed event', e),
   };
 };
 
diff --git a/uidev/src/stories/toggle.stories.tsx b/uidev/src/stories/toggle.stories.tsx
index 091342496..af6b282bc 100644
--- a/uidev/src/stories/toggle.stories.tsx
+++ b/uidev/src/stories/toggle.stories.tsx
@@ -16,17 +16,14 @@ interface IStoreArgs {
   error?: string;
 }
 
-const createStore = (args?: IStoreArgs) => {
-  return observable(Object.assign({
-    id: `element-${uuid()}`,
+const createStore = (args?: IStoreArgs) => observable({ id: `element-${uuid()}`,
     name: 'toggle',
     label: 'Label',
     value: true,
     checked: false,
     disabled: false,
     error: '',
-  },                              args));
-};
+...args });
 
 const WithStoreToggle = observer(({ store }: { store: any }) => (
   <>
@@ -50,21 +47,25 @@ storiesOf('Toggle')
   .add('Checked', () => (
     <WithStoreToggle store={createStore({
       checked: true,
-    })} />
+    })}
+    />
   ))
   .add('Disabled', () => (
     <WithStoreToggle store={createStore({
       checked: true,
       disabled: true,
-    })} />
+    })}
+    />
   ))
   .add('Long label', () => (
     <WithStoreToggle store={createStore({
       label: 'Hello world, this is an insanely long label for this toggle. We need to make sure that it will be displayed correctly.',
-    })} />
+    })}
+    />
   ))
   .add('With error', () => (
     <WithStoreToggle store={createStore({
       error: 'Something went wrong',
-    })} />
+    })}
+    />
   ));
diff --git a/uidev/src/withTheme/index.tsx b/uidev/src/withTheme/index.tsx
index 17a1074d3..4ef649367 100644
--- a/uidev/src/withTheme/index.tsx
+++ b/uidev/src/withTheme/index.tsx
@@ -37,14 +37,12 @@ const Container = injectSheet(styles)(({ name, classes, story }: { name: string,
   </article>
 ));
 
-export const WithTheme = ({ children }: {children: React.ReactChild}) => {
-  return (
-      <>
-        {themes.map((theme, key) => (
-          <ThemeProvider key={key} theme={theme.variables}>
-            <Container story={children} name={theme.name} />
-          </ThemeProvider>
+export const WithTheme = ({ children }: { children: React.ReactChild }) => (
+  <>
+    {themes.map((theme, key) => (
+      <ThemeProvider key={key} theme={theme.variables}>
+        <Container story={children} name={theme.name} />
+      </ThemeProvider>
         ))}
-      </>
+  </>
   );
-};
diff --git a/uidev/tslint.json b/uidev/tslint.json
deleted file mode 100644
index ec365f164..000000000
--- a/uidev/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../tslint.json"
-}
-- 
cgit v1.2.3-70-g09d2