@criticalmanufacturing/cli 5.10.6 → 5.10.8-0

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@criticalmanufacturing/cli",
-  "version": "5.10.6",
+  "version": "5.10.8-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2593,11 +2593,6 @@
       "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==",
       "dev": true
     },
-    "node_modules-path": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/node_modules-path/-/node_modules-path-2.3.0.tgz",
-      "integrity": "sha512-lFrZ1gL5qFbmuDwSW7VOZpXaVoQ8NdsWh5MSpur/I2O5SqxjNjwBBvEu1KTjPZUaPzEFtfxG7+luZSIvS9b4JQ=="
-    },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@criticalmanufacturing/cli",
-  "version": "5.10.6",
+  "version": "5.10.8-0",
   "description": "Critical Manufacturing command line client",
   "bin": {
     "cmf": "run.js"
@@ -40,7 +40,6 @@
     "debug": "^4.3.4",
     "global-dirs": "3.0.0",
     "mkdirp": "^2.1.6",
-    "node_modules-path": "^2.0.7",
     "rimraf": "^3.0.2",
     "tmp": "0.2.1",
     "http-proxy-agent": "^5.0.0",

package/postinstall.js

@@ -13,7 +13,6 @@ const path = require('path'),
     AdmZip = require("adm-zip"),
     tmp = require('tmp'),
     dbg = require('debug'),
-    node_modules = require('node_modules-path'),
     { parsePackageJson, PLATFORM_MAPPING, ARCH_MAPPING } = require('./utils');
 
 const debug = dbg("cmf:debug");
@@ -22,7 +21,10 @@ const error = dbg("cmf:debug:error");
 async function getInstallationPath() {
     debug("Getting installation path...");
     debug("Targeting node_modules/.bin/cmf-cli. Making sure path exists...");
-    const dir = path.join(node_modules(), ".bin", "cmf-cli");
+    // __dirname is always <node_modules>/@criticalmanufacturing/cli, so two
+    // levels up is always the node_modules/ dir that owns .bin/ — whether this
+    // is a local install (with or without shrinkwrap) or a global install.
+    const dir = path.join(path.resolve(__dirname, '..', '..'), ".bin", "cmf-cli");
     await mkdirp(dir);
     debug(`Install path exists!`);
     return dir;

package/run.js

@@ -4,7 +4,6 @@
 
 const { spawn } = require('child_process');
 const path = require('path');
-const node_modules = require('node_modules-path');
 const dbg = require('debug');
 const { parsePackageJson } = require('./utils');
 
@@ -13,7 +12,9 @@ const debug = dbg("cmf:debug");
 
 debug("Executing cmf-cli");
 debug("Getting binary from node_modules/.bin/cmf-cli...");
-const exePath = path.join(node_modules(), ".bin", "cmf-cli", opts.binName);
+// __dirname is always <node_modules>/@criticalmanufacturing/cli, so two levels
+// up is the node_modules/ that owns .bin/ — correct for local and global installs.
+const exePath = path.join(path.resolve(__dirname, '..', '..'), ".bin", "cmf-cli", opts.binName);
 debug("Obtained binary path: " + exePath);
 
 debug(`Spawning cmf-cli from ${exePath} with args ${process.argv.slice(2)} and piping.`);