@dcloudio/uni-cli-shared 3.0.0-4050720250324001 → 3.0.0-4060420250429001

package/dist/easycom.d.ts

@@ -19,7 +19,7 @@ export declare function initEasycoms(inputDir: string, { dirs, platform, isX, }:
     platform: UniApp.PLATFORM;
     isX?: boolean;
 }): {
-    options: EasycomOption;
+    easyComOptions: EasycomOption;
     filter: (id: unknown) => boolean;
     refresh(): void;
     easycoms: EasycomMatcher[];

package/dist/easycom.js

@@ -48,7 +48,7 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
         debugEasycom(easycomOptions);
         return easycomOptions;
     };
-    const options = initEasycomOptions((0, pages_1.parsePagesJsonOnce)(inputDir, platform));
+    const easyComOptions = initEasycomOptions((0, pages_1.parsePagesJsonOnce)(inputDir, platform));
     const initUTSEasycom = () => {
         (0, uts_1.initUTSComponents)(inputDir, platform).forEach((item) => {
             const index = easycoms.findIndex((easycom) => item.name === easycom.name);
@@ -64,26 +64,46 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
             globalThis.uts2jsSourceCodeMap.initUts2jsEasycom(easycoms);
         }
     };
+    const initUTSEasycomCustomElements = () => {
+        (0, uts_1.initUTSCustomElements)(inputDir, platform).forEach((item) => {
+            const index = easycoms.findIndex((easycom) => item.name === easycom.name);
+            if (index > -1) {
+                easycoms.splice(index, 1, item);
+            }
+            else {
+                easycoms.push(item);
+            }
+        });
+    };
     // ext-api 模式下，不存在 easycom 特性
     if (process.env.UNI_COMPILE_TARGET !== 'ext-api') {
-        initEasycom(options);
+        clearEasycom();
+        (0, uts_1.clearUTSComponents)();
+        (0, uts_1.clearUTSCustomElements)();
+        initEasycom(easyComOptions);
+        initUTSEasycomCustomElements();
         initUTSEasycom();
     }
     const componentExtNames = isX ? 'uvue|vue' : 'vue';
     const res = {
-        options,
+        easyComOptions,
         filter: (0, pluginutils_1.createFilter)([
             'components/*/*.(' + componentExtNames + '|jsx|tsx)',
             'uni_modules/*/components/*/*.(' + componentExtNames + '|jsx|tsx)',
             'utssdk/*/**/*.(' + componentExtNames + ')',
             'uni_modules/*/utssdk/*/*.(' + componentExtNames + ')',
+            'uni_modules/*/customElements/*/*.uts',
         ], [], {
             resolve: inputDir,
         }),
         refresh() {
-            res.options = initEasycomOptions();
+            res.easyComOptions = initEasycomOptions();
             if (process.env.UNI_COMPILE_TARGET !== 'ext-api') {
-                initEasycom(res.options);
+                clearEasycom();
+                (0, uts_1.clearUTSComponents)();
+                (0, uts_1.clearUTSCustomElements)();
+                initEasycom(easyComOptions);
+                initUTSEasycomCustomElements();
                 initUTSEasycom();
             }
         },
@@ -93,14 +113,14 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
 }
 exports.initEasycoms = initEasycoms;
 exports.initEasycomsOnce = (0, uni_shared_1.once)(initEasycoms);
-function initUniModulesEasycomDirs(uniModulesDir) {
+function initUniModulesEasycomDirs(uniModulesDir, componentsDir = 'components') {
     if (!fs_1.default.existsSync(uniModulesDir)) {
         return [];
     }
     return fs_1.default
         .readdirSync(uniModulesDir)
         .map((uniModuleDir) => {
-        const uniModuleComponentsDir = path_1.default.resolve(uniModulesDir, uniModuleDir, 'components');
+        const uniModuleComponentsDir = path_1.default.resolve(uniModulesDir, uniModuleDir, componentsDir);
         if (fs_1.default.existsSync(uniModuleComponentsDir)) {
             return uniModuleComponentsDir;
         }
@@ -108,7 +128,6 @@ function initUniModulesEasycomDirs(uniModulesDir) {
         .filter(Boolean);
 }
 function initEasycom({ isX, dirs, rootDir, custom, extensions, }) {
-    clearEasycom();
     rootDir = (0, utils_1.normalizePath)(rootDir);
     const easycomsObj = Object.create(null);
     if (dirs && dirs.length && rootDir) {
@@ -258,10 +277,13 @@ function addImportDeclaration(importDeclarations, local, source, imported) {
 }
 exports.addImportDeclaration = addImportDeclaration;
 function createImportDeclaration(local, source, imported) {
-    if (imported) {
+    if (imported && local) {
         return `import { ${imported} as ${local} } from '${source}';`;
     }
-    return `import ${local} from '${source}';`;
+    if (local) {
+        return `import ${local} from '${source}';`;
+    }
+    return `import '${source}';`;
 }
 const RESOLVE_EASYCOM_IMPORT_CODE = `import { resolveDynamicComponent as __resolveDynamicComponent } from 'vue';import { resolveEasycom } from '@dcloudio/uni-app';`;
 function genResolveEasycomCode(importDeclarations, code, name) {

package/dist/i18n.js

@@ -44,7 +44,7 @@ function isUniAppLocaleFile(filepath) {
 }
 exports.isUniAppLocaleFile = isUniAppLocaleFile;
 function parseLocaleJson(filepath) {
-    let jsonObj = (0, json_1.parseJson)(fs_1.default.readFileSync(filepath, 'utf8'));
+    let jsonObj = (0, json_1.parseJson)(fs_1.default.readFileSync(filepath, 'utf8'), false, filepath);
     if (isUniAppLocaleFile(filepath)) {
         jsonObj = jsonObj.common || {};
     }

package/dist/index.d.ts

@@ -24,6 +24,8 @@ export * from './platform';
 export * from './utsUtils';
 export { parseUniExtApi, parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, formatExtApiProviderName, } from './uni_modules';
 export { parseUniModulesArtifacts, resolveEncryptUniModule, } from './uni_modules.cloud';
+import type { EncryptPackageJson } from './uni_modules.cloud';
+export type EncryptArtifacts = EncryptPackageJson['uni_modules']['artifacts'];
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/json/json.d.ts

@@ -1 +1 @@
-export declare function parseJson(jsonStr: string, shouldPre?: boolean): any;
+export declare function parseJson(jsonStr: string, shouldPre: boolean | undefined, filename: string): any;

package/dist/json/json.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJson = void 0;
 const jsonc_parser_1 = require("jsonc-parser");
 const preprocess_1 = require("../preprocess");
-function parseJson(jsonStr, shouldPre = false) {
+function parseJson(jsonStr, shouldPre = false, filename) {
     return (0, jsonc_parser_1.parse)(shouldPre
         ? process.env.UNI_APP_X === 'true'
-            ? (0, preprocess_1.preUVueJson)(jsonStr)
-            : (0, preprocess_1.preJson)(jsonStr)
+            ? (0, preprocess_1.preUVueJson)(jsonStr, filename)
+            : (0, preprocess_1.preJson)(jsonStr, filename)
         : jsonStr);
 }
 exports.parseJson = parseJson;

package/dist/json/manifest.js

@@ -17,7 +17,7 @@ const parseManifestJson = (inputDir) => {
             return {};
         }
     }
-    return (0, json_1.parseJson)(fs_1.default.readFileSync(path_1.default.join(inputDir, 'manifest.json'), 'utf8'));
+    return (0, json_1.parseJson)(fs_1.default.readFileSync(manifestFilename, 'utf8'), false, manifestFilename);
 };
 exports.parseManifestJson = parseManifestJson;
 exports.parseManifestJsonOnce = (0, uni_shared_1.once)(exports.parseManifestJson);

package/dist/json/mp/jsonFile.js

@@ -162,6 +162,9 @@ function findMiniProgramUsingComponent(usingComponents, componentsDir) {
         else if (componentsDir && path.includes(componentsDir + '/')) {
             res[name] = 'component';
         }
+        else if (path.startsWith('weui-miniprogram')) {
+            res[name] = 'weui';
+        }
         return res;
     }, {});
 }

package/dist/json/mp/pages.js

@@ -57,7 +57,7 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
     let pageJsons = {};
     let nvuePages = [];
     // preprocess
-    const pagesJson = (0, json_1.parseJson)(jsonStr, true);
+    const pagesJson = (0, json_1.parseJson)(jsonStr, true, 'pages.json');
     if (!pagesJson) {
         throw new Error(`[vite] Error: pages.json parse failed.\n`);
     }

package/dist/json/mp/project.js

@@ -25,7 +25,7 @@ function isMiniProgramProjectJsonKey(name) {
 exports.isMiniProgramProjectJsonKey = isMiniProgramProjectJsonKey;
 function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson }) {
     const projectJson = JSON.parse(JSON.stringify(template));
-    const manifestJson = (0, json_1.parseJson)(jsonStr);
+    const manifestJson = (0, json_1.parseJson)(jsonStr, false, '');
     if (manifestJson) {
         projectJson.projectname = manifestJson.name;
         // 用户的平台配置

package/dist/json/mp/types.d.ts

@@ -119,5 +119,5 @@ export interface AppJson {
     restartStrategy?: RestartStrategy;
     [name: string]: unknown;
 }
-export type MiniProgramComponentsType = 'plugin' | 'component' | 'dynamicLib' | 'ext' | 'xr-frame';
+export type MiniProgramComponentsType = 'plugin' | 'component' | 'dynamicLib' | 'ext' | 'xr-frame' | 'weui';
 export {};

package/dist/json/pages.js

@@ -64,7 +64,7 @@ const parsePagesJson = (inputDir, platform, normalize = true) => {
     if (normalize) {
         return normalizePagesJson(jsonStr, platform);
     }
-    return (0, json_1.parseJson)(jsonStr, true);
+    return (0, json_1.parseJson)(jsonStr, true, pagesFilename);
 };
 exports.parsePagesJson = parsePagesJson;
 /**
@@ -87,7 +87,7 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
     };
     // preprocess
     try {
-        pagesJson = (0, json_1.parseJson)(jsonStr, true);
+        pagesJson = (0, json_1.parseJson)(jsonStr, true, 'pages.json');
     }
     catch (e) {
         console.error(`[vite] Error: pages.json parse failed.\n`, jsonStr, e);

package/dist/json/theme.js

@@ -25,7 +25,7 @@ const parseThemeJson = (themeLocation = 'theme.json') => {
         return {};
     }
     const jsonStr = fs_1.default.readFileSync(themeLocation, 'utf8');
-    return (0, json_1.parseJson)(jsonStr, true);
+    return (0, json_1.parseJson)(jsonStr, true, themeLocation);
 };
 exports.parseThemeJson = parseThemeJson;
 const SCHEME_RE = /^([a-z-]+:)?\/\//i;
@@ -74,7 +74,7 @@ const getPagesJson = (inputDir) => {
         };
     }
     const jsonStr = fs_1.default.readFileSync(pagesFilename, 'utf8');
-    return (0, json_1.parseJson)(jsonStr, true);
+    return (0, json_1.parseJson)(jsonStr, true, pagesFilename);
 };
 exports.normalizeThemeConfigOnce = (0, uni_shared_1.once)((manifestJsonPlatform = {}) => {
     const themeConfig = (0, exports.parseThemeJson)(manifestJsonPlatform.themeLocation);

package/dist/json/uni-x/index.js

@@ -147,7 +147,7 @@ function walkNode(node, pagePathNodes) {
 }
 function normalizeUniAppXAppPagesJson(jsonStr) {
     // 先条件编译
-    jsonStr = (0, preprocess_1.preUVueJson)(jsonStr);
+    jsonStr = (0, preprocess_1.preUVueJson)(jsonStr, 'pages.json');
     checkPagesJson(jsonStr, process.env.UNI_INPUT_DIR);
     const pagesJson = {
         pages: [],
@@ -159,7 +159,7 @@ function normalizeUniAppXAppPagesJson(jsonStr) {
     };
     try {
         // 此处不需要条件编译了
-        userPagesJson = (0, json_1.parseJson)(jsonStr, false);
+        userPagesJson = (0, json_1.parseJson)(jsonStr, false, 'pages.json');
     }
     catch (e) {
         console.error(`[vite] Error: pages.json parse failed.\n`, jsonStr, e);

package/dist/logs/console.d.ts

@@ -1,3 +1,5 @@
 import type { TransformResult } from 'vite';
+import type * as tsTypes from 'typescript';
 export declare function rewriteConsoleExpr(method: string, id: string, filename: string, code: string, sourceMap?: boolean): TransformResult;
 export declare function restoreConsoleExpr(code: string): string;
+export declare function appendConsoleExpr(filename: string, code: string, ts: typeof tsTypes): string;

package/dist/logs/console.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.restoreConsoleExpr = exports.rewriteConsoleExpr = void 0;
+exports.appendConsoleExpr = exports.restoreConsoleExpr = exports.rewriteConsoleExpr = void 0;
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 function rewriteConsoleExpr(method, id, filename, code, sourceMap = false) {
@@ -53,3 +53,37 @@ function getLocator(source) {
         return { line, column };
     };
 }
+const methods = ['log', 'info', 'debug', 'warn', 'error'];
+function appendConsoleExpr(filename, code, ts) {
+    if (!ts) {
+        return code;
+    }
+    const s = new magic_string_1.default(code);
+    const sourceFile = ts.createSourceFile(filename, code, ts.ScriptTarget.Latest);
+    // 遍历sourceFile，查找console的方法调用
+    const traverse = (node) => {
+        ts.forEachChild(node, (node) => traverse(node));
+        if (ts.isCallExpression(node) &&
+            node.arguments.length > 0 &&
+            ts.isPropertyAccessExpression(node.expression)) {
+            const propertyAccess = node.expression;
+            if (ts.isIdentifier(propertyAccess.expression) &&
+                propertyAccess.expression.text === 'console' &&
+                ts.isIdentifier(propertyAccess.name) &&
+                methods.includes(propertyAccess.name.text)) {
+                const lastArg = node.arguments[node.arguments.length - 1];
+                if (lastArg) {
+                    const { line } = sourceFile.getLineAndCharacterOfPosition(propertyAccess.name.end);
+                    // 重要，需要用双引号，因为混编的kt，swift，java不能用单引号（char类型）
+                    s.prependRight(lastArg.getEnd(), `, " at ${filename}:${line + 1}"`);
+                }
+            }
+        }
+    };
+    traverse(sourceFile);
+    if (s.hasChanged()) {
+        return s.toString();
+    }
+    return code;
+}
+exports.appendConsoleExpr = appendConsoleExpr;

package/dist/mp/plugin.js

@@ -14,7 +14,7 @@ exports.copyMiniProgramPluginJson = {
         return process.env.UNI_OUTPUT_DIR;
     },
     transform(source) {
-        const pluginJson = (0, json_1.parseJson)(source.toString(), true);
+        const pluginJson = (0, json_1.parseJson)(source.toString(), true, 'plugin.json');
         if (process.env.UNI_APP_X === 'true') {
             const pluginMainJs = pluginJson.main;
             if (pluginMainJs && pluginMainJs.endsWith('.uts')) {
@@ -38,7 +38,7 @@ const copyMiniProgramThemeJson = () => {
                     return process.env.UNI_OUTPUT_DIR;
                 },
                 transform(source) {
-                    return JSON.stringify((0, json_1.parseJson)(source.toString(), true), null, 2);
+                    return JSON.stringify((0, json_1.parseJson)(source.toString(), true, themeLocation), null, 2);
                 },
             },
         ];

package/dist/mp/usingComponents.d.ts

@@ -62,8 +62,6 @@ export declare function transformDynamicImports(code: string, imports: ImportDec
     dynamicImport: (name: string, source: string) => string;
 }): Promise<{
     code: string;
-    map: {
-        mappings: '';
-    };
+    map: null;
 }>;
 export {};

package/dist/mp/usingComponents.js

@@ -390,9 +390,7 @@ async function transformDynamicImports(code, imports, { id, sourceMap, dynamicIm
     if (!imports.length) {
         return {
             code,
-            map: {
-                mappings: '',
-            },
+            map: null,
         };
     }
     const s = new magic_string_1.default(code);
@@ -402,9 +400,7 @@ async function transformDynamicImports(code, imports, { id, sourceMap, dynamicIm
     }
     return {
         code: s.toString(),
-        map: {
-            mappings: '',
-        },
+        map: null,
     };
 }
 exports.transformDynamicImports = transformDynamicImports;

package/dist/platform.d.ts

@@ -1,4 +1,4 @@
 export declare function registerPlatform(platform: string): void;
 export declare function getPlatforms(): string[];
-export declare function getPlatformDir(): "quickapp-webview-huawei" | "quickapp-webview-union";
+export declare function getPlatformDir(): keyof UniApp.PagesJsonPagePlatformStyle | "app-ios" | "app-android";
 export declare function isMiniProgramPlatform(): boolean;

package/dist/platform.js

@@ -38,6 +38,9 @@ function getPlatforms() {
 }
 exports.getPlatforms = getPlatforms;
 function getPlatformDir() {
+    if (process.env.UNI_APP_X && process.env.UNI_PLATFORM === 'app') {
+        return process.env.UNI_UTS_PLATFORM;
+    }
     return process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM;
 }
 exports.getPlatformDir = getPlatformDir;

package/dist/preprocess/index.d.ts

@@ -1,13 +1,13 @@
 export { initPreContext } from './context';
-export declare function preJs(jsCode: string): any;
-export declare function preHtml(htmlCode: string): any;
+export declare function preJs(jsCode: string, filename: string): any;
+export declare function preHtml(htmlCode: string, filename: string): any;
 export declare const preCss: typeof preJs;
 export declare const preJson: typeof preJs;
-export declare function preNVueJs(jsCode: string): any;
-export declare function preNVueHtml(htmlCode: string): any;
+export declare function preNVueJs(jsCode: string, filename: string): any;
+export declare function preNVueHtml(htmlCode: string, filename: string): any;
 export declare const preNVueCss: typeof preNVueJs;
 export declare const preNVueJson: typeof preNVueJs;
-export declare function preUVueJs(jsCode: string): any;
-export declare function preUVueHtml(htmlCode: string): any;
+export declare function preUVueJs(jsCode: string, filename: string): any;
+export declare function preUVueHtml(htmlCode: string, filename: string): any;
 export declare const preUVueCss: typeof preUVueJs;
 export declare const preUVueJson: typeof preUVueJs;

package/dist/preprocess/index.js

@@ -1,44 +1,117 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preUVueJson = exports.preUVueCss = exports.preUVueHtml = exports.preUVueJs = exports.preNVueJson = exports.preNVueCss = exports.preNVueHtml = exports.preNVueJs = exports.preJson = exports.preCss = exports.preHtml = exports.preJs = exports.initPreContext = void 0;
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("../utils");
 const context_1 = require("./context");
 /* eslint-disable no-restricted-globals */
-const { preprocess } = require('../../lib/preprocess');
+const { preprocess: preprocessLib } = require('../../lib/preprocess');
 var context_2 = require("./context");
 Object.defineProperty(exports, "initPreContext", { enumerable: true, get: function () { return context_2.initPreContext; } });
-function preJs(jsCode) {
+function normalizeFilename(filename) {
+    return () => {
+        if (filename && process.env.UNI_INPUT_DIR) {
+            const inputDir = (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR);
+            filename = (0, utils_1.normalizePath)(filename.split('?')[0]);
+            if (filename.startsWith(inputDir)) {
+                return 'at ' + (0, utils_1.normalizePath)(path_1.default.relative(inputDir, filename)) + ':1';
+            }
+            return 'at ' + filename + ':1';
+        }
+    };
+}
+function preJs(jsCode, filename) {
     if (process.env.UNI_APP_X === 'true') {
-        return preUVueJs(jsCode);
+        return preUVueJs(jsCode, filename);
     }
-    return preprocess(jsCode, (0, context_1.getPreVueContext)(), { type: 'js' });
+    return preprocess(jsCode, (0, context_1.getPreVueContext)(), {
+        type: 'js',
+        filename: normalizeFilename(filename),
+    });
 }
 exports.preJs = preJs;
-function preHtml(htmlCode) {
+function preHtml(htmlCode, filename) {
     if (process.env.UNI_APP_X === 'true') {
-        return preUVueHtml(htmlCode);
+        return preUVueHtml(htmlCode, filename);
     }
-    return preprocess(htmlCode, (0, context_1.getPreVueContext)(), { type: 'html' });
+    return preprocess(htmlCode, (0, context_1.getPreVueContext)(), {
+        type: 'html',
+        filename: normalizeFilename(filename),
+    });
 }
 exports.preHtml = preHtml;
 exports.preCss = preJs;
 exports.preJson = preJs;
-function preNVueJs(jsCode) {
-    return preprocess(jsCode, (0, context_1.getPreNVueContext)(), { type: 'js' });
+function preNVueJs(jsCode, filename) {
+    return preprocess(jsCode, (0, context_1.getPreNVueContext)(), {
+        type: 'js',
+        filename: normalizeFilename(filename),
+    });
 }
 exports.preNVueJs = preNVueJs;
-function preNVueHtml(htmlCode) {
-    return preprocess(htmlCode, (0, context_1.getPreNVueContext)(), { type: 'html' });
+function preNVueHtml(htmlCode, filename) {
+    return preprocess(htmlCode, (0, context_1.getPreNVueContext)(), {
+        type: 'html',
+        filename: normalizeFilename(filename),
+    });
 }
 exports.preNVueHtml = preNVueHtml;
 exports.preNVueCss = preNVueJs;
 exports.preNVueJson = preNVueJs;
-function preUVueJs(jsCode) {
-    return preprocess(jsCode, (0, context_1.getPreUVueContext)(), { type: 'js' });
+function preUVueJs(jsCode, filename) {
+    return preprocess(jsCode, (0, context_1.getPreUVueContext)(), {
+        type: 'js',
+        filename: normalizeFilename(filename),
+    });
 }
 exports.preUVueJs = preUVueJs;
-function preUVueHtml(htmlCode) {
-    return preprocess(htmlCode, (0, context_1.getPreUVueContext)(), { type: 'html' });
+function preUVueHtml(htmlCode, filename) {
+    return preprocess(htmlCode, (0, context_1.getPreUVueContext)(), {
+        type: 'html',
+        filename: normalizeFilename(filename),
+    });
 }
 exports.preUVueHtml = preUVueHtml;
 exports.preUVueCss = preUVueJs;
 exports.preUVueJson = preUVueJs;
+const ERRORS = {
+    html: `条件编译失败
+%FILENAME%
+参考示例(注意 ifdef 与 endif 必须配对使用):
+<!--  #ifdef  %PLATFORM% -->
+模板代码
+<!--  #endif -->
+`,
+    js: `条件编译失败
+%FILENAME%
+参考示例(注意 ifdef 与 endif 必须配对使用):
+// #ifdef  %PLATFORM%
+代码
+// #endif
+`,
+    css: `条件编译失败
+%FILENAME%
+参考示例(注意 ifdef 与 endif 必须配对使用):
+/*  #ifdef  %PLATFORM%  */
+代码
+/*  #endif  */
+`,
+};
+function preprocess(code, context, options) {
+    try {
+        return preprocessLib(code, context, options);
+    }
+    catch (e) {
+        const msg = ERRORS[options.type];
+        if (msg) {
+            console.error(msg.replace('%FILENAME%', options.filename?.() || ''));
+        }
+        else {
+            throw e;
+        }
+    }
+    return code;
+}

package/dist/resolve.js

@@ -97,7 +97,7 @@ 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 path_1.default.resolve(process.env.UNI_APP_NEXT_WORKSPACE, 'packages', module.replace('@dcloudio/', ''));
     }
     return require.resolve(module, { paths: getBuiltInPaths() });
 }

package/dist/uni_modules.cloud.d.ts

@@ -14,7 +14,7 @@ export declare function packUploadEncryptUniModules(uniModules: Record<string, E
     zipFile: string;
     modules: string[];
 };
-interface EncryptPackageJson {
+export interface EncryptPackageJson {
     id: string;
     version: string;
     uni_modules: {
@@ -26,6 +26,10 @@ interface EncryptPackageJson {
             apis: string[];
             components: string[];
             scopedSlots: string[];
+            customElements: {
+                name: string;
+                class: string;
+            }[];
             declaration: string;
         };
     };
@@ -47,4 +51,3 @@ export declare function parseUniModulesArtifacts(): {
     scopedSlots: string[];
     declaration: string;
 }[];
-export {};

package/dist/uni_modules.cloud.js

@@ -212,7 +212,8 @@ function findEncryptUniModuleCache(uniModuleId, cacheDir, options) {
         const pkg = require(path_1.default.resolve(uniModuleCacheDir, 'package.json'));
         // 插件版本以及各种环境一致
         if (pkg.version === options.version &&
-            !isEnvExpired(pkg.uni_modules?.artifacts?.env || {}, options.env)) {
+            (options.env.compilerVersion === '4.17-test' ||
+                !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
@@ -284,7 +285,8 @@ function resolveEncryptUniModule(id, platform, isX = true) {
     if (index !== -1) {
         const uniModuleId = parts[index + 1];
         if (uniModuleId in encryptUniModules) {
-            if (parts[index + 2]) {
+            if (parts[index + 2] &&
+                (platform === 'app-android' || platform === 'app-ios')) {
                 console.warn(messages_1.M['uni_modules.import']
                     .replace('{0}', uniModuleId)
                     .replace('{1}', uniModuleId)

package/dist/uni_modules.d.ts

@@ -5,6 +5,8 @@ export type DefineOptions = {
         js?: boolean;
         kotlin?: boolean;
         swift?: boolean;
+        arkts?: boolean;
+        ['x-arkts']?: boolean;
     };
     [key: string]: any;
 };

package/dist/uts.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+import { type Import, type Unimport } from 'unimport';
 import type * as UTSCompiler from '@dcloudio/uni-uts-v1';
 import type { EasycomMatcher } from './easycom';
 /**
@@ -12,14 +13,37 @@ export declare function resolveUTSAppModule(platform: typeof process.env.UNI_UTS
 export declare function resolveUTSModule(id: string, importer: string, includeUTSSDK?: boolean): string | undefined;
 export declare function resolveUTSCompiler(throwError?: boolean): typeof UTSCompiler;
 export declare function resolveUTSCompilerVersion(): string;
+interface UTSComponentMeta {
+    source: string;
+    kotlinPackage: string;
+    swiftModule: string;
+}
+interface UTSCustomElementMeta extends UTSComponentMeta {
+    exports: [string][];
+}
+export declare function getUTSCustomElementsExports(): Map<string, UTSCustomElementMeta>;
+export declare function clearUTSComponents(): void;
 export declare function isUTSComponent(name: string): boolean;
+export declare function clearUTSCustomElements(): void;
+export declare function getUTSCustomElements(): Map<string, UTSComponentMeta>;
+export declare function getUTSPluginCustomElements(): Record<string, Set<string>>;
+export declare function isUTSCustomElement(name: string): boolean;
+export declare function getUTSCustomElement(name: string): UTSComponentMeta | undefined;
 export declare function getUTSComponentAutoImports(language: 'kotlin' | 'swift'): Record<string, [[string]]>;
+export declare function getUTSCustomElementAutoImports(language: 'kotlin' | 'swift'): Record<string, [string][]>;
 export declare function parseUTSComponent(name: string, type: 'kotlin' | 'swift'): {
     className: string;
     namespace: string;
     source: string;
 } | undefined;
+export declare function parseUTSCustomElement(name: string, type: 'kotlin' | 'swift'): {
+    className: string;
+    namespace: string;
+    source: string;
+} | undefined;
 export declare function initUTSComponents(inputDir: string, platform: UniApp.PLATFORM): EasycomMatcher[];
+export declare function initUTSCustomElements(inputDir: string, platform: UniApp.PLATFORM): EasycomMatcher[];
+export declare function parseCustomElementExports(filePath: string, unimport?: Unimport): Promise<Import[]>;
 export declare function parseKotlinPackageWithPluginId(id: string, is_uni_modules: boolean): string;
 export declare function parseSwiftPackageWithPluginId(id: string, is_uni_modules: boolean): string;
 export type UTSTargetLanguage = typeof process.env.UNI_UTS_TARGET_LANGUAGE;
@@ -33,3 +57,4 @@ export declare function uvueOutDir(platform: 'app-android' | 'app-ios' | 'app-ha
 export declare function tscOutDir(platform: 'app-android' | 'app-ios' | 'app-harmony'): string;
 export declare function isUTSProxy(id: string): boolean;
 export declare function isUniHelpers(id: string): boolean;
+export {};