miniprogram-ci 2.1.29 → 2.1.30

package/CHANGELOG.md

@@ -1,3 +1,5 @@
+#### 2.1.30
+ - `new` 新增 允许 CI 构建多端 APK 时使用 beta 版本 SDK
 #### 2.1.29
  - `fix` 修复 多端 iOS 构建专业版水印去除失败
 #### 2.1.27

package/README.md

@@ -7,6 +7,8 @@ miniprogram-ci 是从[微信开发者工具](https://developers.weixin.qq.com/mi
 miniprogram-ci 从 1.0.28 开始支持第三方平台开发的上传和预览，调用方式与普通开发模式无异。[查看详情](#第三方平台开发)
 
 ## 最近变更
+#### 2.1.30
+ - `new` 新增 允许 CI 构建多端 APK 时使用 beta 版本 SDK
 #### 2.1.29
  - `fix` 修复 多端 iOS 构建专业版水印去除失败
 #### 2.1.27

package/dist/@types/config/config.d.ts

@@ -1,5 +1,5 @@
 import { IProject } from '../types';
-export declare const CI_VERSION = "2.1.29";
+export declare const CI_VERSION = "2.1.30";
 export declare const PARAM_ERROR = 10000;
 export declare const WXML_NOT_FOUND = 10007;
 export declare const JS_NOT_FOUND = 10008;

package/dist/@types/modules/corecompiler/baseCompiler.d.ts

@@ -123,6 +123,7 @@ export declare abstract class BaseCoreCompiler {
         componentFiles: string[];
         otherFiles: string[];
     }>;
+    abstract waitSubProcessReady(): Promise<void>;
     abstract getAllPageAndComponent(): Promise<string[]>;
     abstract getExtJSON(): Promise<ExtJSON.IExtJSON>;
     abstract getAppJSON(): Promise<AppJSON.IAppJSON>;

package/dist/@types/modules/corecompiler/originalCompiler.d.ts

@@ -3,6 +3,7 @@ import { BaseCoreCompiler } from './baseCompiler';
 import { OriginalCompileManager } from './original';
 import { FileInfo } from './summer/graph/basegraph';
 export declare class OriginalCompiler extends BaseCoreCompiler {
+    waitSubProcessReady(): Promise<void>;
     readonly isSummer = false;
     compileManager: OriginalCompileManager | undefined;
     constructor(project: MiniProgramCore.IPreCompileProject);

package/dist/@types/modules/corecompiler/summer/graph/basegraph.d.ts

@@ -56,6 +56,7 @@ export declare abstract class BaseGraph {
     private onFileChange;
     private invalidateModules;
     private loadModuleFromFile;
+    private loadSourceForModuleWithoutTransform;
     private loadSourceForModule;
     protected doCompileSingleCode(info: FileInfo, sourceCode?: string): Promise<MiniProgramDevtools.CodeFile>;
     private getCodeFileTask;
@@ -66,6 +67,7 @@ export declare abstract class BaseGraph {
     private readFile;
     private tranform;
     private generate;
+    private compileCode;
     private optimize;
     private compress;
     compile(options: MiniProgramCore.ICompileOptions, recorder: Recorder): Promise<MiniProgramDevtools.ICompileResult>;

package/dist/@types/modules/corecompiler/summer/module.d.ts

@@ -1,6 +1,6 @@
 import { MiniProgramSummer, MiniProgramDevtools, MiniProgramCore } from '../../../types';
 import { CustomError } from '../../../utils/customError';
-import { BaseGraph, FileType } from './graph/basegraph';
+import { FileType } from './graph/basegraph';
 declare class JsTag {
     isLargeFile: boolean;
     isBabelIgnore: boolean;
@@ -17,7 +17,6 @@ declare class JsTag {
     };
 }
 export default class Module {
-    private readonly graph;
     readonly path: string;
     readonly sourcePath: string;
     fileType: FileType;
@@ -25,24 +24,30 @@ export default class Module {
     private _error;
     private loadResult?;
     private generateResultPromise;
+    private compileResultPromise;
     depFiles: string[];
     independentRoot: string;
     isBabelIgnore: boolean;
     private generatedTS;
-    constructor(graph: BaseGraph, path: string, sourcePath: string, fileType: FileType);
+    constructor(path: string, sourcePath: string, fileType: FileType);
     private transResultType;
     getGeneratedTS(resultType: MiniProgramCore.IResultType): number;
     setError(resultType: MiniProgramCore.IResultType, error: CustomError | Error): void;
     getError(resultType: MiniProgramCore.IResultType): Error | CustomError | undefined;
     getJsTag(): Promise<JsTag | undefined>;
+    getJsTag2(): Promise<JsTag | undefined>;
     getSource(): Promise<MiniProgramSummer.SourceDescription>;
     getMd5(): Promise<string>;
     setLoadingPromise(promise: Promise<MiniProgramSummer.ILoadResult>): void;
+    clearUselessCache(): Promise<void>;
     getLoadingPromise(): Promise<MiniProgramSummer.ILoadResult> | undefined;
     setGeneratingPromise(resultType: MiniProgramCore.IResultType, promise: Promise<MiniProgramSummer.IGenerateResult>): void;
     getGeneratingPromise(resultType: MiniProgramCore.IResultType): Promise<MiniProgramSummer.IGenerateResult> | undefined;
+    getCompilePromise(resultType: MiniProgramCore.IResultType): Promise<MiniProgramSummer.IGenerateResult> | undefined;
+    setCompilePromise(resultType: MiniProgramCore.IResultType, promise: Promise<MiniProgramSummer.IGenerateResult>): void;
     getProcessInfo(resultType: MiniProgramCore.IResultType): Promise<MiniProgramSummer.IPluginProcessInfo[] | undefined>;
     toCodeFile(resultType: MiniProgramCore.IResultType): Promise<MiniProgramDevtools.CodeFile | MiniProgramDevtools.CodeError>;
+    toCodeFile2(resultType: MiniProgramCore.IResultType): Promise<MiniProgramDevtools.CodeFile | MiniProgramDevtools.CodeError>;
     toGenerateResult(resultType: MiniProgramCore.IResultType): Promise<MiniProgramSummer.IGenerateResult | MiniProgramDevtools.CodeError>;
     toJSON(): MiniProgramSummer.ModuleJSON;
     addWatchFile(file: string): void;

package/dist/@types/modules/corecompiler/summer/pluginconfig.d.ts

@@ -1,4 +1,4 @@
 import { MiniProgramDevtools } from '../../../types';
-export type AvailableSummerPlugin = 'typescript' | 'javascript' | 'es6module' | 'enhance' | 'wxss' | 'less' | 'sass' | 'terser' | 'minifywxml' | 'worklet' | 'swc';
+export type AvailableSummerPlugin = 'script' | 'wxss' | 'less' | 'sass' | 'minifywxml';
 export declare function couldUseSWCMode(setting: MiniProgramDevtools.IProjectSetting): boolean;
 export declare function getSummerPluginConfig(setting: MiniProgramDevtools.IProjectSetting): (AvailableSummerPlugin | [AvailableSummerPlugin, any])[];

package/dist/@types/modules/corecompiler/summer/plugins/base/es6module.d.ts

@@ -1,21 +1,4 @@
 import { MiniProgramCore, MiniProgramSummer } from '../../../../../types';
-export declare function getBabelRoot(independentRoot: string): string;
-export declare function transformES6ModuleAndGenCode(id: string, source: MiniProgramSummer.SourceDescription, options: {
-    babelRoot: string;
-    disableUseStrict: boolean;
-}): {
-    code: string;
-    map: {
-        version: number;
-        sources: string[];
-        names: string[];
-        sourceRoot?: string | undefined;
-        sourcesContent?: string[] | undefined;
-        mappings: string;
-        file: string;
-    };
-    helpers: string[];
-};
 export default function (project: MiniProgramCore.IPreCompileProject, options: {
     disableUseStrict: boolean;
 }): MiniProgramSummer.SummerPlugin;

package/dist/@types/modules/corecompiler/summer/plugins/filetask/script.d.ts

@@ -0,0 +1,28 @@
+import { MiniProgramCore, MiniProgramSummer } from '../../../../../types';
+export { MAX_CODE_LENGTH, } from '../../../../../config/config';
+export declare function getSWCRoot(project: MiniProgramCore.IPreCompileProject, independentRoot: string): string;
+export interface IScriptCompileOptions {
+    disableUseStrict?: boolean;
+    minify?: boolean;
+    resultType: MiniProgramCore.IResultType;
+    swcRoot: string;
+    target: 'es5' | 'es2022';
+    rc?: {
+        parser?: Record<string, string>;
+        module?: Record<string, string>;
+    };
+}
+export interface IScriptCompileResult {
+    code: string;
+    map?: MiniProgramSummer.SourceMap;
+    helpers: string[];
+}
+export interface IScriptCompileOptions {
+    swc?: boolean;
+    independentRoot: string;
+    isBabelIgnore: boolean;
+    resultType: MiniProgramCore.IResultType;
+}
+export default function (project: MiniProgramCore.IPreCompileProject, options: {
+    disableUseStrict: boolean;
+}): MiniProgramSummer.SummerPlugin;

package/dist/@types/modules/corecompiler/summer/plugins/index.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    load(pluginName: string): typeof import("./enhance").default | typeof import("./base/wxss").default | typeof import("./less").default | null;
+    load(pluginName: string): typeof import("./filetask/script").default | typeof import("./base/wxss").default | typeof import("./less").default | null;
 };
 export default _default;

package/dist/@types/modules/corecompiler/summer/plugins/script_task/babel_script_task.d.ts

@@ -0,0 +1,22 @@
+import { MiniProgramSummer } from '../../../../../types';
+export declare function getBabelRoot(independentRoot: string): string;
+export declare function babelTransformJS(source: MiniProgramSummer.SourceDescription, sourcePath: string): Promise<MiniProgramSummer.SourceDescription>;
+export declare function transformES6ModuleAndGenCode(id: string, source: MiniProgramSummer.SourceDescription, options: {
+    babelRoot: string;
+    disableUseStrict: boolean;
+}): Promise<{
+    code: string;
+    map: any;
+    helpers: string[];
+}>;
+export declare function babelTransformTS(source: MiniProgramSummer.SourceDescription, sourcePath: string): Promise<MiniProgramSummer.SourceDescription>;
+export declare function bableCompile(sourcePath: string, source: MiniProgramSummer.SourceDescription, options: {
+    typescript?: boolean;
+    enhance?: boolean;
+    babelRoot: string;
+    disableUseStrict: boolean;
+}): Promise<{
+    code: string;
+    map: any;
+    helpers: string[];
+}>;

package/dist/@types/modules/corecompiler/summer/plugins/script_task/load_script_task.d.ts

@@ -0,0 +1,7 @@
+import { MiniProgramCore, MiniProgramSummer } from '../../../../../types';
+export interface ILoadScriptResult {
+    targetPath: string;
+    source: MiniProgramSummer.SourceDescription;
+    process: MiniProgramSummer.IPluginProcessInfo[];
+}
+export declare function loadScriptFile(project: MiniProgramCore.IPreCompileProject, targetPath: string, sourcePath: string, pluginName: string): Promise<ILoadScriptResult>;

package/dist/@types/modules/corecompiler/summer/plugins/script_task/minify_script_task.d.ts

@@ -0,0 +1,5 @@
+import { MiniProgramSummer } from '../../../../../types';
+export declare function doCompress(targetPath: string, target: Pick<MiniProgramSummer.GenerateDescription, 'code' | 'map'>): Promise<{
+    code: string;
+    map: string | import("source-map").RawSourceMap | undefined;
+}>;

package/dist/@types/modules/corecompiler/summer/plugins/script_task/swc_task.d.ts

@@ -0,0 +1,22 @@
+import { MiniProgramCore, MiniProgramSummer } from '../../../../../types';
+export interface ISwcCompileOptions {
+    disableUseStrict?: boolean;
+    minify?: boolean;
+    resultType: MiniProgramCore.IResultType;
+    swcRoot: string;
+    target: 'es5' | 'es2022';
+    rc?: {
+        parser?: Record<string, any>;
+        module?: Record<string, any>;
+    };
+}
+export interface ISwcSourceInput {
+    sourceCode: string;
+    inputMap?: MiniProgramSummer.SourceMap;
+}
+export interface ISwcCompileResult {
+    code: string;
+    map?: MiniProgramSummer.SourceMap;
+    helpers: string[];
+}
+export declare function swcCompileTask(id: string, source: ISwcSourceInput, options: ISwcCompileOptions): Promise<ISwcCompileResult>;

package/dist/@types/modules/corecompiler/summerCompiler.d.ts

@@ -31,7 +31,10 @@ export declare class SummerCompiler extends BaseCoreCompiler {
     private loadStatus;
     destroy(): void;
     clearCache(): Promise<void>;
+    getProjectInfo(): MiniProgramDevtools.IDevtoolsProjectInfo;
     updateOptions(options: MiniProgramDevtools.IDevtoolsProjectInfo): void;
+    updateOptionsWithoutJudge(options: MiniProgramDevtools.IDevtoolsProjectInfo): void;
+    updateOptionsWhenAttrNotChanged(options: MiniProgramDevtools.IDevtoolsProjectInfo): void;
     private addProjectListener;
     private removeProjectListener;
     onFileChange: (type: 'unlink' | 'unlinkDir' | 'add' | 'addDir' | 'change', targetPath: string) => void;
@@ -39,6 +42,7 @@ export declare class SummerCompiler extends BaseCoreCompiler {
     private invalidCodeCache;
     private onProgressUpdate;
     private getConf;
+    waitSubProcessReady(): Promise<void>;
     getPackageFiles(graphId: MiniProgramDevtools.GraphId, root: string, resultType?: MiniProgramCore.IResultType, useCache?: boolean): Promise<FileInfo[]>;
     _getPackageFiles: (graphId: import("../../types").MiniProgramCI.ProjectType, root: string, resultType?: MiniProgramCore.IResultType) => Promise<FileInfo[]>;
     private isMiniappPlatformInclude;

package/dist/@types/types/devtools.d.ts

@@ -37,6 +37,13 @@ export declare namespace MiniProgramDevtools {
         outputPath?: string;
         rc?: Record<string, any>;
     };
+    type ISassSetting = {
+        scssCommonUseFilePath?: string;
+        sassCommonUseFilePath?: string;
+    };
+    type ILessSetting = {
+        commonUseFilePath?: string;
+    };
     interface IDevtoolsProjectInfo {
         appid: string;
         attr: any;
@@ -189,6 +196,8 @@ export declare namespace MiniProgramDevtools {
         enhance?: boolean;
         swc?: boolean;
         swcSetting?: ISWCSetting;
+        sassSetting?: ISassSetting;
+        lessSetting?: ILessSetting;
         disableSWC?: boolean | null | undefined;
         coverView?: boolean;
         showShadowRootInWxmlPanel?: boolean;

package/dist/@types/types/summer.d.ts

@@ -69,14 +69,18 @@ export declare namespace MiniProgramSummer {
         process: IPluginProcessInfo[];
     }
     type ITransformResult = ILoadResult;
-    type AsyncPluginHooks = 'load' | 'transform' | 'optimize' | 'generate' | 'compress' | 'sealed';
-    type FirstPluginHooks = 'load' | 'generate';
+    type AsyncPluginHooks = 'load' | 'transform' | 'optimize' | 'generate' | 'compress' | 'sealed' | 'compile';
+    type FirstPluginHooks = 'load' | 'generate' | 'compile';
     type SequentialPluginHooks = 'transform' | 'optimize' | 'compress';
     type ParallelPluginHooks = 'sealed';
     type LoadHook = (this: PluginContext, targetPath: string, sourcePath: string, options: {
         independentRoot: string;
         isBabelIgnore: boolean;
     }) => Promise<ILoadResult | undefined>;
+    type CompileHook = (this: PluginContext, targetPath: string, sourcePath: string, loadResult: ILoadResult, options: {
+        independentRoot: string;
+        isBabelIgnore: boolean;
+    } & ICompileOptions) => Promise<IGenerateResult | undefined>;
     type TransformHook = (this: PluginContext, loadResult: ILoadResult, targetPath: string, sourcePath: string, options: {
         independentRoot: string;
         isBabelIgnore: boolean;
@@ -98,6 +102,7 @@ export declare namespace MiniProgramSummer {
         optimize: OptimizeHook;
         compress: CompressHook;
         sealed: SealedHook;
+        compile: CompileHook;
     }
     interface ResolveExt {
         json?: string | string[];

package/dist/@types/utils/env.d.ts

@@ -2,3 +2,4 @@ export declare const isDevtools: any;
 export declare const isWebIDE: boolean;
 export declare function getProcessEnv(): any;
 export declare const isWin: boolean;
+export declare function isElectron(): boolean;

package/dist/@types/utils/helper_util.d.ts

@@ -6,6 +6,6 @@ export declare function getHelperOutputPath(setting: MiniProgramDevtools.IProjec
 export declare function getHelperContent(setting: MiniProgramDevtools.IProjectSetting, mod: string): Promise<string>;
 export declare function getHelperDeps(setting: MiniProgramDevtools.IProjectSetting, helpers: Set<string>): string[];
 export declare function appendHelpers(project: IProjectLike, helperSet: Set<string>, root: string, resultMap: MiniProgramCore.IAnyObject): Promise<void[]>;
-export declare function isValidHelperFunc(funcName: string): "swc" | "babel" | undefined;
+export declare function isValidHelperFunc(funcName: string): "babel" | "swc" | undefined;
 export declare function getHelperName(setting: MiniProgramDevtools.IProjectSetting, mod: string): string;
 export {};

package/dist/@types/utils/packOptionsHelper.d.ts

@@ -27,6 +27,7 @@ declare class PackOptionsHelper {
     isIgnoreByUnusedFiles(file: string, production?: boolean): boolean;
     getUnusedFiles(): Set<string>;
     isScssOnlyImportedByFile(module: IModule): boolean;
+    clearUnusedFiles(): void;
     initUnusedFiles(project: MiniProgramCore.IPreCompileProject, analyzer: Analyzer | null, production?: boolean): Promise<void>;
 }
 declare const _default: PackOptionsHelper;

package/dist/@types/utils/subprocess/processManager.d.ts

@@ -16,7 +16,7 @@ export declare class SubProcessProxy {
         miniappDirPath?: string;
         devtoolsVersion?: string;
     }, initOptions: any, inspectPort?: number, progressUpdate?: MiniProgramDevtools.ProgressUpdate | undefined);
-    private ready;
+    ready(): Promise<any>;
     private sendProcessMessage;
     private init;
     destroy(): void;