@umijs/utils 4.0.0-rc.12 → 4.0.0-rc.13

package/dist/npmClient.d.ts

@@ -7,7 +7,9 @@ export declare enum NpmClientEnum {
     yarn = "yarn",
     npm = "npm"
 }
-export declare const getNpmClient: () => NpmClient;
+export declare const getNpmClient: (opts: {
+    cwd: string;
+}) => NpmClient;
 export declare const installWithNpmClient: ({ npmClient, cwd, }: {
     npmClient: NpmClient;
     cwd?: string | undefined;

package/dist/npmClient.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installWithNpmClient = exports.getNpmClient = exports.NpmClientEnum = exports.npmClients = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
 exports.npmClients = ['pnpm', 'tnpm', 'cnpm', 'yarn', 'npm'];
 var NpmClientEnum;
 (function (NpmClientEnum) {
@@ -10,17 +12,21 @@ var NpmClientEnum;
     NpmClientEnum["yarn"] = "yarn";
     NpmClientEnum["npm"] = "npm";
 })(NpmClientEnum = exports.NpmClientEnum || (exports.NpmClientEnum = {}));
-const getNpmClient = () => {
-    const userAgent = process.env.npm_config_user_agent;
-    if (userAgent) {
-        if (userAgent.includes('pnpm'))
-            return 'pnpm';
-        if (userAgent.includes('tnpm'))
-            return 'tnpm';
-        if (userAgent.includes('yarn'))
-            return 'yarn';
-        if (userAgent.includes('cnpm'))
-            return 'cnpm';
+const getNpmClient = (opts) => {
+    const chokidarPkg = require('chokidar/package.json');
+    if (chokidarPkg.__npminstall_done) {
+        return chokidarPkg._resolved.includes('registry.npm.alibaba-inc.com')
+            ? 'tnpm'
+            : 'cnpm';
+    }
+    const chokidarPath = require.resolve('chokidar');
+    if (chokidarPath.includes('.pnpm') ||
+        (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'node_modules', '.pnpm'))) {
+        return 'pnpm';
+    }
+    if ((0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'yarn.lock')) ||
+        (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'node_modules', '.yarn-integrity'))) {
+        return 'yarn';
     }
     return 'npm';
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/utils",
-  "version": "4.0.0-rc.12",
+  "version": "4.0.0-rc.13",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -27,7 +27,7 @@
     "@types/color": "3.0.3",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",
-    "@types/lodash": "4.14.181",
+    "@types/lodash": "4.14.182",
     "@types/mustache": "4.1.2",
     "@types/prompts": "^2.0.14",
     "@types/rimraf": "3.0.2",