From 8f28573fc07ea4cad2e7fb9a07764cdcb42e159d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B3mez?= Date: Tue, 25 Oct 2016 08:53:15 -0400 Subject: [PATCH] Prefer default export to make XO happy (#931) * Comply with prefer-default-export rule for findBySession function * Remove XO's prefer-default-export rule * Comply with prefer-default-export rule for init function * Comply with prefer-default-export rule for getRootGroups function * Comply with prefer-default-export rule for INIT constant * Comply with prefer-default-export rule for isExecutable function * Fix default export for constants * Comply with prefer-default-export rule for last function * Comply with prefer-default-export rule for getColorList function --- lib/actions/index.js | 4 ++-- lib/actions/sessions.js | 2 +- lib/actions/term-groups.js | 4 ++-- lib/actions/ui.js | 8 ++++---- lib/components/term.js | 2 +- lib/constants/index.js | 4 +++- lib/containers/header.js | 2 +- lib/containers/terms.js | 2 +- lib/index.js | 2 +- lib/reducers/term-groups.js | 2 +- lib/selectors.js | 4 +++- lib/utils/array.js | 2 +- lib/utils/colors.js | 2 +- lib/utils/file.js | 2 +- lib/utils/term-groups.js | 2 +- package.json | 1 - 16 files changed, 24 insertions(+), 21 deletions(-) diff --git a/lib/actions/index.js b/lib/actions/index.js index 3ff876c2..ea8e9e65 100644 --- a/lib/actions/index.js +++ b/lib/actions/index.js @@ -1,7 +1,7 @@ import rpc from '../rpc'; -import {INIT} from '../constants'; +import INIT from '../constants'; -export function init() { +export default function init() { return dispatch => { dispatch({ type: INIT, diff --git a/lib/actions/sessions.js b/lib/actions/sessions.js index 7fc0dec1..ffab7d9c 100644 --- a/lib/actions/sessions.js +++ b/lib/actions/sessions.js @@ -1,7 +1,7 @@ import rpc from '../rpc'; import getURL from '../utils/url-command'; import {keys} from '../utils/object'; -import {findBySession} from '../utils/term-groups'; +import findBySession from '../utils/term-groups'; import { SESSION_ADD, SESSION_RESIZE, diff --git a/lib/actions/term-groups.js b/lib/actions/term-groups.js index d068816f..15f7bfac 100644 --- a/lib/actions/term-groups.js +++ b/lib/actions/term-groups.js @@ -7,8 +7,8 @@ import { TERM_GROUP_EXIT_ACTIVE } from '../constants/term-groups'; import {SESSION_REQUEST} from '../constants/sessions'; -import {findBySession} from '../utils/term-groups'; -import {getRootGroups} from '../selectors'; +import findBySession from '../utils/term-groups'; +import getRootGroups from '../selectors'; import {setActiveSession, ptyExitSession, userExitSession} from './sessions'; function requestSplit(direction) { diff --git a/lib/actions/ui.js b/lib/actions/ui.js index 84cb627b..1188bf6d 100644 --- a/lib/actions/ui.js +++ b/lib/actions/ui.js @@ -1,8 +1,8 @@ import * as shellEscape from 'php-escape-shell'; -import {last} from '../utils/array'; -import {isExecutable} from '../utils/file'; -import {getRootGroups} from '../selectors'; -import {findBySession} from '../utils/term-groups'; +import last from '../utils/array'; +import isExecutable from '../utils/file'; +import getRootGroups from '../selectors'; +import findBySession from '../utils/term-groups'; import notify from '../utils/notify'; import rpc from '../rpc'; import { diff --git a/lib/components/term.js b/lib/components/term.js index 4f8a1ff8..843e704b 100644 --- a/lib/components/term.js +++ b/lib/components/term.js @@ -4,7 +4,7 @@ import Color from 'color'; import uuid from 'uuid'; import hterm from '../hterm'; import Component from '../component'; -import {getColorList} from '../utils/colors'; +import getColorList from '../utils/colors'; import notify from '../utils/notify'; export default class Term extends Component { diff --git a/lib/constants/index.js b/lib/constants/index.js index d67c7a89..ab791e74 100644 --- a/lib/constants/index.js +++ b/lib/constants/index.js @@ -1 +1,3 @@ -export const INIT = 'INIT'; +const INIT = 'INIT'; + +export default INIT; diff --git a/lib/containers/header.js b/lib/containers/header.js index f2459f8c..a4fa5516 100644 --- a/lib/containers/header.js +++ b/lib/containers/header.js @@ -4,7 +4,7 @@ import {createSelector} from 'reselect'; import Header from '../components/header'; import {closeTab, changeTab, maximize, unmaximize} from '../actions/header'; import {connect} from '../utils/plugins'; -import {getRootGroups} from '../selectors'; +import getRootGroups from '../selectors'; const isMac = /Mac/.test(navigator.userAgent); diff --git a/lib/containers/terms.js b/lib/containers/terms.js index 8640bbb0..167b6209 100644 --- a/lib/containers/terms.js +++ b/lib/containers/terms.js @@ -7,7 +7,7 @@ import { setSessionXtermTitle, setActiveSession } from '../actions/sessions'; -import {getRootGroups} from '../selectors'; +import getRootGroups from '../selectors'; const TermsContainer = connect( state => { diff --git a/lib/index.js b/lib/index.js index d896e202..b251c5ea 100644 --- a/lib/index.js +++ b/lib/index.js @@ -5,7 +5,7 @@ import React from 'react'; import {render} from 'react-dom'; import rpc from './rpc'; -import {init} from './actions/index'; +import init from './actions/index'; import * as config from './utils/config'; import * as plugins from './utils/plugins'; import * as uiActions from './actions/ui'; diff --git a/lib/reducers/term-groups.js b/lib/reducers/term-groups.js index 85ca5aa4..146eaab9 100644 --- a/lib/reducers/term-groups.js +++ b/lib/reducers/term-groups.js @@ -2,7 +2,7 @@ import uuid from 'uuid'; import Immutable from 'seamless-immutable'; import {TERM_GROUP_EXIT, TERM_GROUP_RESIZE} from '../constants/term-groups'; import {SESSION_ADD, SESSION_SET_ACTIVE} from '../constants/sessions'; -import {findBySession} from '../utils/term-groups'; +import findBySession from '../utils/term-groups'; import {decorateTermGroupsReducer} from '../utils/plugins'; const MIN_SIZE = 0.05; diff --git a/lib/selectors.js b/lib/selectors.js index 93dfed0e..54441fd7 100644 --- a/lib/selectors.js +++ b/lib/selectors.js @@ -1,9 +1,11 @@ import {createSelector} from 'reselect'; const getTermGroups = ({termGroups}) => termGroups.termGroups; -export const getRootGroups = createSelector( +const getRootGroups = createSelector( getTermGroups, termGroups => Object.keys(termGroups) .map(uid => termGroups[uid]) .filter(({parentUid}) => !parentUid) ); + +export default getRootGroups; diff --git a/lib/utils/array.js b/lib/utils/array.js index 8f676a62..fb9cff07 100644 --- a/lib/utils/array.js +++ b/lib/utils/array.js @@ -1,3 +1,3 @@ -export function last(arr) { +export default function last(arr) { return arr[arr.length - 1]; } diff --git a/lib/utils/colors.js b/lib/utils/colors.js index 8b30ecdb..f0137f4a 100644 --- a/lib/utils/colors.js +++ b/lib/utils/colors.js @@ -19,7 +19,7 @@ const colorList = [ 'grayscale' ]; -export function getColorList(colors) { +export default function getColorList(colors) { // For backwards compatibility, return early if it's already an array if (Array.isArray(colors)) { return colors; diff --git a/lib/utils/file.js b/lib/utils/file.js index b11af41d..bc0b02de 100644 --- a/lib/utils/file.js +++ b/lib/utils/file.js @@ -10,7 +10,7 @@ * PR: https://github.com/kevva/executable/pull/10 */ -export function isExecutable(fileStat) { +export default function isExecutable(fileStat) { if (process.platform === 'win32') { return true; } diff --git a/lib/utils/term-groups.js b/lib/utils/term-groups.js index 0608ffcb..4b8c6bd6 100644 --- a/lib/utils/term-groups.js +++ b/lib/utils/term-groups.js @@ -1,4 +1,4 @@ -export function findBySession(termGroupState, sessionUid) { +export default function findBySession(termGroupState, sessionUid) { const {termGroups} = termGroupState; return Object.keys(termGroups) .map(uid => termGroups[uid]) diff --git a/package.json b/package.json index 03c4437d..83bb1ccf 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "new-cap": 0, "no-warning-comments": 0, "complexity": 0, - "import/prefer-default-export": 0, "react/prop-types": 0, "react/jsx-no-bind": 0 },