@utoo/pack-cli 1.0.5 → 1.0.7

package/dist/commands/build.d.ts

@@ -5,6 +5,7 @@ export default class Build extends Command {
     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/build.js

@@ -32,39 +32,22 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const utooPack = __importStar(require("@utoo/pack"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const common_1 = require("../utils/common");
 class Build extends core_1.Command {
-    static description = "Utoo pack build";
+    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 = {
-        project: core_1.Flags.string({
-            char: "p",
-            description: "Set the project path",
-            required: false,
-        }),
-        root: core_1.Flags.string({
-            char: "r",
-            description: "Set the root path",
-            required: false,
-        }),
-    };
+    static flags = common_1.commonFlags;
     async run() {
-        const { flags: { project, root }, } = await this.parse(Build);
-        const cwd = process.cwd();
-        const projectOptions = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(cwd, project || "", "project_options.json"), {
-            encoding: "utf-8",
-        }));
-        await utooPack.build(projectOptions, path_1.default.resolve(cwd, project || cwd), root && path_1.default.resolve(cwd, root));
+        const { flags } = await this.parse(Build);
+        const { projectOptions, projectPath, rootPath } = (0, common_1.resolveBuildOptions)(flags);
+        await utooPack.build(projectOptions, projectPath, rootPath);
     }
 }
 exports.default = Build;

package/dist/commands/dev.d.ts

@@ -5,6 +5,7 @@ export default class Dev extends Command {
     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.js

@@ -32,39 +32,22 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const utooPack = __importStar(require("@utoo/pack"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const common_1 = require("../utils/common");
 class Dev extends core_1.Command {
-    static description = "Utoo pack dev";
+    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 = {
-        project: core_1.Flags.string({
-            char: "p",
-            description: "Set the project path",
-            required: false,
-        }),
-        root: core_1.Flags.string({
-            char: "r",
-            description: "Set the root path",
-            required: false,
-        }),
-    };
+    static flags = common_1.commonFlags;
     async run() {
-        const { flags: { project, root }, } = await this.parse(Dev);
-        const cwd = process.cwd();
-        const projectOptions = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(cwd, project || "", "project_options.json"), {
-            encoding: "utf-8",
-        }));
-        await utooPack.serve(projectOptions, path_1.default.resolve(cwd, project || cwd), root && path_1.default.resolve(cwd, root));
+        const { flags } = await this.parse(Dev);
+        const { projectOptions, projectPath, rootPath } = (0, common_1.resolveBuildOptions)(flags);
+        await utooPack.serve(projectOptions, projectPath, rootPath);
     }
 }
 exports.default = Dev;

package/dist/utils/common.d.ts

@@ -0,0 +1,16 @@
+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;

package/dist/utils/common.js

@@ -0,0 +1,43 @@
+"use strict";
+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,
+    }),
+    root: core_1.Flags.string({
+        char: "r",
+        description: "Set the root path",
+        required: false,
+    }),
+    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();
+    let projectPath = path_1.default.resolve(cwd, project || cwd);
+    let rootPath = root ? path_1.default.resolve(cwd, root) : undefined;
+    let projectOptions;
+    if (webpack) {
+        projectOptions = { webpackMode: true };
+    }
+    else {
+        projectOptions = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(cwd, project || "", "project_options.json"), {
+            encoding: "utf-8",
+        }));
+    }
+    return { projectPath, rootPath, projectOptions };
+}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@utoo/pack-cli",
   "description": "Utoo pack cli",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "author": "xusd320",
   "bin": {
-    "utoo-pack": "./bin/run.js"
+    "utoopack": "./bin/run.js"
   },
   "dependencies": {
     "@oclif/core": "^4",
-    "@utoo/pack": "1.0.5"
+    "@utoo/pack": "1.0.7"
   },
   "devDependencies": {
     "@types/node": "^20.3.0",
@@ -26,7 +26,7 @@
   "license": "MIT",
   "main": "dist/index.js",
   "oclif": {
-    "bin": "utoo-pack",
+    "bin": "utoopack",
     "commands": "./dist/commands",
     "topicSeparator": " ",
     "topics": {