navy - npm Package Compare versions

Comparing version 2.1.0-rc4 to 2.1.0-rc5

lib/config-providers/npm/index.js

@@ -21,20 +21,24 @@ 'use strict';
           case 0:
-            _context.prev = 0;
+            _context.next = 2;
+            return mkdirp(nodeModulesPath);
 
+          case 2:
+            _context.prev = 2;
+
             // $FlowIgnore some weird bug with execSync
-            (0, _child_process.execSync)('npm info ' + pkgName + ' name', { stdio: 'inherit' });
-            _context.next = 7;
+            (0, _child_process.execSync)('npm info ' + pkgName + ' name', { stdio: 'ignore' });
+            _context.next = 9;
             break;
 
-          case 4:
-            _context.prev = 4;
-            _context.t0 = _context['catch'](0);
+          case 6:
+            _context.prev = 6;
+            _context.t0 = _context['catch'](2);
             throw new Error('Package "' + pkgName + '" not found or unreachable');
 
-          case 7:
+          case 9:
 
             // $FlowIgnore some weird bug with execSync
-            (0, _child_process.execSync)('npm i -g ' + pkgName, { stdio: 'inherit' });
+            (0, _child_process.execSync)('npm i ' + pkgName, { stdio: 'inherit', cwd: npmContext });
 
-          case 8:
+          case 10:
           case 'end':
@@ -44,3 +48,3 @@ return _context.stop();
       }
-    }, _callee, this, [[0, 4]]);
+    }, _callee, this, [[2, 6]]);
   }));
@@ -58,9 +62,5 @@ return function tryAndInstall(_x) {
           case 0:
-            if (!_cachedNpmPrefix) {
-              _cachedNpmPrefix = (0, _child_process.execSync)('npm config get prefix').toString().trim();
-            }
+            return _context2.abrupt('return', _path2.default.join(nodeModulesPath, pkgName));
 
-            return _context2.abrupt('return', _path2.default.join(_cachedNpmPrefix, '/lib/node_modules/', pkgName));
-
-          case 2:
+          case 1:
           case 'end':
@@ -85,2 +85,6 @@ return _context2.stop();
 
+var _bluebird = require('bluebird');
+
+var _bluebird2 = _interopRequireDefault(_bluebird);
+
 var _navy = require('../../navy');
@@ -92,6 +96,11 @@
 
+var _state = require('../../navy/state');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _cachedNpmPrefix = null;
+var mkdirp = _bluebird2.default.promisify(require('mkdirp'));
 
+var npmContext = _path2.default.join((0, _state.pathToNavyRoot)(), 'npm');
+var nodeModulesPath = _path2.default.join(npmContext, 'node_modules');
+
 function createNpmConfigProvider(navy) {
@@ -130,19 +139,14 @@ return {
               case 7:
-
-                if (!_cachedNpmPrefix) {
-                  _cachedNpmPrefix = (0, _child_process.execSync)('npm config get prefix').toString().trim();
-                }
-
-                _context3.next = 10;
+                _context3.next = 9;
                 return pathToModule(envState.npmPackage);
 
-              case 10:
+              case 9:
                 navyPath = _context3.sent;
-                _context3.next = 13;
-                return _fs2.default.accessAsync(navyPath);
 
-              case 13:
+
+                _fs2.default.accessSync(navyPath); // see if path exists
+
                 return _context3.abrupt('return', navyPath);
 
-              case 14:
+              case 12:
               case 'end':
@@ -149,0 +153,0 @@ return _context3.stop();

package.json

 {
   "name": "navy",
-  "version": "2.1.0-rc4",
+  "version": "2.1.0-rc5",
   "description": "Docker Compose wrapper to allow for easy development workflows",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

136052

increased by0.02%

No dependency changes