@eggjs/scripts 4.0.0 → 5.0.0-beta.27

package/package.json

@@ -1,103 +1,83 @@
 {
   "name": "@eggjs/scripts",
-  "version": "4.0.0",
-  "publishConfig": {
-    "access": "public"
-  },
+  "version": "5.0.0-beta.27",
   "description": "deploy tool for egg project",
-  "dependencies": {
-    "@eggjs/utils": "^4.2.1",
-    "@oclif/core": "^4.2.0",
-    "common-bin": "^3.0.1",
-    "mz": "^2.7.0",
-    "mz-modules": "^2.1.0",
-    "node-homedir": "^2.0.0",
-    "runscript": "^2.0.1",
-    "source-map-support": "^0.5.21",
-    "utility": "^2.4.0"
-  },
-  "devDependencies": {
-    "@arethetypeswrong/cli": "^0.17.1",
-    "@eggjs/bin": "^7.0.1",
-    "@eggjs/tsconfig": "1",
-    "@types/mocha": "10",
-    "@types/node": "22",
-    "coffee": "^5.5.1",
-    "egg": "beta",
-    "eslint": "8",
-    "eslint-config-egg": "14",
-    "mm": "^4.0.1",
-    "rimraf": "6",
-    "ts-node": "^10.9.2",
-    "tshy": "3",
-    "tshy-after": "1",
-    "typescript": "5",
-    "urllib": "4"
-  },
-  "engines": {
-    "node": ">=18.19.0"
-  },
-  "scripts": {
-    "lint": "eslint --cache src test --ext .ts",
-    "pretest": "npm run clean && npm run lint -- --fix && npm run prepublishOnly",
-    "test": "egg-bin test",
-    "posttest": "npm run clean",
-    "preci": "npm run clean && npm run lint && npm run prepublishOnly",
-    "ci": "egg-bin test",
-    "postci": "npm run clean",
-    "clean": "rimraf dist",
-    "prepublishOnly": "tshy && tshy-after && attw --pack"
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js",
+    "./baseCommand": "./dist/baseCommand.js",
+    "./commands/start": "./dist/commands/start.js",
+    "./commands/stop": "./dist/commands/stop.js",
+    "./helper": "./dist/helper.js",
+    "./types": "./dist/types.js",
+    "./package.json": "./package.json"
   },
-  "bug": {
-    "url": "https://github.com/eggjs/egg/issues"
+  "publishConfig": {
+    "access": "public"
   },
-  "homepage": "https://github.com/eggjs/scripts",
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:eggjs/scripts.git"
+  "bin": {
+    "egg-scripts": "./bin/run.js",
+    "eggctl": "./bin/run.js"
   },
-  "author": "TZ <atian25@qq.com>",
-  "license": "MIT",
+  "files": [
+    "bin",
+    "dist",
+    "scripts"
+  ],
   "oclif": {
     "bin": "eggctl",
-    "commands": "./dist/esm/commands",
+    "commands": "./dist/commands",
     "dirname": "eggctl",
     "topicSeparator": " ",
     "additionalHelpFlags": [
       "-h"
     ]
   },
-  "bin": {
-    "egg-scripts": "./bin/run.js",
-    "eggctl": "./bin/run.js"
+  "license": "MIT",
+  "homepage": "https://github.com/eggjs/egg/tree/next/tools/scripts",
+  "bugs": {
+    "url": "https://github.com/eggjs/egg/issues"
   },
-  "type": "module",
-  "tshy": {
-    "exports": {
-      ".": "./src/index.ts",
-      "./package.json": "./package.json"
-    }
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/eggjs/egg.git",
+    "directory": "tools/scripts"
   },
-  "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/commonjs/index.d.ts",
-        "default": "./dist/commonjs/index.js"
-      }
-    },
-    "./package.json": "./package.json"
+  "author": "TZ <atian25@qq.com>",
+  "engines": {
+    "node": ">= 22.18.0"
   },
-  "files": [
-    "bin",
-    "dist",
-    "src",
-    "scripts"
-  ],
-  "types": "./dist/commonjs/index.d.ts",
-  "main": "./dist/commonjs/index.js",
-  "module": "./dist/esm/index.js"
-}
+  "dependencies": {
+    "@oclif/core": "^4.2.0",
+    "node-homedir": "^2.0.0",
+    "runscript": "^2.0.1",
+    "source-map-support": "^0.5.21",
+    "utility": "^2.5.0",
+    "@eggjs/utils": "5.0.0-beta.27"
+  },
+  "devDependencies": {
+    "@types/node": "^24.6.2",
+    "coffee": "5",
+    "detect-port": "^2.1.0",
+    "mm": "^4.0.2",
+    "oxlint": "^1.19.0",
+    "tsdown": "^0.15.4",
+    "typescript": "^5.9.3",
+    "urllib": "^4.8.2",
+    "vitest": "4.0.0-beta.16",
+    "@eggjs/tsconfig": "3.1.0-beta.27",
+    "egg": "4.1.0-beta.27"
+  },
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsdown",
+    "typecheck": "tsc --noEmit",
+    "lint": "oxlint --type-aware",
+    "pretest": "pnpm run build",
+    "test": "vitest run --bail 1 --no-file-parallelism",
+    "cov": "pnpm test --coverage",
+    "ci": "pnpm run cov"
+  }
+}

package/scripts/start-cluster.cjs

@@ -1,15 +1,22 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 const { debuglog } = require('node:util');
+
 const { importModule } = require('@eggjs/utils');
 
-const debug = debuglog('@eggjs/scripts/scripts/start-cluster');
+const debug = debuglog('egg/scripts/start-cluster/cjs');
 
 async function main() {
   debug('argv: %o', process.argv);
   const options = JSON.parse(process.argv[2]);
   debug('start cluster options: %o', options);
-  const { startCluster } = await importModule(options.framework);
+  const exports = await importModule(options.framework);
+  let startCluster = exports.startCluster;
+  if (typeof startCluster !== 'function') {
+    startCluster = exports.default.startCluster;
+  }
   await startCluster(options);
 }
 
-main();
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

package/scripts/start-cluster.mjs

@@ -1,7 +1,8 @@
 import { debuglog } from 'node:util';
+
 import { importModule } from '@eggjs/utils';
 
-const debug = debuglog('@eggjs/scripts/scripts/start-cluster');
+const debug = debuglog('egg/scripts/start-cluster/esm');
 
 async function main() {
   debug('argv: %o', process.argv);
@@ -11,4 +12,7 @@ async function main() {
   await startCluster(options);
 }
 
-main();
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

package/dist/commonjs/baseCommand.d.ts

@@ -1,25 +0,0 @@
-import { Command, Flags, Interfaces } from '@oclif/core';
-import { PackageEgg } from './types.js';
-type Flags<T extends typeof Command> = Interfaces.InferredFlags<typeof BaseCommand['baseFlags'] & T['flags']>;
-type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
-export declare abstract class BaseCommand<T extends typeof Command> extends Command {
-    static enableJsonFlag: boolean;
-    static baseFlags: {};
-    protected flags: Flags<T>;
-    protected args: Args<T>;
-    protected env: {
-        [x: string]: string | undefined;
-        TZ?: string;
-    };
-    protected pkg: Record<string, any>;
-    protected isESM: boolean;
-    protected pkgEgg: PackageEgg;
-    protected globalExecArgv: string[];
-    init(): Promise<void>;
-    protected initBaseInfo(baseDir: string): Promise<void>;
-    protected catch(err: Error & {
-        exitCode?: number;
-    }): Promise<any>;
-    protected finally(_: Error | undefined): Promise<any>;
-}
-export {};

package/dist/commonjs/baseCommand.js

@@ -1,62 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseCommand = void 0;
-const node_util_1 = require("node:util");
-const core_1 = require("@oclif/core");
-const utility_1 = require("utility");
-const node_path_1 = __importDefault(require("node:path"));
-const debug = (0, node_util_1.debuglog)('@eggjs/scripts/baseCommand');
-class BaseCommand extends core_1.Command {
-    // add the --json flag
-    static enableJsonFlag = false;
-    // define flags that can be inherited by any command that extends BaseCommand
-    static baseFlags = {
-    // 'log-level': Flags.option({
-    //   default: 'info',
-    //   helpGroup: 'GLOBAL',
-    //   options: ['debug', 'warn', 'error', 'info', 'trace'] as const,
-    //   summary: 'Specify level for logging.',
-    // })(),
-    };
-    flags;
-    args;
-    env = { ...process.env };
-    pkg;
-    isESM;
-    pkgEgg;
-    globalExecArgv = [];
-    async init() {
-        await super.init();
-        debug('[init] raw args: %o, NODE_ENV: %o', this.argv, this.env.NODE_ENV);
-        const { args, flags } = await this.parse({
-            flags: this.ctor.flags,
-            baseFlags: super.ctor.baseFlags,
-            enableJsonFlag: this.ctor.enableJsonFlag,
-            args: this.ctor.args,
-            strict: this.ctor.strict,
-        });
-        this.flags = flags;
-        this.args = args;
-    }
-    async initBaseInfo(baseDir) {
-        const pkg = await (0, utility_1.readJSON)(node_path_1.default.join(baseDir, 'package.json'));
-        this.pkg = pkg;
-        this.pkgEgg = pkg.egg ?? {};
-        this.isESM = pkg.type === 'module';
-        debug('[initBaseInfo] baseDir: %o, pkgEgg: %o, isESM: %o', baseDir, this.pkgEgg, this.isESM);
-    }
-    async catch(err) {
-        // add any custom logic to handle errors from the command
-        // or simply return the parent class error handling
-        return super.catch(err);
-    }
-    async finally(_) {
-        // called after run and catch regardless of whether or not the command errored
-        return super.finally(_);
-    }
-}
-exports.BaseCommand = BaseCommand;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZUNvbW1hbmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmFzZUNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEseUNBQXFDO0FBQ3JDLHNDQUF5RDtBQUV6RCxxQ0FBbUM7QUFDbkMsMERBQTZCO0FBRTdCLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVEsRUFBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBS3JELE1BQXNCLFdBQXNDLFNBQVEsY0FBTztJQUN6RSxzQkFBc0I7SUFDdEIsTUFBTSxDQUFDLGNBQWMsR0FBRyxLQUFLLENBQUM7SUFFOUIsNkVBQTZFO0lBQzdFLE1BQU0sQ0FBQyxTQUFTLEdBQUc7SUFDakIsOEJBQThCO0lBQzlCLHFCQUFxQjtJQUNyQix5QkFBeUI7SUFDekIsbUVBQW1FO0lBQ25FLDJDQUEyQztJQUMzQyxRQUFRO0tBQ1QsQ0FBQztJQUVRLEtBQUssQ0FBWTtJQUNqQixJQUFJLENBQVc7SUFFZixHQUFHLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUN6QixHQUFHLENBQXNCO0lBQ3pCLEtBQUssQ0FBVTtJQUNmLE1BQU0sQ0FBYTtJQUNuQixjQUFjLEdBQWEsRUFBRSxDQUFDO0lBRWpDLEtBQUssQ0FBQyxJQUFJO1FBQ2YsTUFBTSxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDbkIsS0FBSyxDQUFDLG1DQUFtQyxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN6RSxNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQztZQUN2QyxLQUFLLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLO1lBQ3RCLFNBQVMsRUFBRyxLQUFLLENBQUMsSUFBMkIsQ0FBQyxTQUFTO1lBQ3ZELGNBQWMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQWM7WUFDeEMsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSTtZQUNwQixNQUFNLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNO1NBQ3pCLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBaUIsQ0FBQztRQUMvQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQWUsQ0FBQztJQUM5QixDQUFDO0lBRVMsS0FBSyxDQUFDLFlBQVksQ0FBQyxPQUFlO1FBQzFDLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBQSxrQkFBUSxFQUFDLG1CQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDO1FBQy9ELElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2YsSUFBSSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQztRQUM1QixJQUFJLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDO1FBQ25DLEtBQUssQ0FBQyxtREFBbUQsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDL0YsQ0FBQztJQUVTLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBZ0M7UUFDcEQseURBQXlEO1FBQ3pELG1EQUFtRDtRQUNuRCxPQUFPLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUIsQ0FBQztJQUVTLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBb0I7UUFDMUMsOEVBQThFO1FBQzlFLE9BQU8sS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMxQixDQUFDOztBQXRESCxrQ0F1REMifQ==

package/dist/commonjs/commands/start.d.ts

@@ -1,34 +0,0 @@
-import { BaseCommand } from '../baseCommand.js';
-export interface FrameworkOptions {
-    baseDir: string;
-    framework?: string;
-}
-export default class Start<T extends typeof Start> extends BaseCommand<T> {
-    #private;
-    static description: string;
-    static examples: string[];
-    static args: {
-        baseDir: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
-    };
-    static flags: {
-        title: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        framework: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        port: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        workers: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        env: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        daemon: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        stdout: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        stderr: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        timeout: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
-        'ignore-stderr': import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        node: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        require: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        sourcemap: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-    };
-    isReady: boolean;
-    protected getFrameworkPath(options: FrameworkOptions): Promise<string>;
-    protected getFrameworkName(frameworkPath: string): Promise<string>;
-    protected getServerBin(): Promise<string>;
-    run(): Promise<void>;
-    protected checkStatus(): Promise<void>;
-}