xhs-mp-compiler-cli 2.0.0-beta.4 → 2.0.1

package/dist/bin/xhs-mp-cli-build.js

@@ -1,40 +1,54 @@
 #!/usr/bin/env node
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const path_1 = __importDefault(require("path"));
-const packs_1 = require("../packs");
-const commander = new commander_1.Command();
-commander.usage('[options]').option('-d, --mpDir <path>', 'set workdir [default: ./]');
-commander.usage('[options]').option('-p, --platform <string>', 'set platform [default: xhs]');
-commander.usage('[options]').option('-l, --lite <string>', '轻量编译器');
-commander.usage('[options]').option('-c, --compressJs <boolean>', 'compressJs');
-commander.usage('[options]').option('-v1, --enableV1 <boolean>', 'package v1');
-commander.usage('[options]').option('-v2, --enableV2 <boolean>', 'package v2');
-commander.usage('[options]').option('-vdom, --enableVDom <boolean>', 'vdom 架构支持');
-commander.parse(process.argv);
-const projectPath = commander.opts().mpDir ? path_1.default.resolve(commander.opts().mpDir) : process.cwd();
-const platform = commander.opts().platform ? commander.opts().platform : 'xhs';
-const enableV1 = commander.opts().enableV1 === "true";
-const enableV2 = commander.opts().enableV2 === "true";
-const enableVDom = commander.opts().enableVDom === "true";
-const compressJs = commander.opts().compressJs === "true";
-const multiCompiler = (0, packs_1.createCompiler)({
-    projectPath,
-    action: 'build',
-    platform,
-    compressJs,
-    enableSourcemap: false,
-    enableV1,
-    enableV2,
-    enableVDom,
-});
-multiCompiler.run((err, stats) => {
-    console.log(stats.toString({ warnings: true, errors: true, all: false }));
-    multiCompiler.close(() => {
-        // noop
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "commander", "path", "../packs"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const commander_1 = require("commander");
+    const path_1 = __importDefault(require("path"));
+    const packs_1 = require("../packs");
+    const commander = new commander_1.Command();
+    commander.usage('[options]').option('-d, --mpDir <path>', 'set workdir [default: ./]');
+    commander.usage('[options]').option('-p, --platform <string>', 'set platform [default: xhs]');
+    commander.usage('[options]').option('-l, --lite <string>', '轻量编译器');
+    commander.usage('[options]').option('-c, --compressJs <boolean>', 'compressJs');
+    commander.usage('[options]').option('-v1, --enableV1 <boolean>', 'package v1');
+    commander.usage('[options]').option('-v2, --enableV2 <boolean>', 'package v2');
+    commander.usage('[options]').option('-vdom, --enableVDom <boolean>', 'vdom 架构支持');
+    commander.parse(process.argv);
+    const projectPath = commander.opts().mpDir ? path_1.default.resolve(commander.opts().mpDir) : process.cwd();
+    const platform = commander.opts().platform ? commander.opts().platform : 'xhs';
+    const enableV1 = commander.opts().enableV1 === "true";
+    const enableV2 = commander.opts().enableV2 === "true";
+    const enableVDom = commander.opts().enableVDom === "true";
+    const compressJs = commander.opts().compressJs === "true";
+    const projectPacker = (0, packs_1.createPacker)({
+        projectPath,
+        action: 'build',
+        platform,
+        compressJs,
+        enableSourcemap: false,
+        enableV1,
+        enableV2,
+        enableVDom,
+        packMode: 'webpack',
+    });
+    projectPacker.on('buildInfo', data => {
+        if (data.resource) {
+            console.log(`资源编译：${data.resource}`);
+        }
+    });
+    projectPacker.build((err, stats) => {
+        console.log('编译完成');
+        console.log(stats.toString({ warnings: true, errors: true, all: false }));
     });
 });

package/dist/bin/xhs-mp-cli-dev.js

@@ -1,50 +1,39 @@
 #!/usr/bin/env node
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const path_1 = __importDefault(require("path"));
-const packs_1 = require("../packs");
-const commander = new commander_1.Command();
-commander.usage('[options]').option('-d, --mpDir <path>', 'set workdir [default: ./]');
-commander.usage('[options]').option('-p, --platform <string>', 'set platform [default: xhs]');
-commander.usage('[options]').option('-P, --port <string>', 'set dev server port [default: 1388]');
-commander.usage('[options]').option('-l, --lite <string>', 'lite compiler');
-commander.usage('[options]').option('-o, --out <string>', '是否输出内容');
-commander.usage('[options]').option('-v1, --enableV1 <boolean>', 'package v1');
-commander.usage('[options]').option('-v2, --enableV2 <boolean>', 'package v2');
-commander.usage('[options]').option('-vdom, --enableVDom <boolean>', 'vdom 架构支持');
-commander.parse(process.argv);
-const projectPath = commander.opts().mpDir ? path_1.default.resolve(commander.opts().mpDir) : process.cwd();
-const platform = commander.opts().platform ? commander.opts().platform : 'xhs';
-const devServerPort = commander.opts().port ? commander.opts().port : 1388;
-const out = commander.opts().out === "true";
-const enableV1 = commander.opts().enableV1 === "true";
-const enableV2 = commander.opts().enableV2 === "true";
-const enableVDom = commander.opts().enableVDom === "true";
-process.env.PRETTIER_XHSML = "true";
-if (out) {
-    const multiCompiler = (0, packs_1.createCompiler)({
-        projectPath,
-        action: 'dev',
-        platform,
-        compressJs: false,
-        enableSourcemap: false,
-        enableV1,
-        enableV2,
-        enableVDom,
-    });
-    multiCompiler.run((err, stats) => {
-        console.log(stats.toString({ warnings: true, errors: true, all: false }));
-        multiCompiler.close(() => {
-            // noop
-        });
-    });
-}
-else {
-    (0, packs_1.createCompiler)({
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "commander", "path", "../packs"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const commander_1 = require("commander");
+    const path_1 = __importDefault(require("path"));
+    const packs_1 = require("../packs");
+    const commander = new commander_1.Command();
+    commander.usage('[options]').option('-d, --mpDir <path>', 'set workdir [default: ./]');
+    commander.usage('[options]').option('-p, --platform <string>', 'set platform [default: xhs]');
+    commander.usage('[options]').option('-P, --port <string>', 'set dev server port [default: 1388]');
+    commander.usage('[options]').option('-l, --lite <string>', 'lite compiler');
+    commander.usage('[options]').option('-o, --out <string>', '是否输出内容');
+    commander.usage('[options]').option('-v1, --enableV1 <boolean>', 'package v1');
+    commander.usage('[options]').option('-v2, --enableV2 <boolean>', 'package v2');
+    commander.usage('[options]').option('-vdom, --enableVDom <boolean>', 'vdom 架构支持');
+    commander.parse(process.argv);
+    const projectPath = commander.opts().mpDir ? path_1.default.resolve(commander.opts().mpDir) : process.cwd();
+    const platform = commander.opts().platform ? commander.opts().platform : 'xhs';
+    const devServerPort = commander.opts().port ? commander.opts().port : 1388;
+    const out = commander.opts().out === "true";
+    const enableV1 = commander.opts().enableV1 === "true";
+    const enableV2 = commander.opts().enableV2 === "true";
+    const enableVDom = commander.opts().enableVDom === "true";
+    const projectPacker = (0, packs_1.createPacker)({
         projectPath,
         action: 'dev',
         enableDevServer: true,
@@ -55,5 +44,16 @@ else {
         enableV1,
         enableV2,
         enableVDom,
+        packMode: 'webpack',
+    });
+    projectPacker.on('buildInfo', data => {
+        if (data.resource) {
+            console.log(`资源编译：${data.resource}`);
+        }
+    });
+    projectPacker.watch({
+        scene: 'watch',
+    }, (err, stats) => {
+        console.log(stats.toString({ warnings: true, errors: true, all: false }));
     });
-}
+});

package/dist/bin/xhs-mp-cli.js

@@ -1,16 +1,26 @@
 #!/usr/bin/env node
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-// @ts-ignore
-const package_json_1 = __importDefault(require("../../package.json"));
-const commander = new commander_1.Command();
-commander
-    .version(package_json_1.default.version)
-    .usage('<command> [options]')
-    .command('dev', '启动开发服务')
-    .command('build', '打包小程序')
-    .parse(process.argv);
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "commander", "../../package.json"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const commander_1 = require("commander");
+    // @ts-ignore
+    const package_json_1 = __importDefault(require("../../package.json"));
+    const commander = new commander_1.Command();
+    commander
+        .version(package_json_1.default.version)
+        .usage('<command> [options]')
+        .command('dev', '启动开发服务')
+        .command('build', '打包小程序')
+        .parse(process.argv);
+});

package/dist/compiler.d.ts

@@ -1,14 +1,8 @@
-/// <reference types="node/child_process" />
-/// <reference types=".pnpm/artifactory.devops.xiaohongshu.com+@types+node@20.12.2/node_modules/@types/node/child_process" />
-/// <reference types="node/stream" />
-/// <reference types=".pnpm/artifactory.devops.xiaohongshu.com+@types+node@20.12.2/node_modules/@types/node/stream" />
-/**
- * 在子进程执行编译
- */
-import { ChildProcess } from 'child_process';
 import { EventEmitter } from 'stream';
 type Platform = 'wx' | 'xhs';
+type IWorkerType = 'web' | 'process' | 'thread';
 export interface ICompilerOption {
+    packMode: string;
     projectPath: string;
     appMode: string;
 }
@@ -18,37 +12,35 @@ export interface ICompilerArgs {
     inspectPort?: number;
     maxSpaceSaze?: number;
     nodeJsPath?: string;
+    workerType?: IWorkerType;
 }
 export interface ForkWebpackOption {
     platform: Platform;
-    extJsonPath: string;
     distDir: string;
     cacheDirectory: string | null;
 }
 export interface ICheckOptions {
     compilePkgs?: string[];
-    compressJs: boolean;
+    compressCss?: boolean;
+    compressJs?: boolean;
     enableV2?: boolean;
     enableV1?: boolean;
 }
-declare abstract class AbstractCompiler extends EventEmitter {
+export declare abstract class AbstractCompiler extends EventEmitter {
     protected inspectPort: any;
-    private _cp;
+    protected workerType: IWorkerType;
     private compilerOpts;
-    private cpArgs;
-    private logger;
-    private _handlerMap;
-    constructor(opts: ICompilerOption, args?: ICompilerArgs);
-    get cp(): any;
-    protected createSp: (passData?: {}) => any;
-    protected create: (passData?: {}) => ChildProcess;
+    protected logger: any;
+    protected pool: any;
+    constructor(opts: ICompilerOption, args: ICompilerArgs);
+    static prepareDevPool(): void;
+    static createPool(workerType: any, poolOpts?: {}, processArgs?: {}): any;
+    static createProcessOps: (processArgs: any) => any;
     close(): void;
     kill(): void;
-    private handleMessage;
-    call: (method: any, data: any) => Promise<unknown>;
-    send: (method: any, data: any) => void;
+    call: (method: any, data: any, options?: any) => any;
 }
-declare class MPPackDevCompiler extends AbstractCompiler {
+export declare class MPPackDevCompiler extends AbstractCompiler {
     private pending;
     private pendingPkgs;
     private readyPkgs;
@@ -62,17 +54,18 @@ declare class MPPackDevCompiler extends AbstractCompiler {
     makePkgsReady(opts: ICheckOptions): Promise<void>;
     reCompilePkgs(options: any): Promise<void>;
 }
-declare class WebPackDevCompiler extends AbstractCompiler {
+export declare class WebPackDevCompiler extends AbstractCompiler {
     private watching;
     private pendingTask?;
-    constructor(props: any);
+    constructor(props: any, args: any);
     makePkgsReady(opts: any): Promise<unknown>;
     reCompilePkgs(opts: any): Promise<void>;
 }
-declare class BuildCompiler extends AbstractCompiler {
+export declare class BuildCompiler extends AbstractCompiler {
     cps: any;
     constructor(props: any, args: any);
-    build(option: ICheckOptions): Promise<unknown>;
+    build(option: ICheckOptions): Promise<any>;
 }
-export declare function getProcessCompilerClass(compilerType: any): typeof MPPackDevCompiler | typeof WebPackDevCompiler | typeof BuildCompiler;
+export declare function getProjectCompilerClass(compilerType: any): typeof MPPackDevCompiler | typeof WebPackDevCompiler | typeof BuildCompiler;
+export declare const prepareDevPool: typeof AbstractCompiler.prepareDevPool;
 export {};