navy 4.1.2-rc.2 → 5.0.0

package/lib/cli/launch.js

@@ -1,133 +1,52 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _inquirer = require('inquirer');
-
-var _inquirer2 = _interopRequireDefault(_inquirer);
-
-var _util = require('./util');
-
-var _driverLogging = require('../driver-logging');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var SELECTED_WEIGHT = 100; // make sure selected services appear at the top
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(services, opts) {
-    var navy, navyFile, serviceNames, launchedServiceNames, selectedServiceNames, choices, _ref2, selectedServices;
-
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return (0, _util.getOrInitialiseNavy)(opts.navy);
-
-          case 2:
-            navy = _context.sent;
-            _context.next = 5;
-            return navy.getNavyFile();
-
-          case 5:
-            _context.t0 = _context.sent;
-
-            if (_context.t0) {
-              _context.next = 8;
-              break;
-            }
-
-            _context.t0 = {};
-
-          case 8:
-            navyFile = _context.t0;
-            _context.next = 11;
-            return navy.ensurePluginsLoaded();
-
-          case 11:
-            _context.next = 13;
-            return navy.getAvailableServiceNames();
-
-          case 13:
-            serviceNames = _context.sent;
-            _context.next = 16;
-            return navy.getLaunchedServiceNames();
-
-          case 16:
-            launchedServiceNames = _context.sent;
-            selectedServiceNames = launchedServiceNames.length > 0 ? launchedServiceNames : navyFile.launchDefaults || [];
-
-            if (!(!services || services.length === 0)) {
-              _context.next = 25;
-              break;
-            }
-
-            choices = serviceNames.sort(function (name) {
-              return selectedServiceNames.indexOf(name) === -1 ? SELECTED_WEIGHT : -1;
-            }).map(function (name) {
-              return {
-                name: name,
-                checked: selectedServiceNames.indexOf(name) !== -1
-              };
-            });
-            _context.next = 22;
-            return _inquirer2.default.prompt([{
-              type: 'checkbox',
-              message: 'Select services that you\'d like to bring up',
-              name: 'services',
-              choices: choices
-            }]);
-
-          case 22:
-            _ref2 = _context.sent;
-            selectedServices = _ref2.services;
-
-
-            services = selectedServices;
-
-          case 25:
-            if (!(services.length === 0)) {
-              _context.next = 27;
-              break;
-            }
-
-            return _context.abrupt('return');
-
-          case 27:
-            _context.next = 29;
-            return navy.emitAsync('cli.before.launch');
-
-          case 29:
-
-            (0, _driverLogging.startDriverLogging)('Launching services...');
-            _context.next = 32;
-            return navy.launch(services);
-
-          case 32:
-            (0, _driverLogging.stopDriverLogging)();
-
-          case 33:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function (_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+exports.default = _default;
+
+var _inquirer = _interopRequireDefault(require("inquirer"));
+
+var _util = require("./util");
+
+var _driverLogging = require("../driver-logging");
+
+const SELECTED_WEIGHT = 100; // make sure selected services appear at the top
+
+async function _default(services, opts) {
+  const navy = await (0, _util.getOrInitialiseNavy)(opts.navy);
+  const navyFile = (await navy.getNavyFile()) || {};
+  await navy.ensurePluginsLoaded();
+  const serviceNames = await navy.getAvailableServiceNames();
+  const launchedServiceNames = await navy.getLaunchedServiceNames();
+  const selectedServiceNames = launchedServiceNames.length > 0 ? launchedServiceNames : navyFile.launchDefaults || [];
+
+  if (!services || services.length === 0) {
+    const choices = serviceNames.sort(name => selectedServiceNames.indexOf(name) === -1 ? SELECTED_WEIGHT : -1).map(name => ({
+      name,
+      checked: selectedServiceNames.indexOf(name) !== -1
+    }));
+    const {
+      services: selectedServices
+    } = await _inquirer.default.prompt([{
+      type: 'checkbox',
+      message: 'Select services that you\'d like to bring up',
+      name: 'services',
+      choices
+    }]);
+    services = selectedServices;
+  }
+
+  if (services.length === 0) {
+    return;
+  }
+
+  await navy.emitAsync('cli.before.launch');
+  (0, _driverLogging.startDriverLogging)('Launching services...');
+  await navy.launch(services);
+  (0, _driverLogging.stopDriverLogging)();
+}
 
 module.exports = exports.default;

package/lib/cli/live.js

@@ -1,129 +1,55 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
-
-var _defineProperty3 = _interopRequireDefault(_defineProperty2);
-
-var _extends3 = require('babel-runtime/helpers/extends');
-
-var _extends4 = _interopRequireDefault(_extends3);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _ = require('../');
-
-var _errors = require('../errors');
-
-var _navyrc = require('../util/navyrc');
-
-var _navyrc2 = _interopRequireDefault(_navyrc);
+var _chalk = _interopRequireDefault(require("chalk"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _ = require("../");
 
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(service, opts) {
-    var navy, cwd, navyRc, state;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            navy = (0, _.getNavy)(opts.navy);
-            cwd = process.cwd();
-            _context.next = 4;
-            return (0, _navyrc2.default)(cwd);
+var _errors = require("../errors");
 
-          case 4:
-            navyRc = _context.sent;
+var _navyrc = _interopRequireDefault(require("../util/navyrc"));
 
-            if (!(navyRc && !navyRc.services)) {
-              _context.next = 7;
-              break;
-            }
+async function _default(service, opts) {
+  const navy = (0, _.getNavy)(opts.navy);
+  const cwd = process.cwd();
+  const navyRc = await (0, _navyrc.default)(cwd);
 
-            throw new _errors.NavyError('No valid .navyrc file was found in "' + cwd + '"');
+  if (navyRc && !navyRc.services) {
+    throw new _errors.NavyError(`No valid .navyrc file was found in "${cwd}"`);
+  }
 
-          case 7:
-            if (!(navyRc && navyRc.services.length > 1 && !service)) {
-              _context.next = 9;
-              break;
-            }
+  if (navyRc && navyRc.services.length > 1 && !service) {
+    throw new _errors.NavyError('Multiple service mappings are defined in .navyrc, you need to explicitly specify what service to develop');
+  }
 
-            throw new _errors.NavyError('Multiple service mappings are defined in .navyrc, you need to explicitly specify what service to develop');
+  if (navyRc && !service) {
+    service = navyRc.services[0];
+  }
 
-          case 9:
+  const state = (await navy.getState()) || {};
 
-            if (navyRc && !service) {
-              service = navyRc.services[0];
-            }
+  if (!state || !state.services || !state.services[service] || !state.services[service]._develop) {
+    return console.log(_chalk.default.dim(`Nothing to do, ${service} is not in development`));
+  }
 
-            _context.next = 12;
-            return navy.getState();
-
-          case 12:
-            _context.t0 = _context.sent;
-
-            if (_context.t0) {
-              _context.next = 15;
-              break;
-            }
-
-            _context.t0 = {};
-
-          case 15:
-            state = _context.t0;
-
-            if (!(!state || !state.services || !state.services[service] || !state.services[service]._develop)) {
-              _context.next = 18;
-              break;
-            }
-
-            return _context.abrupt('return', console.log(_chalk2.default.dim('Nothing to do, ' + service + ' is not in development')));
-
-          case 18:
-            _context.next = 20;
-            return navy.saveState((0, _extends4.default)({}, state, {
-              services: (0, _extends4.default)({}, state.services, (0, _defineProperty3.default)({}, service, (0, _extends4.default)({}, (state.services || {})[service], {
-                _develop: undefined
-              })))
-            }));
-
-          case 20:
-            _context.next = 22;
-            return navy.kill([service]);
-
-          case 22:
-            _context.next = 24;
-            return navy.relaunch({ noDeps: true });
-
-          case 24:
-
-            console.log(service + ' is no longer in development');
-
-          case 25:
-          case 'end':
-            return _context.stop();
-        }
+  await navy.saveState({ ...state,
+    services: { ...state.services,
+      [service]: { ...(state.services || {})[service],
+        _develop: undefined
       }
-    }, _callee, this);
-  }));
-
-  return function (_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+    }
+  });
+  await navy.kill([service]);
+  await navy.relaunch({
+    noDeps: true
+  });
+  console.log(`${service} is no longer in development`);
+}
 
 module.exports = exports.default;

package/lib/cli/local-ip.js

@@ -1,63 +1,26 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _config = require('../config');
-
-var _reconfigure = require('./util/reconfigure');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(navy) {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return (0, _config.setConfig)((0, _extends3.default)({}, (0, _config.getConfig)(), {
-              externalIP: '127.0.0.1'
-            }));
-
-          case 2:
-            _context.next = 4;
-            return (0, _reconfigure.reconfigureAllNavies)();
-
-          case 4:
+var _chalk = _interopRequireDefault(require("chalk"));
 
-            console.log();
-            console.log(_chalk2.default.green(' ✔ Now using your local IP address (127.0.0.1)'));
-            console.log();
+var _config = require("../config");
 
-          case 7:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+var _reconfigure = require("./util/reconfigure");
 
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+async function _default(navy) {
+  await (0, _config.setConfig)({ ...(0, _config.getConfig)(),
+    externalIP: '127.0.0.1'
+  });
+  await (0, _reconfigure.reconfigureAllNavies)();
+  console.log();
+  console.log(_chalk.default.green(' ✔ Now using your local IP address (127.0.0.1)'));
+  console.log();
+}
 
 module.exports = exports.default;

package/lib/cli/logs.js

@@ -1,43 +1,15 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
+var _ = require("../");
 
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _ = require('../');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(services, opts) {
-    var env;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            env = (0, _.getNavy)(opts.navy);
-            _context.next = 3;
-            return env.spawnLogStream(services);
-
-          case 3:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function (_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+async function _default(services, opts) {
+  const env = (0, _.getNavy)(opts.navy);
+  await env.spawnLogStream(services);
+}
 
 module.exports = exports.default;

package/lib/cli/open.js

@@ -1,54 +1,20 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _opn = require('opn');
-
-var _opn2 = _interopRequireDefault(_opn);
-
-var _ = require('../');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(service, opts) {
-    var navy;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            navy = (0, _.getNavy)(opts.navy);
-            _context.t0 = _opn2.default;
-            _context.next = 4;
-            return navy.url(service);
-
-          case 4:
-            _context.t1 = _context.sent;
-            (0, _context.t0)(_context.t1);
-
-            console.log('\uD83C\uDF10  Opening ' + service + '...');
+var _opn = _interopRequireDefault(require("opn"));
 
-          case 7:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+var _ = require("../");
 
-  return function (_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+async function _default(service, opts) {
+  const navy = (0, _.getNavy)(opts.navy);
+  (0, _opn.default)(await navy.url(service));
+  console.log(`🌐  Opening ${service}...`);
+}
 
 module.exports = exports.default;