@umijs/utils 4.0.0-canary.20220628.1 → 4.0.0-canary.20220713.1

package/dist/getGitInfo.d.ts

@@ -0,0 +1,6 @@
+export interface IGitInfo {
+    username: string;
+    email: string;
+}
+declare const getGitInfo: () => Promise<IGitInfo>;
+export default getGitInfo;

package/dist/getGitInfo.js

@@ -0,0 +1,42 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const execa = __importStar(require("../compiled/execa"));
+const getGitInfo = async () => {
+    try {
+        const [{ stdout: username }, { stdout: email }] = await Promise.all([
+            execa.execaCommand('git config --global user.name'),
+            execa.execaCommand('git config --global user.email'),
+        ]);
+        return { username, email };
+    }
+    catch (e) {
+        return {
+            username: '',
+            email: '',
+        };
+    }
+};
+exports.default = getGitInfo;

package/dist/index.d.ts

@@ -22,8 +22,10 @@ import yParser from '../compiled/yargs-parser';
 import BaseGenerator from './BaseGenerator/BaseGenerator';
 import generateFile from './BaseGenerator/generateFile';
 import Generator from './Generator/Generator';
+import getGitInfo from './getGitInfo';
 import installDeps from './installDeps';
 import * as logger from './logger';
+import * as printHelp from './printHelp';
 import updatePackageJSON from './updatePackageJSON';
 export * from './getCorejsVersion';
 export * from './importLazy';
@@ -34,4 +36,4 @@ export * from './randomColor/randomColor';
 export * as register from './register';
 export * from './tryPaths';
 export * from './winPath';
-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, };
+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, getGitInfo, printHelp, };

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.execa = exports.deepmerge = exports.debug = exports.crossSpawn = exports.chokidar = exports.cheerio = exports.chalk = exports.axios = exports.address = exports.register = void 0;
+exports.printHelp = exports.getGitInfo = 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"));
@@ -79,10 +79,14 @@ const generateFile_1 = __importDefault(require("./BaseGenerator/generateFile"));
 exports.generateFile = generateFile_1.default;
 const Generator_1 = __importDefault(require("./Generator/Generator"));
 exports.Generator = Generator_1.default;
+const getGitInfo_1 = __importDefault(require("./getGitInfo"));
+exports.getGitInfo = getGitInfo_1.default;
 const installDeps_1 = __importDefault(require("./installDeps"));
 exports.installDeps = installDeps_1.default;
 const logger = __importStar(require("./logger"));
 exports.logger = logger;
+const printHelp = __importStar(require("./printHelp"));
+exports.printHelp = printHelp;
 const updatePackageJSON_1 = __importDefault(require("./updatePackageJSON"));
 exports.updatePackageJSON = updatePackageJSON_1.default;
 __exportStar(require("./getCorejsVersion"), exports);

package/dist/logger.d.ts

@@ -16,4 +16,4 @@ 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;
+export declare function getLatestLogFilePath(): string | null;

package/dist/logger.js

@@ -5,33 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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 importLazy_1 = require("./importLazy");
+const enableFSLogger = process.env.FS_LOGGER !== 'none' && !process.versions.webcontainer;
 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') + ' -',
@@ -42,6 +21,38 @@ exports.prefixes = {
     event: chalk_1.default.magenta('event') + ' -',
     debug: chalk_1.default.gray('debug') + ' -',
 };
+let logger;
+if (enableFSLogger) {
+    const { default: pino } = (0, importLazy_1.importLazy)(require.resolve('pino'));
+    fs_extra_1.default.mkdirpSync(loggerDir);
+    const customLevels = {
+        ready: 31,
+        event: 32,
+        wait: 55,
+        // 虽然这里设置了 debug 为 30，但日志中还是 20，符合预期
+        // 这里不加会不生成到 umi.log，transport 的 level 配置没有生效，原因不明
+        debug: 30,
+    };
+    logger = pino({
+        customLevels,
+    }, pino.transport({
+        targets: [
+            {
+                target: require.resolve('pino/file'),
+                options: {
+                    destination: loggerPath,
+                },
+                level: 'trace',
+            },
+        ],
+    }));
+}
+else {
+    logger = {};
+    Object.keys(exports.prefixes).forEach((key) => {
+        logger[key] = () => { };
+    });
+}
 function wait(...message) {
     console.log(exports.prefixes.wait, ...message);
     logger.wait(message[0]);
@@ -85,6 +96,6 @@ function fatal(...message) {
 }
 exports.fatal = fatal;
 function getLatestLogFilePath() {
-    return loggerPath;
+    return enableFSLogger ? loggerPath : null;
 }
 exports.getLatestLogFilePath = getLatestLogFilePath;

package/dist/printHelp.d.ts

@@ -0,0 +1,2 @@
+export declare function exit(): void;
+export declare function runtime(e: Error): void;

package/dist/printHelp.js

@@ -0,0 +1,43 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runtime = exports.exit = void 0;
+const logger = __importStar(require("./logger"));
+const FEEDBACK_MESSAGE = '如果你需要进交流群，请访问 https://fb.umijs.org';
+function exit() {
+    const loggerPath = logger.getLatestLogFilePath();
+    if (loggerPath) {
+        logger.fatal('A complete log of this run can be found in:');
+        logger.fatal(loggerPath);
+    }
+    logger.fatal('Consider reporting a GitHub issue on https://github.com/umijs/umi/issues');
+    logger.fatal(FEEDBACK_MESSAGE);
+}
+exports.exit = exit;
+function runtime(e) {
+    logger.error(e);
+    logger.fatal(FEEDBACK_MESSAGE);
+}
+exports.runtime = runtime;

package/dist/register.js

@@ -12,13 +12,21 @@ function transform(opts) {
     const { code, filename, implementor } = opts;
     files.push(filename);
     const ext = (0, path_1.extname)(filename);
-    return implementor.transformSync(code, {
-        loader: ext.slice(1),
-        // consistent with `tsconfig.base.json`
-        // https://github.com/umijs/umi-next/pull/729
-        target: 'es2019',
-        format: 'cjs',
-    }).code;
+    try {
+        return implementor.transformSync(code, {
+            sourcefile: filename,
+            loader: ext.slice(1),
+            // consistent with `tsconfig.base.json`
+            // https://github.com/umijs/umi-next/pull/729
+            target: 'es2019',
+            format: 'cjs',
+            logLevel: 'error',
+        }).code;
+    }
+    catch (e) {
+        // @ts-ignore
+        throw new Error(`Parse file failed: [${filename}]`, { cause: e });
+    }
 }
 function register(opts) {
     files = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/utils",
-  "version": "4.0.0-canary.20220628.1",
+  "version": "4.0.0-canary.20220713.1",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {