shuvi 1.0.55 → 1.0.56

package/lib/commands/dev.js

@@ -35,6 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const perf_hooks_1 = require("perf_hooks");
 const commander_1 = require("commander");
 const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
@@ -59,7 +60,7 @@ exports.default = () => {
 function devAction(dir, options) {
     return __awaiter(this, void 0, void 0, function* () {
         process.env.NODE_ENV = 'development';
-        const startTime = performance.now();
+        const startTime = perf_hooks_1.performance.now();
         const cwd = (0, utils_1.getProjectDir)(dir);
         const { host, port } = options;
         const configFile = options.config && path.resolve(cwd, options.config);
@@ -76,7 +77,7 @@ function devAction(dir, options) {
             yield shuviApp.listen(port, host);
             (0, utils_1.printStartupInfo)({
                 startTime,
-                readyTime: performance.now(),
+                readyTime: perf_hooks_1.performance.now(),
                 host,
                 port
             });

package/lib/commands/eslint/core/customFormatter.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatResults = exports.MessageSeverity = void 0;
+exports.MessageSeverity = void 0;
+exports.formatResults = formatResults;
 /* eslint-disable prefer-template */
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
@@ -12,7 +13,7 @@ var MessageSeverity;
 (function (MessageSeverity) {
     MessageSeverity[MessageSeverity["Warning"] = 1] = "Warning";
     MessageSeverity[MessageSeverity["Error"] = 2] = "Error";
-})(MessageSeverity = exports.MessageSeverity || (exports.MessageSeverity = {}));
+})(MessageSeverity || (exports.MessageSeverity = MessageSeverity = {}));
 function pluginCount(messages) {
     let pluginWarningCount = 0;
     let pluginErrorCount = 0;
@@ -88,4 +89,3 @@ function formatResults(baseDir, results, format) {
         totalShuviPluginWarningCount
     };
 }
-exports.formatResults = formatResults;

package/lib/commands/eslint/core/hasEslintConfiguration.d.ts

@@ -1,4 +1,4 @@
-export declare type ConfigAvailable = {
+export type ConfigAvailable = {
     exists: boolean;
     emptyEslintrc?: boolean;
     emptyPkgJsonConfig?: boolean;

package/lib/commands/eslint/core/hasEslintConfiguration.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasEslintConfiguration = void 0;
+exports.hasEslintConfiguration = hasEslintConfiguration;
 const fs_1 = require("fs");
 function hasEslintConfiguration(eslintrcFile, 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -39,4 +39,3 @@ packageJsonConfig) {
         return configObject;
     });
 }
-exports.hasEslintConfiguration = hasEslintConfiguration;

package/lib/commands/eslint/core/runLintCheck.js

@@ -35,7 +35,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runLintCheck = exports.ESLINT_PROMPT_VALUES = void 0;
+exports.ESLINT_PROMPT_VALUES = void 0;
+exports.runLintCheck = runLintCheck;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const fs_1 = require("fs");
 const chalk_1 = __importDefault(require("chalk"));
@@ -98,9 +99,9 @@ function cliPrompt() {
         }
     });
 }
-function lint(baseDir, lintDirs, eslintrcFile, pkgJsonPath, { lintDuringBuild = false, eslintOptions = null, reportErrorsOnly = false, maxWarnings = -1, formatter = null, outputFile = null }) {
-    var _a, _b, _c, _d, _e, _f;
-    return __awaiter(this, void 0, void 0, function* () {
+function lint(baseDir_1, lintDirs_1, eslintrcFile_1, pkgJsonPath_1, _a) {
+    return __awaiter(this, arguments, void 0, function* (baseDir, lintDirs, eslintrcFile, pkgJsonPath, { lintDuringBuild = false, eslintOptions = null, reportErrorsOnly = false, maxWarnings = -1, formatter = null, outputFile = null }) {
+        var _b, _c, _d, _e, _f, _g;
         try {
             // Load ESLint after we're sure it exists:
             const deps = yield (0, has_necessary_dependencies_1.hasNecessaryDependencies)(baseDir, requiredPackages);
@@ -115,7 +116,7 @@ function lint(baseDir, lintDirs, eslintrcFile, pkgJsonPath, { lintDuringBuild =
             }
             const mod = yield Promise.resolve(require(deps.resolved.get('eslint')));
             const { ESLint } = mod;
-            let eslintVersion = (_a = ESLint === null || ESLint === void 0 ? void 0 : ESLint.version) !== null && _a !== void 0 ? _a : (_b = mod === null || mod === void 0 ? void 0 : mod.CLIEngine) === null || _b === void 0 ? void 0 : _b.version;
+            let eslintVersion = (_b = ESLint === null || ESLint === void 0 ? void 0 : ESLint.version) !== null && _b !== void 0 ? _b : (_c = mod === null || mod === void 0 ? void 0 : mod.CLIEngine) === null || _c === void 0 ? void 0 : _c.version;
             if (!eslintVersion || semver_1.default.lt(eslintVersion, '7.0.0')) {
                 return `${chalk_1.default.red('error')} - Your project has an older version of ESLint installed${eslintVersion ? ` (${eslintVersion})` : ''}. Please upgrade to ESLint version 7 or above`;
             }
@@ -128,7 +129,7 @@ function lint(baseDir, lintDirs, eslintrcFile, pkgJsonPath, { lintDuringBuild =
                     continue;
                 }
                 const completeConfig = yield eslint.calculateConfigForFile(configFile);
-                if ((_c = completeConfig.plugins) === null || _c === void 0 ? void 0 : _c.includes('@shuvi/shuvi')) {
+                if ((_d = completeConfig.plugins) === null || _d === void 0 ? void 0 : _d.includes('@shuvi/shuvi')) {
                     shuviEslintPluginIsEnabled = true;
                     for (const [name, [severity]] of Object.entries(completeConfig.rules)) {
                         if (!name.startsWith('@shuvi/shuvi/')) {
@@ -154,8 +155,8 @@ function lint(baseDir, lintDirs, eslintrcFile, pkgJsonPath, { lintDuringBuild =
             if (shuviEslintPluginIsEnabled) {
                 let updatedPagesDir = false;
                 for (const rule of pagesDirRules) {
-                    if (!((_d = options.baseConfig.rules) === null || _d === void 0 ? void 0 : _d[rule]) &&
-                        !((_e = options.baseConfig.rules) === null || _e === void 0 ? void 0 : _e[rule.replace('@shuvi/shuvi', '@shuvi/babel-plugin-shuvi')])) {
+                    if (!((_e = options.baseConfig.rules) === null || _e === void 0 ? void 0 : _e[rule]) &&
+                        !((_f = options.baseConfig.rules) === null || _f === void 0 ? void 0 : _f[rule.replace('@shuvi/shuvi', '@shuvi/babel-plugin-shuvi')])) {
                         if (!options.baseConfig.rules) {
                             options.baseConfig.rules = {};
                         }
@@ -190,7 +191,7 @@ function lint(baseDir, lintDirs, eslintrcFile, pkgJsonPath, { lintDuringBuild =
             }
             return {
                 output: formattedResult.outputWithMessages,
-                isError: ((_f = ESLint.getErrorResults(results)) === null || _f === void 0 ? void 0 : _f.length) > 0 ||
+                isError: ((_g = ESLint.getErrorResults(results)) === null || _g === void 0 ? void 0 : _g.length) > 0 ||
                     (maxWarnings >= 0 && totalWarnings > maxWarnings),
                 eventInfo: {
                     durationInSeconds: lintEnd[0],
@@ -218,8 +219,8 @@ function lint(baseDir, lintDirs, eslintrcFile, pkgJsonPath, { lintDuringBuild =
     });
 }
 function runLintCheck(baseDir, lintDirs, opts) {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         const { lintDuringBuild = false, eslintOptions = null, reportErrorsOnly = false, maxWarnings = -1, formatter = null, outputFile = null, strict = false } = opts;
         try {
             // Find user's .eslintrc file
@@ -297,4 +298,3 @@ function runLintCheck(baseDir, lintDirs, opts) {
         }
     });
 }
-exports.runLintCheck = runLintCheck;

package/lib/commands/eslint/core/writeDefaultConfig.js

@@ -35,18 +35,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeDefaultConfig = void 0;
+exports.writeDefaultConfig = writeDefaultConfig;
 const fs_1 = require("fs");
 const chalk_1 = __importDefault(require("chalk"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const CommentJson = __importStar(require("comment-json"));
-function writeDefaultConfig(baseDir, { exists, emptyEslintrc, emptyPkgJsonConfig }, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-selectedConfig, eslintrcFile, pkgJsonPath, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-packageJsonConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
+function writeDefaultConfig(baseDir_1, _a, selectedConfig_1, eslintrcFile_1, pkgJsonPath_1, packageJsonConfig_1) {
+    return __awaiter(this, arguments, void 0, function* (baseDir, { exists, emptyEslintrc, emptyPkgJsonConfig }, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    selectedConfig, eslintrcFile, pkgJsonPath, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    packageJsonConfig) {
         if (!exists && emptyEslintrc && eslintrcFile) {
             const ext = path_1.default.extname(eslintrcFile);
             let newFileContent;
@@ -75,4 +75,3 @@ packageJsonConfig) {
         }
     });
 }
-exports.writeDefaultConfig = writeDefaultConfig;

package/lib/commands/eslint/core/writeOutputFile.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeOutputFile = void 0;
+exports.writeOutputFile = writeOutputFile;
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const is_error_1 = __importDefault(require("../is-error"));
@@ -62,4 +62,3 @@ outputData) {
         }
     });
 }
-exports.writeOutputFile = writeOutputFile;

package/lib/commands/eslint/file-exists.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileExists = void 0;
+exports.fileExists = fileExists;
 const fs_1 = require("fs");
 const is_error_1 = __importDefault(require("./is-error"));
 function fileExists(fileName, type) {
@@ -40,4 +40,3 @@ function fileExists(fileName, type) {
         }
     });
 }
-exports.fileExists = fileExists;

package/lib/commands/eslint/find-pages-dir.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findPagesDir = exports.findDir = exports.existsSync = void 0;
+exports.existsSync = void 0;
+exports.findDir = findDir;
+exports.findPagesDir = findPagesDir;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const existsSync = (f) => {
@@ -23,7 +25,6 @@ function findDir(dir, name) {
         return curDir;
     return null;
 }
-exports.findDir = findDir;
 function findPagesDir(dir) {
     const pagesDir = findDir(dir, 'routes') || undefined;
     if (!pagesDir) {
@@ -31,4 +32,3 @@ function findPagesDir(dir) {
     }
     return pagesDir;
 }
-exports.findPagesDir = findPagesDir;

package/lib/commands/eslint/has-necessary-dependencies.d.ts

@@ -3,7 +3,7 @@ export interface MissingDependency {
     pkg: string;
     exportsRestrict: boolean;
 }
-export declare type NecessaryDependencies = {
+export type NecessaryDependencies = {
     resolved: Map<string, string>;
     missing: MissingDependency[];
 };

package/lib/commands/eslint/has-necessary-dependencies.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasNecessaryDependencies = void 0;
+exports.hasNecessaryDependencies = hasNecessaryDependencies;
 const fs_1 = require("fs");
 const file_exists_1 = require("./file-exists");
 const resolve_from_1 = require("./resolve-from");
@@ -52,4 +52,3 @@ function hasNecessaryDependencies(baseDir, requiredPackages) {
         };
     });
 }
-exports.hasNecessaryDependencies = hasNecessaryDependencies;

package/lib/commands/eslint/helpers/get-npx-command.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNpxCommand = void 0;
+exports.getNpxCommand = getNpxCommand;
 const child_process_1 = require("child_process");
 const get_pkg_manager_1 = require("./get-pkg-manager");
 function getNpxCommand(baseDir) {
@@ -18,4 +18,3 @@ function getNpxCommand(baseDir) {
     }
     return command;
 }
-exports.getNpxCommand = getNpxCommand;

package/lib/commands/eslint/helpers/get-online.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOnline = void 0;
+exports.getOnline = getOnline;
 const child_process_1 = require("child_process");
 const dns_1 = __importDefault(require("dns"));
 const url_1 = __importDefault(require("url"));
@@ -39,4 +39,3 @@ function getOnline() {
         });
     });
 }
-exports.getOnline = getOnline;

package/lib/commands/eslint/helpers/get-pkg-manager.d.ts

@@ -1,2 +1,2 @@
-export declare type PackageManager = 'npm' | 'pnpm' | 'yarn';
+export type PackageManager = 'npm' | 'pnpm' | 'yarn';
 export declare function getPkgManager(baseDir: string): PackageManager;

package/lib/commands/eslint/helpers/get-pkg-manager.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPkgManager = void 0;
+exports.getPkgManager = getPkgManager;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
@@ -40,4 +40,3 @@ function getPkgManager(baseDir) {
         return 'npm';
     }
 }
-exports.getPkgManager = getPkgManager;

package/lib/commands/eslint/helpers/get-registry.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRegistry = void 0;
+exports.getRegistry = getRegistry;
 const child_process_1 = require("child_process");
 const get_pkg_manager_1 = require("./get-pkg-manager");
 /**
@@ -23,4 +23,3 @@ function getRegistry(baseDir = process.cwd()) {
         return registry;
     }
 }
-exports.getRegistry = getRegistry;

package/lib/commands/eslint/helpers/install.d.ts

@@ -1,4 +1,4 @@
-export declare type PackageManager = 'npm' | 'pnpm' | 'yarn';
+export type PackageManager = 'npm' | 'pnpm' | 'yarn';
 interface InstallArgs {
     /**
      * Indicate whether to install packages using npm, pnpm or Yarn.

package/lib/commands/eslint/helpers/install.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.install = void 0;
+exports.install = install;
 const chalk_1 = __importDefault(require("chalk"));
 const cross_spawn_1 = __importDefault(require("cross-spawn"));
 /**
@@ -100,4 +100,3 @@ function install(root, dependencies, { packageManager, isOnline, devDependencies
         });
     });
 }
-exports.install = install;

package/lib/commands/eslint/install-dependencies.d.ts

@@ -1,4 +1,4 @@
-export declare type Dependencies = {
+export type Dependencies = {
     resolved: Map<string, string>;
 };
 export declare function installDependencies(baseDir: string, deps: any, dev?: boolean): Promise<void>;

package/lib/commands/eslint/install-dependencies.js

@@ -12,15 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installDependencies = void 0;
+exports.installDependencies = installDependencies;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const get_pkg_manager_1 = require("./helpers/get-pkg-manager");
 const install_1 = require("./helpers/install");
 const get_online_1 = require("./helpers/get-online");
-function installDependencies(baseDir, deps, dev = false) {
-    return __awaiter(this, void 0, void 0, function* () {
+function installDependencies(baseDir_1, deps_1) {
+    return __awaiter(this, arguments, void 0, function* (baseDir, deps, dev = false) {
         const packageManager = (0, get_pkg_manager_1.getPkgManager)(baseDir);
         const isOnline = yield (0, get_online_1.getOnline)();
         if (deps.length) {
@@ -35,4 +35,3 @@ function installDependencies(baseDir, deps, dev = false) {
         }
     });
 }
-exports.installDependencies = installDependencies;

package/lib/commands/eslint/is-error.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProperError = void 0;
+exports.default = isError;
+exports.getProperError = getProperError;
 function isError(err) {
     return (typeof err === 'object' && err !== null && 'name' in err && 'message' in err);
 }
-exports.default = isError;
 function getProperError(err) {
     if (isError(err)) {
         return err;
     }
     return new Error(isPlainObject(err) ? JSON.stringify(err) : `${err}`);
 }
-exports.getProperError = getProperError;
 function getObjectClassLabel(value) {
     return Object.prototype.toString.call(value);
 }

package/lib/commands/eslint/oxford-comma-list.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOxfordCommaList = void 0;
+exports.getOxfordCommaList = getOxfordCommaList;
 function getOxfordCommaList(items) {
     return items
         .map((v, index, { length }) => (index > 0
@@ -12,4 +12,3 @@ function getOxfordCommaList(items) {
         : '') + v)
         .join('');
 }
-exports.getOxfordCommaList = getOxfordCommaList;

package/lib/commands/eslint/printAndExit.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printAndExit = void 0;
+exports.printAndExit = printAndExit;
 function printAndExit(message, code = 1) {
     if (code === 0) {
         console.log(message);
@@ -10,4 +10,3 @@ function printAndExit(message, code = 1) {
     }
     process.exit(code);
 }
-exports.printAndExit = printAndExit;

package/lib/commands/eslint/recursive-readdir.js

@@ -9,25 +9,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recursiveReadDir = void 0;
+exports.recursiveReadDir = recursiveReadDir;
 const fs_1 = require("fs");
 const path_1 = require("path");
 /**
  * Recursively read directory
  * Returns array holding all relative paths
  */
-function recursiveReadDir(
-/** Directory to read */
-dir, 
-/** Filter for the file path */
-filter, 
-/** Filter for the file path */
-ignore, ignorePart, 
-/** This doesn't have to be provided, it's used for the recursion */
-arr = [], 
-/** Used to replace the initial path, only the relative path is left, it's faster than path.relative. */
-rootDir = dir) {
-    return __awaiter(this, void 0, void 0, function* () {
+function recursiveReadDir(dir_1, filter_1, ignore_1, ignorePart_1) {
+    return __awaiter(this, arguments, void 0, function* (
+    /** Directory to read */
+    dir, 
+    /** Filter for the file path */
+    filter, 
+    /** Filter for the file path */
+    ignore, ignorePart, 
+    /** This doesn't have to be provided, it's used for the recursion */
+    arr = [], 
+    /** Used to replace the initial path, only the relative path is left, it's faster than path.relative. */
+    rootDir = dir) {
         const result = yield fs_1.promises.readdir(dir, { withFileTypes: true });
         yield Promise.all(result.map((part) => __awaiter(this, void 0, void 0, function* () {
             const absolutePath = (0, path_1.join)(dir, part.name);
@@ -57,4 +57,3 @@ rootDir = dir) {
         return arr.sort();
     });
 }
-exports.recursiveReadDir = recursiveReadDir;

package/lib/commands/lint.d.ts

@@ -2,7 +2,7 @@ import { Command } from 'commander';
 import { LintOptions } from './utils/options';
 declare const _default: () => Command;
 export default _default;
-declare type EsLintOption = {
+type EsLintOption = {
     dir: string[];
     file: string[];
     strict: boolean;

package/lib/commands/lint.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintAction = void 0;
+exports.lintAction = lintAction;
 const commander_1 = require("commander");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -143,4 +143,3 @@ function lintAction(dir, options) {
         });
     });
 }
-exports.lintAction = lintAction;

package/lib/commands/serve.js

@@ -35,6 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const perf_hooks_1 = require("perf_hooks");
 const commander_1 = require("commander");
 const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
@@ -58,7 +59,7 @@ exports.default = () => {
 };
 function serveAction(dir, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const startTime = performance.now();
+        const startTime = perf_hooks_1.performance.now();
         process.env.NODE_ENV = 'production';
         const { host, port } = options;
         const cwd = (0, utils_1.getProjectDir)(dir);
@@ -74,7 +75,7 @@ function serveAction(dir, options) {
             yield shuviApp.listen(port, host);
             (0, utils_1.printStartupInfo)({
                 startTime,
-                readyTime: performance.now(),
+                readyTime: perf_hooks_1.performance.now(),
                 host,
                 port
             });

package/lib/config/config.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineConfig = exports.normalizePlatformConfig = void 0;
+exports.normalizePlatformConfig = normalizePlatformConfig;
+exports.defineConfig = defineConfig;
 const deepmerge_1 = require("@shuvi/utils/deepmerge");
 function getDefaultPlatformConfig() {
     return {
@@ -18,8 +19,6 @@ function normalizePlatformConfig(rawConfig) {
     }
     return config;
 }
-exports.normalizePlatformConfig = normalizePlatformConfig;
 function defineConfig(config) {
     return config;
 }
-exports.defineConfig = defineConfig;

package/lib/config/index.d.ts

@@ -1,3 +1,3 @@
-export declare type OptionsKeyMap = Record<string, string | ((config: any, optionValue: any) => void)>;
+export type OptionsKeyMap = Record<string, string | ((config: any, optionValue: any) => void)>;
 export { normalizePlatformConfig, defineConfig } from './config';
 export { getConfigFromCli } from './utils';

package/lib/config/utils.d.ts

@@ -1,3 +1,3 @@
 import { ShuviConfig } from '@shuvi/service';
-export declare type OptionsKeyMap = Record<string, string | ((config: any, optionValue: any) => void)>;
+export type OptionsKeyMap = Record<string, string | ((config: any, optionValue: any) => void)>;
 export declare function getConfigFromCli(cliOptions: Record<string, any>, cliOptionsKeyMap?: OptionsKeyMap): Promise<ShuviConfig>;

package/lib/config/utils.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfigFromCli = void 0;
+exports.getConfigFromCli = getConfigFromCli;
 const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 function set(obj, path, value) {
     const segments = path.split('.');
@@ -51,10 +51,9 @@ function getConfigFromCliOtherOptions(cliOptions, cliOptionsKeyMap = {}) {
     }
     return config;
 }
-function getConfigFromCli(cliOptions, cliOptionsKeyMap = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function getConfigFromCli(cliOptions_1) {
+    return __awaiter(this, arguments, void 0, function* (cliOptions, cliOptionsKeyMap = {}) {
         const configFromCliOtherOptions = getConfigFromCliOtherOptions(cliOptions, cliOptionsKeyMap);
         return configFromCliOtherOptions;
     });
 }
-exports.getConfigFromCli = getConfigFromCli;

package/lib/shuvi.js

@@ -23,7 +23,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initShuvi = exports.getPlatform = void 0;
+exports.getPlatform = getPlatform;
+exports.initShuvi = initShuvi;
 const service_1 = require("@shuvi/service");
 const platform_web_1 = __importDefault(require("@shuvi/platform-web"));
 const config_1 = require("./config");
@@ -32,10 +33,9 @@ const trace_1 = require("@shuvi/service/lib/trace");
 function getPlatform() {
     return (0, platform_web_1.default)({ framework: 'react' });
 }
-exports.getPlatform = getPlatform;
 function initShuvi(_a) {
-    var { config } = _a, options = __rest(_a, ["config"]);
     return __awaiter(this, void 0, void 0, function* () {
+        var { config } = _a, options = __rest(_a, ["config"]);
         const { plugins, presets } = config, restConfig = __rest(config, ["plugins", "presets"]);
         const shuvi = yield (0, service_1.getApi)(Object.assign(Object.assign({}, options), { plugins,
             presets, config: restConfig, platform: getPlatform(), normalizePlatformConfig: config_1.normalizePlatformConfig }));
@@ -45,4 +45,3 @@ function initShuvi(_a) {
         return shuvi;
     });
 }
-exports.initShuvi = initShuvi;

package/lib/tasks/build.d.ts

@@ -5,4 +5,4 @@ export interface IBuildOptions {
     target?: 'spa' | 'ssr';
     configFile?: string | false;
 }
-export declare function build(options: IBuildOptions): Promise<import("@shuvi/service/lib/core/api").Api>;
+export declare function build(options: IBuildOptions): Promise<import("@shuvi/service").Api>;

package/lib/tasks/build.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = void 0;
+exports.build = build;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs-extra"));
 const formatWebpackMessages_1 = __importDefault(require("@shuvi/toolpack/lib/utils/formatWebpackMessages"));
@@ -98,4 +98,3 @@ function build(options) {
         return api;
     });
 }
-exports.build = build;

package/lib/types.d.ts

@@ -1,3 +1,3 @@
 import { IServicePhase, IServiceMode } from '@shuvi/service';
-export declare type ShuviPhase = IServicePhase;
-export declare type ShuviMode = IServiceMode;
+export type ShuviPhase = IServicePhase;
+export type ShuviMode = IServiceMode;

package/lib/utils.js

@@ -26,7 +26,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.color = exports.useColor = exports.printStartupInfo = exports.getProjectDir = exports.getPackageInfo = void 0;
+exports.color = exports.useColor = void 0;
+exports.getPackageInfo = getPackageInfo;
+exports.getProjectDir = getProjectDir;
+exports.printStartupInfo = printStartupInfo;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const logger_1 = __importDefault(require("@shuvi/utils/logger"));
@@ -36,7 +39,6 @@ const package_json_1 = __importDefault(require("../package.json"));
 function getPackageInfo() {
     return package_json_1.default;
 }
-exports.getPackageInfo = getPackageInfo;
 function getProjectDir(dir) {
     const dirPath = path.resolve(dir || '.');
     if (!(0, fs_1.existsSync)(dirPath)) {
@@ -45,7 +47,6 @@ function getProjectDir(dir) {
     }
     return dirPath;
 }
-exports.getProjectDir = getProjectDir;
 function printStartupInfo({ startTime, readyTime, host, port }) {
     const appUrl = `http://${host === '0.0.0.0' ? 'localhost' : host}:${port}`;
     const readyMsg = chalk_1.default.dim(`ready in ${chalk_1.default.white(chalk_1.default.bold(Math.ceil(readyTime - startTime)))} ms`);
@@ -53,7 +54,6 @@ function printStartupInfo({ startTime, readyTime, host, port }) {
     const colorUrl = (url) => chalk_1.default.cyan(url.replace(/:(\d+)\//, (_, port) => `:${chalk_1.default.bold(port)}/`));
     logger_1.default.info(`  ${chalk_1.default.green('➜')}  ${chalk_1.default.bold('Local')}:   ${colorUrl(appUrl)} \n`);
 }
-exports.printStartupInfo = printStartupInfo;
 /**
  * ref: https://github.com/remix-run/remix/blob/main/packages/remix-dev/colors.ts
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuvi",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "description": "Full Stack Web development framework.",
   "repository": {
     "type": "git",
@@ -18,9 +18,9 @@
     "lib"
   ],
   "scripts": {
-    "dev": "tsc -p tsconfig.build.json -m commonjs -w",
+    "dev": "tsc -p tsconfig.build.json -w",
     "prebuild": "rimraf lib",
-    "build": "tsc -p tsconfig.build.json -m commonjs"
+    "build": "tsc -p tsconfig.build.json"
   },
   "engines": {
     "node": ">= 16.0.0"
@@ -30,13 +30,13 @@
     "find-up": "4.1.0",
     "semver": "7.3.2",
     "cli-select": "1.1.2",
-    "@shuvi/platform-shared": "1.0.55",
-    "@shuvi/platform-web": "1.0.55",
-    "@shuvi/service": "1.0.55",
-    "@shuvi/shared": "1.0.55",
-    "@shuvi/toolpack": "1.0.55",
-    "@shuvi/utils": "1.0.55",
-    "@shuvi/reporters": "1.0.55",
+    "@shuvi/platform-shared": "1.0.56",
+    "@shuvi/platform-web": "1.0.56",
+    "@shuvi/service": "1.0.56",
+    "@shuvi/shared": "1.0.56",
+    "@shuvi/toolpack": "1.0.56",
+    "@shuvi/utils": "1.0.56",
+    "@shuvi/reporters": "1.0.56",
     "cli-highlight": "^2.1.9",
     "commander": "10.0.0",
     "cross-spawn": "7.0.3",