Merge pull request #558 from mesosphere/refactor/convert-commonjs-to-…

…es6-modules Refactor/convert commonjs to es6 modules
mesosphere · Jan 20, 2016 · f658244 · f658244
2 parents 6b28cc3 + 916c87c
commit f658244
Show file tree

Hide file tree

Showing 158 changed files with 981 additions and 1,003 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,13 +1,14 @@
 var autoprefixer = require("gulp-autoprefixer");
 var connect = require("gulp-connect");
-var header = require('gulp-header');
+var header = require("gulp-header");
 var browserSync = require("browser-sync");
 var eslintFormatter = require("eslint/lib/formatters/stylish");
 var gulp = require("gulp");
 var gutil = require("gulp-util");
 var less = require("gulp-less");
 var minifyCSS = require("gulp-minify-css");
 var path = require("path");
+var fs = require("fs");
 var replace = require("gulp-replace");
 var uglify = require("gulp-uglify");
 var webpack = require("webpack");
@@ -40,8 +41,17 @@ var files = {
 };
 
 var webpackWatch = false;
+var configFilePath = path.resolve(dirs.js + "/config/config.js");
 if (process.env.GULP_ENV === "development") {
   webpackWatch = true;
+  try {
+    var devConfigFilePath = path.resolve(dirs.js + "/config/config.dev.js");
+    fs.accessSync(devConfigFilePath);
+    configFilePath = devConfigFilePath;
+  } catch (e) {
+    console.info("You could copy config.template.js to config.dev.js " +
+      "to enable a development configuration.");
+  }
 }
 
 var webpackConfig = {
@@ -83,6 +93,13 @@ var webpackConfig = {
       }
     ]
   },
+  plugins: [
+    new webpack.NormalModuleReplacementPlugin(/\/config\/config(\.js)?$/,
+      function (result) {
+        result.request = configFilePath;
+      }
+    )
+  ],
   resolve: {
     extensions: ["", ".jsx", ".js"]
   },
@@ -159,7 +176,7 @@ gulp.task("minify-js", ["webpack"], function () {
 
   return gulp.src(dirs.dist + "/" + files.mainJs + ".js")
     .pipe(uglify())
-    .pipe(header(banner, { pkg : packageInfo } ))
+    .pipe(header(banner, {pkg : packageInfo}))
     .pipe(gulp.dest(dirs.dist));
 });
 
@@ -170,10 +187,10 @@ gulp.task("images", function () {
 
 gulp.task("fonts", function () {
   return gulp.src([
-      dirs.ionicons + "/**/*.*",
-      dirs.sourceSansPro + "/" + files.sourceSansPro,
-      dirs.sourceSansPro + "/" + files.sourceSansProBold
-    ]).pipe(gulp.dest(dirs.dist + "/" + dirs.fontsDist));
+    dirs.ionicons + "/**/*.*",
+    dirs.sourceSansPro + "/" + files.sourceSansPro,
+    dirs.sourceSansPro + "/" + files.sourceSansProBold
+  ]).pipe(gulp.dest(dirs.dist + "/" + dirs.fontsDist));
 });
 
 gulp.task("index", function () {

diff --git a/src/js/AppDispatcher.js b/src/js/AppDispatcher.js
@@ -1,9 +1,10 @@
-var dispatcher = new (require("flux").Dispatcher)();
+import {Dispatcher} from "flux";
 
+var dispatcher = new Dispatcher();
 dispatcher.dispatchNext = function (obj) {
   setTimeout(function () {
     dispatcher.dispatch(obj);
   });
 };
 
-module.exports = dispatcher;
+export default dispatcher;
diff --git a/src/js/actions/AppVersionsActions.js b/src/js/actions/AppVersionsActions.js
@@ -1,8 +1,9 @@
-var ajaxWrapper = require("../helpers/ajaxWrapper");
+import ajaxWrapper from "../helpers/ajaxWrapper";
 
-var config = require("../config/config");
-var AppDispatcher = require("../AppDispatcher");
-var AppVersionsEvents = require("../events/AppVersionsEvents");
+import config from "../config/config";
+
+import AppDispatcher from "../AppDispatcher";
+import AppVersionsEvents from "../events/AppVersionsEvents";
 
 var AppVersionsActions = {
   requestAppVersions: function (appId) {
@@ -48,4 +49,4 @@ var AppVersionsActions = {
   request: ajaxWrapper
 };
 
-module.exports = AppVersionsActions;
+export default AppVersionsActions;
diff --git a/src/js/actions/AppsActions.js b/src/js/actions/AppsActions.js
@@ -1,8 +1,9 @@
-var ajaxWrapper = require("../helpers/ajaxWrapper");
+import ajaxWrapper from "../helpers/ajaxWrapper";
 
-var config = require("../config/config");
-var AppDispatcher = require("../AppDispatcher");
-var AppsEvents = require("../events/AppsEvents");
+import config from "../config/config";
+
+import AppDispatcher from "../AppDispatcher";
+import AppsEvents from "../events/AppsEvents";
 
 var AppsActions = {
   requestApps: function () {
@@ -187,4 +188,4 @@ var AppsActions = {
   request: ajaxWrapper
 };
 
-module.exports = AppsActions;
+export default AppsActions;
diff --git a/src/js/actions/DCOSActions.js b/src/js/actions/DCOSActions.js
@@ -1,6 +1,6 @@
-var AppDispatcher = require("../AppDispatcher");
-var ajaxWrapper = require("../helpers/ajaxWrapper");
-var DCOSEvents = require("../events/DCOSEvents");
+import AppDispatcher from "../AppDispatcher";
+import ajaxWrapper from "../helpers/ajaxWrapper";
+import DCOSEvents from "../events/DCOSEvents";
 
 var DCOSActions = {
   requestBuildInformation: function (host) {
@@ -21,4 +21,4 @@ var DCOSActions = {
   request: ajaxWrapper
 };
 
-module.exports = DCOSActions;
+export default DCOSActions;
diff --git a/src/js/actions/DeploymentActions.js b/src/js/actions/DeploymentActions.js
@@ -1,8 +1,9 @@
-var ajaxWrapper = require("../helpers/ajaxWrapper");
+import ajaxWrapper from "../helpers/ajaxWrapper";
 
-var config = require("../config/config");
-var AppDispatcher = require("../AppDispatcher");
-var DeploymentEvents = require("../events/DeploymentEvents");
+import config from "../config/config";
+
+import AppDispatcher from "../AppDispatcher";
+import DeploymentEvents from "../events/DeploymentEvents";
 
 var DeploymentActions = {
   requestDeployments: function () {
@@ -63,4 +64,4 @@ var DeploymentActions = {
   request: ajaxWrapper
 };
 
-module.exports = DeploymentActions;
+export default DeploymentActions;
diff --git a/src/js/actions/DialogActions.js b/src/js/actions/DialogActions.js
@@ -1,8 +1,8 @@
-var Util = require("../helpers/Util");
-var AppDispatcher = require("../AppDispatcher");
-var DialogEvents = require("../events/DialogEvents");
-var DialogTypes = require("../constants/DialogTypes");
-var dialogScheme = require("../stores/schemes/dialogScheme");
+import Util from "../helpers/Util";
+import AppDispatcher from "../AppDispatcher";
+import DialogEvents from "../events/DialogEvents";
+import DialogTypes from "../constants/DialogTypes";
+import dialogScheme from "../stores/schemes/dialogScheme";
 
 function showDialog(data) {
   var dialog = Util.extendObject(dialogScheme, data,
@@ -86,4 +86,4 @@ var DialogActions = {
   }
 };
 
-module.exports = DialogActions;
+export default DialogActions;
diff --git a/src/js/actions/FormActions.js b/src/js/actions/FormActions.js
@@ -1,5 +1,5 @@
-var AppDispatcher = require("../AppDispatcher");
-var FormsEvents = require("../events/FormEvents");
+import AppDispatcher from "../AppDispatcher";
+import FormsEvents from "../events/FormEvents";
 
 var FormActions = {
   insert: function (fieldId, value, index = null) {
@@ -28,4 +28,4 @@ var FormActions = {
   }
 };
 
-module.exports = FormActions;
+export default FormActions;
diff --git a/src/js/actions/GroupsActions.js b/src/js/actions/GroupsActions.js
@@ -1,8 +1,9 @@
-var ajaxWrapper = require("../helpers/ajaxWrapper");
+import ajaxWrapper from "../helpers/ajaxWrapper";
 
-var config = require("../config/config");
-var AppDispatcher = require("../AppDispatcher");
-var GroupsEvents = require("../events/GroupsEvents");
+import config from "../config/config";
+
+import AppDispatcher from "../AppDispatcher";
+import GroupsEvents from "../events/GroupsEvents";
 
 var GroupsActions = {
   scaleGroup: function (groupId, scaleBy) {
@@ -50,4 +51,4 @@ var GroupsActions = {
   request: ajaxWrapper
 };
 
-module.exports = GroupsActions;
+export default GroupsActions;
diff --git a/src/js/actions/InfoActions.js b/src/js/actions/InfoActions.js
@@ -1,8 +1,9 @@
-var ajaxWrapper = require("../helpers/ajaxWrapper");
+import ajaxWrapper from "../helpers/ajaxWrapper";
 
-var config = require("../config/config");
-var AppDispatcher = require("../AppDispatcher");
-var InfoEvents = require("../events/InfoEvents");
+import config from "../config/config";
+
+import AppDispatcher from "../AppDispatcher";
+import InfoEvents from "../events/InfoEvents";
 
 var InfoActions = {
   requestInfo: function () {
@@ -25,4 +26,4 @@ var InfoActions = {
   request: ajaxWrapper
 };
 
-module.exports = InfoActions;
+export default InfoActions;
diff --git a/src/js/actions/MesosActions.js b/src/js/actions/MesosActions.js
@@ -1,8 +1,8 @@
-var semver = require("semver");
+import semver from "semver";
 
-var AppDispatcher = require("../AppDispatcher");
-var JSONPUtil = require("../helpers/JSONPUtil");
-var MesosEvents = require("../events/MesosEvents");
+import AppDispatcher from "../AppDispatcher";
+import JSONPUtil from "../helpers/JSONPUtil";
+import MesosEvents from "../events/MesosEvents";
 
 var MesosActions = {
   requestVersionInformation: function (host) {
@@ -76,4 +76,4 @@ var MesosActions = {
   request: JSONPUtil.request
 };
 
-module.exports = MesosActions;
+export default MesosActions;
diff --git a/src/js/actions/QueueActions.js b/src/js/actions/QueueActions.js
@@ -1,8 +1,9 @@
-var ajaxWrapper = require("../helpers/ajaxWrapper");
+import ajaxWrapper from "../helpers/ajaxWrapper";
 
-var config = require("../config/config");
-var AppDispatcher = require("../AppDispatcher");
-var QueueEvents = require("../events/QueueEvents");
+import config from "../config/config";
+
+import AppDispatcher from "../AppDispatcher";
+import QueueEvents from "../events/QueueEvents";
 
 var QueueActions = {
   requestQueue: function () {
@@ -44,4 +45,4 @@ var QueueActions = {
   request: ajaxWrapper
 };
 
-module.exports = QueueActions;
+export default QueueActions;
diff --git a/src/js/actions/TasksActions.js b/src/js/actions/TasksActions.js
@@ -1,8 +1,9 @@
-var ajaxWrapper = require("../helpers/ajaxWrapper");
+import ajaxWrapper from "../helpers/ajaxWrapper";
 
-var config = require("../config/config");
-var AppDispatcher = require("../AppDispatcher");
-var TasksEvents = require("../events/TasksEvents");
+import config from "../config/config";
+
+import AppDispatcher from "../AppDispatcher";
+import TasksEvents from "../events/TasksEvents";
 
 var TasksActions = {
   deleteTasks: function (appId, taskIds = []) {
@@ -57,4 +58,4 @@ var TasksActions = {
   request: ajaxWrapper
 };
 
-module.exports = TasksActions;
+export default TasksActions;
diff --git a/src/js/components/AlertDialogComponent.jsx b/src/js/components/AlertDialogComponent.jsx
@@ -1,9 +1,9 @@
-var React = require("react/addons");
-var classNames = require("classnames");
+import React from "react/addons";
+import classNames from "classnames";
 
-var DialogSeverity = require("../constants/DialogSeverity");
-var Util = require("../helpers/Util");
-var ModalComponent = require("../components/ModalComponent");
+import DialogSeverity from "../constants/DialogSeverity";
+import Util from "../helpers/Util";
+import ModalComponent from "../components/ModalComponent";
 
 var AlertDialogComponent = React.createClass({
   displayName: "AlertDialogComponent",
@@ -64,4 +64,4 @@ var AlertDialogComponent = React.createClass({
   }
 });
 
-module.exports = AlertDialogComponent;
+export default AlertDialogComponent;
diff --git a/src/js/components/AppDebugInfoComponent.jsx b/src/js/components/AppDebugInfoComponent.jsx
@@ -1,14 +1,12 @@
-var React = require("react/addons");
-var Moment = require("moment");
-
-var AppsStore = require("../stores/AppsStore");
-var AppsActions = require("../actions/AppsActions");
-var AppsEvents = require("../events/AppsEvents");
-var AppTaskStatsListComponent =
-  require("../components/AppTaskStatsListComponent");
-var TaskMesosUrlComponent = require("../components/TaskMesosUrlComponent");
-var UnspecifiedNodeComponent =
-  require("../components/UnspecifiedNodeComponent");
+import React from "react/addons";
+import Moment from "moment";
+
+import AppsStore from "../stores/AppsStore";
+import AppsActions from "../actions/AppsActions";
+import AppsEvents from "../events/AppsEvents";
+import AppTaskStatsListComponent from "../components/AppTaskStatsListComponent";
+import TaskMesosUrlComponent from "../components/TaskMesosUrlComponent";
+import UnspecifiedNodeComponent from "../components/UnspecifiedNodeComponent";
 
 function invalidateValue(value, suffix) {
   if (value == null || value === "") {
@@ -170,4 +168,4 @@ var AppDebugInfoComponent = React.createClass({
   }
 });
 
-module.exports = AppDebugInfoComponent;
+export default AppDebugInfoComponent;
diff --git a/src/js/components/AppHealthBarComponent.jsx b/src/js/components/AppHealthBarComponent.jsx
@@ -1,6 +1,6 @@
-var classNames = require("classnames");
-var React = require("react/addons");
-var AppStatus = require("../constants/AppStatus");
+import classNames from "classnames";
+import React from "react/addons";
+import AppStatus from "../constants/AppStatus";
 
 function roundWorkaround(x) {
   return Math.floor(x * 1000) / 1000;
@@ -64,4 +64,4 @@ var AppHealthBarComponent = React.createClass({
 
 });
 
-module.exports = AppHealthBarComponent;
+export default AppHealthBarComponent;
diff --git a/src/js/components/AppHealthBarWithTooltipComponent.jsx b/src/js/components/AppHealthBarWithTooltipComponent.jsx
@@ -1,10 +1,10 @@
-var React = require("react/addons");
+import React from "react/addons";
 
-var AppHealthBarComponent = require("./AppHealthBarComponent");
-var AppHealthDetailComponent = require("./AppHealthDetailComponent");
-var PopoverComponent = require("./PopoverComponent");
-var Util = require("../helpers/Util");
-var HealthStatus = require("../constants/HealthStatus");
+import AppHealthBarComponent from "./AppHealthBarComponent";
+import AppHealthDetailComponent from "./AppHealthDetailComponent";
+import PopoverComponent from "./PopoverComponent";
+import Util from "../helpers/Util";
+import HealthStatus from "../constants/HealthStatus";
 
 var AppHealthBarWithTooltipComponent = React.createClass({
   displayName: "AppHealthBarWithTooltipComponent",
@@ -62,4 +62,4 @@ var AppHealthBarWithTooltipComponent = React.createClass({
   }
 });
 
-module.exports = AppHealthBarWithTooltipComponent;
+export default AppHealthBarWithTooltipComponent;