@utoo/pack-cli 1.2.0-rc.1 → 1.2.4

package/bin/run.js

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
 
-// eslint-disable-next-line unicorn/prefer-top-level-await
-(async () => {
-  const oclif = require("@oclif/core");
-  await oclif.execute({ development: false, dir: __dirname });
-})();
+const { run } = require("../cjs/index");
+run();
+

package/cjs/commands/build.d.ts

@@ -0,0 +1,17 @@
+declare const _default: import("citty").CommandDef<{
+    project: {
+        type: "string";
+        alias: string;
+        description: string;
+    };
+    root: {
+        type: "string";
+        alias: string;
+        description: string;
+    };
+    webpack: {
+        type: "boolean";
+        description: string;
+    };
+}>;
+export default _default;

package/{dist → cjs}/commands/build.js

@@ -33,21 +33,32 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
 const utooPack = __importStar(require("@utoo/pack"));
+const citty_1 = require("citty");
 const common_1 = require("../utils/common");
-class Build extends core_1.Command {
-    static description = "utoopack build";
-    static examples = [
-        `<%= config.bin %> <%= command.id %> build --project .`,
-        `<%= config.bin %> <%= command.id %> build --project . --root ../..`,
-        `<%= config.bin %> <%= command.id %> build --webpack`,
-    ];
-    static flags = common_1.commonFlags;
-    async run() {
-        const { flags } = await this.parse(Build);
-        const { projectOptions, projectPath, rootPath } = (0, common_1.resolveBuildOptions)(flags);
+exports.default = (0, citty_1.defineCommand)({
+    meta: {
+        name: "build",
+        description: "utoopack build",
+    },
+    args: {
+        project: {
+            type: "string",
+            alias: "p",
+            description: "Set the project path",
+        },
+        root: {
+            type: "string",
+            alias: "r",
+            description: "Set the root path",
+        },
+        webpack: {
+            type: "boolean",
+            description: "Enable webpack mode",
+        },
+    },
+    async run({ args }) {
+        const { projectOptions, projectPath, rootPath } = (0, common_1.resolveBuildOptions)(args);
         await utooPack.build(projectOptions, projectPath, rootPath);
-    }
-}
-exports.default = Build;
+    },
+});

package/cjs/commands/dev.d.ts

@@ -0,0 +1,17 @@
+declare const _default: import("citty").CommandDef<{
+    project: {
+        type: "string";
+        alias: string;
+        description: string;
+    };
+    root: {
+        type: "string";
+        alias: string;
+        description: string;
+    };
+    webpack: {
+        type: "boolean";
+        description: string;
+    };
+}>;
+export default _default;

package/{dist → cjs}/commands/dev.js

@@ -33,24 +33,35 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
 const utooPack = __importStar(require("@utoo/pack"));
+const citty_1 = require("citty");
 const common_1 = require("../utils/common");
-class Dev extends core_1.Command {
-    static description = "utoopack dev";
-    static examples = [
-        `<%= config.bin %> <%= command.id %> dev --project .`,
-        `<%= config.bin %> <%= command.id %> dev --project . --root ../..`,
-        `<%= config.bin %> <%= command.id %> dev --webpack`,
-    ];
-    static flags = common_1.commonFlags;
-    async run() {
-        const { flags } = await this.parse(Dev);
-        const { projectOptions, projectPath, rootPath } = (0, common_1.resolveBuildOptions)(flags);
+exports.default = (0, citty_1.defineCommand)({
+    meta: {
+        name: "dev",
+        description: "utoopack dev",
+    },
+    args: {
+        project: {
+            type: "string",
+            alias: "p",
+            description: "Set the project path",
+        },
+        root: {
+            type: "string",
+            alias: "r",
+            description: "Set the root path",
+        },
+        webpack: {
+            type: "boolean",
+            description: "Enable webpack mode",
+        },
+    },
+    async run({ args }) {
+        const { projectOptions, projectPath, rootPath } = (0, common_1.resolveBuildOptions)(args);
         await utooPack.serve(projectOptions, projectPath, rootPath, {
             logServerInfo: true,
             port: 3000,
         });
-    }
-}
-exports.default = Dev;
+    },
+});

package/cjs/index.d.ts

@@ -0,0 +1 @@
+export declare const run: () => Promise<void>;

package/cjs/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const citty_1 = require("citty");
+const build_1 = __importDefault(require("./commands/build"));
+const dev_1 = __importDefault(require("./commands/dev"));
+const main = (0, citty_1.defineCommand)({
+    meta: {
+        name: "up",
+        version: "0.0.0",
+        description: "Utoo pack cli",
+    },
+    subCommands: {
+        build: build_1.default,
+        dev: dev_1.default,
+    },
+});
+const run = () => (0, citty_1.runMain)(main);
+exports.run = run;

package/cjs/utils/common.d.ts

@@ -0,0 +1,11 @@
+import * as utooPack from "@utoo/pack";
+export interface BuildOptions {
+    projectPath: string;
+    rootPath: string | undefined;
+    projectOptions: utooPack.WebpackConfig | utooPack.BundleOptions;
+}
+export declare function resolveBuildOptions(flags: {
+    project?: string;
+    root?: string;
+    webpack?: boolean;
+}): BuildOptions;

package/{dist → cjs}/utils/common.js

@@ -3,30 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commonFlags = void 0;
 exports.resolveBuildOptions = resolveBuildOptions;
-const core_1 = require("@oclif/core");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-exports.commonFlags = {
-    project: core_1.Flags.string({
-        char: "p",
-        description: "Set the project path",
-        required: false,
-        aliases: ["projectPath"],
-    }),
-    root: core_1.Flags.string({
-        char: "r",
-        description: "Set the root path",
-        required: false,
-        aliases: ["rootPath"],
-    }),
-    webpack: core_1.Flags.boolean({
-        name: "webpack",
-        description: "Enable webpack mode",
-        required: false,
-    }),
-};
 function resolveBuildOptions(flags) {
     const { project, root, webpack } = flags;
     const cwd = process.cwd();

package/package.json

@@ -1,18 +1,17 @@
 {
   "name": "@utoo/pack-cli",
   "description": "Utoo pack cli",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.4",
   "author": "xusd320",
   "bin": {
     "up": "./bin/run.js"
   },
   "dependencies": {
-    "@oclif/core": "^4",
-    "@utoo/pack": "1.2.0-rc.1"
+    "@utoo/pack": "1.2.4",
+    "citty": "^0.1.6"
   },
   "devDependencies": {
     "@types/node": "^20.3.0",
-    "oclif": "^4",
     "typescript": "^5"
   },
   "engines": {
@@ -20,28 +19,14 @@
   },
   "files": [
     "./bin",
-    "./dist",
-    "./oclif.manifest.json"
+    "./cjs"
   ],
   "license": "MIT",
-  "main": "dist/index.js",
-  "oclif": {
-    "bin": "up",
-    "commands": "./dist/commands",
-    "topicSeparator": " ",
-    "topics": {
-      "build": {
-        "description": "Build with production"
-      },
-      "dev": {
-        "description": "Build with development and HMR"
-      }
-    }
-  },
+  "main": "cjs/index.js",
   "scripts": {
-    "build": "rm -rf dist && tsc -b",
-    "clean": "rm -rf dist",
+    "build": "rm -rf cjs && tsc -b",
+    "clean": "rm -rf cjs",
     "prepublishOnly": "npm run build"
   },
-  "types": "dist/index.d.ts"
+  "types": "cjs/index.d.ts"
 }

package/bin/dev.cmd

@@ -1,3 +0,0 @@
-@echo off
-
-node --loader ts-node/esm --no-warnings=ExperimentalWarning "%~dp0\dev" %*

package/bin/dev.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node_modules/.bin/ts-node
-// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
-(async () => {
-  const oclif = require("@oclif/core");
-  await oclif.execute({ development: true, dir: __dirname });
-})();

package/dist/commands/build.d.ts

@@ -1,11 +0,0 @@
-import { Command } from "@oclif/core";
-export default class Build extends Command {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        project: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        webpack: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    };
-    run(): Promise<void>;
-}

package/dist/commands/dev.d.ts

@@ -1,11 +0,0 @@
-import { Command } from "@oclif/core";
-export default class Dev extends Command {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        project: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        webpack: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    };
-    run(): Promise<void>;
-}

package/dist/index.d.ts

@@ -1 +0,0 @@
-export { run } from "@oclif/core";

package/dist/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = void 0;
-var core_1 = require("@oclif/core");
-Object.defineProperty(exports, "run", { enumerable: true, get: function () { return core_1.run; } });

package/dist/utils/common.d.ts

@@ -1,16 +0,0 @@
-import * as utooPack from "@utoo/pack";
-export declare const commonFlags: {
-    project: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-    root: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-    webpack: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-};
-export interface BuildOptions {
-    projectPath: string;
-    rootPath: string | undefined;
-    projectOptions: utooPack.WebpackConfig | utooPack.BundleOptions;
-}
-export declare function resolveBuildOptions(flags: {
-    project?: string;
-    root?: string;
-    webpack?: boolean;
-}): BuildOptions;