@blocklet/cli 1.16.23-beta-abdda301 → 1.16.23-beta-a2f9b088

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/cli",
-  "version": "1.16.23-beta-abdda301",
+  "version": "1.16.23-beta-a2f9b088",
   "description": "Command line tools to manage Blocklet and Blocklet Server",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "main": "bin/blocklet.js",
@@ -16,6 +16,7 @@
     "test": "node tools/jest.js",
     "coverage": "npm run test -- --coverage",
     "clean": "rm -fr lib",
+    "build:blocklet-cli": "npm run build",
     "build": "npm run clean && tsc && cp src/constant.js lib"
   },
   "files": [
@@ -36,7 +37,7 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/cli": "1.16.23-beta-abdda301",
+    "@abtnode/cli": "1.16.23-beta-a2f9b088",
     "colors": "1.4.0",
     "cross-spawn": "^7.0.3",
     "shelljs": "^0.8.5"
@@ -56,5 +57,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "2b064df15b34007f6145170ee691ae9e91ff1528"
+  "gitHead": "cc060de5d06e1759112a787dd10b780e628ce0b7"
 }

package/lib/constant.js

@@ -1,5 +0,0 @@
-const packageJson = require('../package.json');
-
-module.exports = {
-  name: packageJson.name,
-};

package/lib/run.d.ts

@@ -1,2 +0,0 @@
-declare const _default: () => void;
-export = _default;

package/lib/run.js

@@ -1,73 +0,0 @@
-"use strict";
-/* eslint-disable global-require */
-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;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const constant_1 = require("@abtnode/cli/lib/constant");
-// !!! PM_HOME must be set before everything
-process.env.PM2_HOME = constant_1.PM2_HOME;
-process.env.ABT_NODE_HOME = constant_1.ABT_NODE_HOME;
-process.env.ABT_NODE_MAX_CLUSTER_SIZE = constant_1.ABT_NODE_MAX_CLUSTER_SIZE;
-const cross_spawn_1 = __importDefault(require("cross-spawn"));
-const get_cli_binary_name_1 = __importDefault(require("@abtnode/cli/lib/util/get-cli-binary-name"));
-const exit_when_server_stopped_1 = __importDefault(require("@abtnode/cli/lib/util/exit-when-server-stopped"));
-const print_error_1 = __importDefault(require("@abtnode/cli/lib/util/print-error"));
-const constant_2 = require("./constant");
-const keepAliveParams = ['--keep-alive', '-k'];
-const parseArgv = () => {
-    const binaryName = (0, get_cli_binary_name_1.default)();
-    const isServer = process.argv[2] === 'server';
-    const isStart = process.argv[3] === 'start';
-    const keepAlive = keepAliveParams.some((x) => process.argv.includes(x));
-    return { binaryName, isServer, isStart, keepAlive };
-};
-module.exports = () => {
-    process.env.ABT_NODE_PACKAGE_NAME = constant_2.name;
-    const { binaryName, isServer, isStart, keepAlive } = parseArgv();
-    if (isServer && isStart && keepAlive) {
-        const argv = process.argv.slice(4).filter((x) => !keepAliveParams.includes(x));
-        const { error, status } = cross_spawn_1.default.sync(binaryName, ['server', 'start', ...argv], {
-            timeout: 3 * 60 * 1000,
-            detached: false,
-            windowsHide: true,
-            shell: false,
-            stdio: 'inherit',
-        });
-        if (error) {
-            (0, print_error_1.default)(error.message);
-            process.exit(error.errno || -1);
-            return; // just for test
-        }
-        if (status !== 0) {
-            process.exit(status);
-            return; // just for test
-        }
-        (0, exit_when_server_stopped_1.default)();
-    }
-    else {
-        Promise.resolve().then(() => __importStar(require('@abtnode/cli/bin/blocklet')));
-    }
-};