xhs-mp-compiler-cli 2.0.2 → 2.0.4-beta.0

package/dist/config/constant.config.d.ts

@@ -35,7 +35,6 @@ export declare const PROD_TARGETS: {
     ios: string;
 };
 export declare const ENTRY_CSS_NAME = "app";
-export declare const FULL_PKG = "xhs-full";
 export declare const MAIN_PKG = "xhs-main";
 export declare const SUB_PKG = "xhs-sub";
 export declare const BUILD_REASON: {
@@ -49,3 +48,7 @@ export declare const PACK_MODE: {
     MPPACK: string;
     WEBPACK: string;
 };
+export declare const CSS_REG: RegExp;
+export declare const SKETCH_CSS_REG: RegExp;
+export declare const ML_REG: RegExp;
+export declare const SKETCH_ML_REG: RegExp;

package/dist/config/constant.config.js

@@ -9,7 +9,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.PACK_MODE = exports.ASSETS_EXTS = exports.BUILD_REASON = exports.SUB_PKG = exports.MAIN_PKG = exports.FULL_PKG = exports.ENTRY_CSS_NAME = exports.PROD_TARGETS = exports.DEV_TARGETS = exports.DEV_BROWSERSLIST = exports.PROD_BROWSERSLIST = exports.COMPILE_SUB_PKG = exports.COMPILE_MAIN_PKG = exports.COMPILE_FULL_PKG = exports.PKG_ROOT_SEP = exports.MiniMode = exports.COMPILE_ENTRY = exports.COMPILE_TYPE = exports.COMPILER_TYPE = exports.MAIN_PKG_ROOT = void 0;
+    exports.SKETCH_ML_REG = exports.ML_REG = exports.SKETCH_CSS_REG = exports.CSS_REG = exports.PACK_MODE = exports.ASSETS_EXTS = exports.BUILD_REASON = exports.SUB_PKG = exports.MAIN_PKG = exports.ENTRY_CSS_NAME = exports.PROD_TARGETS = exports.DEV_TARGETS = exports.DEV_BROWSERSLIST = exports.PROD_BROWSERSLIST = exports.COMPILE_SUB_PKG = exports.COMPILE_MAIN_PKG = exports.COMPILE_FULL_PKG = exports.PKG_ROOT_SEP = exports.MiniMode = exports.COMPILE_ENTRY = exports.COMPILE_TYPE = exports.COMPILER_TYPE = exports.MAIN_PKG_ROOT = void 0;
     exports.MAIN_PKG_ROOT = 'xhs-main';
     exports.COMPILER_TYPE = {
         dev: 'dev',
@@ -47,7 +47,6 @@
         ios: '10'
     };
     exports.ENTRY_CSS_NAME = 'app';
-    exports.FULL_PKG = 'xhs-full';
     exports.MAIN_PKG = 'xhs-main';
     exports.SUB_PKG = 'xhs-sub';
     exports.BUILD_REASON = {
@@ -79,4 +78,9 @@
         MPPACK: 'mp-pack',
         WEBPACK: 'webpack'
     };
+    // loader 规则使用下面变量
+    exports.CSS_REG = /(?<!\.skeleton)\.(wxss|css)$/;
+    exports.SKETCH_CSS_REG = /\.skeleton\.(wxss|css)$/;
+    exports.ML_REG = /(?<!\.skeleton)\.(wx|xhs)ml$/;
+    exports.SKETCH_ML_REG = /\.skeleton\.(wx|xhs)ml$/;
 });

package/dist/index.d.ts

@@ -2,46 +2,54 @@ import { COMPILE_ENTRY } from './config/constant.config';
 import { Project } from 'xhs-mp-project';
 import EventEmitter from 'events';
 import { Logger } from 'xhs-mp-shared';
-import { getProjectCompilerClass, prepareDevPool } from './compiler';
+import { prepareDevPool } from './compiler';
+export { COMPILE_ENTRY, prepareDevPool };
 interface ILibFeatures {
     supportV2?: boolean;
-    supportVdom?: boolean;
+    supportVDom?: boolean;
 }
-export { COMPILE_ENTRY, getProjectCompilerClass, prepareDevPool };
+export type IArchType = 'v0' | 'v1' | 'v2';
+export type IZipResult = {
+    type: IArchType;
+    zipPath: string;
+    zipSize: number;
+    root: string;
+    originSize: number;
+};
 export type ICompileOpts = {
     logger?: any;
-    compileDir?: string;
+    report?: (key: string, data?: any) => void;
+    compileDistDir?: string;
+    compileCacheDir?: string;
     nodeJsPath?: string;
-    mpDevJsonPath?: string;
-    libFeatures?: ILibFeatures;
+    getLibFeatures?: () => Promise<ILibFeatures>;
 };
-export type ICompilerProps = ({
-    projectPath: string;
-} | {
-    project: Project;
-}) & ICompileOpts;
+export type ICompilerProps = {
+    projectPath?: string;
+    project?: Project;
+} & ICompileOpts;
 interface ICompileBaseConfig {
     compressCss?: boolean;
     compressJs?: boolean;
     enableSourcemap?: boolean;
     appendSourcemapComment?: boolean;
     runInServiceSandbox?: boolean;
-    enableV2: boolean;
-    enableV1: boolean;
-    enableVDom: boolean;
+    enableV2?: boolean;
+    enableV1?: boolean;
+    enableVDom?: boolean;
 }
 type IMakePkgsReadyConfig = ICompileBaseConfig & {
-    compilePkgs: any;
+    compilePkgs?: string[];
 };
 type ICompilePkgsConfig = ICompileBaseConfig & {
-    compilePkgs: any;
+    compilePkgs?: string[];
 };
-type ICompileBuildConfig = ICompileBaseConfig & {
-    entryType: string;
+type ICompileProjectConfig = ICompileBaseConfig & {
+    entryType?: string;
     mpUploadOptions?: ICompileAndZipOptions | false;
 };
 export interface ICompileAndZipOptions {
-    entryType: string;
+    entryType?: string;
     can_upload_ext_json?: boolean;
     upload_app_id?: string;
     pkgInfo?: {
@@ -52,35 +60,36 @@ export interface ISubPackages {
     root: string;
     pages: string;
 }
-export declare class ProjectCompiler extends EventEmitter {
-    projectPath: string;
+export declare class ProjectCompilerManager extends EventEmitter {
     compilerProps: ICompilerProps;
     project: Project;
     compilerImplMap: {};
     logger: Logger;
+    report?: (key: string, data?: any) => void;
     constructor(props: ICompilerProps);
-    createProject(props: any): any;
-    private getCompilerDir;
-    private initSimulatorCompiler;
-    private initBuildCompiler;
-    getUsingPackageType(entryType?: string): Promise<{
-        enableV1: boolean;
-        enableV2: boolean;
-        enableVDom: boolean;
-    }>;
+    bindProject(props: any): void;
     private getCompilerType;
     getDistDir(entryType?: string): string;
     removeDistDir(entryType?: string): void;
     getCacheDir(entryType?: string): string;
     removeCacheDir(entryType?: string): void;
-    private createCompilerImpl;
-    private getComilerImpl;
-    makePkgsReady(config: IMakePkgsReadyConfig): Promise<void>;
-    reCompilePkgs(config: ICompilePkgsConfig): Promise<void>;
-    compileProject(config: ICompileBuildConfig): Promise<void>;
-    compileAndZip(opts: ICompileAndZipOptions): Promise<any>;
+    removeAllCacheDir(): void;
+    private createCompiler;
+    private getCompiler;
+    getUsingPackageType(entryType?: string): Promise<{
+        enableV1: boolean;
+        enableV2: boolean;
+        enableVDom: boolean;
+    }>;
+    private initSimulatorCompiler;
+    private initBuildCompiler;
+    makePkgsReady(opts: IMakePkgsReadyConfig): Promise<void>;
+    reCompilePkgs(opts: ICompilePkgsConfig): Promise<void>;
+    compileProject(config: ICompileProjectConfig): Promise<void>;
+    compileAndZip(opts: ICompileAndZipOptions): Promise<IZipResult[]>;
+    closeCompiler(entryType?: string): void;
+    killCompiler(entryType?: string): void;
+    killAll(): void;
     private zipWithFullPackage;
     private zipWithSubPackage;
-    close(entryType?: string): void;
-    kill(entryType?: string): void;
 }