Merge pull request #796 from TeckniX/refactor

Migrated all required module calls to ES6 imports equivalents

src/app.js

@@ -1,24 +1,23 @@
 require.main.paths.splice(0, 0, process.env.NODE_PATH);
-var remote = require('remote');
+import remote from 'remote';
 var Menu = remote.require('menu');
-var React = require('react');
-var SetupStore = require('./stores/SetupStore');
-var ipc = require('ipc');
-var machine = require('./utils/DockerMachineUtil');
-var metrics = require('./utils/MetricsUtil');
-var router = require('./router');
-var template = require('./menutemplate');
-var webUtil = require('./utils/WebUtil');
-var hubUtil = require('./utils/HubUtil');
+import React from 'react';
+import SetupStore from './stores/SetupStore';
+import ipc from 'ipc';
+import machine from './utils/DockerMachineUtil';
+import metrics from './utils/MetricsUtil';
+import template from './menutemplate';
+import webUtil from './utils/WebUtil';
+import hubUtil from './utils/HubUtil';
 var urlUtil = require ('./utils/URLUtil');
 var app = remote.require('app');
-var request = require('request');
-var docker = require('./utils/DockerUtil');
-var hub = require('./utils/HubUtil');
-var Router = require('react-router');
-var routes = require('./routes');
-var routerContainer = require('./router');
-var repositoryActions = require('./actions/RepositoryActions');
+import request from 'request';
+import docker from './utils/DockerUtil';
+import hub from './utils/HubUtil';
+import Router from 'react-router';
+import routes from './routes';
+import routerContainer from './router';
+import repositoryActions from './actions/RepositoryActions';
 
 hubUtil.init();
 

src/browser.js

@@ -1,11 +1,11 @@
-var app = require('app');
-var autoUpdater = require('auto-updater');
-var BrowserWindow = require('browser-window');
-var fs = require('fs');
-var os = require('os');
-var ipc = require('ipc');
-var path = require('path');
-var child_process = require('child_process');
+import app from 'app';
+import autoUpdater from 'auto-updater';
+import BrowserWindow from 'browser-window';
+import fs from 'fs';
+import os from 'os';
+import ipc from 'ipc';
+import path from 'path';
+import child_process from 'child_process';
 
 process.env.NODE_PATH = path.join(__dirname, 'node_modules');
 process.env.RESOURCES_PATH = path.join(__dirname, '/../resources');

src/components/Account.react.js

@@ -1,10 +1,10 @@
-var React = require('react/addons');
-var Router = require('react-router');
-var RetinaImage = require('react-retina-image');
-var Header = require('./Header.react');
-var metrics = require('../utils/MetricsUtil');
-var accountStore = require('../stores/AccountStore');
-var accountActions = require('../actions/AccountActions');
+import React from 'react/addons';
+import Router from 'react-router';
+import RetinaImage from 'react-retina-image';
+import Header from './Header.react';
+import metrics from '../utils/MetricsUtil';
+import accountStore from '../stores/AccountStore';
+import accountActions from '../actions/AccountActions';
 
 module.exports = React.createClass({
   mixins: [Router.Navigation],

src/components/AccountLogin.react.js

@@ -1,10 +1,10 @@
-var _ = require('underscore');
-var React = require('react/addons');
-var Router = require('react-router');
-var validator = require('validator');
-var accountActions = require('../actions/AccountActions');
-var metrics = require('../utils/MetricsUtil');
-var shell = require('shell');
+import _ from 'underscore';
+import React from 'react/addons';
+import Router from 'react-router';
+import validator from 'validator';
+import accountActions from '../actions/AccountActions';
+import metrics from '../utils/MetricsUtil';
+import shell from 'shell';
 
 module.exports = React.createClass({
   mixins: [Router.Navigation, React.addons.LinkedStateMixin],

src/components/AccountSignup.react.js

@@ -1,9 +1,9 @@
-var _ = require('underscore');
-var React = require('react/addons');
-var Router = require('react-router');
-var validator = require('validator');
-var accountActions = require('../actions/AccountActions');
-var metrics = require('../utils/MetricsUtil');
+import _ from 'underscore';
+import React from 'react/addons';
+import Router from 'react-router';
+import validator from 'validator';
+import accountActions from '../actions/AccountActions';
+import metrics from '../utils/MetricsUtil';
 
 module.exports = React.createClass({
   mixins: [Router.Navigation, React.addons.LinkedStateMixin],

src/components/ContainerDetails.react.js

@@ -1,10 +1,10 @@
-var React = require('react/addons');
-var Router = require('react-router');
-var ContainerDetailsHeader = require('./ContainerDetailsHeader.react');
-var ContainerDetailsSubheader = require('./ContainerDetailsSubheader.react');
-var containerUtil = require('../utils/ContainerUtil');
-var util = require('../utils/Util');
-var _ = require('underscore');
+import React from 'react/addons';
+import Router from 'react-router';
+import ContainerDetailsHeader from './ContainerDetailsHeader.react';
+import ContainerDetailsSubheader from './ContainerDetailsSubheader.react';
+import containerUtil from '../utils/ContainerUtil';
+import util from '../utils/Util';
+import _ from 'underscore';
 
 var ContainerDetails = React.createClass({
   contextTypes: {

src/components/ContainerDetailsHeader.react.js

@@ -1,4 +1,4 @@
-var React = require('react/addons');
+import React from 'react/addons';
 
 var ContainerDetailsHeader = React.createClass({
   render: function () {

src/components/ContainerDetailsSubheader.react.js

@@ -1,11 +1,11 @@
-var _ = require('underscore');
-var React = require('react');
-var shell = require('shell');
-var metrics = require('../utils/MetricsUtil');
-var ContainerUtil = require('../utils/ContainerUtil');
-var classNames = require('classnames');
-var containerActions = require('../actions/ContainerActions');
-var dockerMachineUtil = require('../utils/DockerMachineUtil');
+import _ from 'underscore';
+import React from 'react';
+import shell from 'shell';
+import metrics from '../utils/MetricsUtil';
+import ContainerUtil from '../utils/ContainerUtil';
+import classNames from 'classnames';
+import containerActions from '../actions/ContainerActions';
+import dockerMachineUtil from '../utils/DockerMachineUtil';
 
 var ContainerDetailsSubheader = React.createClass({
   contextTypes: {

src/components/ContainerHome.react.js

@@ -1,12 +1,12 @@
-var _ = require('underscore');
-var $ = require('jquery');
-var React = require('react/addons');
-var Radial = require('./Radial.react');
-var ContainerProgress = require('./ContainerProgress.react');
-var ContainerHomePreview = require('./ContainerHomePreview.react');
-var ContainerHomeLogs = require('./ContainerHomeLogs.react');
-var ContainerHomeFolders = require('./ContainerHomeFolders.react');
-var shell = require('shell');
+import _ from 'underscore';
+import $ from 'jquery';
+import React from 'react/addons';
+import Radial from './Radial.react';
+import ContainerProgress from './ContainerProgress.react';
+import ContainerHomePreview from './ContainerHomePreview.react';
+import ContainerHomeLogs from './ContainerHomeLogs.react';
+import ContainerHomeFolders from './ContainerHomeFolders.react';
+import shell from 'shell';
 
 var ContainerHome = React.createClass({
   contextTypes: {
@@ -39,11 +39,11 @@ var ContainerHome = React.createClass({
   showWeb: function () {
     return _.keys(this.props.ports).length > 0;
   },
-  
+
   showFolders: function () {
     return this.props.container.Volumes && _.keys(this.props.container.Volumes).length > 0 && this.props.container.State.Running;
   },
-  
+
   render: function () {
     if (!this.props.container) {
       return;

src/components/ContainerHomeFolders.react.js

@@ -1,13 +1,14 @@
-var _ = require('underscore');
-var React = require('react/addons');
-var RetinaImage = require('react-retina-image');
-var path = require('path');
-var shell = require('shell');
-var util = require('../utils/Util');
-var metrics = require('../utils/MetricsUtil');
-var containerActions = require('../actions/ContainerActions');
-var dialog = require('remote').require('dialog');
-var mkdirp = require('mkdirp');
+import _ from 'underscore';
+import React from 'react/addons';
+import RetinaImage from 'react-retina-image';
+import path from 'path';
+import shell from 'shell';
+import util from '../utils/Util';
+import metrics from '../utils/MetricsUtil';
+import containerActions from '../actions/ContainerActions';
+import remote from 'remote';
+var dialog = remote.require('dialog');
+import mkdirp from 'mkdirp';
 
 var ContainerHomeFolder = React.createClass({
   contextTypes: {

src/components/ContainerHomeLogs.react.js

@@ -1,8 +1,8 @@
-var $ = require('jquery');
-var React = require('react/addons');
-var LogStore = require('../stores/LogStore');
-var Router = require('react-router');
-var metrics = require('../utils/MetricsUtil');
+import $ from 'jquery';
+import React from 'react/addons';
+import LogStore from '../stores/LogStore';
+import Router from 'react-router';
+import metrics from '../utils/MetricsUtil';
 
 var _prevBottom = 0;
 

src/components/ContainerHomePreview.react.js

@@ -1,8 +1,8 @@
-var _ = require('underscore');
-var React = require('react/addons');
-var request = require('request');
-var shell = require('shell');
-var metrics = require('../utils/MetricsUtil');
+import _ from 'underscore';
+import React from 'react/addons';
+import request from 'request';
+import shell from 'shell';
+import metrics from '../utils/MetricsUtil';
 
 var ContainerHomePreview = React.createClass({
   contextTypes: {

src/components/ContainerList.react.js

@@ -1,5 +1,5 @@
-var React = require('react/addons');
-var ContainerListItem = require('./ContainerListItem.react');
+import React from 'react/addons';
+import ContainerListItem from './ContainerListItem.react';
 
 var ContainerList = React.createClass({
   componentWillMount: function () {

src/components/ContainerListItem.react.js

@@ -1,12 +1,11 @@
-var $ = require('jquery');
-var React = require('react/addons');
-var Router = require('react-router');
-var remote = require('remote');
+import $ from 'jquery';
+import React from 'react/addons';
+import Router from 'react-router';
+import remote from 'remote';
 var dialog = remote.require('dialog');
-var metrics = require('../utils/MetricsUtil');
-var OverlayTrigger = require('react-bootstrap').OverlayTrigger;
-var Tooltip = require('react-bootstrap').Tooltip;
-var containerActions = require('../actions/ContainerActions');
+import metrics from '../utils/MetricsUtil';
+import {OverlayTrigger, Tooltip} from 'react-bootstrap';
+import containerActions from '../actions/ContainerActions';
 
 var ContainerListItem = React.createClass({
   handleItemMouseEnter: function () {

src/components/ContainerLogs.react.js

@@ -1,6 +1,6 @@
-var $ = require('jquery');
-var React = require('react/addons');
-var LogStore = require('../stores/LogStore');
+import $ from 'jquery';
+import React from 'react/addons';
+import LogStore from '../stores/LogStore';
 
 var _prevBottom = 0;
 

src/components/ContainerProgress.react.js

@@ -1,4 +1,4 @@
-var React = require('react');
+import React from 'react';
 
 /*
 

src/components/ContainerSettings.react.js

@@ -1,7 +1,7 @@
-var $ = require('jquery');
-var _ = require('underscore');
-var React = require('react/addons');
-var Router = require('react-router');
+import $ from 'jquery';
+import _ from 'underscore';
+import React from 'react/addons';
+import Router from 'react-router';
 
 var ContainerSettings = React.createClass({
   contextTypes: {

src/components/ContainerSettingsAdvanced.react.js

@@ -1,7 +1,7 @@
-var React = require('react/addons');
-var metrics = require('../utils/MetricsUtil');
-var ContainerUtil = require('../utils/ContainerUtil');
-var containerActions = require('../actions/ContainerActions');
+import React from 'react/addons';
+import metrics from '../utils/MetricsUtil';
+import ContainerUtil from '../utils/ContainerUtil';
+import containerActions from '../actions/ContainerActions';
 
 var ContainerSettingsAdvanced = React.createClass({
   mixins: [React.addons.LinkedStateMixin],

src/components/ContainerSettingsGeneral.react.js

@@ -1,11 +1,11 @@
-var _ = require('underscore');
-var React = require('react/addons');
-var remote = require('remote');
-var metrics = require('../utils/MetricsUtil');
+import _ from 'underscore';
+import React from 'react/addons';
+import metrics from '../utils/MetricsUtil';
+import remote from 'remote';
 var dialog = remote.require('dialog');
-var ContainerUtil = require('../utils/ContainerUtil');
-var containerActions = require('../actions/ContainerActions');
-var util = require('../utils/Util');
+import ContainerUtil from '../utils/ContainerUtil';
+import containerActions from '../actions/ContainerActions';
+import util from '../utils/Util';
 
 var ContainerSettingsGeneral = React.createClass({
   mixins: [React.addons.LinkedStateMixin],

src/components/ContainerSettingsPorts.react.js

@@ -1,9 +1,9 @@
-var _ = require('underscore');
-var React = require('react/addons');
-var shell = require('shell');
-var ContainerUtil = require('../utils/ContainerUtil');
-var metrics = require('../utils/MetricsUtil');
-var webPorts = require('../utils/Util').webPorts;
+import _ from 'underscore';
+import React from 'react/addons';
+import shell from 'shell';
+import ContainerUtil from '../utils/ContainerUtil';
+import metrics from '../utils/MetricsUtil';
+import {webPorts} from '../utils/Util';
 
 var ContainerSettingsPorts = React.createClass({
   contextTypes: {

src/components/ContainerSettingsVolumes.react.js

@@ -1,11 +1,11 @@
-var _ = require('underscore');
-var React = require('react/addons');
-var remote = require('remote');
+import _ from 'underscore';
+import React from 'react/addons';
+import remote from 'remote';
 var dialog = remote.require('dialog');
-var shell = require('shell');
-var util = require('../utils/Util');
-var metrics = require('../utils/MetricsUtil');
-var containerActions = require('../actions/ContainerActions');
+import shell from 'shell';
+import util from '../utils/Util';
+import metrics from '../utils/MetricsUtil';
+import containerActions from '../actions/ContainerActions';
 
 var ContainerSettingsVolumes = React.createClass({
   handleChooseVolumeClick: function (dockerVol) {

src/components/Containers.react.js

@@ -1,13 +1,13 @@
-var $ = require('jquery');
-var _ = require('underscore');
-var React = require('react');
-var Router = require('react-router');
-var containerStore = require('../stores/ContainerStore');
-var ContainerList = require('./ContainerList.react');
-var Header = require('./Header.react');
-var metrics = require('../utils/MetricsUtil');
-var shell = require('shell');
-var machine = require('../utils/DockerMachineUtil');
+import $ from 'jquery';
+import _ from 'underscore';
+import React from 'react';
+import Router from 'react-router';
+import containerStore from '../stores/ContainerStore';
+import ContainerList from './ContainerList.react';
+import Header from './Header.react';
+import metrics from '../utils/MetricsUtil';
+import shell from 'shell';
+import machine from '../utils/DockerMachineUtil';
 
 var Containers = React.createClass({
   contextTypes: {

src/components/Header.react.js

@@ -1,17 +1,16 @@
-var React = require('react/addons');
-var remote = require('remote');
-var RetinaImage = require('react-retina-image');
-var remote = require('remote');
-var ipc = require('ipc');
+import React from 'react/addons';
+import remote from 'remote';
+import RetinaImage from 'react-retina-image';
+import ipc from 'ipc';
 var autoUpdater = remote.require('auto-updater');
-var util = require('../utils/Util');
-var metrics = require('../utils/MetricsUtil');
+import util from '../utils/Util';
+import metrics from '../utils/MetricsUtil';
 var Menu = remote.require('menu');
 var MenuItem = remote.require('menu-item');
-var accountStore = require('../stores/AccountStore');
-var accountActions = require('../actions/AccountActions');
-var Router = require('react-router');
-var classNames = require('classnames');
+import accountStore from '../stores/AccountStore';
+import accountActions from '../actions/AccountActions';
+import Router from 'react-router';
+import classNames from 'classnames';
 
 var Header = React.createClass({
   mixins: [Router.Navigation],

src/components/ImageCard.react.js

@@ -1,13 +1,13 @@
-var $ = require('jquery');
-var React = require('react/addons');
-var Router = require('react-router');
-var shell = require('shell');
-var RetinaImage = require('react-retina-image');
-var metrics = require('../utils/MetricsUtil');
-var containerActions = require('../actions/ContainerActions');
-var containerStore = require('../stores/ContainerStore');
-var tagStore = require('../stores/TagStore');
-var tagActions = require('../actions/TagActions');
+import $ from 'jquery';
+import React from 'react/addons';
+import Router from 'react-router';
+import shell from 'shell';
+import RetinaImage from 'react-retina-image';
+import metrics from '../utils/MetricsUtil';
+import containerActions from '../actions/ContainerActions';
+import containerStore from '../stores/ContainerStore';
+import tagStore from '../stores/TagStore';
+import tagActions from '../actions/TagActions';
 
 var ImageCard = React.createClass({
   mixins: [Router.Navigation],

src/components/NewContainerPull.react.js

@@ -1,9 +1,9 @@
-var React = require('react/addons');
-var Router = require('react-router');
-var shell = require('shell');
-var containerActions = require('../actions/ContainerActions');
-var containerStore = require('../stores/ContainerStore');
-var metrics = require('../utils/MetricsUtil');
+import React from 'react/addons';
+import Router from 'react-router';
+import shell from 'shell';
+import containerActions from '../actions/ContainerActions';
+import containerStore from '../stores/ContainerStore';
+import metrics from '../utils/MetricsUtil';
 
 module.exports = React.createClass({
   mixins: [Router.Navigation],

src/components/NewContainerSearch.react.js

@@ -1,15 +1,15 @@
-var _ = require('underscore');
-var React = require('react/addons');
-var Router = require('react-router');
-var RetinaImage = require('react-retina-image');
-var ImageCard = require('./ImageCard.react');
-var Promise = require('bluebird');
-var metrics = require('../utils/MetricsUtil');
-var classNames = require('classnames');
-var repositoryActions = require('../actions/RepositoryActions');
-var repositoryStore = require('../stores/RepositoryStore');
-var accountStore = require('../stores/AccountStore');
-var accountActions = require('../actions/AccountActions');
+import _ from 'underscore';
+import React from 'react/addons';
+import Router from 'react-router';
+import RetinaImage from 'react-retina-image';
+import ImageCard from './ImageCard.react';
+import Promise from 'bluebird';
+import metrics from '../utils/MetricsUtil';
+import classNames from 'classnames';
+import repositoryActions from '../actions/RepositoryActions';
+import repositoryStore from '../stores/RepositoryStore';
+import accountStore from '../stores/AccountStore';
+import accountActions from '../actions/AccountActions';
 
 var _searchPromise = null;
 

src/components/Preferences.react.js

@@ -1,6 +1,6 @@
-var React = require('react/addons');
-var metrics = require('../utils/MetricsUtil');
-var Router = require('react-router');
+import React from 'react/addons';
+import metrics from '../utils/MetricsUtil';
+import Router from 'react-router';
 
 var Preferences = React.createClass({
   mixins: [Router.Navigation],

src/components/Radial.react.js

@@ -1,5 +1,5 @@
-var React = require('react');
-var classNames = require('classnames');
+import React from 'react';
+import classNames from 'classnames';
 
 var Radial = React.createClass({
   render: function () {

src/components/Setup.react.js

@@ -1,11 +1,11 @@
-var React = require('react/addons');
-var Router = require('react-router');
-var Radial = require('./Radial.react.js');
-var SetupStore = require('../stores/SetupStore');
-var RetinaImage = require('react-retina-image');
-var Header = require('./Header.react');
-var Util = require('../utils/Util');
-var metrics = require('../utils/MetricsUtil');
+import React from 'react/addons';
+import Router from 'react-router';
+import Radial from './Radial.react.js';
+import SetupStore from '../stores/SetupStore';
+import RetinaImage from 'react-retina-image';
+import Header from './Header.react';
+import Util from '../utils/Util';
+import metrics from '../utils/MetricsUtil';
 
 var Setup = React.createClass({
   mixins: [ Router.Navigation ],

src/routes.js

@@ -1,21 +1,21 @@
-var React = require('react/addons');
-var Setup = require('./components/Setup.react');
-var Account = require('./components/Account.react');
-var AccountSignup = require('./components/AccountSignup.react');
-var AccountLogin = require('./components/AccountLogin.react');
-var Containers = require('./components/Containers.react');
-var ContainerDetails = require('./components/ContainerDetails.react');
-var ContainerHome = require('./components/ContainerHome.react');
-var ContainerLogs = require('./components/ContainerLogs.react');
-var ContainerSettings = require('./components/ContainerSettings.react');
-var ContainerSettingsGeneral = require('./components/ContainerSettingsGeneral.react');
-var ContainerSettingsPorts = require('./components/ContainerSettingsPorts.react');
-var ContainerSettingsVolumes = require('./components/ContainerSettingsVolumes.react');
-var ContainerSettingsAdvanced = require('./components/ContainerSettingsAdvanced.react');
-var Preferences = require('./components/Preferences.react');
-var NewContainerSearch = require('./components/NewContainerSearch.react');
-var NewContainerPull = require('./components/NewContainerPull.react');
-var Router = require('react-router');
+import React from 'react/addons';
+import Setup from './components/Setup.react';
+import Account from './components/Account.react';
+import AccountSignup from './components/AccountSignup.react';
+import AccountLogin from './components/AccountLogin.react';
+import Containers from './components/Containers.react';
+import ContainerDetails from './components/ContainerDetails.react';
+import ContainerHome from './components/ContainerHome.react';
+import ContainerLogs from './components/ContainerLogs.react';
+import ContainerSettings from './components/ContainerSettings.react';
+import ContainerSettingsGeneral from './components/ContainerSettingsGeneral.react';
+import ContainerSettingsPorts from './components/ContainerSettingsPorts.react';
+import ContainerSettingsVolumes from './components/ContainerSettingsVolumes.react';
+import ContainerSettingsAdvanced from './components/ContainerSettingsAdvanced.react';
+import Preferences from './components/Preferences.react';
+import NewContainerSearch from './components/NewContainerSearch.react';
+import NewContainerPull from './components/NewContainerPull.react';
+import Router from 'react-router';
 
 var Route = Router.Route;
 var DefaultRoute = Router.DefaultRoute;

src/stores/LogStore.js

@@ -1,8 +1,8 @@
-var EventEmitter = require('events').EventEmitter;
-var assign = require('object-assign');
-var Convert = require('ansi-to-html');
-var docker = require('../utils/DockerUtil');
-var stream = require('stream');
+import {EventEmitter} from 'events';
+import assign from 'object-assign';
+import Convert from 'ansi-to-html';
+import docker from '../utils/DockerUtil';
+import stream from 'stream';
 
 var _convert = new Convert();
 var _logs = {};

src/stores/SetupStore.js

@@ -1,16 +1,16 @@
-var EventEmitter = require('events').EventEmitter;
-var _ = require('underscore');
-var path = require('path');
-var fs = require('fs');
-var Promise = require('bluebird');
-var machine = require('../utils/DockerMachineUtil');
-var virtualBox = require('../utils/VirtualBoxUtil');
-var setupUtil = require('../utils/SetupUtil');
-var util = require('../utils/Util');
-var assign = require('object-assign');
-var metrics = require('../utils/MetricsUtil');
-var bugsnag = require('bugsnag-js');
-var docker = require('../utils/DockerUtil');
+import {EventEmitter} from 'events';
+import _ from 'underscore';
+import path from 'path';
+import fs from 'fs';
+import Promise from 'bluebird';
+import machine from '../utils/DockerMachineUtil';
+import virtualBox from '../utils/VirtualBoxUtil';
+import setupUtil from '../utils/SetupUtil';
+import util from '../utils/Util';
+import assign from 'object-assign';
+import metrics from '../utils/MetricsUtil';
+import bugsnag from 'bugsnag-js';
+import docker from '../utils/DockerUtil';
 
 var _currentStep = null;
 var _error = null;

src/utils/ContainerUtil.js

@@ -1,5 +1,5 @@
-var _ = require('underscore');
-var docker = require('../utils/DockerUtil');
+import _ from 'underscore';
+import docker from '../utils/DockerUtil';
 
 var ContainerUtil = {
   env: function (container) {

src/utils/DockerMachineUtil.js

@@ -1,9 +1,9 @@
-var _ = require('underscore');
-var path = require('path');
-var Promise = require('bluebird');
-var fs = require('fs');
-var util = require('./Util');
-var resources = require('./ResourcesUtil');
+import _ from 'underscore';
+import path from 'path';
+import Promise from 'bluebird';
+import fs from 'fs';
+import util from './Util';
+import resources from './ResourcesUtil';
 
 var NAME = util.isWindows () ? 'kitematic' : 'dev';
 

src/utils/HubUtil.js

@@ -1,7 +1,7 @@
-var _ = require('underscore');
-var request = require('request');
-var accountServerActions = require('../actions/AccountServerActions');
-var metrics = require('./MetricsUtil');
+import _ from 'underscore';
+import request from 'request';
+import accountServerActions from '../actions/AccountServerActions';
+import metrics from './MetricsUtil';
 
 let HUB2_ENDPOINT = process.env.HUB2_ENDPOINT || 'https://hub.docker.com/v2';
 

src/utils/MetricsUtil.js

@@ -1,11 +1,11 @@
-var assign = require('object-assign');
-var Mixpanel = require('mixpanel');
-var uuid = require('node-uuid');
-var fs = require('fs');
-var path = require('path');
-var util = require('./Util');
-var os = require('os');
-var osxRelease = require('osx-release');
+import assign from 'object-assign';
+import Mixpanel from 'mixpanel';
+import uuid from 'node-uuid';
+import fs from 'fs';
+import path from 'path';
+import util from './Util';
+import os from 'os';
+import osxRelease from 'osx-release';
 var settings;
 
 try {

src/utils/RegHubUtil.js

@@ -1,10 +1,10 @@
-var _ = require('underscore');
-var request = require('request');
-var async = require('async');
-var util = require('../utils/Util');
-var hubUtil = require('../utils/HubUtil');
-var repositoryServerActions = require('../actions/RepositoryServerActions');
-var tagServerActions = require('../actions/TagServerActions');
+import _ from 'underscore';
+import request from 'request';
+import async from 'async';
+import util from '../utils/Util';
+import hubUtil from '../utils/HubUtil';
+import repositoryServerActions from '../actions/RepositoryServerActions';
+import tagServerActions from '../actions/TagServerActions';
 
 let REGHUB2_ENDPOINT = process.env.REGHUB2_ENDPOINT || 'https://registry.hub.docker.com/v2';
 let searchReq = null;

src/utils/ResourcesUtil.js

@@ -1,5 +1,5 @@
-var util = require('./Util');
-var path = require('path');
+import util from './Util';
+import path from 'path';
 
 module.exports = {
   resourceDir: function () {

src/utils/SetupUtil.js

@@ -1,12 +1,12 @@
-var _ = require('underscore');
-var crypto = require('crypto');
-var fs = require('fs');
-var path = require('path');
-var request = require('request');
-var progress = require('request-progress');
-var Promise = require('bluebird');
-var util = require('./Util');
-var resources = require('./ResourcesUtil');
+import _ from 'underscore';
+import crypto from 'crypto';
+import fs from 'fs';
+import path from 'path';
+import request from 'request';
+import progress from 'request-progress';
+import Promise from 'bluebird';
+import util from './Util';
+import resources from './ResourcesUtil';
 var virtualBox = require ('./VirtualBoxUtil');
 
 var SetupUtil = {

src/utils/URLUtil.js

@@ -1,6 +1,6 @@
-var util = require('./Util');
-var parseUri = require('parseUri');
-var containerServerActions = require('../actions/ContainerServerActions');
+import util from './Util';
+import parseUri from 'parseUri';
+import containerServerActions from '../actions/ContainerServerActions';
 
 module.exports = {
   TYPE_WHITELIST: ['repository'],

src/utils/Util.js

@@ -1,10 +1,10 @@
-var exec = require('exec');
-var child_process = require('child_process');
-var Promise = require('bluebird');
-var fs = require('fs');
-var path = require('path');
-var crypto = require('crypto');
-var remote = require('remote');
+import exec from 'exec';
+import child_process from 'child_process';
+import Promise from 'bluebird';
+import fs from 'fs';
+import path from 'path';
+import crypto from 'crypto';
+import remote from 'remote';
 var app = remote.require('app');
 
 module.exports = {

src/utils/VirtualBoxUtil.js

@@ -1,6 +1,6 @@
-var fs = require('fs');
-var util = require('./Util');
-var Promise = require('bluebird');
+import fs from 'fs';
+import util from './Util';
+import Promise from 'bluebird';
 
 var VirtualBox = {
   command: function () {

src/utils/WebUtil.js

@@ -1,9 +1,10 @@
-var app = require('remote').require('app');
-var fs = require('fs');
-var util = require('./Util');
-var path = require('path');
-var bugsnag = require('bugsnag-js');
-var metrics = require('./MetricsUtil');
+import remote from 'remote';
+var app = remote.require('app');
+import fs from 'fs';
+import util from './Util';
+import path from 'path';
+import bugsnag from 'bugsnag-js';
+import metrics from './MetricsUtil';
 
 var WebUtil = {
   addWindowSizeSaving: function () {