From aee335bc9e4e976bbf0992ef2a5f899a3f045d69 Mon Sep 17 00:00:00 2001 From: TeckniX Date: Wed, 8 Jul 2015 18:29:43 -0400 Subject: [PATCH] Migrated all require to ES6 imports Signed-off-by: TeckniX --- src/app.js | 33 +++++++++-------- src/browser.js | 16 ++++----- src/components/Account.react.js | 14 ++++---- src/components/AccountLogin.react.js | 14 ++++---- src/components/AccountSignup.react.js | 12 +++---- src/components/ContainerDetails.react.js | 14 ++++---- .../ContainerDetailsHeader.react.js | 2 +- .../ContainerDetailsSubheader.react.js | 16 ++++----- src/components/ContainerHome.react.js | 22 ++++++------ src/components/ContainerHomeFolders.react.js | 21 +++++------ src/components/ContainerHomeLogs.react.js | 10 +++--- src/components/ContainerHomePreview.react.js | 10 +++--- src/components/ContainerList.react.js | 4 +-- src/components/ContainerListItem.react.js | 15 ++++---- src/components/ContainerLogs.react.js | 6 ++-- src/components/ContainerProgress.react.js | 2 +- src/components/ContainerSettings.react.js | 8 ++--- .../ContainerSettingsAdvanced.react.js | 8 ++--- .../ContainerSettingsGeneral.react.js | 14 ++++---- .../ContainerSettingsPorts.react.js | 12 +++---- .../ContainerSettingsVolumes.react.js | 14 ++++---- src/components/Containers.react.js | 20 +++++------ src/components/Header.react.js | 21 ++++++----- src/components/ImageCard.react.js | 20 +++++------ src/components/NewContainerPull.react.js | 12 +++---- src/components/NewContainerSearch.react.js | 24 ++++++------- src/components/Preferences.react.js | 6 ++-- src/components/Radial.react.js | 4 +-- src/components/Setup.react.js | 16 ++++----- src/routes.js | 36 +++++++++---------- src/stores/LogStore.js | 10 +++--- src/stores/SetupStore.js | 26 +++++++------- src/utils/ContainerUtil.js | 4 +-- src/utils/DockerMachineUtil.js | 12 +++---- src/utils/HubUtil.js | 8 ++--- src/utils/MetricsUtil.js | 16 ++++----- src/utils/RegHubUtil.js | 14 ++++---- src/utils/ResourcesUtil.js | 4 +-- src/utils/SetupUtil.js | 18 +++++----- src/utils/URLUtil.js | 6 ++-- src/utils/Util.js | 14 ++++---- src/utils/VirtualBoxUtil.js | 6 ++-- src/utils/WebUtil.js | 13 +++---- 43 files changed, 288 insertions(+), 289 deletions(-) diff --git a/src/app.js b/src/app.js index fa6d1c840d..6c300f2dc9 100644 --- a/src/app.js +++ b/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(); diff --git a/src/browser.js b/src/browser.js index feba1af5ca..9ff97d3011 100644 --- a/src/browser.js +++ b/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'); diff --git a/src/components/Account.react.js b/src/components/Account.react.js index bf5c486d4c..eed1b87aec 100644 --- a/src/components/Account.react.js +++ b/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], diff --git a/src/components/AccountLogin.react.js b/src/components/AccountLogin.react.js index 427c272511..4c9bf66e98 100644 --- a/src/components/AccountLogin.react.js +++ b/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], diff --git a/src/components/AccountSignup.react.js b/src/components/AccountSignup.react.js index 6c4b85da11..f1a23ff478 100644 --- a/src/components/AccountSignup.react.js +++ b/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], diff --git a/src/components/ContainerDetails.react.js b/src/components/ContainerDetails.react.js index 793de1cbd2..e1d5668760 100644 --- a/src/components/ContainerDetails.react.js +++ b/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: { diff --git a/src/components/ContainerDetailsHeader.react.js b/src/components/ContainerDetailsHeader.react.js index 363e55a3d7..70e90e3ef8 100644 --- a/src/components/ContainerDetailsHeader.react.js +++ b/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 () { diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js index e53204bd90..b793e8332b 100644 --- a/src/components/ContainerDetailsSubheader.react.js +++ b/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: { diff --git a/src/components/ContainerHome.react.js b/src/components/ContainerHome.react.js index 198730eeb1..a0af212ed5 100644 --- a/src/components/ContainerHome.react.js +++ b/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; diff --git a/src/components/ContainerHomeFolders.react.js b/src/components/ContainerHomeFolders.react.js index c1761666b4..2755663d79 100644 --- a/src/components/ContainerHomeFolders.react.js +++ b/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: { diff --git a/src/components/ContainerHomeLogs.react.js b/src/components/ContainerHomeLogs.react.js index d673c82db3..0853f98692 100644 --- a/src/components/ContainerHomeLogs.react.js +++ b/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; diff --git a/src/components/ContainerHomePreview.react.js b/src/components/ContainerHomePreview.react.js index c4d7818d4f..74efe462df 100644 --- a/src/components/ContainerHomePreview.react.js +++ b/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: { diff --git a/src/components/ContainerList.react.js b/src/components/ContainerList.react.js index 4a042b4c81..ee557c0110 100644 --- a/src/components/ContainerList.react.js +++ b/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 () { diff --git a/src/components/ContainerListItem.react.js b/src/components/ContainerListItem.react.js index 0955ef2f74..589ff6ef3c 100644 --- a/src/components/ContainerListItem.react.js +++ b/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 () { diff --git a/src/components/ContainerLogs.react.js b/src/components/ContainerLogs.react.js index 6355154ee4..7da5e84129 100644 --- a/src/components/ContainerLogs.react.js +++ b/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; diff --git a/src/components/ContainerProgress.react.js b/src/components/ContainerProgress.react.js index 175fb4d72a..ba51d4564d 100644 --- a/src/components/ContainerProgress.react.js +++ b/src/components/ContainerProgress.react.js @@ -1,4 +1,4 @@ -var React = require('react'); +import React from 'react'; /* diff --git a/src/components/ContainerSettings.react.js b/src/components/ContainerSettings.react.js index def09db363..6a9f191781 100644 --- a/src/components/ContainerSettings.react.js +++ b/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: { diff --git a/src/components/ContainerSettingsAdvanced.react.js b/src/components/ContainerSettingsAdvanced.react.js index c041445472..6120498c3c 100644 --- a/src/components/ContainerSettingsAdvanced.react.js +++ b/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], diff --git a/src/components/ContainerSettingsGeneral.react.js b/src/components/ContainerSettingsGeneral.react.js index e95bee4b06..a9650d43ce 100644 --- a/src/components/ContainerSettingsGeneral.react.js +++ b/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], diff --git a/src/components/ContainerSettingsPorts.react.js b/src/components/ContainerSettingsPorts.react.js index 1738db5a5b..bfd2537b4b 100644 --- a/src/components/ContainerSettingsPorts.react.js +++ b/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: { diff --git a/src/components/ContainerSettingsVolumes.react.js b/src/components/ContainerSettingsVolumes.react.js index 154bc87666..2ebae2f44a 100644 --- a/src/components/ContainerSettingsVolumes.react.js +++ b/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) { diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js index 449afb4835..b7058b28df 100644 --- a/src/components/Containers.react.js +++ b/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: { diff --git a/src/components/Header.react.js b/src/components/Header.react.js index 826b8a4124..e69c14ea80 100644 --- a/src/components/Header.react.js +++ b/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], diff --git a/src/components/ImageCard.react.js b/src/components/ImageCard.react.js index a92d69b19b..0e54e59770 100644 --- a/src/components/ImageCard.react.js +++ b/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], diff --git a/src/components/NewContainerPull.react.js b/src/components/NewContainerPull.react.js index 24dbc63a13..c8e5bdd74c 100644 --- a/src/components/NewContainerPull.react.js +++ b/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], diff --git a/src/components/NewContainerSearch.react.js b/src/components/NewContainerSearch.react.js index 9b19739aef..e5ad237d6c 100644 --- a/src/components/NewContainerSearch.react.js +++ b/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; diff --git a/src/components/Preferences.react.js b/src/components/Preferences.react.js index fc96ce7dff..0fcbabfb54 100644 --- a/src/components/Preferences.react.js +++ b/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], diff --git a/src/components/Radial.react.js b/src/components/Radial.react.js index bdc9ea1773..0989ea01b6 100644 --- a/src/components/Radial.react.js +++ b/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 () { diff --git a/src/components/Setup.react.js b/src/components/Setup.react.js index fb0cfab3e2..0d42839562 100644 --- a/src/components/Setup.react.js +++ b/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 ], diff --git a/src/routes.js b/src/routes.js index ca86453266..086c34347d 100644 --- a/src/routes.js +++ b/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; diff --git a/src/stores/LogStore.js b/src/stores/LogStore.js index 5f81580d78..89ed09cebd 100644 --- a/src/stores/LogStore.js +++ b/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 = {}; diff --git a/src/stores/SetupStore.js b/src/stores/SetupStore.js index 7d8061bb55..b1f15f00c5 100644 --- a/src/stores/SetupStore.js +++ b/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; diff --git a/src/utils/ContainerUtil.js b/src/utils/ContainerUtil.js index b94c1632c5..129e77e0ad 100644 --- a/src/utils/ContainerUtil.js +++ b/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) { diff --git a/src/utils/DockerMachineUtil.js b/src/utils/DockerMachineUtil.js index 9037fa76ce..c307c49c7d 100644 --- a/src/utils/DockerMachineUtil.js +++ b/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'; diff --git a/src/utils/HubUtil.js b/src/utils/HubUtil.js index 6f02d03975..f88b4d51a6 100644 --- a/src/utils/HubUtil.js +++ b/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'; diff --git a/src/utils/MetricsUtil.js b/src/utils/MetricsUtil.js index a608ce1ea3..be8be4e7f3 100644 --- a/src/utils/MetricsUtil.js +++ b/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 { diff --git a/src/utils/RegHubUtil.js b/src/utils/RegHubUtil.js index a10ed54a1d..ed24c136e9 100644 --- a/src/utils/RegHubUtil.js +++ b/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; diff --git a/src/utils/ResourcesUtil.js b/src/utils/ResourcesUtil.js index 3aaed0e6fe..5fd652ef93 100644 --- a/src/utils/ResourcesUtil.js +++ b/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 () { diff --git a/src/utils/SetupUtil.js b/src/utils/SetupUtil.js index f22e7a4c33..80b0edc6f2 100644 --- a/src/utils/SetupUtil.js +++ b/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 = { diff --git a/src/utils/URLUtil.js b/src/utils/URLUtil.js index 2b4e8a8933..68b102fd22 100644 --- a/src/utils/URLUtil.js +++ b/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'], diff --git a/src/utils/Util.js b/src/utils/Util.js index 1dc83a6178..a3c59b6342 100644 --- a/src/utils/Util.js +++ b/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 = { diff --git a/src/utils/VirtualBoxUtil.js b/src/utils/VirtualBoxUtil.js index b6729cef60..b4b3094157 100644 --- a/src/utils/VirtualBoxUtil.js +++ b/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 () { diff --git a/src/utils/WebUtil.js b/src/utils/WebUtil.js index 318d529764..c146e0eb9f 100644 --- a/src/utils/WebUtil.js +++ b/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 () {