@umijs/utils 4.0.0-rc.9 → 4.0.2

package/dist/BaseGenerator/BaseGenerator.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -27,31 +18,32 @@ class BaseGenerator extends Generator_1.default {
     prompting() {
         return this.questions;
     }
-    writing() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const context = Object.assign(Object.assign({}, this.data), this.prompts);
-            if ((0, fs_1.statSync)(this.path).isDirectory()) {
-                this.copyDirectory({
-                    context,
-                    path: this.path,
+    async writing() {
+        const context = {
+            ...this.data,
+            ...this.prompts,
+        };
+        if ((0, fs_1.statSync)(this.path).isDirectory()) {
+            this.copyDirectory({
+                context,
+                path: this.path,
+                target: this.target,
+            });
+        }
+        else {
+            if (this.path.endsWith('.tpl')) {
+                this.copyTpl({
+                    templatePath: this.path,
                     target: this.target,
+                    context,
                 });
             }
             else {
-                if (this.path.endsWith('.tpl')) {
-                    this.copyTpl({
-                        templatePath: this.path,
-                        target: this.target,
-                        context,
-                    });
-                }
-                else {
-                    const absTarget = this.target;
-                    fs_extra_1.default.mkdirpSync((0, path_1.dirname)(absTarget));
-                    (0, fs_1.copyFileSync)(this.path, absTarget);
-                }
+                const absTarget = this.target;
+                fs_extra_1.default.mkdirpSync((0, path_1.dirname)(absTarget));
+                (0, fs_1.copyFileSync)(this.path, absTarget);
             }
-        });
+        }
     }
 }
 exports.default = BaseGenerator;

package/dist/BaseGenerator/generateFile.js

@@ -1,19 +1,10 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseGenerator_1 = __importDefault(require("./BaseGenerator"));
-const generateFile = ({ path, target, baseDir, data, questions, }) => __awaiter(void 0, void 0, void 0, function* () {
+const generateFile = async ({ path, target, baseDir, data, questions, }) => {
     const generator = new BaseGenerator_1.default({
         path,
         target,
@@ -21,6 +12,6 @@ const generateFile = ({ path, target, baseDir, data, questions, }) => __awaiter(
         data,
         questions,
     });
-    yield generator.run();
-});
+    await generator.run();
+};
 exports.default = generateFile;

package/dist/Generator/Generator.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -25,19 +16,15 @@ class Generator {
         this.args = args;
         this.prompts = {};
     }
-    run() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const questions = this.prompting();
-            this.prompts = yield (0, prompts_1.default)(questions);
-            yield this.writing();
-        });
+    async run() {
+        const questions = this.prompting();
+        this.prompts = await (0, prompts_1.default)(questions);
+        await this.writing();
     }
     prompting() {
         return [];
     }
-    writing() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
+    async writing() { }
     copyTpl(opts) {
         const tpl = (0, fs_1.readFileSync)(opts.templatePath, 'utf-8');
         const content = mustache_1.default.render(tpl, opts.context);

package/dist/index.d.ts

@@ -6,6 +6,7 @@ import cheerio from '../compiled/cheerio';
 import crossSpawn from '../compiled/cross-spawn';
 import debug from '../compiled/debug';
 import deepmerge from '../compiled/deepmerge';
+import * as execa from '../compiled/execa';
 import fsExtra from '../compiled/fs-extra';
 import glob from '../compiled/glob';
 import lodash from '../compiled/lodash';
@@ -26,10 +27,11 @@ import * as logger from './logger';
 import updatePackageJSON from './updatePackageJSON';
 export * from './getCorejsVersion';
 export * from './importLazy';
+export * from './isLocalDev';
 export * from './isStyleFile';
 export * from './npmClient';
 export * from './randomColor/randomColor';
 export * as register from './register';
 export * from './tryPaths';
 export * from './winPath';
-export { address, axios, chalk, cheerio, chokidar, crossSpawn, debug, deepmerge, fsExtra, glob, Generator, BaseGenerator, generateFile, installDeps, lodash, logger, Mustache, pkgUp, portfinder, prompts, resolve, rimraf, semver, stripAnsi, updatePackageJSON, yParser, };
+export { address, axios, chalk, cheerio, chokidar, crossSpawn, debug, deepmerge, execa, fsExtra, glob, Generator, BaseGenerator, generateFile, installDeps, lodash, logger, Mustache, pkgUp, portfinder, prompts, resolve, rimraf, semver, stripAnsi, updatePackageJSON, yParser, };

package/dist/index.js

@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yParser = exports.updatePackageJSON = exports.stripAnsi = exports.semver = exports.rimraf = exports.resolve = exports.prompts = exports.portfinder = exports.pkgUp = exports.Mustache = exports.logger = exports.lodash = exports.installDeps = exports.generateFile = exports.BaseGenerator = exports.Generator = exports.glob = exports.fsExtra = exports.deepmerge = exports.debug = exports.crossSpawn = exports.chokidar = exports.cheerio = exports.chalk = exports.axios = exports.address = exports.register = void 0;
+exports.yParser = exports.updatePackageJSON = exports.stripAnsi = exports.semver = exports.rimraf = exports.resolve = exports.prompts = exports.portfinder = exports.pkgUp = exports.Mustache = exports.logger = exports.lodash = exports.installDeps = exports.generateFile = exports.BaseGenerator = exports.Generator = exports.glob = exports.fsExtra = exports.execa = exports.deepmerge = exports.debug = exports.crossSpawn = exports.chokidar = exports.cheerio = exports.chalk = exports.axios = exports.address = exports.register = void 0;
 const chokidar = __importStar(require("chokidar"));
 exports.chokidar = chokidar;
 const address_1 = __importDefault(require("../compiled/address"));
@@ -46,6 +46,8 @@ const debug_1 = __importDefault(require("../compiled/debug"));
 exports.debug = debug_1.default;
 const deepmerge_1 = __importDefault(require("../compiled/deepmerge"));
 exports.deepmerge = deepmerge_1.default;
+const execa = __importStar(require("../compiled/execa"));
+exports.execa = execa;
 const fs_extra_1 = __importDefault(require("../compiled/fs-extra"));
 exports.fsExtra = fs_extra_1.default;
 const glob_1 = __importDefault(require("../compiled/glob"));
@@ -85,6 +87,7 @@ const updatePackageJSON_1 = __importDefault(require("./updatePackageJSON"));
 exports.updatePackageJSON = updatePackageJSON_1.default;
 __exportStar(require("./getCorejsVersion"), exports);
 __exportStar(require("./importLazy"), exports);
+__exportStar(require("./isLocalDev"), exports);
 __exportStar(require("./isStyleFile"), exports);
 __exportStar(require("./npmClient"), exports);
 __exportStar(require("./randomColor/randomColor"), exports);

package/dist/installDeps.js

@@ -43,7 +43,9 @@ function installDeps({ opts, cwd = process.cwd(), }) {
             .join(' '), {
             encoding: 'utf8',
             cwd,
-            env: Object.assign({}, process.env),
+            env: {
+                ...process.env,
+            },
             stderr: 'pipe',
             stdout: 'pipe',
         });

package/dist/isLocalDev.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Check whether it is development in local
+ */
+export declare const isLocalDev: () => string | false;

package/dist/isLocalDev.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLocalDev = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const root = (0, path_1.join)(__dirname, '../../../');
+const rootPkg = (0, path_1.join)(root, './package.json');
+/**
+ * Check whether it is development in local
+ */
+const isLocalDev = () => {
+    const isLocal = (0, fs_1.existsSync)(rootPkg) && require(rootPkg)._local;
+    return isLocal ? root : false;
+};
+exports.isLocalDev = isLocalDev;

package/dist/logger.d.ts

@@ -1,6 +1,7 @@
 export declare const prefixes: {
     wait: string;
     error: string;
+    fatal: string;
     warn: string;
     ready: string;
     info: string;
@@ -14,3 +15,5 @@ export declare function ready(...message: any[]): void;
 export declare function info(...message: any[]): void;
 export declare function event(...message: any[]): void;
 export declare function debug(...message: any[]): void;
+export declare function fatal(...message: any[]): void;
+export declare function getLatestLogFilePath(): string;

package/dist/logger.js

@@ -3,11 +3,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debug = exports.event = exports.info = exports.ready = exports.warn = exports.error = exports.wait = exports.prefixes = void 0;
+exports.getLatestLogFilePath = exports.fatal = exports.debug = exports.event = exports.info = exports.ready = exports.warn = exports.error = exports.wait = exports.prefixes = void 0;
+const path_1 = require("path");
+const pino_1 = __importDefault(require("pino"));
 const chalk_1 = __importDefault(require("../compiled/chalk"));
+const fs_extra_1 = __importDefault(require("../compiled/fs-extra"));
+const loggerDir = (0, path_1.join)(process.cwd(), 'node_modules/.cache/logger');
+const loggerPath = (0, path_1.join)(loggerDir, 'umi.log');
+fs_extra_1.default.mkdirpSync(loggerDir);
+const customLevels = {
+    ready: 31,
+    event: 32,
+    wait: 55,
+    // 虽然这里设置了 debug 为 30，但日志中还是 20，符合预期
+    // 这里不加会不生成到 umi.log，transport 的 level 配置没有生效，原因不明
+    debug: 30,
+};
+const logger = (0, pino_1.default)({
+    customLevels,
+}, pino_1.default.transport({
+    targets: [
+        {
+            target: require.resolve('pino/file'),
+            options: {
+                destination: loggerPath,
+            },
+            level: 'trace',
+        },
+    ],
+}));
 exports.prefixes = {
     wait: chalk_1.default.cyan('wait') + '  -',
     error: chalk_1.default.red('error') + ' -',
+    fatal: chalk_1.default.red('fatal') + ' -',
     warn: chalk_1.default.yellow('warn') + '  -',
     ready: chalk_1.default.green('ready') + ' -',
     info: chalk_1.default.cyan('info') + '  -',
@@ -16,31 +44,47 @@ exports.prefixes = {
 };
 function wait(...message) {
     console.log(exports.prefixes.wait, ...message);
+    logger.wait(message[0]);
 }
 exports.wait = wait;
 function error(...message) {
     console.error(exports.prefixes.error, ...message);
+    logger.error(message[0]);
 }
 exports.error = error;
 function warn(...message) {
     console.warn(exports.prefixes.warn, ...message);
+    logger.warn(message[0]);
 }
 exports.warn = warn;
 function ready(...message) {
     console.log(exports.prefixes.ready, ...message);
+    logger.ready(message[0]);
 }
 exports.ready = ready;
 function info(...message) {
     console.log(exports.prefixes.info, ...message);
+    logger.info(message[0]);
 }
 exports.info = info;
 function event(...message) {
     console.log(exports.prefixes.event, ...message);
+    logger.event(message[0]);
 }
 exports.event = event;
 function debug(...message) {
     if (process.env.DEBUG) {
         console.log(exports.prefixes.debug, ...message);
     }
+    logger.debug(message[0]);
 }
 exports.debug = debug;
+function fatal(...message) {
+    console.error(exports.prefixes.fatal, ...message);
+    logger.fatal(message[0]);
+}
+exports.fatal = fatal;
+function getLatestLogFilePath() {
+    return loggerPath;
+}
+exports.getLatestLogFilePath = getLatestLogFilePath;

package/dist/npmClient.d.ts

@@ -7,8 +7,9 @@ export declare enum NpmClientEnum {
     yarn = "yarn",
     npm = "npm"
 }
-export declare const getNpmClient: () => NpmClient;
-export declare const checkNpmClient: (npmClient: NpmClient) => boolean;
+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.checkNpmClient = exports.getNpmClient = exports.NpmClientEnum = exports.npmClients = void 0;
+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,26 +12,25 @@ 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';
 };
 exports.getNpmClient = getNpmClient;
-const checkNpmClient = (npmClient) => {
-    const userAgent = process.env.npm_config_user_agent;
-    return !!(userAgent && userAgent.includes(npmClient));
-};
-exports.checkNpmClient = checkNpmClient;
 const installWithNpmClient = ({ npmClient, cwd, }) => {
     const { sync } = require('../compiled/cross-spawn');
     const npm = sync(npmClient, [npmClient === 'yarn' ? '' : 'install'], {

package/dist/register.js

@@ -14,7 +14,9 @@ function transform(opts) {
     const ext = (0, path_1.extname)(filename);
     return implementor.transformSync(code, {
         loader: ext.slice(1),
-        target: 'es2017',
+        // consistent with `tsconfig.base.json`
+        // https://github.com/umijs/umi-next/pull/729
+        target: 'es2019',
         format: 'cjs',
     }).code;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/utils",
-  "version": "4.0.0-rc.9",
+  "version": "4.0.2",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -16,44 +16,47 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "build:deps": "umi-scripts bundleDeps",
+    "dev": "pnpm build --watch",
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "chokidar": "3.5.3"
+    "chokidar": "3.5.3",
+    "pino": "7.11.0"
   },
   "devDependencies": {
+    "@hapi/joi": "17.1.1",
     "@types/color": "3.0.3",
     "@types/cross-spawn": "6.0.2",
     "@types/debug": "4.1.7",
-    "@types/lodash": "4.14.180",
+    "@types/hapi__joi": "17.1.8",
+    "@types/lodash": "4.14.182",
     "@types/mustache": "4.1.2",
     "@types/prompts": "^2.0.14",
     "@types/rimraf": "3.0.2",
     "@types/semver": "7.3.9",
     "address": "1.1.2",
-    "axios": "0.26.1",
+    "axios": "0.27.2",
     "chalk": "5.0.1",
     "cheerio": "1.0.0-rc.10",
-    "color": "4.2.1",
+    "color": "4.2.3",
     "cross-spawn": "7.0.3",
     "debug": "4.3.4",
     "deepmerge": "4.2.2",
     "execa": "6.1.0",
     "fs-extra": "10.0.1",
-    "glob": "7.2.0",
+    "glob": "8.0.1",
     "import-lazy": "4.0.0",
     "lodash": "4.17.21",
     "mustache": "4.2.0",
     "pirates": "4.0.5",
     "pkg-up": "4.0.0",
     "portfinder": "1.0.28",
-    "prettier": "2.6.0",
+    "prettier": "2.6.2",
     "prompts": "2.4.2",
     "resolve": "1.22.0",
     "rimraf": "3.0.2",
-    "semver": "7.3.5",
+    "semver": "7.3.6",
     "strip-ansi": "7.0.1",
     "yargs-parser": "21.0.1"
   },
@@ -88,7 +91,8 @@
       "semver",
       "strip-ansi",
       "yargs-parser",
-      "pirates"
+      "pirates",
+      "@hapi/joi"
     ],
     "externals": {
       "address": "$$LOCAL",
@@ -109,7 +113,8 @@
       "semver": "$$LOCAL",
       "strip-ansi": "$$LOCAL",
       "yargs-parser": "$$LOCAL",
-      "pirates": "$$LOCAL"
+      "pirates": "$$LOCAL",
+      "@hapi/joi": "$$LOCAL"
     }
   }
 }