@dcloudio/uni-cli-shared 3.0.0-alpha-4020820240920001 → 3.0.0-alpha-4030120240925001

package/dist/index.d.ts

@@ -22,7 +22,8 @@ export * from './resolve';
 export * from './scripts';
 export * from './platform';
 export * from './utsUtils';
-export { parseUniExtApi, parseUniExtApis, parseInjects, parseUniModulesArtifacts, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, resolveEncryptUniModule, formatExtApiProviderName, } from './uni_modules';
+export { parseUniExtApi, parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, formatExtApiProviderName, } from './uni_modules';
+export { parseUniModulesArtifacts, resolveEncryptUniModule, } from './uni_modules.cloud';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUpdate = exports.M = exports.formatExtApiProviderName = exports.resolveEncryptUniModule = exports.getUniExtApiProviderRegisters = exports.parseUniModulesArtifacts = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
+exports.checkUpdate = exports.M = exports.resolveEncryptUniModule = exports.parseUniModulesArtifacts = exports.formatExtApiProviderName = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -43,10 +43,11 @@ var uni_modules_1 = require("./uni_modules");
 Object.defineProperty(exports, "parseUniExtApi", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApi; } });
 Object.defineProperty(exports, "parseUniExtApis", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApis; } });
 Object.defineProperty(exports, "parseInjects", { enumerable: true, get: function () { return uni_modules_1.parseInjects; } });
-Object.defineProperty(exports, "parseUniModulesArtifacts", { enumerable: true, get: function () { return uni_modules_1.parseUniModulesArtifacts; } });
 Object.defineProperty(exports, "getUniExtApiProviderRegisters", { enumerable: true, get: function () { return uni_modules_1.getUniExtApiProviderRegisters; } });
-Object.defineProperty(exports, "resolveEncryptUniModule", { enumerable: true, get: function () { return uni_modules_1.resolveEncryptUniModule; } });
 Object.defineProperty(exports, "formatExtApiProviderName", { enumerable: true, get: function () { return uni_modules_1.formatExtApiProviderName; } });
+var uni_modules_cloud_1 = require("./uni_modules.cloud");
+Object.defineProperty(exports, "parseUniModulesArtifacts", { enumerable: true, get: function () { return uni_modules_cloud_1.parseUniModulesArtifacts; } });
+Object.defineProperty(exports, "resolveEncryptUniModule", { enumerable: true, get: function () { return uni_modules_cloud_1.resolveEncryptUniModule; } });
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

package/dist/json/app/manifest/defaultManifestJson.js

@@ -26,7 +26,7 @@ const defaultManifestJson = `{
     "permissions": {},
     "plus": {
         "useragent": {
-            "value": "uni-app appservice",
+            "value": "",
             "concatenate": true
         },
         "splashscreen": {

package/dist/json/app/manifest/launchwebview.js

@@ -14,7 +14,17 @@ function initLaunchwebview(manifestJson, pagesJson) {
         }
         catch (e) { }
     }
-    manifestJson.plus.useragent.value = 'uni-app';
+    if (manifestJson.plus.useragent.concatenate) {
+        if (manifestJson.plus.useragent.value) {
+            manifestJson.plus.useragent.value = [
+                'uni-app',
+                manifestJson.plus.useragent.value,
+            ].join(' ');
+        }
+        else {
+            manifestJson.plus.useragent.value = 'uni-app';
+        }
+    }
     (0, shared_1.extend)(manifestJson.plus.launchwebview, {
         id: '1',
         kernel: 'WKWebview',

package/dist/json/app/pages/uniConfig.js

@@ -36,6 +36,8 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
         locales: (0, i18n_1.initLocales)(path_1.default.join(process.env.UNI_INPUT_DIR, 'locale')),
         darkmode: platformConfig.darkmode || false,
         themeConfig: (0, theme_1.normalizeThemeConfigOnce)(platformConfig),
+        // @ts-expect-error
+        qqMapKey: platformConfig?.distribute?.sdkConfigs?.maps?.qqmap?.key,
     };
     // TODO 待支持分包
     return JSON.stringify(config);

package/dist/json/manifest.js

@@ -9,10 +9,11 @@ const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const json_1 = require("./json");
+const utils_1 = require("../utils");
 const parseManifestJson = (inputDir) => {
     const manifestFilename = path_1.default.join(inputDir, 'manifest.json');
     if (!fs_1.default.existsSync(manifestFilename)) {
-        if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+        if (!(0, utils_1.isNormalCompileTarget)()) {
             return {};
         }
     }

package/dist/json/pages.js

@@ -45,7 +45,7 @@ exports.isUniPageSfcFile = isUniPageSfcFile;
 const parsePagesJson = (inputDir, platform, normalize = true) => {
     const pagesFilename = path_1.default.join(inputDir, 'pages.json');
     if (!fs_1.default.existsSync(pagesFilename)) {
-        if (process.env.UNI_COMPILE_TARGET === 'uni_modules') {
+        if (!(0, utils_1.isNormalCompileTarget)()) {
             return {
                 pages: [],
                 globalStyle: { navigationBar: {} },

package/dist/mp/template.d.ts

@@ -1,5 +1,5 @@
 import type { EmittedAsset } from 'rollup';
-import type { ElementNode } from '@vue/compiler-core';
+import type { AttributeNode, DirectiveNode, ElementNode } from '@vue/compiler-core';
 import type { MiniProgramComponentsType } from '../json/mp/types';
 type LazyElementFn = (node: ElementNode, context: {
     isMiniProgramComponent(name: string): MiniProgramComponentsType | undefined;
@@ -10,6 +10,10 @@ type LazyElementFn = (node: ElementNode, context: {
     }[] | true;
 } | boolean;
 export interface MiniProgramCompilerOptions {
+    /**
+     * 检查属性名称是否符合平台要求，比如华为快应用不允许使用 key 属性等
+     */
+    checkPropName?: (name: string, prop: AttributeNode | DirectiveNode, node: ElementNode) => boolean;
     /**
      * 需要延迟渲染的组件，通常是某个组件的某个事件会立刻触发，需要延迟到首次 render 之后，比如微信 editor 的 ready 事件，快手 switch 的 change
      */

package/dist/platform.js

@@ -18,6 +18,7 @@ const BUILT_IN_PLATFORMS = [
     'mp-qq',
     'mp-toutiao',
     'mp-weixin',
+    'mp-xhs',
     'quickapp-webview',
     'quickapp-webview-huawei',
     'quickapp-webview-union',

package/dist/preprocess/context.d.ts

@@ -1,4 +1,9 @@
 export declare function getPreVueContext(): any;
 export declare function getPreNVueContext(): any;
 export declare function getPreUVueContext(): any;
+export declare function initScopedPreContext(platform: UniApp.PLATFORM, userPreContext?: Record<string, boolean> | string, utsPlatform?: typeof process.env.UNI_UTS_PLATFORM, isX?: boolean): {
+    preVueContext: any;
+    preNVueContext: any;
+    preUVueContext: any;
+};
 export declare function initPreContext(platform: UniApp.PLATFORM, userPreContext?: Record<string, boolean> | string, utsPlatform?: typeof process.env.UNI_UTS_PLATFORM, isX?: boolean): void;

package/dist/preprocess/context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initPreContext = exports.getPreUVueContext = exports.getPreNVueContext = exports.getPreVueContext = void 0;
+exports.initPreContext = exports.initScopedPreContext = exports.getPreUVueContext = exports.getPreNVueContext = exports.getPreVueContext = void 0;
 const extend = Object.assign;
 const isString = (val) => typeof val === 'string';
 const objectToString = Object.prototype.toString;
@@ -51,7 +51,7 @@ function getPreUVueContext() {
     return preUVueContext;
 }
 exports.getPreUVueContext = getPreUVueContext;
-function initPreContext(platform, userPreContext, utsPlatform, isX) {
+function initScopedPreContext(platform, userPreContext, utsPlatform, isX) {
     const vueContext = Object.create(null);
     const nvueContext = Object.create(null);
     const uvueContext = Object.create(null);
@@ -112,9 +112,18 @@ function initPreContext(platform, userPreContext, utsPlatform, isX) {
             });
         }
     }
-    extend(preVueContext, defaultContext, vueContext);
-    extend(preNVueContext, defaultContext, nvueContext);
-    extend(preUVueContext, defaultContext, uvueContext);
+    return {
+        preVueContext: extend({}, defaultContext, vueContext),
+        preNVueContext: extend({}, defaultContext, nvueContext),
+        preUVueContext: extend({}, defaultContext, uvueContext),
+    };
+}
+exports.initScopedPreContext = initScopedPreContext;
+function initPreContext(platform, userPreContext, utsPlatform, isX) {
+    const { preVueContext: scopedPreVueContext, preNVueContext: scopedPreNVueContext, preUVueContext: scopedPreUVueContext, } = initScopedPreContext(platform, userPreContext, utsPlatform, isX);
+    extend(preVueContext, scopedPreVueContext);
+    extend(preNVueContext, scopedPreNVueContext);
+    extend(preUVueContext, scopedPreUVueContext);
 }
 exports.initPreContext = initPreContext;
 function normalizeKey(name) {

package/dist/resolve.d.ts

@@ -2,6 +2,7 @@ export declare function requireResolve(filename: string, basedir: string): strin
 export declare function relativeFile(from: string, to: string): string;
 export declare const resolveMainPathOnce: (inputDir: string) => string;
 export declare function getBuiltInPaths(): string[];
-export declare function resolveBuiltIn(path: string): string;
+export declare function resolveBuiltIn(module: string): string;
 export declare function resolveVueI18nRuntime(): string;
 export declare function resolveComponentsLibPath(): string;
+export declare function resolveComponentsLibDirs(): string[];

package/dist/resolve.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
+exports.resolveComponentsLibDirs = exports.resolveComponentsLibPath = exports.resolveVueI18nRuntime = exports.resolveBuiltIn = exports.getBuiltInPaths = exports.resolveMainPathOnce = exports.relativeFile = exports.requireResolve = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
@@ -93,8 +93,13 @@ function getBuiltInPaths() {
     return paths;
 }
 exports.getBuiltInPaths = getBuiltInPaths;
-function resolveBuiltIn(path) {
-    return require.resolve(path, { paths: getBuiltInPaths() });
+function resolveBuiltIn(module) {
+    if (process.env.UNI_COMPILE_TARGET === 'ext-api' &&
+        process.env.UNI_APP_NEXT_WORKSPACE &&
+        module.startsWith('@dcloudio/')) {
+        return path_1.default.resolve(process.env.UNI_APP_NEXT_WORKSPACE, 'packages', module);
+    }
+    return require.resolve(module, { paths: getBuiltInPaths() });
 }
 exports.resolveBuiltIn = resolveBuiltIn;
 function resolveVueI18nRuntime() {
@@ -125,3 +130,9 @@ function resolveComponentsLibPath() {
     return componentsLibPath;
 }
 exports.resolveComponentsLibPath = resolveComponentsLibPath;
+function resolveComponentsLibDirs() {
+    return process.env.UNI_COMPILE_TARGET === 'ext-api'
+        ? []
+        : [resolveComponentsLibPath()];
+}
+exports.resolveComponentsLibDirs = resolveComponentsLibDirs;

package/dist/uni_modules.cloud.d.ts

@@ -0,0 +1,49 @@
+export declare function genEncryptEasyComModuleIndex(platform: typeof process.env.UNI_UTS_PLATFORM, components: Record<string, '.vue' | '.uvue'>): string;
+export declare function parseUniModulesWithComponents(inputDir: string): Record<string, Record<string, ".vue" | ".uvue">>;
+/**
+ * 解析 easyCom 组件列表
+ * @param pluginId
+ * @param inputDir
+ * @returns
+ */
+export declare function parseEasyComComponents(pluginId: string, inputDir: string, detectBinary?: boolean): Record<string, ".vue" | ".uvue">;
+export declare function findEncryptUniModules(inputDir: string, cacheDir?: string): Record<string, EncryptPackageJson | undefined>;
+export declare function findUploadEncryptUniModulesFiles(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string): Record<string, string[]>;
+export declare function packUploadEncryptUniModules(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string, cacheDir: string): {
+    zipFile: string;
+    modules: string[];
+};
+interface EncryptPackageJson {
+    id: string;
+    version: string;
+    uni_modules: {
+        dependencies: string[];
+        artifacts: {
+            env: {
+                compilerVersion: string;
+            } & Record<string, any>;
+            apis: string[];
+            components: string[];
+            scopedSlots: string[];
+            declaration: string;
+        };
+    };
+}
+export declare function initCheckEnv(): Record<string, string>;
+export declare function resolveEncryptUniModule(id: string, platform: typeof process.env.UNI_UTS_PLATFORM, isX?: boolean): string | undefined;
+export declare function checkEncryptUniModules(inputDir: string, params: {
+    mode: 'development' | 'production';
+    packType: 'debug' | 'release';
+    compilerVersion: string;
+    appid: string;
+    appname: string;
+    platform: typeof process.env.UNI_UTS_PLATFORM;
+    'uni-app-x': boolean;
+}): Promise<{} | undefined>;
+export declare function parseUniModulesArtifacts(): {
+    name: string;
+    package: string;
+    scopedSlots: string[];
+    declaration: string;
+}[];
+export {};

package/dist/uni_modules.cloud.js

@@ -0,0 +1,332 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseUniModulesArtifacts = exports.checkEncryptUniModules = exports.resolveEncryptUniModule = exports.initCheckEnv = exports.packUploadEncryptUniModules = exports.findUploadEncryptUniModulesFiles = exports.findEncryptUniModules = exports.parseEasyComComponents = exports.parseUniModulesWithComponents = exports.genEncryptEasyComModuleIndex = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const fast_glob_1 = require("fast-glob");
+const utils_1 = require("./utils");
+const easycom_1 = require("./easycom");
+const messages_1 = require("./messages");
+function genEncryptEasyComModuleIndex(platform, components) {
+    const imports = [];
+    const ids = [];
+    Object.keys(components).forEach((component) => {
+        const id = (0, utils_1.capitalize)((0, utils_1.camelize)(component));
+        ids.push(id);
+        let instance = '';
+        if (platform === 'app-android') {
+            instance = (0, easycom_1.genUTSComponentPublicInstanceIdent)(component);
+            // 类型
+            ids.push(instance);
+        }
+        imports.push(`import ${id}${instance ? `, { ${instance} }` : ''} from './components/${component}/${component}${components[component]}'`);
+    });
+    return `
+  ${imports.join('\n')}
+  export { 
+    ${ids.join(',\n  ')} 
+  }
+  `;
+}
+exports.genEncryptEasyComModuleIndex = genEncryptEasyComModuleIndex;
+// 目前该函数仅在云端使用（目前仅限iOS/web），云端编译时，提交上来的uni_modules是过滤好的
+function parseUniModulesWithComponents(inputDir) {
+    const modulesDir = path_1.default.resolve(inputDir, 'uni_modules');
+    const uniModules = {};
+    if (fs_extra_1.default.existsSync(modulesDir)) {
+        fs_extra_1.default.readdirSync(modulesDir).forEach((uniModuleDir) => {
+            if (!fs_extra_1.default.existsSync(path_1.default.resolve(modulesDir, uniModuleDir, 'package.json'))) {
+                return;
+            }
+            // 解析加密的 easyCom 插件列表
+            const components = parseEasyComComponents(uniModuleDir, inputDir, false);
+            uniModules[uniModuleDir] = components;
+        });
+    }
+    return uniModules;
+}
+exports.parseUniModulesWithComponents = parseUniModulesWithComponents;
+/**
+ * 解析 easyCom 组件列表
+ * @param pluginId
+ * @param inputDir
+ * @returns
+ */
+function parseEasyComComponents(pluginId, inputDir, detectBinary = true) {
+    const componentsDir = path_1.default.resolve(inputDir, 'uni_modules', pluginId, 'components');
+    const components = {};
+    if (fs_extra_1.default.existsSync(componentsDir)) {
+        fs_extra_1.default.readdirSync(componentsDir).forEach((componentDir) => {
+            const componentFile = path_1.default.resolve(componentsDir, componentDir, componentDir);
+            const extname = ['.vue', '.uvue'].find((extname) => {
+                const filename = componentFile + extname;
+                // 探测 filename 是否是二进制文件
+                if (fs_extra_1.default.existsSync(filename)) {
+                    if (detectBinary) {
+                        // 延迟require，这个是新增的依赖，无法及时同步到内部测试版本HBuilderX中，导致报错，所以延迟require吧
+                        if (require('isbinaryfile').isBinaryFileSync(filename)) {
+                            return true;
+                        }
+                    }
+                    else {
+                        return true;
+                    }
+                }
+            });
+            if (extname) {
+                components[componentDir] = extname;
+            }
+        });
+    }
+    return components;
+}
+exports.parseEasyComComponents = parseEasyComComponents;
+// 查找所有普通加密插件 uni_modules
+function findEncryptUniModules(inputDir, cacheDir = '') {
+    const modulesDir = path_1.default.resolve(inputDir, 'uni_modules');
+    const uniModules = {};
+    if (fs_extra_1.default.existsSync(modulesDir)) {
+        fs_extra_1.default.readdirSync(modulesDir).forEach((uniModuleDir) => {
+            const uniModuleRootDir = path_1.default.resolve(modulesDir, uniModuleDir);
+            if (!fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'encrypt'))) {
+                return;
+            }
+            // 仅扫描普通加密插件，无需依赖
+            if (fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk'))) {
+                return;
+            }
+            const pkg = require(path_1.default.resolve(uniModuleRootDir, 'package.json'));
+            uniModules[uniModuleDir] = findEncryptUniModuleCache(uniModuleDir, cacheDir, { version: pkg.version, env: initCheckEnv() });
+        });
+    }
+    return uniModules;
+}
+exports.findEncryptUniModules = findEncryptUniModules;
+function findUploadEncryptUniModulesFiles(uniModules, platform, inputDir) {
+    const modules = {};
+    Object.keys(uniModules).forEach((uniModuleId) => {
+        if (!uniModules[uniModuleId]) {
+            modules[uniModuleId] = findUniModuleFiles(platform, uniModuleId, inputDir);
+        }
+    });
+    return modules;
+}
+exports.findUploadEncryptUniModulesFiles = findUploadEncryptUniModulesFiles;
+function packUploadEncryptUniModules(uniModules, platform, inputDir, cacheDir) {
+    const modules = findUploadEncryptUniModulesFiles(uniModules, platform, inputDir);
+    const uploadModuleIds = Object.keys(modules);
+    if (uploadModuleIds.length) {
+        // 延迟 require，避免 vue2 编译器需要安装此依赖，目前该方法仅在 vite 编译器中使用
+        const AdmZip = require('adm-zip');
+        const zip = new AdmZip();
+        uploadModuleIds.forEach((moduleId) => {
+            modules[moduleId].forEach((file) => {
+                zip.addLocalFile(file, path_1.default.dirname(path_1.default.relative(inputDir, file)));
+            });
+        });
+        const zipFile = path_1.default.resolve(cacheDir, 'cloud-compile-plugins.zip');
+        zip.writeZip(zipFile);
+        return {
+            zipFile,
+            modules: uploadModuleIds,
+        };
+    }
+    return {
+        zipFile: '',
+        modules: [],
+    };
+}
+exports.packUploadEncryptUniModules = packUploadEncryptUniModules;
+function isEnvExpired(value, other) {
+    const valueKeys = Object.keys(value);
+    const otherKeys = Object.keys(other);
+    if (valueKeys.length !== otherKeys.length) {
+        return true;
+    }
+    if (valueKeys.find((name) => value[name] !== other[name])) {
+        return true;
+    }
+    return false;
+}
+function findEncryptUniModuleCache(uniModuleId, cacheDir, options) {
+    if (!cacheDir) {
+        return;
+    }
+    const uniModuleCacheDir = path_1.default.resolve(cacheDir, 'uni_modules', uniModuleId);
+    if (fs_extra_1.default.existsSync(uniModuleCacheDir)) {
+        const pkg = require(path_1.default.resolve(uniModuleCacheDir, 'package.json'));
+        // 插件版本以及各种环境一致
+        if (pkg.version === options.version &&
+            !isEnvExpired(pkg.uni_modules?.artifacts?.env || {}, options.env)) {
+            const declaration = path_1.default.resolve(uniModuleCacheDir, 'utssdk/app-android/index.d.uts');
+            pkg.uni_modules.artifacts.declaration = fs_extra_1.default.existsSync(declaration)
+                ? declaration
+                : '';
+            return pkg;
+        }
+        console.log(`插件${uniModuleId} 缓存已过期，需要重新云编译。`);
+        // 已过期的插件，删除缓存
+        fs_extra_1.default.rmSync(uniModuleCacheDir, { recursive: true });
+    }
+}
+const KNOWN_ASSET_TYPES = [
+    // images
+    'png',
+    'jpe?g',
+    'gif',
+    'svg',
+    'ico',
+    'webp',
+    'avif',
+    // media
+    'mp4',
+    'webm',
+    'ogg',
+    'mp3',
+    'wav',
+    'flac',
+    'aac',
+    // fonts
+    'woff2?',
+    'eot',
+    'ttf',
+    'otf',
+    // other
+    'pdf',
+    'txt',
+];
+function findUniModuleFiles(platform, id, inputDir) {
+    return (0, fast_glob_1.sync)(`uni_modules/${id}/**/*`, {
+        cwd: inputDir,
+        absolute: true,
+        ignore: [
+            '**/*.md',
+            ...(platform !== 'app-android' // 非 android 平台不需要扫描 assets
+                ? [`**/*.{${KNOWN_ASSET_TYPES.join(',')}}`]
+                : []),
+        ],
+    });
+}
+function initCheckEnv() {
+    return {
+        // 云端编译的版本号不带日期及小版本
+        compilerVersion: process.env.UNI_COMPILER_VERSION,
+    };
+}
+exports.initCheckEnv = initCheckEnv;
+function findLastIndex(array, predicate) {
+    for (let i = array.length - 1; i >= 0; i--) {
+        if (predicate(array[i], i, array)) {
+            return i;
+        }
+    }
+    return -1;
+}
+let encryptUniModules = {};
+function resolveEncryptUniModule(id, platform, isX = true) {
+    const parts = id.split('?', 2)[0].split('/');
+    const index = findLastIndex(parts, (part) => part === 'uni_modules');
+    if (index !== -1) {
+        const uniModuleId = parts[index + 1];
+        if (uniModuleId in encryptUniModules) {
+            if (parts[index + 2]) {
+                console.warn(messages_1.M['uni_modules.import']
+                    .replace('{0}', uniModuleId)
+                    .replace('{1}', uniModuleId)
+                    .replace('{2}', parts.slice(index + 2).join('/')));
+            }
+            // 原生平台走旧的uts-proxy
+            return (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, `uni_modules/${uniModuleId}?${isX && platform === 'app-android' ? 'uts-proxy' : 'uni_helpers'}`));
+        }
+    }
+}
+exports.resolveEncryptUniModule = resolveEncryptUniModule;
+async function checkEncryptUniModules(inputDir, params) {
+    // 扫描加密插件云编译
+    encryptUniModules = findEncryptUniModules(inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR);
+    if (!Object.keys(encryptUniModules).length) {
+        return {};
+    }
+    if (!process.env.UNI_HBUILDERX_PLUGINS) {
+        return {};
+    }
+    const cacheDir = process.env.UNI_MODULES_ENCRYPT_CACHE_DIR;
+    const { zipFile, modules } = packUploadEncryptUniModules(encryptUniModules, process.env.UNI_UTS_PLATFORM, inputDir, cacheDir);
+    if (zipFile) {
+        const downloadFile = path_1.default.resolve(cacheDir, 'uni_modules.download.zip');
+        const { C, D, R, U } = (0, utils_1.requireUniHelpers)();
+        try {
+            const isLogin = await C();
+            const tips = process.env.UNI_UTS_PLATFORM !== 'app-android'
+                ? '（此过程耗时较长）'
+                : '';
+            console.log(`正在云编译插件${isLogin ? '' : '（请先登录）'}${tips}：${modules.join(',')}...`);
+            let downloadUrl = '';
+            try {
+                downloadUrl = await U({
+                    params,
+                    attachment: zipFile,
+                });
+            }
+            catch (e) {
+                if (e.message && e.message === '{"error":"UserNotLogin"}') {
+                    console.log('当前项目包含需要云编译的付费插件，需要您先登录HBuilderX账号。');
+                }
+                else {
+                    console.error(e);
+                }
+                process.exit(0);
+            }
+            await D(downloadUrl, downloadFile);
+            // unzip
+            const AdmZip = require('adm-zip');
+            const zip = new AdmZip(downloadFile);
+            zip.extractAllTo(cacheDir, true);
+            fs_extra_1.default.unlinkSync(zipFile);
+            fs_extra_1.default.unlinkSync(downloadFile);
+            R({
+                dir: process.env.UNI_INPUT_DIR,
+                cacheDir: process.env.UNI_MODULES_ENCRYPT_CACHE_DIR,
+            });
+            console.log(`云编译已完成`);
+            console.log(`正在编译中...`);
+        }
+        catch (e) {
+            fs_extra_1.default.existsSync(zipFile) && fs_extra_1.default.unlinkSync(zipFile);
+            fs_extra_1.default.existsSync(downloadFile) && fs_extra_1.default.unlinkSync(downloadFile);
+            console.error(e);
+            process.exit(0);
+        }
+    }
+    else {
+        // android 平台需要在这里初始化
+        if (params.platform === 'app-android') {
+            const { R } = (0, utils_1.requireUniHelpers)();
+            R({
+                dir: process.env.UNI_INPUT_DIR,
+                cacheDir: process.env.UNI_MODULES_ENCRYPT_CACHE_DIR,
+            });
+        }
+    }
+    encryptUniModules = findEncryptUniModules(inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR);
+}
+exports.checkEncryptUniModules = checkEncryptUniModules;
+function parseUniModulesArtifacts() {
+    const res = [];
+    Object.keys(encryptUniModules).forEach((uniModuleId) => {
+        const pkg = encryptUniModules[uniModuleId];
+        if (pkg?.uni_modules?.artifacts) {
+            res.push({
+                name: uniModuleId,
+                package: `uts.sdk.modules.${(0, utils_1.camelize)(uniModuleId)}`,
+                scopedSlots: pkg.uni_modules.artifacts.scopedSlots || [],
+                declaration: pkg.uni_modules.artifacts.declaration,
+            });
+        }
+    });
+    return res;
+}
+exports.parseUniModulesArtifacts = parseUniModulesArtifacts;

package/dist/uni_modules.d.ts

@@ -73,52 +73,3 @@ export declare const capitalize: (str: string) => string;
  * @returns
  */
 export declare function parseUTSModuleDeps(deps: string[], inputDir: string): string[];
-export declare function genEncryptEasyComModuleIndex(platform: typeof process.env.UNI_UTS_PLATFORM, components: Record<string, '.vue' | '.uvue'>): string;
-export declare function parseUniModulesWithComponents(inputDir: string): Record<string, Record<string, ".vue" | ".uvue">>;
-/**
- * 解析 easyCom 组件列表
- * @param pluginId
- * @param inputDir
- * @returns
- */
-export declare function parseEasyComComponents(pluginId: string, inputDir: string, detectBinary?: boolean): Record<string, ".vue" | ".uvue">;
-export declare function findEncryptUniModules(inputDir: string, cacheDir?: string): Record<string, EncryptPackageJson | undefined>;
-export declare function findUploadEncryptUniModulesFiles(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string): Record<string, string[]>;
-export declare function packUploadEncryptUniModules(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string, cacheDir: string): {
-    zipFile: string;
-    modules: string[];
-};
-interface EncryptPackageJson {
-    id: string;
-    version: string;
-    uni_modules: {
-        dependencies: string[];
-        artifacts: {
-            env: {
-                compilerVersion: string;
-            } & Record<string, any>;
-            apis: string[];
-            components: string[];
-            scopedSlots: string[];
-            declaration: string;
-        };
-    };
-}
-export declare function initCheckEnv(): Record<string, string>;
-export declare function resolveEncryptUniModule(id: string, platform: typeof process.env.UNI_UTS_PLATFORM, isX?: boolean): string | undefined;
-export declare function checkEncryptUniModules(inputDir: string, params: {
-    mode: 'development' | 'production';
-    packType: 'debug' | 'release';
-    compilerVersion: string;
-    appid: string;
-    appname: string;
-    platform: typeof process.env.UNI_UTS_PLATFORM;
-    'uni-app-x': boolean;
-}): Promise<{} | undefined>;
-export declare function parseUniModulesArtifacts(): {
-    name: string;
-    package: string;
-    scopedSlots: string[];
-    declaration: string;
-}[];
-export {};