Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style(app): change default exports to named exports #4822

Merged
merged 2 commits into from
Jan 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app-shell/src/__mocks__/log.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// mock logger
module.exports = require('../../../app/src/__mocks__/logger').default
module.exports = require('../../../app/src/__mocks__/logger')
2 changes: 1 addition & 1 deletion app-shell/src/buildroot/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import path from 'path'
import { readFile, ensureDir } from 'fs-extra'
import { app } from 'electron'

import createLogger from '../log'
import { createLogger } from '../log'
import { getConfig } from '../config'
import { CURRENT_VERSION } from '../update'
import { downloadManifest, getReleaseSet } from './release-manifest'
Expand Down
2 changes: 1 addition & 1 deletion app-shell/src/buildroot/release-files.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { move, readdir } from 'fs-extra'
import StreamZip from 'node-stream-zip'
import getStream from 'get-stream'

import createLogger from '../log'
import { createLogger } from '../log'
import { fetchToFile } from '../http'
import type { DownloadProgress } from '../http'
import type { ReleaseSetUrls, ReleaseSetFilepaths, UserFileInfo } from './types'
Expand Down
2 changes: 1 addition & 1 deletion app-shell/src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import uuid from 'uuid/v4'
import yargsParser from 'yargs-parser'

import pkg from '../package.json'
import createLogger from './log'
import { createLogger } from './log'

// TODO(mc, 2018-08-08): figure out type exports from app
import type { Config } from '@opentrons/app/src/config/types'
Expand Down
2 changes: 1 addition & 1 deletion app-shell/src/discovery.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import DiscoveryClient, {
} from '@opentrons/discovery-client'

import { getConfig, getOverrides, handleConfigChange } from './config'
import createLogger from './log'
import { createLogger } from './log'

import type { Service } from '@opentrons/discovery-client'

Expand Down
8 changes: 4 additions & 4 deletions app-shell/src/log.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ let config
let transports
let log

export default function initializeLogger(filename) {
export function createLogger(filename) {
if (!config) config = getConfig('log')
if (!transports) initializeTransports()

return createLogger(filename)
return createWinstonLogger(filename)
}

function initializeTransports() {
Expand All @@ -44,7 +44,7 @@ function initializeTransports() {
}

transports = createTransports()
log = createLogger('log')
log = createWinstonLogger('log')

if (error) log.error('Could not create log directory', { error })
log.info(`Level "error" and higher logging to ${ERROR_LOG}`)
Expand Down Expand Up @@ -97,7 +97,7 @@ function createTransports() {
]
}

function createLogger(label) {
function createWinstonLogger(label) {
log && log.debug(`Creating logger for ${label}`)

const formats = [
Expand Down
6 changes: 3 additions & 3 deletions app-shell/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import { app, ipcMain } from 'electron'
import contextMenu from 'electron-context-menu'

import createUi from './ui'
import initializeMenu from './menu'
import createLogger from './log'
import { createUi } from './ui'
import { initializeMenu } from './menu'
import { createLogger } from './log'
import { getConfig, getStore, getOverrides, registerConfig } from './config'
import { registerDiscovery } from './discovery'
import { registerLabware } from './labware'
Expand Down
2 changes: 1 addition & 1 deletion app-shell/src/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ const helpMenu = {

const template = [firstMenu, editMenu, viewMenu, windowMenu, helpMenu]

export default function initializeMenu() {
export function initializeMenu() {
Menu.setApplicationMenu(Menu.buildFromTemplate(template))
}
2 changes: 1 addition & 1 deletion app-shell/src/robot-logs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// download robot logs manager

import { download } from 'electron-dl'
import createLogger from './log'
import { createLogger } from './log'

const log = createLogger('robot-logs')

Expand Down
4 changes: 2 additions & 2 deletions app-shell/src/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { app, shell, BrowserWindow } from 'electron'
import path from 'path'
import { getConfig } from './config'
import createLogger from './log'
import { createLogger } from './log'

const config = getConfig('ui')
const log = createLogger('ui')
Expand Down Expand Up @@ -30,7 +30,7 @@ const WINDOW_OPTS = {
),
}

export default function createUi() {
export function createUi() {
log.debug('Creating main window', { options: WINDOW_OPTS })

const mainWindow = new BrowserWindow(WINDOW_OPTS).once(
Expand Down
2 changes: 1 addition & 1 deletion app-shell/src/update.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import path from 'path'
import fs from 'fs'
import { autoUpdater as updater } from 'electron-updater'

import createLogger from './log'
import { createLogger } from './log'
import { getConfig } from './config'

import type { UpdateInfo } from '@opentrons/app/src/shell/types'
Expand Down
2 changes: 1 addition & 1 deletion app/src/__mocks__/logger.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// mock logger for tests
import path from 'path'

export default function createLogger(filename) {
export function createLogger(filename) {
const label = path.relative(path.join(__dirname, '../../..'), filename)

return new Proxy(
Expand Down
2 changes: 1 addition & 1 deletion app/src/analytics/hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// considered secure nor should they ever be released publicly
const ALGORITHM = 'SHA-256'

export default function hash(source: string): Promise<string> {
export function hash(source: string): Promise<string> {
const encoder = new TextEncoder()
const data = encoder.encode(source)

Expand Down
2 changes: 1 addition & 1 deletion app/src/analytics/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
// analytics module
import createLogger from '../logger'
import { createLogger } from '../logger'
import { updateConfig } from '../config'
import { initializeMixpanel } from './mixpanel'

Expand Down
2 changes: 1 addition & 1 deletion app/src/analytics/make-event.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
// redux action types to analytics events map
import createLogger from '../logger'
import { createLogger } from '../logger'
import { selectors as robotSelectors } from '../robot'
import { getConnectedRobot } from '../discovery'
import * as CustomLabware from '../custom-labware'
Expand Down
2 changes: 1 addition & 1 deletion app/src/analytics/mixpanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// mixpanel actions
import mixpanel from 'mixpanel-browser'

import createLogger from '../logger'
import { createLogger } from '../logger'
import { CURRENT_VERSION } from '../shell'

import type { AnalyticsEvent, AnalyticsConfig } from './types'
Expand Down
2 changes: 1 addition & 1 deletion app/src/analytics/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
import { getRobotSettings } from '../robot-settings'
import { getAttachedPipettes } from '../pipettes'

import hash from './hash'
import { hash } from './hash'

import type { OutputSelector } from 'reselect'
import type { State } from '../types'
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/CalibrateDeck/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type { OP, SP, DP, CalibrateDeckProps, CalibrationStep } from './types'

import { getPipetteModelSpecs } from '@opentrons/shared-data'
import { chainActions } from '../../util'
import createLogger from '../../logger'
import { createLogger } from '../../logger'

import { home, ROBOT } from '../../robot-controls'
import {
Expand Down
2 changes: 1 addition & 1 deletion app/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import thunk from 'redux-thunk'
import { ConnectedRouter, routerMiddleware } from 'connected-react-router'
import { createEpicMiddleware } from 'redux-observable'

import createLogger from './logger'
import { createLogger } from './logger'
import { checkShellUpdate } from './shell'

import { apiClientMiddleware as robotApiMiddleware } from './robot'
Expand Down
2 changes: 1 addition & 1 deletion app/src/logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const VERBOSE: 'verbose' = 'verbose'
const DEBUG: 'debug' = 'debug'
const SILLY: 'silly' = 'silly'

export default function createLogger(filename: string): Logger {
export function createLogger(filename: string): Logger {
const label = `app/${filename}`

return {
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/Robots/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as React from 'react'
import { useSelector } from 'react-redux'
import { withRouter, Route, Switch, Redirect } from 'react-router-dom'

import createLogger from '../../logger'
import { createLogger } from '../../logger'

import {
CONNECTABLE,
Expand Down
2 changes: 1 addition & 1 deletion app/src/protocol/protocol-data.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
// functions for parsing protocol files
import createLogger from '../logger'
import { createLogger } from '../logger'

import type { ProtocolFile, ProtocolData, ProtocolType } from './types'

Expand Down
2 changes: 1 addition & 1 deletion app/src/protocol/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { createSelector } from 'reselect'
import { getter } from '@thi.ng/paths'
import { getProtocolSchemaVersion } from '@opentrons/shared-data'
import { fileIsJson } from './protocol-data'
import createLogger from '../logger'
import { createLogger } from '../logger'

import type { LabwareDefinition2 } from '@opentrons/shared-data'
import type { ProtocolFile as SchemaV3ProtocolFile } from '@opentrons/shared-data/protocol/flowTypes/schemaV3'
Expand Down
2 changes: 1 addition & 1 deletion app/src/robot/api-client/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// robot api client redux middleware
// wraps the api client worker to handle API side effects in a different thread

import createLogger from '../../logger'
import { createLogger } from '../../logger'
import Worker from './worker'

const log = createLogger(__filename)
Expand Down
2 changes: 1 addition & 1 deletion app/src/shell/epic.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { combineEpics } from 'redux-observable'
import { fromEvent } from 'rxjs'
import { filter, tap, ignoreElements } from 'rxjs/operators'

import createLogger from '../logger'
import { createLogger } from '../logger'
import remote from './remote'

import type { StrictEpic, Action } from '../types'
Expand Down
2 changes: 1 addition & 1 deletion app/src/support.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { version } from './../package.json'
import { FF_PREFIX, getRobotAnalyticsData } from './analytics'
import { getConnectedRobot } from './discovery'
import createLogger from './logger'
import { createLogger } from './logger'

import type { Action, ThunkAction, Middleware } from './types'
import type { BaseRobot } from './robot/types'
Expand Down
2 changes: 1 addition & 1 deletion app/src/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// utility functions

import type { Action, ThunkAction, ThunkPromiseAction } from './types'
import createLogger from './logger'
import { createLogger } from './logger'

type Chainable = Action | ThunkAction | ThunkPromiseAction

Expand Down