From f4b4416ea52d564bc2dbe543a82084ed98843ccc Mon Sep 17 00:00:00 2001 From: Markus Hatvan 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 --- src/features/announcements/components/AnnouncementScreen.js | 2 +- src/features/communityRecipes/store.js | 2 +- src/features/publishDebugInfo/Component.js | 6 +++--- src/features/quickSwitch/Component.js | 4 ++-- src/features/shareFranz/Component.js | 2 +- src/features/todos/containers/TodosScreen.js | 4 ++-- src/features/utils/ActionBinding.js | 4 ++-- src/features/utils/FeatureStore.js | 8 ++++---- src/features/webControls/components/WebControls.js | 4 ++-- src/features/webControls/containers/WebControlsScreen.js | 2 +- src/features/workspaces/api.js | 2 +- src/features/workspaces/components/WorkspaceDrawer.js | 2 +- src/features/workspaces/components/WorkspaceDrawerItem.js | 2 +- src/features/workspaces/components/WorkspaceItem.js | 2 +- src/features/workspaces/components/WorkspaceServiceListItem.js | 2 +- src/features/workspaces/components/WorkspaceSwitchingIndicator.js | 2 +- src/features/workspaces/components/WorkspacesDashboard.js | 4 ++-- src/features/workspaces/containers/WorkspacesScreen.js | 4 ++-- src/features/workspaces/models/Workspace.js | 4 ++-- 19 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/features') diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js index 21964b108..315843db3 100644 --- a/src/features/announcements/components/AnnouncementScreen.js +++ b/src/features/announcements/components/AnnouncementScreen.js @@ -25,7 +25,7 @@ const messages = defineMessages({ const smallScreen = '1000px'; -const styles = theme => ({ +const styles = (theme) => ({ container: { background: theme.colorBackground, position: 'relative', diff --git a/src/features/communityRecipes/store.js b/src/features/communityRecipes/store.js index acc1e52f6..b115a53e1 100644 --- a/src/features/communityRecipes/store.js +++ b/src/features/communityRecipes/store.js @@ -19,7 +19,7 @@ export class CommunityRecipesStore extends FeatureStore { if (!this.stores) return []; return this.stores.recipePreviews.dev.map((r) => { - r.isDevRecipe = !!r.author.find(a => a.email === this.stores.user.data.email); + r.isDevRecipe = !!r.author.find((a) => a.email === this.stores.user.data.email); return r; }); diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js index f97a7c750..5387bd358 100644 --- a/src/features/publishDebugInfo/Component.js +++ b/src/features/publishDebugInfo/Component.js @@ -46,7 +46,7 @@ const messages = defineMessages({ }, }); -const styles = theme => ({ +const styles = (theme) => ({ container: { minWidth: '70vw', }, @@ -186,10 +186,10 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class <>

{intl.formatMessage(messages.info)}

- + {intl.formatMessage(messages.privacy)} - + {intl.formatMessage(messages.terms)} diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js index 04822db71..812f2c04b 100644 --- a/src/features/quickSwitch/Component.js +++ b/src/features/quickSwitch/Component.js @@ -28,7 +28,7 @@ const messages = defineMessages({ }, }); -const styles = theme => ({ +const styles = (theme) => ({ modal: { width: '80%', maxWidth: 600, @@ -139,7 +139,7 @@ export default @injectSheet(styles) @inject('stores', 'actions') @observer class if (this.state.search && compact(invoke(this.state.search, 'match', /^[a-z0-9]/i)).length > 0) { // Apply simple search algorythm to list of all services services = this.props.stores.services.allDisplayed; - services = services.filter(service => service.name.toLowerCase().search(this.state.search.toLowerCase()) !== -1); + services = services.filter((service) => service.name.toLowerCase().search(this.state.search.toLowerCase()) !== -1); } else { // Add the currently active service first const currentService = this.props.stores.services.active; diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js index b66375453..cc2e81b70 100644 --- a/src/features/shareFranz/Component.js +++ b/src/features/shareFranz/Component.js @@ -44,7 +44,7 @@ const messages = defineMessages({ }, }); -const styles = theme => ({ +const styles = (theme) => ({ modal: { width: '80%', maxWidth: 600, diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js index 6425746e6..d05e24e56 100644 --- a/src/features/todos/containers/TodosScreen.js +++ b/src/features/todos/containers/TodosScreen.js @@ -24,10 +24,10 @@ class TodosScreen extends Component { isVisible={todosStore.isTodosPanelVisible} togglePanel={todoActions.toggleTodosPanel} handleClientMessage={todoActions.handleClientMessage} - setTodosWebview={webview => todoActions.setTodosWebview({ webview })} + setTodosWebview={(webview) => todoActions.setTodosWebview({ webview })} width={todosStore.width} minWidth={TODOS_MIN_WIDTH} - resize={width => todoActions.resize({ width })} + resize={(width) => todoActions.resize({ width })} userAgent={todosStore.userAgent} todoUrl={todosStore.todoUrl} isTodoUrlValid={todosStore.isTodoUrlValid} diff --git a/src/features/utils/ActionBinding.js b/src/features/utils/ActionBinding.js index 497aa071b..787166d44 100644 --- a/src/features/utils/ActionBinding.js +++ b/src/features/utils/ActionBinding.js @@ -24,6 +24,6 @@ export default class ActionBinding { } } -export const createActionBindings = actions => ( - actions.map(a => new ActionBinding(a)) +export const createActionBindings = (actions) => ( + actions.map((a) => new ActionBinding(a)) ); diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js index 0bc10e176..4d4e217a9 100644 --- a/src/features/utils/FeatureStore.js +++ b/src/features/utils/FeatureStore.js @@ -16,11 +16,11 @@ export class FeatureStore { } _startActions(actions = this._actions) { - actions.forEach(a => a.start()); + actions.forEach((a) => a.start()); } _stopActions(actions = this._actions) { - actions.forEach(a => a.stop()); + actions.forEach((a) => a.stop()); } // REACTIONS @@ -31,10 +31,10 @@ export class FeatureStore { } _startReactions(reactions = this._reactions) { - reactions.forEach(r => r.start()); + reactions.forEach((r) => r.start()); } _stopReactions(reactions = this._reactions) { - reactions.forEach(r => r.stop()); + reactions.forEach((r) => r.stop()); } } diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js index b9403bd0d..1cdd14e55 100644 --- a/src/features/webControls/components/WebControls.js +++ b/src/features/webControls/components/WebControls.js @@ -32,7 +32,7 @@ const messages = defineMessages({ }, }); -const styles = theme => ({ +const styles = (theme) => ({ root: { background: theme.colorBackground, position: 'relative', @@ -197,7 +197,7 @@ class WebControls extends Component { this.setState({ + onChange={(event) => this.setState({ inputUrl: event.target.value, })} onFocus={(event) => { diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js index d638b831c..e1e1b9991 100644 --- a/src/features/webControls/containers/WebControlsScreen.js +++ b/src/features/webControls/containers/WebControlsScreen.js @@ -114,7 +114,7 @@ class WebControlsScreen extends Component { goBack={() => this.goBack()} canGoForward={this.canGoForward} goForward={() => this.goForward()} - navigate={url => this.navigate(url)} + navigate={(url) => this.navigate(url)} url={this.url} /> ); diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js index 30fbd84be..322695ed2 100644 --- a/src/features/workspaces/api.js +++ b/src/features/workspaces/api.js @@ -14,7 +14,7 @@ export const workspaceApi = { debug('getUserWorkspaces RESULT', result); if (!result.ok) throw result; const workspaces = await result.json(); - return workspaces.map(data => new Workspace(data)); + return workspaces.map((data) => new Workspace(data)); }, createWorkspace: async (name) => { diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index 3ddc9cf16..1138f23d7 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js @@ -34,7 +34,7 @@ const messages = defineMessages({ }, }); -const styles = theme => ({ +const styles = (theme) => ({ drawer: { background: theme.workspaces.drawer.background, width: `${theme.workspaces.drawer.width}px`, diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js index 2e58b70d6..a3fdf4f47 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.js +++ b/src/features/workspaces/components/WorkspaceDrawerItem.js @@ -18,7 +18,7 @@ const messages = defineMessages({ }, }); -const styles = theme => ({ +const styles = (theme) => ({ item: { height: '67px', padding: `15px ${theme.workspaces.drawer.padding}px`, diff --git a/src/features/workspaces/components/WorkspaceItem.js b/src/features/workspaces/components/WorkspaceItem.js index cc4b1a3ba..85fc02d51 100644 --- a/src/features/workspaces/components/WorkspaceItem.js +++ b/src/features/workspaces/components/WorkspaceItem.js @@ -6,7 +6,7 @@ import injectSheet from 'react-jss'; import Workspace from '../models/Workspace'; -const styles = theme => ({ +const styles = (theme) => ({ row: { height: theme.workspaces.settings.listItems.height, borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`, diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.js b/src/features/workspaces/components/WorkspaceServiceListItem.js index e05b21440..f6e2a2786 100644 --- a/src/features/workspaces/components/WorkspaceServiceListItem.js +++ b/src/features/workspaces/components/WorkspaceServiceListItem.js @@ -8,7 +8,7 @@ import { Toggle } from '@meetfranz/forms'; import Service from '../../../models/Service'; import ServiceIcon from '../../../components/ui/ServiceIcon'; -const styles = theme => ({ +const styles = (theme) => ({ listItem: { height: theme.workspaces.settings.listItems.height, borderBottom: `1px solid ${theme.workspaces.settings.listItems.borderColor}`, diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js index a70d1d66f..b46959e91 100644 --- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js +++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js @@ -15,7 +15,7 @@ const messages = defineMessages({ }, }); -const styles = theme => ({ +const styles = (theme) => ({ wrapper: { display: 'flex', alignItems: 'flex-start', diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index 0c2588c42..8319d3bc6 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js @@ -175,11 +175,11 @@ class WorkspacesDashboard extends Component { {/* ===== Workspaces list ===== */} - {workspaces.map(workspace => ( + {workspaces.map((workspace) => ( onWorkspaceClick(w)} + onItemClick={(w) => onWorkspaceClick(w)} /> ))} diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js index c241cd622..4828658f9 100644 --- a/src/features/workspaces/containers/WorkspacesScreen.js +++ b/src/features/workspaces/containers/WorkspacesScreen.js @@ -30,8 +30,8 @@ class WorkspacesScreen extends Component { createWorkspaceRequest={createWorkspaceRequest} deleteWorkspaceRequest={deleteWorkspaceRequest} updateWorkspaceRequest={updateWorkspaceRequest} - onCreateWorkspaceSubmit={data => actions.workspaces.create(data)} - onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })} + onCreateWorkspaceSubmit={(data) => actions.workspaces.create(data)} + onWorkspaceClick={(w) => actions.workspaces.edit({ workspace: w })} /> ); diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.js index 77c4e05f4..11ee377cd 100644 --- a/src/features/workspaces/models/Workspace.js +++ b/src/features/workspaces/models/Workspace.js @@ -22,13 +22,13 @@ export default class Workspace { this.name = data.name; this.order = data.order; - let services = data.services; + let { services } = data; if (data.saving && data.keepLoaded) { // Keep workspaces loaded services.push(KEEP_WS_LOADED_USID); } else if (data.saving && data.services.includes(KEEP_WS_LOADED_USID)) { // Don't keep loaded - services = services.filter(e => e !== KEEP_WS_LOADED_USID); + services = services.filter((e) => e !== KEEP_WS_LOADED_USID); } this.services.replace(services); -- cgit v1.2.3-70-g09d2