👌 IMPROVE: Remove mz modules deps (#405)

mz, mz-modules, uuid

Author: fengmk2

bin/install.js

@@ -3,17 +3,17 @@
 'use strict';
 
 const debug = require('debug')('npminstall:bin:install');
-const npa = require('../lib/npa');
 const chalk = require('chalk');
 const path = require('path');
 const util = require('util');
-const execSync = require('child_process').execSync;
-const fs = require('mz/fs');
+const { execSync } = require('child_process');
+const fs = require('fs/promises');
+const { writeFileSync } = require('fs');
 const parseArgs = require('minimist');
+const { installLocal, installGlobal } = require('..');
+const npa = require('../lib/npa');
 const utils = require('../lib/utils');
 const globalConfig = require('../lib/config');
-const installLocal = require('..').installLocal;
-const installGlobal = require('..').installGlobal;
 const { parsePackageName } = require('../lib/alias');
 const {
   LOCAL_TYPES,
@@ -306,7 +306,7 @@ debug('argv: %j, env: %j', argv, env);
   const dependenciesTree = argv['dependencies-tree'];
   if (dependenciesTree) {
     try {
-      const content = fs.readFileSync(dependenciesTree);
+      const content = await fs.readFile(dependenciesTree);
       config.dependenciesTree = JSON.parse(content);
     } catch (err) {
       console.warn(chalk.yellow('npminstall WARN load dependencies tree %s error: %s'), dependenciesTree, err.message);
@@ -332,7 +332,7 @@ debug('argv: %j, env: %j', argv, env);
       if (config.production) {
         // warning when `${root}/node_modules` exists
         const nodeModulesDir = path.join(root, 'node_modules');
-        if (await fs.exists(nodeModulesDir)) {
+        if (await utils.exists(nodeModulesDir)) {
           const dirs = await fs.readdir(nodeModulesDir);
           // ignore [ '.bin', 'node' ], it will install first by https://github.com/cnpm/nodeinstall
           if (!(dirs.length === 2 && dirs.indexOf('.bin') >= 0 && dirs.indexOf('node') >= 0)) {
@@ -341,7 +341,7 @@ debug('argv: %j, env: %j', argv, env);
         }
       }
       const pkgFile = path.join(root, 'package.json');
-      const exists = await fs.exists(pkgFile);
+      const exists = await utils.exists(pkgFile);
       if (!exists) {
         console.warn(chalk.yellow(`npminstall WARN package.json not exists: ${pkgFile}`));
       } else {
@@ -420,7 +420,7 @@ debug('argv: %j, env: %j', argv, env);
 
   process.on('exit', code => {
     if (code !== 0) {
-      fs.writeFileSync(path.join(root, 'npminstall-debug.log'), util.inspect(config, { depth: 2 }));
+      writeFileSync(path.join(root, 'npminstall-debug.log'), util.inspect(config, { depth: 2 }));
     }
   });
 })().catch(err => {

bin/link.js

@@ -8,7 +8,6 @@ const semver = require('semver');
 const assert = require('assert');
 const chalk = require('chalk');
 const path = require('path');
-const fs = require('mz/fs');
 const parseArgs = require('minimist');
 const utils = require('../lib/utils');
 const bin = require('../lib/bin');
@@ -139,7 +138,7 @@ const folders = argv._.map(name => utils.formatPath(name));
         folder = path.join(root, folder);
       }
       // read from folder
-      if (!(await fs.exists(folder))) {
+      if (!(await utils.exists(folder))) {
         throw new Error(`${folder} not exists`);
       }
 

bin/uninstall.js

@@ -5,7 +5,7 @@
 const debug = require('debug')('npminstall:bin:uninstall');
 const npa = require('npm-package-arg');
 const path = require('path');
-const fs = require('mz/fs');
+const fs = require('fs/promises');
 const parseArgs = require('minimist');
 const chalk = require('chalk');
 const execSync = require('child_process').execSync;

bin/update.js

@@ -3,26 +3,10 @@
 'use strict';
 
 const path = require('path');
-const rimraf = require('mz-modules/rimraf');
 const parseArgs = require('minimist');
+const { rimraf } = require('../lib/utils');
 
-const argv = parseArgs(process.argv.slice(2), {
-  string: [
-    'root',
-  ],
-  boolean: [
-    'help',
-  ],
-  alias: {
-    h: 'help',
-  },
-});
-
-if (argv.help) return help();
-
-const root = argv.root || process.cwd();
-
-function help() {
+function help(root) {
   console.log(`
 Usage:
 
@@ -33,6 +17,20 @@ Usage:
 }
 
 (async () => {
+  const argv = parseArgs(process.argv.slice(2), {
+    string: [
+      'root',
+    ],
+    boolean: [
+      'help',
+    ],
+    alias: {
+      h: 'help',
+    },
+  });
+
+  const root = argv.root || process.cwd();
+  if (argv.help) return help(root);
   const nodeModules = path.join(root, 'node_modules');
   console.log('[npmupdate] removing %s', nodeModules);
   await rimraf(nodeModules);

lib/download/git.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const uuid = require('uuid');
+const { randomUUID } = require('crypto');
 const chalk = require('chalk');
 const pacote = require('pacote');
 const utils = require('../utils');
@@ -15,7 +15,7 @@ module.exports = async (pkg, options) => {
 
   options.gitPackages++;
   options.console.warn(chalk.yellow(`[${displayName}] install ${name || ''} from git ${raw}, may be very slow, please keep patience`));
-  const cloneDir = path.join(options.storeDir, '.tmp', uuid());
+  const cloneDir = path.join(options.storeDir, '.tmp', randomUUID());
   await utils.mkdirp(cloneDir);
   try {
     const resolveResult = await pacote.extract(raw, cloneDir);

lib/download/local.js

@@ -1,12 +1,11 @@
 'use strict';
 
 const debug = require('debug')('npminstall:download:local');
-const cp = require('mz/child_process');
-const rimraf = require('mz-modules/rimraf');
-const fs = require('mz/fs');
+const { randomUUID } = require('crypto');
+const fs = require('fs/promises');
+const { createReadStream } = require('fs');
 const path = require('path');
 const chalk = require('chalk');
-const uuid = require('uuid');
 const utils = require('../utils');
 
 module.exports = async (pkg, options) => {
@@ -32,27 +31,27 @@ async function localFolder(filepath, pkg, options) {
   debug(`install ${pkg.name}@${pkg.rawSpec} from local folder ${filepath}`);
   try {
     // use npm pack to ensure npmignore/gitignore/package.files work fine
-    const res = await cp.exec('npm pack', { cwd: filepath });
-    if (res && res[0]) {
-      const tarball = path.join(filepath, res[0].trim());
+    const res = await utils.exec('npm pack', { cwd: filepath });
+    if (res && res.stdout) {
+      const tarball = path.join(filepath, res.stdout.trim());
       try {
         return await localTarball(tarball, pkg, options);
       } finally {
-        await rimraf(tarball);
+        await utils.rimraf(tarball);
       }
     }
   } catch (err) {
     // fallback to copy
-    debug(`install ${pkg.name}@${pkg.rawSpec} from local folder ${filepath} with npm pack failed(${err.message}), use copy`);
+    options.console.warn(`[npminstall:download:local] install ${pkg.displayName} from local folder ${filepath} with npm pack failed(${err.message}), use copy`);
     return await utils.copyInstall(filepath, options);
   }
 }
 
 async function localTarball(filepath, pkg, options) {
   debug(`install ${pkg.name}@${pkg.rawSpec} from local tarball ${filepath}`);
-  const readstream = fs.createReadStream(filepath);
+  const readstream = createReadStream(filepath);
   // everytime unpack to a different directory
-  const ungzipDir = path.join(options.storeDir, '.tmp', uuid());
+  const ungzipDir = path.join(options.storeDir, '.tmp', randomUUID());
   await utils.mkdirp(ungzipDir);
   try {
     await utils.unpack(readstream, ungzipDir, pkg);
@@ -62,7 +61,7 @@ async function localTarball(filepath, pkg, options) {
     try {
       await utils.rimraf(ungzipDir);
     } catch (err) {
-      options.console.warn(chalk.yellow(`rmdir local ungzip dir: ${ungzipDir} error: ${err}, ignore it`));
+      options.console.warn(chalk.yellow(`[npminstall:download:local] ${pkg.displayName} rmdir local ungzip dir: ${ungzipDir} error: ${err}, ignore it`));
     }
   }
 }

lib/download/npm.js

@@ -2,6 +2,7 @@
 
 const debug = require('debug')('npminstall:download:npm');
 const bytes = require('bytes');
+const { randomUUID } = require('crypto');
 const { createWriteStream, createReadStream, rmSync } = require('fs');
 const fs = require('fs/promises');
 const path = require('path');
@@ -11,7 +12,6 @@ const zlib = require('zlib');
 const destroy = require('destroy');
 const urlresolve = require('url').resolve;
 const chalk = require('chalk');
-const uuid = require('uuid');
 const moment = require('moment');
 const os = require('os');
 const semver = require('semver');
@@ -573,7 +573,7 @@ async function getTarballStream(tarballUrl, pkg, options) {
     const tmpDir = path.join(options.cacheDir, '.tmp', moment().format('YYYY/MM/DD'));
     await utils.mkdirp(parentDir);
     await utils.mkdirp(tmpDir);
-    const tmpFile = path.join(tmpDir, `${name}-${pkg.version}-${uuid.v4()}.tgz`);
+    const tmpFile = path.join(tmpDir, `${name}-${pkg.version}-${randomUUID()}.tgz`);
     const result = await get(tarballUrl, {
       timeout: options.streamingTimeout || options.timeout,
       followRedirect: true,

lib/download/remote.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const uuid = require('uuid');
+const { randomUUID } = require('crypto');
 const chalk = require('chalk');
 const utils = require('../utils');
 
@@ -17,7 +17,7 @@ module.exports = async (pkg, options) => {
   const remoteUrl = fetchSpec;
   options.console.warn(chalk.yellow(`[${displayName}] install ${name || ''} from remote ${remoteUrl}, may be very slow, please keep patience`));
   const readstream = await utils.getTarballStream(remoteUrl, options);
-  const ungzipDir = path.join(options.storeDir, '.tmp', uuid());
+  const ungzipDir = path.join(options.storeDir, '.tmp', randomUUID());
   await utils.mkdirp(ungzipDir);
   try {
     await utils.unpack(readstream, ungzipDir, pkg);

lib/format_install_options.js

@@ -2,7 +2,7 @@
 
 const debug = require('debug')('npminstall:format_install_options');
 const os = require('os');
-const uuid = require('uuid');
+const { randomUUID } = require('crypto');
 const awaitEvent = require('await-event');
 const assert = require('assert');
 const path = require('path');
@@ -124,7 +124,7 @@ module.exports = function formatInstallOptions(options) {
   if (options.production) {
     options.referer += ' --production';
   }
-  options.referer += ' --uuid=' + uuid.v1();
+  options.referer += ` --uuid=${randomUUID()}`;
 
   options.installRoot = options.pkgs.length === 0;
 

lib/global_install.js

@@ -6,7 +6,7 @@
 
 const path = require('path');
 const utility = require('utility');
-const fs = require('mz/fs');
+const fs = require('fs/promises');
 const chalk = require('chalk');
 const npa = require('./npa');
 const installLocal = require('./local_install');