@dcloudio/uni-cli-shared 3.0.0-alpha-1000920260909822 → 3.0.0-alpha-5020720260921001

package/dist/dom2/script.js

@@ -4,7 +4,6 @@ exports.uniVaporScriptPlugin = void 0;
 const uts_1 = require("../uts");
 const extApi_1 = require("../uts/extApi");
 const utils_1 = require("../utils");
-const scriptMacros_1 = require("../uts/scriptMacros");
 const sharedData_1 = require("./sharedData");
 function uniVaporScriptPlugin(options = {}) {
     const { uasm, ...sharedData } = options;
@@ -15,7 +14,6 @@ function uniVaporScriptPlugin(options = {}) {
         : undefined;
     return D2SP({
         typescript: (0, uts_1.resolveUTSCompiler)().getTypeScript(),
-        createUniAppXScriptMacrosTransformer: scriptMacros_1.createUniAppXScriptMacrosTransformer,
         extApi,
         uasm,
         sharedData: {

package/dist/hbx/index.d.ts

@@ -1,5 +1,5 @@
 export { formatAtFilename, createErrorWithBlockFlag } from './log';
 export * from './env';
 export { initModuleAlias, installHBuilderXPlugin, formatInstallHBuilderXPluginTips, } from './alias';
-export declare function uniHBuilderXConsolePlugin(method?: string): import("vite/dist/node").Plugin<any>;
+export declare function uniHBuilderXConsolePlugin(method?: string): import("vite").Plugin<any>;
 export declare function isEnableConsole(): boolean;

package/dist/index.d.ts

@@ -7,7 +7,6 @@ export * from './ssr';
 export * from './vue';
 export * from './uts';
 export * from './uts/extApi';
-export * from './uts/scriptMacros';
 export * from './x';
 export * from './logs';
 export * from './dom2';

package/dist/index.js

@@ -24,7 +24,6 @@ __exportStar(require("./ssr"), exports);
 __exportStar(require("./vue"), exports);
 __exportStar(require("./uts"), exports);
 __exportStar(require("./uts/extApi"), exports);
-__exportStar(require("./uts/scriptMacros"), exports);
 __exportStar(require("./x"), exports);
 __exportStar(require("./logs"), exports);
 __exportStar(require("./dom2"), exports);

package/dist/json/manifest.d.ts

@@ -1,8 +1,5 @@
 export declare const parseManifestJson: (inputDir: string) => any;
 export declare const parseManifestJsonOnce: (inputDir: string) => any;
-export type UniAppXVaporScriptLang = 'js' | 'ts' | 'uts';
-export declare function resolveUniAppXVaporScriptLang(manifestJson: Record<string, any>): UniAppXVaporScriptLang;
-export declare function getUniAppXVaporScriptLang(inputDir?: string): UniAppXVaporScriptLang;
 export declare const parseRpx2UnitOnce: (inputDir: string, platform?: UniApp.PLATFORM) => any;
 export declare function getNativeTags(inputDir?: string, platform?: UniApp.PLATFORM): any;
 interface CompilerCompatConfig {

package/dist/json/manifest.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.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getPlatformManifestJson = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.getNativeTags = exports.parseRpx2UnitOnce = exports.getUniAppXVaporScriptLang = exports.resolveUniAppXVaporScriptLang = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getPlatformManifestJson = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.getNativeTags = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -21,18 +21,6 @@ const parseManifestJson = (inputDir) => {
 };
 exports.parseManifestJson = parseManifestJson;
 exports.parseManifestJsonOnce = (0, uni_shared_1.once)(exports.parseManifestJson);
-function resolveUniAppXVaporScriptLang(manifestJson) {
-    const lang = manifestJson['uni-app-x']?.['vapor-default-script-lang'];
-    return lang === 'js' || lang === 'ts' || lang === 'uts' ? lang : 'ts';
-}
-exports.resolveUniAppXVaporScriptLang = resolveUniAppXVaporScriptLang;
-function getUniAppXVaporScriptLang(inputDir) {
-    if (!inputDir) {
-        return 'ts';
-    }
-    return resolveUniAppXVaporScriptLang((0, exports.parseManifestJsonOnce)(inputDir));
-}
-exports.getUniAppXVaporScriptLang = getUniAppXVaporScriptLang;
 exports.parseRpx2UnitOnce = (0, uni_shared_1.once)((inputDir, platform = 'h5') => {
     const rpx2unit = platform === 'h5' || platform === 'app' || platform === 'app-harmony'
         ? uni_shared_1.defaultRpx2Unit

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

@@ -5,9 +5,16 @@ export declare function hasJsonFile(filename: string): boolean;
 export declare function getComponentJsonFilenames(): string[];
 export declare function findJsonFile(filename: string): Record<string, any> | ComponentJson | PageWindowOptions | undefined;
 export declare function findUsingComponents(filename: string): UsingComponents | undefined;
+export declare function findMiniProgramSubPackageRoot(filename: string): string | undefined;
+export declare function addMiniProgramComponentPackageRoot(filename: string, packageRoot?: string): void;
+export declare function findMiniProgramComponentPackageRoot(filename: string): string | undefined;
+export declare function findMiniProgramComponentPackageRoots(filename: string): (string | undefined)[] | undefined;
+export declare function resolveMiniProgramComponentPackageRoot(filename: string, packageRoot?: string): string | undefined;
 export declare function normalizeJsonFilename(filename: string): string;
 export declare function findChangedJsonFiles(supportGlobalUsingComponents?: boolean | ((filename: string) => boolean)): Map<string, string>;
-export declare function addMiniProgramAppJson(appJson: Record<string, any>): void;
+export declare function addMiniProgramAppJson(appJson: Record<string, any>, options?: {
+    subPackages?: boolean;
+}): void;
 export declare function addMiniProgramPageJson(filename: string, json: PageWindowOptions): void;
 export declare function addMiniProgramComponentJson(filename: string, json: ComponentJson): void;
 export declare function addMiniProgramUsingComponents(filename: string, json: UsingComponents): void;

package/dist/json/mp/jsonFile.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.findUsingComponentsJson = exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.resetMiniProgramJsonFiles = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.findUsingComponents = exports.findJsonFile = exports.getComponentJsonFilenames = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
+exports.findUsingComponentsJson = exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.resetMiniProgramJsonFiles = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.resolveMiniProgramComponentPackageRoot = exports.findMiniProgramComponentPackageRoots = exports.findMiniProgramComponentPackageRoot = exports.addMiniProgramComponentPackageRoot = exports.findMiniProgramSubPackageRoot = exports.findUsingComponents = exports.findJsonFile = exports.getComponentJsonFilenames = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const shared_1 = require("@vue/shared");
@@ -12,12 +12,16 @@ const resolve_1 = require("../../resolve");
 const utils_2 = require("../../vue/utils");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const subpackage_1 = require("./subpackage");
+const x_1 = require("../../x");
 let appJsonCache = {};
+let subPackageRootsCache = [];
 let independentRootsCache = [];
 const jsonFilesCache = new Map();
 const jsonPagesCache = new Map();
 const jsonComponentsCache = new Map();
 const jsonUsingComponentsCache = new Map();
+const componentPackageRootsCache = new Map();
+const mainPackageRoot = '';
 function isMiniProgramPageFile(file, inputDir) {
     if (inputDir && path_1.default.isAbsolute(file)) {
         file = (0, utils_1.normalizePath)(path_1.default.relative(inputDir, file));
@@ -50,6 +54,74 @@ function findUsingComponents(filename) {
     return jsonUsingComponentsCache.get(filename);
 }
 exports.findUsingComponents = findUsingComponents;
+function findMiniProgramSubPackageRoot(filename) {
+    if (!(0, x_1.isUniAppX)()) {
+        return;
+    }
+    return findSubPackageRoot(filename, subPackageRootsCache);
+}
+exports.findMiniProgramSubPackageRoot = findMiniProgramSubPackageRoot;
+function addMiniProgramComponentPackageRoot(filename, packageRoot) {
+    if (!(0, x_1.isUniAppX)()) {
+        return;
+    }
+    const normalizedFilename = normalizeComponentPackageFilename(filename);
+    if (!normalizedFilename.startsWith('uni_modules/')) {
+        return;
+    }
+    const roots = componentPackageRootsCache.get(normalizedFilename) || new Set();
+    roots.add(packageRoot || mainPackageRoot);
+    componentPackageRootsCache.set(normalizedFilename, roots);
+}
+exports.addMiniProgramComponentPackageRoot = addMiniProgramComponentPackageRoot;
+function findMiniProgramComponentPackageRoot(filename) {
+    if (!(0, x_1.isUniAppX)()) {
+        return;
+    }
+    const roots = getMiniProgramComponentPackageRoots(filename);
+    if (roots?.size === 1) {
+        const [root] = [...roots];
+        return root || undefined;
+    }
+}
+exports.findMiniProgramComponentPackageRoot = findMiniProgramComponentPackageRoot;
+function findMiniProgramComponentPackageRoots(filename) {
+    if (!(0, x_1.isUniAppX)()) {
+        return;
+    }
+    const roots = getMiniProgramComponentPackageRoots(filename);
+    if (roots) {
+        if (roots.has(mainPackageRoot) || roots.size > 1) {
+            return [undefined];
+        }
+        return [...roots].map((root) => root || undefined);
+    }
+}
+exports.findMiniProgramComponentPackageRoots = findMiniProgramComponentPackageRoots;
+function resolveMiniProgramComponentPackageRoot(filename, packageRoot) {
+    if (!(0, x_1.isUniAppX)()) {
+        return;
+    }
+    const roots = getMiniProgramComponentPackageRoots(filename);
+    if (!roots) {
+        return packageRoot;
+    }
+    if (roots.has(mainPackageRoot)) {
+        return;
+    }
+    if (roots.size > 1) {
+        return;
+    }
+    const normalizedPackageRoot = packageRoot || mainPackageRoot;
+    if (roots.has(normalizedPackageRoot)) {
+        return packageRoot;
+    }
+    if (roots.size === 1) {
+        const [root] = [...roots];
+        return root || undefined;
+    }
+}
+exports.resolveMiniProgramComponentPackageRoot = resolveMiniProgramComponentPackageRoot;
 function normalizeJsonFilename(filename) {
     return (0, utils_1.normalizeNodeModules)(filename);
 }
@@ -57,16 +129,20 @@ exports.normalizeJsonFilename = normalizeJsonFilename;
 function findChangedJsonFiles(supportGlobalUsingComponents = true) {
     const changedJsonFiles = new Map();
     function findChangedFile(filename, json) {
+        const cacheFilename = filename;
+        const outputFilename = (0, x_1.isUniAppX)()
+            ? normalizeJsonPackageFilename(filename)
+            : filename;
         const newJson = JSON.parse(JSON.stringify(json));
         if (!newJson.usingComponents) {
             newJson.usingComponents = {};
         }
-        (0, shared_1.extend)(newJson.usingComponents, jsonUsingComponentsCache.get(filename));
+        (0, shared_1.extend)(newJson.usingComponents, jsonUsingComponentsCache.get(cacheFilename));
         // 格式化为相对路径，这样作为分包也可以直接运行
         // app.json mp-baidu 在 win 不支持相对路径。所有平台改用绝对路径
-        if (filename !== 'app') {
+        if (outputFilename !== 'app') {
             let usingComponents = newJson.usingComponents;
-            const independentRoot = findIndependentRoot(filename, independentRootsCache);
+            const independentRoot = findSubPackageRoot(outputFilename, independentRootsCache);
             const supportGlobalUsingComponentsForFile = typeof supportGlobalUsingComponents === 'function'
                 ? supportGlobalUsingComponents(filename)
                 : supportGlobalUsingComponents;
@@ -82,20 +158,22 @@ function findChangedJsonFiles(supportGlobalUsingComponents = true) {
                 };
             }
             if (independentRoot) {
-                validateIndependentUsingComponents(filename, independentRoot, usingComponents);
+                validateIndependentUsingComponents(outputFilename, independentRoot, usingComponents);
             }
             Object.keys(usingComponents).forEach((name) => {
-                const componentFilename = usingComponents[name];
+                const componentFilename = (0, x_1.isUniAppX)()
+                    ? normalizeUsingComponentPackageFilename(usingComponents[name], outputFilename)
+                    : usingComponents[name];
                 if (componentFilename.startsWith('/')) {
-                    usingComponents[name] = (0, resolve_1.relativeFile)(filename, componentFilename.slice(1));
+                    usingComponents[name] = (0, resolve_1.relativeFile)(outputFilename, componentFilename.slice(1));
                 }
             });
             newJson.usingComponents = usingComponents;
         }
         const jsonStr = JSON.stringify(newJson, null, 2);
-        if (jsonFilesCache.get(filename) !== jsonStr) {
-            changedJsonFiles.set(filename, jsonStr);
-            jsonFilesCache.set(filename, jsonStr);
+        if (jsonFilesCache.get(outputFilename) !== jsonStr) {
+            changedJsonFiles.set(outputFilename, jsonStr);
+            jsonFilesCache.set(outputFilename, jsonStr);
         }
     }
     function findChangedFiles(jsonsCache) {
@@ -111,8 +189,8 @@ function findChangedJsonFiles(supportGlobalUsingComponents = true) {
     return changedJsonFiles;
 }
 exports.findChangedJsonFiles = findChangedJsonFiles;
-function findIndependentRoot(filename, independentRoots) {
-    return independentRoots.find((root) => {
+function findSubPackageRoot(filename, roots) {
+    return roots.find((root) => {
         return filename === root || filename.startsWith(root + '/');
     });
 }
@@ -142,8 +220,13 @@ function isLocalUsingComponent(componentFilename) {
     return (!/^(?:plugin|dynamicLib|ext):\/\//.test(componentFilename) &&
         !componentFilename.startsWith('weui-miniprogram'));
 }
-function addMiniProgramAppJson(appJson) {
+function addMiniProgramAppJson(appJson, options = {}) {
     appJsonCache = appJson;
+    componentPackageRootsCache.clear();
+    subPackageRootsCache =
+        !(0, x_1.isUniAppX)() || options.subPackages === false
+            ? []
+            : parseSubPackageRoots(appJson);
     independentRootsCache = (0, subpackage_1.parseIndependentSubPackages)(appJson).map(({ root }) => root);
 }
 exports.addMiniProgramAppJson = addMiniProgramAppJson;
@@ -161,14 +244,89 @@ function addMiniProgramUsingComponents(filename, json) {
 exports.addMiniProgramUsingComponents = addMiniProgramUsingComponents;
 function resetMiniProgramJsonFiles() {
     appJsonCache = {};
+    subPackageRootsCache = [];
     independentRootsCache = [];
     (0, subpackage_1.setIndependentSubPackages)([]);
+    componentPackageRootsCache.clear();
     jsonFilesCache.clear();
     jsonPagesCache.clear();
     jsonComponentsCache.clear();
     jsonUsingComponentsCache.clear();
 }
 exports.resetMiniProgramJsonFiles = resetMiniProgramJsonFiles;
+function parseSubPackageRoots(pagesJson) {
+    const subPackages = pagesJson?.subPackages || pagesJson?.subpackages || [];
+    if (!Array.isArray(subPackages)) {
+        return [];
+    }
+    return subPackages
+        .map((subPackage) => {
+        if (!subPackage ||
+            subPackage.independent === true ||
+            typeof subPackage.root !== 'string') {
+            return '';
+        }
+        return (0, utils_1.normalizePath)(subPackage.root).replace(/^\/+|\/+$/g, '');
+    })
+        .filter(Boolean)
+        .sort((a, b) => b.length - a.length);
+}
+function normalizeJsonPackageFilename(filename) {
+    const unrootedFilename = withoutSubPackageRootForUniModules(filename);
+    const ownerRoot = findMiniProgramSubPackageRoot(filename);
+    const roots = getMiniProgramComponentPackageRoots(unrootedFilename);
+    if (unrootedFilename !== filename &&
+        roots &&
+        (roots.has(mainPackageRoot) ||
+            roots.size > 1 ||
+            !ownerRoot ||
+            !roots.has(ownerRoot))) {
+        return unrootedFilename;
+    }
+    return filename;
+}
+function normalizeUsingComponentPackageFilename(componentFilename, ownerFilename) {
+    if (!componentFilename.startsWith('/')) {
+        return componentFilename;
+    }
+    const normalizedFilename = (0, utils_1.normalizePath)(componentFilename).replace(/^\/+/, '');
+    const unrootedFilename = withoutSubPackageRootForUniModules(normalizedFilename);
+    if (!unrootedFilename.startsWith('uni_modules/')) {
+        return componentFilename;
+    }
+    const roots = getMiniProgramComponentPackageRoots(unrootedFilename);
+    if (!roots) {
+        return componentFilename;
+    }
+    if (roots.has(mainPackageRoot) || roots.size > 1) {
+        return '/' + unrootedFilename;
+    }
+    const ownerRoot = findMiniProgramSubPackageRoot(ownerFilename);
+    if (ownerRoot && roots.has(ownerRoot)) {
+        return '/' + `${ownerRoot}/${unrootedFilename}`;
+    }
+    const packageRoot = findMiniProgramComponentPackageRoot(unrootedFilename);
+    return '/' + (packageRoot ? `${packageRoot}/` : '') + unrootedFilename;
+}
+function withoutSubPackageRootForUniModules(filename) {
+    for (const root of subPackageRootsCache) {
+        if (filename.startsWith(`${root}/uni_modules/`)) {
+            return filename.slice(root.length + 1);
+        }
+    }
+    return filename;
+}
+function normalizeComponentPackageFilename(filename) {
+    let normalizedFilename = withoutSubPackageRootForUniModules((0, utils_1.normalizePath)(filename).split('?')[0].replace(/^\/+/, ''));
+    const uniModulesIndex = normalizedFilename.indexOf('uni_modules/');
+    if (uniModulesIndex > -1) {
+        normalizedFilename = normalizedFilename.slice(uniModulesIndex);
+    }
+    return (0, utils_1.removeExt)(normalizedFilename);
+}
+function getMiniProgramComponentPackageRoots(filename) {
+    return componentPackageRootsCache.get(normalizeComponentPackageFilename(filename));
+}
 function isMiniProgramUsingComponent(name, options) {
     return !!findMiniProgramUsingComponents(options)[name];
 }

package/dist/json/uni-x/index.d.ts

@@ -8,7 +8,6 @@ export interface UniXPageOptions {
     androidOverscroll?: boolean;
     androidRefresherColor?: string;
     backgroundColor?: string;
-    backgroundTextStyle?: 'dark' | 'light';
 }
 export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
 export declare function parseUniXPageOptions(filename: string): UniXPageOptions | undefined;

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

@@ -97,7 +97,6 @@ function updateUniXPageOptions(pagesJson) {
 function normalizeRootPageOptions(pageStyle, globalStyle) {
     const androidRefresherColor = pageStyle?.androidRefresherColor ?? globalStyle.androidRefresherColor;
     const backgroundColor = pageStyle?.backgroundColor ?? globalStyle.backgroundColor;
-    const backgroundTextStyle = pageStyle?.backgroundTextStyle ?? globalStyle.backgroundTextStyle;
     return {
         disableScroll: pageStyle?.disableScroll === true || undefined,
         enablePullDownRefresh: (pageStyle && isEnablePullDownRefresh(pageStyle)) || undefined,
@@ -112,9 +111,6 @@ function normalizeRootPageOptions(pageStyle, globalStyle) {
         backgroundColor: backgroundColor?.startsWith('@')
             ? undefined
             : backgroundColor,
-        backgroundTextStyle: backgroundTextStyle?.startsWith('@')
-            ? undefined
-            : backgroundTextStyle,
     };
 }
 function initUniXPageOptions() {

package/dist/logs/console.js

@@ -21,24 +21,13 @@ function rewriteConsoleExpr(method, id, filename, code, sourceMap = false) {
         return {
             code: s.toString(),
             map: sourceMap
-                ? normalizeSourceMap(s.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() }))
+                ? s.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() })
                 : { mappings: '' },
         };
     }
     return { code, map: null };
 }
 exports.rewriteConsoleExpr = rewriteConsoleExpr;
-function normalizeSourceMap(map) {
-    return {
-        ...map,
-        file: map.file || '',
-        names: map.names || [],
-        sources: map.sources || [],
-        sourcesContent: map.sourcesContent || [],
-        toString: () => map.toString(),
-        toUrl: () => map.toUrl(),
-    };
-}
 function restoreConsoleExpr(code) {
     return code.replace(/(?:uni\.)?__f__\('([^']+)','at ([^:]+):(\d+)',/g, 'console.$1(');
 }

package/dist/mp/usingComponents.d.ts

@@ -11,8 +11,8 @@ interface MainDescriptor {
     template: string;
 }
 export declare function parseMainDescriptor(filename: string, ast: Program, resolve: ParseDescriptor['resolve'], root?: string): Promise<MainDescriptor>;
-export declare function updateMiniProgramComponentsByScriptFilename(scriptFilename: string, inputDir: string, normalizeComponentName: (name: string) => string, root?: string): void;
-export declare function updateMiniProgramComponentsByTemplateFilename(templateFilename: string, inputDir: string, normalizeComponentName: (name: string) => string, root?: string): void;
+export declare function updateMiniProgramComponentsByScriptFilename(scriptFilename: string, inputDir: string, normalizeComponentName: (name: string) => string, root?: string, packageRoot?: string): void;
+export declare function updateMiniProgramComponentsByTemplateFilename(templateFilename: string, inputDir: string, normalizeComponentName: (name: string) => string, root?: string, packageRoot?: string): void;
 export declare function updateMiniProgramGlobalComponents(filename: string, ast: Program, { inputDir, resolve, normalizeComponentName, root, }: {
     inputDir: string;
     resolve: ParseDescriptor['resolve'];
@@ -21,7 +21,7 @@ export declare function updateMiniProgramGlobalComponents(filename: string, ast:
 }): Promise<{
     imports: ImportDeclaration[];
 }>;
-export declare function updateMiniProgramComponentsByMainFilename(mainFilename: string, inputDir: string, normalizeComponentName: (name: string) => string, root?: string): void;
+export declare function updateMiniProgramComponentsByMainFilename(mainFilename: string, inputDir: string, normalizeComponentName: (name: string) => string, root?: string, packageRoot?: string): void;
 export interface TemplateDescriptor {
     bindingComponents: BindingComponents;
     imports: ImportDeclaration[];

package/dist/mp/usingComponents.js

@@ -13,6 +13,7 @@ const messages_1 = require("../messages");
 const constants_1 = require("../constants");
 const utils_1 = require("../utils");
 const utils_2 = require("../vite/utils");
+const x_1 = require("../x");
 const jsonFile_1 = require("../json/mp/jsonFile");
 const subpackage_1 = require("../json/mp/subpackage");
 const mainDescriptors = new Map();
@@ -94,17 +95,17 @@ function updateMainDescriptorIndex(mainDescriptorKey, descriptor) {
     scriptDescriptorMainMap.set(descriptor.script, mainDescriptorKey);
     templateDescriptorMainMap.set(descriptor.template, mainDescriptorKey);
 }
-function updateMiniProgramComponentsByScriptFilename(scriptFilename, inputDir, normalizeComponentName, root) {
+function updateMiniProgramComponentsByScriptFilename(scriptFilename, inputDir, normalizeComponentName, root, packageRoot) {
     const mainFilename = findMainFilenameByScriptFilename(createDescriptorKey(scriptFilename, root));
     if (mainFilename) {
-        updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName, root);
+        updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName, root, packageRoot);
     }
 }
 exports.updateMiniProgramComponentsByScriptFilename = updateMiniProgramComponentsByScriptFilename;
-function updateMiniProgramComponentsByTemplateFilename(templateFilename, inputDir, normalizeComponentName, root) {
+function updateMiniProgramComponentsByTemplateFilename(templateFilename, inputDir, normalizeComponentName, root, packageRoot) {
     const mainFilename = findMainFilenameByTemplateFilename(createDescriptorKey(templateFilename, root));
     if (mainFilename) {
-        updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName, root);
+        updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName, root, packageRoot);
     }
 }
 exports.updateMiniProgramComponentsByTemplateFilename = updateMiniProgramComponentsByTemplateFilename;
@@ -126,14 +127,18 @@ async function updateMiniProgramGlobalComponents(filename, ast, { inputDir, reso
             globalComponentSourceMap.set(bindingComponents[name].tag, (0, subpackage_1.withoutIndependentRoot)(value));
         }
     });
-    (0, jsonFile_1.addMiniProgramUsingComponents)('app', createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName));
+    (0, jsonFile_1.addMiniProgramUsingComponents)('app', createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName, undefined, undefined, !!root));
     return {
         imports,
     };
 }
 exports.updateMiniProgramGlobalComponents = updateMiniProgramGlobalComponents;
-function createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName) {
+function createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName, ownerFilename, ownerPackageRoot, ownerIsIndependent) {
     const usingComponents = {};
+    const ownerSubPackageRoot = (0, x_1.isUniAppX)() && !ownerIsIndependent
+        ? ownerPackageRoot ||
+            (ownerFilename && (0, jsonFile_1.findMiniProgramSubPackageRoot)(ownerFilename))
+        : undefined;
     imports.forEach(({ source: { value }, specifiers: [specifier] }) => {
         const { name } = specifier.local;
         if (!bindingComponents[name]) {
@@ -141,12 +146,23 @@ function createUsingComponents(bindingComponents, imports, inputDir, normalizeCo
         }
         const componentName = normalizeComponentName((0, shared_1.hyphenate)(bindingComponents[name].tag));
         if (!usingComponents[componentName]) {
-            usingComponents[componentName] = (0, uni_shared_1.addLeadingSlash)((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)((0, subpackage_1.withoutIndependentRoot)(value), inputDir)));
+            let componentFilename = (0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)((0, subpackage_1.withoutIndependentRoot)(value), inputDir));
+            if ((0, x_1.isUniAppX)() &&
+                !ownerIsIndependent &&
+                componentFilename.startsWith('uni_modules/')) {
+                (0, jsonFile_1.addMiniProgramComponentPackageRoot)(componentFilename, ownerSubPackageRoot);
+                const componentPackageRoot = (0, jsonFile_1.resolveMiniProgramComponentPackageRoot)(componentFilename, ownerSubPackageRoot);
+                if (ownerSubPackageRoot &&
+                    componentPackageRoot === ownerSubPackageRoot) {
+                    componentFilename = `${ownerSubPackageRoot}/${componentFilename}`;
+                }
+            }
+            usingComponents[componentName] = (0, uni_shared_1.addLeadingSlash)(componentFilename);
         }
     });
     return usingComponents;
 }
-function updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName, root) {
+function updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, normalizeComponentName, root, packageRoot) {
     const mainDescriptor = mainDescriptors.get(createDescriptorKey(mainFilename, root));
     if (!mainDescriptor) {
         return;
@@ -164,7 +180,11 @@ function updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, norma
         ...scriptDescriptor.setupBindingComponents,
     }, scriptDescriptor.bindingComponents);
     const imports = parseImports(mainDescriptor.imports, scriptDescriptor.imports, templateDescriptor.imports);
-    (0, jsonFile_1.addMiniProgramUsingComponents)((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)((0, subpackage_1.withoutIndependentRoot)(mainFilename), inputDir)), createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName));
+    const normalizedOwnerFilename = (0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)((0, subpackage_1.withoutIndependentRoot)(mainFilename), inputDir));
+    const ownerFilename = packageRoot && normalizedOwnerFilename.startsWith('uni_modules/')
+        ? `${packageRoot}/${normalizedOwnerFilename}`
+        : normalizedOwnerFilename;
+    (0, jsonFile_1.addMiniProgramUsingComponents)(ownerFilename, createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName, ownerFilename, root ? undefined : packageRoot, !!root));
 }
 exports.updateMiniProgramComponentsByMainFilename = updateMiniProgramComponentsByMainFilename;
 function findBindingComponent(tag, bindingComponents) {

package/dist/resolve.js

@@ -47,11 +47,6 @@ exports.resolveMainPathOnce = (0, uni_shared_1.once)((inputDir) => {
     if (fs_1.default.existsSync(mainTsPath)) {
         return (0, utils_1.normalizePath)(mainTsPath);
     }
-    if (process.env.UNI_APP_X === 'true' &&
-        process.env.UNI_UTS_PLATFORM === 'app-android' &&
-        process.env.UNI_APP_X_DOM2 !== 'true') {
-        throw new Error('uni-app x Android VDOM 模式仅支持 main.uts 或 main.ts 入口文件');
-    }
     return (0, utils_1.normalizePath)(path_1.default.resolve(inputDir, 'main.js'));
 });
 const ownerModules = [

package/dist/uasm.d.ts

@@ -12,7 +12,6 @@ export interface LoadUasmTransformOptions {
 }
 export interface LoadUasmTransformerOptions extends LoadUasmTransformOptions {
     typescript: TypeScriptCompiler;
-    methodNames?: readonly string[];
     resolveLoader?: (modulePath: string) => ResolvedUasmLoader | undefined;
     onSourceEdit?: (edit: UasmSourceEdit) => void;
     resolveError?: (modulePath: string) => string;

package/dist/uasm.js

@@ -68,7 +68,6 @@ function initUasmWebTransformOptions() {
         createLoadUasmTransformer(options) {
             return createLoadUasmTransformer({
                 ...options,
-                methodNames: ['loadUasm'],
                 resolveError(modulePath) {
                     const moduleName = parseUasmModuleName(modulePath);
                     const entry = moduleName
@@ -93,7 +92,6 @@ function createUasmDiagnostic(options, sourceFile, node, messageText) {
 }
 function createLoadUasmTransformer(options) {
     const { typescript, resolve, reportDiagnostic } = options;
-    const methodNames = new Set(options.methodNames || ['loadUasm', 'loadUasmSync']);
     const targetArchs = options.targetArchs?.join(', ') || '未指定';
     return (context) => {
         const { factory } = context;
@@ -103,14 +101,13 @@ function createLoadUasmTransformer(options) {
                 if (typescript.isCallExpression(node) &&
                     node.arguments.length >= 1 &&
                     typescript.isPropertyAccessExpression(node.expression) &&
-                    methodNames.has(node.expression.name.text) &&
+                    node.expression.name.escapedText === 'loadUASM' &&
                     typescript.isIdentifier(node.expression.expression) &&
                     node.expression.expression.escapedText === 'uni') {
-                    const methodName = node.expression.name.text;
                     const firstArg = node.arguments[0];
                     if (!typescript.isStringLiteral(firstArg) &&
                         !typescript.isNoSubstitutionTemplateLiteral(firstArg)) {
-                        reportDiagnostic(context, createUasmDiagnostic(options, sourceFile, firstArg, `uni.${methodName}(modulePath) 的 modulePath 参数必须是字符串字面量`));
+                        reportDiagnostic(context, createUasmDiagnostic(options, sourceFile, firstArg, 'uni.loadUASM(modulePath) 的 modulePath 参数必须是字符串字面量'));
                         return node;
                     }
                     const resolved = resolve(firstArg.text);
@@ -226,7 +223,7 @@ function copyUasmIOSFrameworks(inputDir) {
         return;
     }
     const libraryIdentifier = process.env.HX_RUN_DEVICE_TYPE === 'ios_simulator'
-        ? 'ios-arm64_x86_64-simulator'
+        ? 'ios-arm64-simulator'
         : 'ios-arm64';
     const targetDir = node_path_1.default.resolve(dependenciesDir, 'modules');
     for (const module of Object.values(uasmModules)) {
@@ -341,9 +338,6 @@ function parseUasmModuleName(modulePath) {
     return /^uni_modules\/([^/]+)$/.exec(normalized)?.[1];
 }
 exports.parseUasmModuleName = parseUasmModuleName;
-function resolveUasmLibraryFileName(moduleName) {
-    return `libUasm${(0, utils_1.capitalize)((0, utils_1.camelize)(moduleName))}.so`;
-}
 function resolveUasmWebLoad(modulePath) {
     const moduleName = parseUasmModuleName(modulePath);
     const entry = moduleName && uasmModules[moduleName]?.web?.entry;
@@ -365,7 +359,7 @@ function resolveUasmLoadPath(modulePath, platform, isProduction = (process.env.U
     if (platform === 'app-ios') {
         return moduleName;
     }
-    const libraryName = resolveUasmLibraryFileName(moduleName);
+    const libraryName = `lib${moduleName}.so`;
     if (isProduction) {
         return libraryName;
     }
@@ -435,7 +429,7 @@ function scanUasmPlatform(inputDir, moduleName, platform) {
                 return;
             }
             const relativeArchDir = (0, utils_1.normalizePath)(node_path_1.default.join(relativeDir, entry.name));
-            const file = (0, utils_1.normalizePath)(node_path_1.default.join(relativeArchDir, resolveUasmLibraryFileName(moduleName)));
+            const file = (0, utils_1.normalizePath)(node_path_1.default.join(relativeArchDir, `lib${moduleName}.so`));
             if (!fs_extra_1.default.existsSync(node_path_1.default.resolve(inputDir, file))) {
                 return;
             }

package/dist/vite/autoImport.js

@@ -311,19 +311,13 @@ function initAutoImportOptions(platform, { imports = [], ...userOptions }) {
             autoImport.push(utsJsPreset);
         }
     }
-    // node_modules 可能包含依赖 auto import 的 uni-app x 源码包，不能恢复 unplugin 的默认排除项。
-    const exclude = [
-        /[\\/]\.git[\\/]/,
-        // @dcloudio 包中的 JS 是自带完整导入的官方产物，正则扫描导出别名或继承类时可能误判，
-        // 进而产生自引用或重复声明。
-        /[\\/]@dcloudio[\\/].*\.js$/,
-    ];
+    const exclude = [/[\\/]\.git[\\/]/];
     if (process.env.UNI_INPUT_DIR) {
         exclude.push(...(0, workers_1.resolveWorkersDir)(process.env.UNI_INPUT_DIR).map((dir) => (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, dir, '*'))));
     }
     return {
         ...userOptions,
-        include: [/\.(?:js|ts|uts)$/, /\.[u]?vue/],
+        include: [/\.[u]?ts$/, /\.[u]?vue/],
         exclude,
         imports: imports.concat(
         // 旧版 Android x 仍由专有编译流程处理，Android Vapor 对齐 iOS 走通用自动导入