@dcloudio/uni-cli-shared 3.0.0-3090920231225001 → 3.0.0-4000720240327001

package/dist/constants.d.ts

@@ -1,6 +1,5 @@
 export declare const PUBLIC_DIR = "static";
 export declare const EXTNAME_JS: string[];
-export declare const X_EXTNAME_JS: string[];
 export declare const EXTNAME_TS: string[];
 export declare const EXTNAME_VUE: string[];
 export declare const X_EXTNAME_VUE: string[];
@@ -31,6 +30,7 @@ export declare const H5_API_STYLE_PATH = "@dcloudio/uni-h5/style/api/";
 export declare const H5_FRAMEWORK_STYLE_PATH = "@dcloudio/uni-h5/style/framework/";
 export declare const H5_COMPONENTS_STYLE_PATH = "@dcloudio/uni-h5/style/";
 export declare const BASE_COMPONENTS_STYLE_PATH = "@dcloudio/uni-components/style/";
+export declare const X_BASE_COMPONENTS_STYLE_PATH = "@dcloudio/uni-components/style-x/";
 export declare const COMMON_EXCLUDE: RegExp[];
 export declare const KNOWN_ASSET_TYPES: string[];
 export declare const DEFAULT_ASSETS_RE: RegExp;

package/dist/constants.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.X_EXTNAME_JS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.X_BASE_COMPONENTS_STYLE_PATH = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
-exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
-exports.X_EXTNAME_JS = ['.uts', ...exports.EXTNAME_JS];
+exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx', '.uts'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
 exports.EXTNAME_VUE = ['.vue', '.nvue', '.uvue'];
 exports.X_EXTNAME_VUE = ['.uvue', '.vue'];
 exports.EXTNAME_VUE_TEMPLATE = ['.vue', '.nvue', '.uvue', '.jsx', '.tsx'];
 exports.EXTNAME_VUE_RE = /\.(vue|nvue|uvue)$/;
-exports.EXTNAME_JS_RE = /\.(js|jsx|ts|tsx|mjs)$/;
+exports.EXTNAME_JS_RE = /\.(js|jsx|ts|uts|tsx|mjs)$/;
 exports.EXTNAME_TS_RE = /\.tsx?$/;
 const COMMON_EXTENSIONS = [
     '.uts',
@@ -45,6 +44,7 @@ exports.H5_API_STYLE_PATH = '@dcloudio/uni-h5/style/api/';
 exports.H5_FRAMEWORK_STYLE_PATH = '@dcloudio/uni-h5/style/framework/';
 exports.H5_COMPONENTS_STYLE_PATH = '@dcloudio/uni-h5/style/';
 exports.BASE_COMPONENTS_STYLE_PATH = '@dcloudio/uni-components/style/';
+exports.X_BASE_COMPONENTS_STYLE_PATH = '@dcloudio/uni-components/style-x/';
 exports.COMMON_EXCLUDE = [
     /\/pages\.json\.js$/,
     /\/manifest\.json\.js$/,
@@ -55,8 +55,6 @@ exports.COMMON_EXCLUDE = [
     /\/vue-i18n\//,
     /\/@dcloudio\/uni-h5-vue/,
     /\/@dcloudio\/uni-shared/,
-    /\/@dcloudio\/uni-h5\/style/,
-    /\/@dcloudio\/uni-components\/style/,
 ];
 exports.KNOWN_ASSET_TYPES = [
     // images

package/dist/easycom.d.ts

@@ -1,4 +1,5 @@
 interface EasycomOption {
+    isX?: boolean;
     dirs?: string[];
     rootDir: string;
     extensions: string[];
@@ -28,4 +29,8 @@ export declare function matchEasycom(tag: string): string | false | undefined;
 export declare function addImportDeclaration(importDeclarations: string[], local: string, source: string, imported?: string): string;
 export declare function genResolveEasycomCode(importDeclarations: string[], code: string, name: string): string;
 export declare const UNI_EASYCOM_EXCLUDE: RegExp[];
+export declare function getUTSEasyComAutoImports(): Record<string, [[string, string]]>;
+export declare function addUTSEasyComAutoImports(source: string, imports: [string, string]): void;
+export declare function genUTSComponentPublicInstanceIdent(tagName: string): string;
+export declare function genUTSComponentPublicInstanceImported(root: string, fileName: string): string;
 export {};

package/dist/easycom.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.UNI_EASYCOM_EXCLUDE = exports.genResolveEasycomCode = exports.addImportDeclaration = exports.matchEasycom = exports.initEasycomsOnce = exports.initEasycoms = void 0;
+exports.genUTSComponentPublicInstanceImported = exports.genUTSComponentPublicInstanceIdent = exports.addUTSEasyComAutoImports = exports.getUTSEasyComAutoImports = exports.UNI_EASYCOM_EXCLUDE = exports.genResolveEasycomCode = exports.addImportDeclaration = exports.matchEasycom = exports.initEasycomsOnce = exports.initEasycoms = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
@@ -31,6 +31,7 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
         // 初始化时，从once中读取缓存，refresh时，实时读取
         const { easycom } = pagesJson || (0, pages_1.parsePagesJson)(inputDir, platform, false);
         const easycomOptions = {
+            isX,
             dirs: easycom && easycom.autoscan === false
                 ? [...dirs] // 禁止自动扫描
                 : [
@@ -57,6 +58,10 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
                 easycoms.push(item);
             }
         });
+        if (isX && globalThis.uts2jsSourceCodeMap) {
+            ;
+            globalThis.uts2jsSourceCodeMap.initUts2jsEasycom(easycoms);
+        }
     };
     initEasycom(options);
     initUTSEasycom();
@@ -96,11 +101,26 @@ function initUniModulesEasycomDirs(uniModulesDir) {
     })
         .filter(Boolean);
 }
-function initEasycom({ dirs, rootDir, custom, extensions }) {
+function initEasycom({ isX, dirs, rootDir, custom, extensions, }) {
     clearEasycom();
+    rootDir = (0, utils_1.normalizePath)(rootDir);
     const easycomsObj = Object.create(null);
     if (dirs && dirs.length && rootDir) {
-        (0, shared_1.extend)(easycomsObj, initAutoScanEasycoms(dirs, rootDir, extensions));
+        const autoEasyComObj = initAutoScanEasycoms(dirs, rootDir, extensions);
+        if (isX) {
+            Object.keys(autoEasyComObj).forEach((tagName) => {
+                let source = autoEasyComObj[tagName];
+                tagName = tagName.slice(1, -1);
+                if (path_1.default.isAbsolute(source) && source.startsWith(rootDir)) {
+                    source = '@/' + (0, utils_1.normalizePath)(path_1.default.relative(rootDir, source));
+                }
+                addUTSEasyComAutoImports(source, [
+                    genUTSComponentPublicInstanceImported(rootDir, source),
+                    genUTSComponentPublicInstanceIdent(tagName),
+                ]);
+            });
+        }
+        (0, shared_1.extend)(easycomsObj, autoEasyComObj);
     }
     if (custom) {
         Object.keys(custom).forEach((name) => {
@@ -219,3 +239,34 @@ function genResolveEasycomCode(importDeclarations, code, name) {
 }
 exports.genResolveEasycomCode = genResolveEasycomCode;
 exports.UNI_EASYCOM_EXCLUDE = [/App.vue$/, /@dcloudio\/uni-h5/];
+const utsEasyComAutoImports = {};
+function getUTSEasyComAutoImports() {
+    return utsEasyComAutoImports;
+}
+exports.getUTSEasyComAutoImports = getUTSEasyComAutoImports;
+function addUTSEasyComAutoImports(source, imports) {
+    if (!utsEasyComAutoImports[source]) {
+        utsEasyComAutoImports[source] = [imports];
+    }
+    else {
+        if (!utsEasyComAutoImports[source].find((item) => item[0] === imports[0])) {
+            utsEasyComAutoImports[source].push(imports);
+        }
+    }
+}
+exports.addUTSEasyComAutoImports = addUTSEasyComAutoImports;
+function genUTSComponentPublicInstanceIdent(tagName) {
+    return (0, shared_1.capitalize)((0, shared_1.camelize)(tagName)) + 'ComponentPublicInstance';
+}
+exports.genUTSComponentPublicInstanceIdent = genUTSComponentPublicInstanceIdent;
+function genUTSComponentPublicInstanceImported(root, fileName) {
+    root = (0, utils_1.normalizePath)(root);
+    if (path_1.default.isAbsolute(fileName) && fileName.startsWith(root)) {
+        fileName = (0, utils_1.normalizePath)(path_1.default.relative(root, fileName));
+    }
+    if (fileName.startsWith('@/')) {
+        return ((0, uts_1.genUTSClassName)(fileName.replace('@/', '')) + 'ComponentPublicInstance');
+    }
+    return (0, uts_1.genUTSClassName)(fileName) + 'ComponentPublicInstance';
+}
+exports.genUTSComponentPublicInstanceImported = genUTSComponentPublicInstanceImported;

package/dist/env/define.d.ts

@@ -12,6 +12,7 @@ export declare function initDefine(stringifyBoolean?: boolean): {
     'process.env.UNI_COMPILER_VERSION': string;
     'process.env.RUN_BY_HBUILDERX': string | boolean;
     'process.env.UNI_AUTOMATOR_WS_ENDPOINT': string;
+    'process.env.UNI_AUTOMATOR_APP_WEBVIEW_SRC': string;
     'process.env.UNI_CLOUD_PROVIDER': string;
     'process.env.UNICLOUD_DEBUG': string;
     'process.env.VUE_APP_PLATFORM': string;

package/dist/env/define.js

@@ -27,6 +27,7 @@ function initDefine(stringifyBoolean = false) {
             ? JSON.stringify(isRunByHBuilderX)
             : isRunByHBuilderX,
         'process.env.UNI_AUTOMATOR_WS_ENDPOINT': JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT || ''),
+        'process.env.UNI_AUTOMATOR_APP_WEBVIEW_SRC': JSON.stringify(process.env.UNI_AUTOMATOR_APP_WEBVIEW_SRC || ''),
         'process.env.UNI_CLOUD_PROVIDER': JSON.stringify(process.env.UNI_CLOUD_PROVIDER || ''),
         'process.env.UNICLOUD_DEBUG': JSON.stringify(process.env.UNICLOUD_DEBUG || ''),
         // 兼容旧版本

package/dist/hbx/alias.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
 const path_1 = __importDefault(require("path"));
 const module_alias_1 = __importDefault(require("module-alias"));
-const resolve_1 = __importDefault(require("resolve"));
 const env_1 = require("./env");
 const hbxPlugins = {
     // typescript: 'compile-typescript/node_modules/typescript',
@@ -38,14 +37,39 @@ function initModuleAlias() {
         Object.keys(hbxPlugins).forEach((name) => {
             module_alias_1.default.addAlias(name, path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[name]));
         });
-        // https://github.com/vitejs/vite/blob/892916d040a035edde1add93c192e0b0c5c9dd86/packages/vite/src/node/plugins/css.ts#L1481
-        const oldSync = resolve_1.default.sync;
-        resolve_1.default.sync = (id, opts) => {
-            if (hbxPlugins[id]) {
-                return path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[id]);
-            }
-            return oldSync(id, opts);
-        };
+        // web 平台用了 vite 内置 css 插件，该插件会加载预编译器如scss、less等，需要转向到 HBuilderX 的对应编译器插件
+        if (process.env.UNI_PLATFORM === 'h5' ||
+            process.env.UNI_PLATFORM === 'web') {
+            // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/packages.ts#L92
+            // 拦截预编译器
+            const join = path_1.default.join;
+            path_1.default.join = function (...paths) {
+                if (paths.length === 4) {
+                    // path.join(basedir, 'node_modules', pkgName, 'package.json')
+                    // const basedir = paths[0]
+                    const nodeModules = paths[1]; // = node_modules
+                    const pkgName = paths[2];
+                    const packageJson = paths[3]; // = package.json
+                    if (nodeModules === 'node_modules' &&
+                        packageJson === 'package.json' &&
+                        hbxPlugins[pkgName]) {
+                        return path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[pkgName], packageJson);
+                    }
+                }
+                return join(...paths);
+            };
+            // https://github.com/vitejs/vite/blob/892916d040a035edde1add93c192e0b0c5c9dd86/packages/vite/src/node/plugins/css.ts#L1481
+            // const oldSync = resovle.sync
+            // resovle.sync = (id: string, opts?: SyncOpts) => {
+            //   if ((hbxPlugins as any)[id]) {
+            //     return path.resolve(
+            //       process.env.UNI_HBUILDERX_PLUGINS,
+            //       hbxPlugins[id as keyof typeof hbxPlugins]
+            //     )
+            //   }
+            //   return oldSync(id, opts)
+            // }
+        }
     }
 }
 exports.initModuleAlias = initModuleAlias;

package/dist/json/json.js

@@ -4,6 +4,10 @@ exports.parseJson = void 0;
 const jsonc_parser_1 = require("jsonc-parser");
 const preprocess_1 = require("../preprocess");
 function parseJson(jsonStr, shouldPre = false) {
-    return (0, jsonc_parser_1.parse)(shouldPre ? (0, preprocess_1.preJson)(jsonStr) : jsonStr);
+    return (0, jsonc_parser_1.parse)(shouldPre
+        ? process.env.UNI_APP_X === 'true'
+            ? (0, preprocess_1.preUVueJson)(jsonStr)
+            : (0, preprocess_1.preJson)(jsonStr)
+        : jsonStr);
 }
 exports.parseJson = parseJson;

package/dist/json/manifest.js

@@ -97,6 +97,10 @@ function getRouterOptions(manifestJson) {
 }
 exports.getRouterOptions = getRouterOptions;
 function isEnableTreeShaking(manifestJson) {
+    // 自动化测试时，一定不摇树
+    if (process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
+        return false;
+    }
     return manifestJson.h5?.optimization?.treeShaking?.enable !== false;
 }
 exports.isEnableTreeShaking = isEnableTreeShaking;

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

@@ -17,7 +17,7 @@ export declare function isMiniProgramUsingComponent(name: string, options: {
     componentsDir?: string;
 }): boolean;
 interface MiniProgramComponents {
-    [name: string]: 'plugin' | 'component' | 'dynamicLib';
+    [name: string]: 'plugin' | 'component' | 'dynamicLib' | 'ext';
 }
 export declare function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }: {
     filename: string;

package/dist/json/mp/jsonFile.js

@@ -141,11 +141,17 @@ function findMiniProgramUsingComponent(usingComponents, componentsDir) {
     return Object.keys(usingComponents).reduce((res, name) => {
         const path = usingComponents[name];
         if (path.includes('plugin://')) {
+            // mp-weixin & mp-alipay
             res[name] = 'plugin';
         }
         else if (path.includes('dynamicLib://')) {
+            // mp-baidu
             res[name] = 'dynamicLib';
         }
+        else if (path.includes('ext://')) {
+            // mp-toutiao
+            res[name] = 'ext';
+        }
         else if (componentsDir && path.includes(componentsDir + '/')) {
             res[name] = 'component';
         }

package/dist/json/mp/pages.js

@@ -114,7 +114,7 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
             appJson.tabBar = tabBar;
         }
     }
-    ;
+    (0, pages_1.filterPlatformPages)(platform, pagesJson);
     ['preloadRule', 'workers', 'plugins', 'entryPagePath'].forEach((name) => {
         if ((0, shared_1.hasOwn)(pagesJson, name)) {
             appJson[name] = pagesJson[name];

package/dist/json/pages.d.ts

@@ -28,4 +28,5 @@ export declare function removePlatformStyle(pageStyle: Record<string, any>): Rec
 export declare function normalizePagesRoute(pagesJson: UniApp.PagesJson): UniApp.UniRoute[];
 declare function parseSubpackagesRoot(inputDir: string, platform: UniApp.PLATFORM): string[];
 export declare const parseSubpackagesRootOnce: typeof parseSubpackagesRoot;
+export declare function filterPlatformPages(platform: UniApp.PLATFORM, pagesJson: UniApp.PagesJson): void;
 export {};

package/dist/json/pages.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.parseSubpackagesRootOnce = exports.normalizePagesRoute = exports.removePlatformStyle = exports.validatePages = exports.normalizePagesJson = exports.parsePagesJsonOnce = exports.parsePagesJson = exports.isUniPageSfcFile = exports.isUniPageSetupAndTs = exports.isUniPageFile = void 0;
+exports.filterPlatformPages = exports.parseSubpackagesRootOnce = exports.normalizePagesRoute = exports.removePlatformStyle = exports.validatePages = exports.normalizePagesJson = exports.parsePagesJsonOnce = exports.parsePagesJson = exports.isUniPageSfcFile = exports.isUniPageSetupAndTs = exports.isUniPageFile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -108,6 +108,8 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
             delete pagesJson.tabBar;
         }
     }
+    // 过滤平台page
+    filterPlatformPages(platform, pagesJson);
     // 缓存页面列表
     pagesCacheSet.clear();
     pagesJson.pages.forEach((page) => pagesCacheSet.add(page.path));
@@ -122,16 +124,19 @@ exports.normalizePagesJson = normalizePagesJson;
 function validatePages(pagesJson, jsonStr) {
     if (!(0, shared_1.isArray)(pagesJson.pages)) {
         pagesJson.pages = [];
-        throw new Error(`[uni-app] Error: pages.json->pages parse failed.`);
+        console.error(`[uni-app] Error: pages.json->pages parse failed.`);
+        process.exit(0);
     }
     else if (!pagesJson.pages.length) {
-        throw new Error(`[uni-app] Error: pages.json->pages must contain at least 1 page.`);
+        console.error(`[uni-app] Error: pages.json->pages must contain at least 1 page.`);
+        process.exit(0);
     }
     else {
         const pages = [];
         pagesJson.pages.forEach((page) => {
             if (pages.indexOf(page.path) !== -1) {
-                throw new Error(`[uni-app] Error: pages.json->${page.path} duplication.`);
+                console.error(`[uni-app] Error: pages.json->${page.path} duplication.`);
+                process.exit(0);
             }
             pages.push(page.path);
         });
@@ -441,3 +446,64 @@ function parseSubpackagesRoot(inputDir, platform) {
     return roots;
 }
 exports.parseSubpackagesRootOnce = (0, uni_shared_1.once)(parseSubpackagesRoot);
+let isInvalidPagesWarned = false;
+function filterPlatformPages(platform, pagesJson) {
+    const invalidPages = [];
+    pagesJson.pages = pagesJson.pages.filter(({ path }) => {
+        if (isPlatformPage(platform, path)) {
+            return true;
+        }
+        invalidPages.push(path);
+        return false;
+    });
+    if (pagesJson.subPackages) {
+        pagesJson.subPackages.forEach((subPackage) => {
+            if (subPackage.pages) {
+                subPackage.pages = subPackage.pages.filter(({ path }) => {
+                    const pagePath = subPackage.root + '/' + path;
+                    if (isPlatformPage(platform, pagePath)) {
+                        return true;
+                    }
+                    invalidPages.push(pagePath);
+                    return false;
+                });
+            }
+        });
+    }
+    if (pagesJson.subpackages) {
+        pagesJson.subpackages.forEach((subPackage) => {
+            if (subPackage.pages) {
+                subPackage.pages = subPackage.pages.filter(({ path }) => {
+                    const pagePath = subPackage.root + '/' + path;
+                    if (isPlatformPage(platform, pagePath)) {
+                        return true;
+                    }
+                    invalidPages.push(pagePath);
+                    return false;
+                });
+            }
+        });
+    }
+    // 目前仅启动的时候警告一次，该方法可能会被调用很多次
+    if (invalidPages.length) {
+        if (!isInvalidPagesWarned) {
+            isInvalidPagesWarned = true;
+            console.log(`已忽略页面：${invalidPages.join('、')}。详见：https://uniapp.dcloud.net.cn/tutorial/platform.html#platforms`);
+        }
+    }
+}
+exports.filterPlatformPages = filterPlatformPages;
+function isPlatformPage(platform, pagePath) {
+    if (pagePath.startsWith('platforms/')) {
+        if (platform === 'app' || platform === 'app-plus') {
+            return (pagePath.startsWith('platforms/app/') ||
+                pagePath.startsWith('platforms/app-plus/'));
+        }
+        else if (platform === 'h5' || platform === 'web') {
+            return (pagePath.startsWith('platforms/h5/') ||
+                pagePath.startsWith('platforms/web/'));
+        }
+        return pagePath.startsWith('platforms/' + platform + '/');
+    }
+    return true;
+}

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

@@ -14,6 +14,7 @@ const utils_1 = require("../../utils");
 const uniRoutes_1 = require("../app/pages/uniRoutes");
 const uniConfig_1 = require("./uniConfig");
 const utils_2 = require("../../vite/plugins/vitejs/utils");
+const preprocess_1 = require("../../preprocess");
 var manifest_1 = require("./manifest");
 Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return manifest_1.parseUniXFlexDirection; } });
 Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return manifest_1.parseUniXSplashScreen; } });
@@ -58,8 +59,7 @@ function checkPagesJson(jsonStr, inputDir) {
     if (pagePathNodes.length) {
         for (const node of pagePathNodes) {
             const pagePath = node.value ?? '';
-            if (fs_1.default.existsSync(path_1.default.join(inputDir, pagePath + '.uvue')) ||
-                fs_1.default.existsSync(path_1.default.join(inputDir, pagePath + '.vue'))) {
+            if (pageExistsWithCaseSync(path_1.default.join(inputDir, pagePath))) {
                 continue;
             }
             const { line, column } = (0, utils_2.offsetToLineColumn)(jsonStr, node.offset);
@@ -78,6 +78,18 @@ function checkPagesJson(jsonStr, inputDir) {
     return true;
 }
 exports.checkPagesJson = checkPagesJson;
+function pageExistsWithCaseSync(pagePath) {
+    try {
+        const files = fs_1.default.readdirSync(path_1.default.dirname(pagePath));
+        const basename = path_1.default.basename(pagePath);
+        const uvuePage = basename + '.uvue';
+        const vuePage = basename + '.vue';
+        return files.some((file) => file === uvuePage || file === vuePage);
+    }
+    catch (e) {
+        return false;
+    }
+}
 function findSubPackageRoot(node) {
     const child = node.children?.find((child) => child.type === 'property' &&
         child.children &&
@@ -122,6 +134,8 @@ function walkNode(node, pagePathNodes) {
     }
 }
 function normalizeUniAppXAppPagesJson(jsonStr) {
+    // 先条件编译
+    jsonStr = (0, preprocess_1.preUVueJson)(jsonStr);
     checkPagesJson(jsonStr, process.env.UNI_INPUT_DIR);
     const pagesJson = {
         pages: [],
@@ -131,9 +145,9 @@ function normalizeUniAppXAppPagesJson(jsonStr) {
         pages: [],
         globalStyle: {},
     };
-    // preprocess
     try {
-        userPagesJson = (0, json_1.parseJson)(jsonStr, true);
+        // 此处不需要条件编译了
+        userPagesJson = (0, json_1.parseJson)(jsonStr, false);
     }
     catch (e) {
         console.error(`[vite] Error: pages.json parse failed.\n`, jsonStr, e);
@@ -163,6 +177,8 @@ function normalizeUniAppXAppPagesJson(jsonStr) {
     if (userPagesJson.uniIdRouter) {
         pagesJson.uniIdRouter = userPagesJson.uniIdRouter;
     }
+    // 是否应该用 process.env.UNI_UTS_PLATFORM
+    (0, pages_1.filterPlatformPages)(process.env.UNI_PLATFORM, pagesJson);
     return pagesJson;
 }
 exports.normalizeUniAppXAppPagesJson = normalizeUniAppXAppPagesJson;

package/dist/logs/format.js

@@ -30,6 +30,9 @@ const initWarnFormattersOnce = (0, uni_shared_1.once)(() => {
     warnFormatters.push(log_1.removeWarnFormatter);
 });
 function formatErrMsg(msg, options) {
+    if (options && (0, env_1.isInHBuilderX)()) {
+        options.timestamp = false;
+    }
     initErrFormattersOnce();
     const formatter = errFormatters.find(({ test }) => test(msg, options));
     if (formatter) {
@@ -76,6 +79,9 @@ function formatInfoMsg(msg, options) {
 }
 exports.formatInfoMsg = formatInfoMsg;
 function formatWarnMsg(msg, options) {
+    if (options && (0, env_1.isInHBuilderX)()) {
+        options.timestamp = false;
+    }
     initWarnFormattersOnce();
     const formatter = warnFormatters.find(({ test }) => test(msg, options));
     if (formatter) {

package/dist/messages/en.d.ts

@@ -5,6 +5,7 @@ declare const _default: {
     readonly 'dev.exclusion': "Please configure the antivirus software to set up an exclusion list for scanning, reducing system resource consumption. [详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)";
     readonly 'dev.performance.nvue': "Especially the sourcemap of app-nvue has a greater impact";
     readonly 'dev.performance.mp': "To officially release, please click the release menu or use the cli release command to release";
+    readonly 'dev.performance.web': "\nVite is compiled on demand, and clicking on an uncompiled page at runtime will compile first and then load, resulting in a slower display, and there is no such problem after release.";
     readonly 'build.done': "DONE  Build complete.";
     readonly 'dev.watching.start': "Compiling...";
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";

package/dist/messages/en.js

@@ -7,6 +7,7 @@ exports.default = {
     'dev.exclusion': 'Please configure the antivirus software to set up an exclusion list for scanning, reducing system resource consumption. [详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)',
     'dev.performance.nvue': 'Especially the sourcemap of app-nvue has a greater impact',
     'dev.performance.mp': 'To officially release, please click the release menu or use the cli release command to release',
+    'dev.performance.web': '\nVite is compiled on demand, and clicking on an uncompiled page at runtime will compile first and then load, resulting in a slower display, and there is no such problem after release.',
     'build.done': 'DONE  Build complete.',
     'dev.watching.start': 'Compiling...',
     'dev.watching.end': 'DONE  Build complete. Watching for changes...',

package/dist/messages/index.d.ts

@@ -5,6 +5,7 @@ export declare const M: {
     readonly 'dev.exclusion': "请在杀毒软件中设置扫描排除名单，减少系统资源消耗。[详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)";
     readonly 'dev.performance.nvue': "尤其是 app-nvue 的 sourcemap 影响较大";
     readonly 'dev.performance.mp': "若要正式发布，请点击发行菜单或使用 cli 发布命令进行发布";
+    readonly 'dev.performance.web': "\nvite是按需编译，运行时点击某个未编译页面会先编译后加载，导致显示较慢，发行后无此问题。";
     readonly 'build.done': "DONE  Build complete.";
     readonly 'dev.watching.start': "开始差量编译...";
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
@@ -49,6 +50,7 @@ export declare const M: {
     readonly 'dev.exclusion': "Please configure the antivirus software to set up an exclusion list for scanning, reducing system resource consumption. [详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)";
     readonly 'dev.performance.nvue': "Especially the sourcemap of app-nvue has a greater impact";
     readonly 'dev.performance.mp': "To officially release, please click the release menu or use the cli release command to release";
+    readonly 'dev.performance.web': "\nVite is compiled on demand, and clicking on an uncompiled page at runtime will compile first and then load, resulting in a slower display, and there is no such problem after release.";
     readonly 'build.done': "DONE  Build complete.";
     readonly 'dev.watching.start': "Compiling...";
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";

package/dist/messages/zh_CN.d.ts

@@ -5,6 +5,7 @@ declare const _default: {
     readonly 'dev.exclusion': "请在杀毒软件中设置扫描排除名单，减少系统资源消耗。[详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)";
     readonly 'dev.performance.nvue': "尤其是 app-nvue 的 sourcemap 影响较大";
     readonly 'dev.performance.mp': "若要正式发布，请点击发行菜单或使用 cli 发布命令进行发布";
+    readonly 'dev.performance.web': "\nvite是按需编译，运行时点击某个未编译页面会先编译后加载，导致显示较慢，发行后无此问题。";
     readonly 'build.done': "DONE  Build complete.";
     readonly 'dev.watching.start': "开始差量编译...";
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";

package/dist/messages/zh_CN.js

@@ -7,6 +7,7 @@ exports.default = {
     'dev.exclusion': '请在杀毒软件中设置扫描排除名单，减少系统资源消耗。[详情](https://uniapp.dcloud.net.cn/uni-app-x/compiler/#tips)',
     'dev.performance.nvue': '尤其是 app-nvue 的 sourcemap 影响较大',
     'dev.performance.mp': '若要正式发布，请点击发行菜单或使用 cli 发布命令进行发布',
+    'dev.performance.web': '\nvite是按需编译，运行时点击某个未编译页面会先编译后加载，导致显示较慢，发行后无此问题。',
     'build.done': 'DONE  Build complete.',
     'dev.watching.start': '开始差量编译...',
     'dev.watching.end': 'DONE  Build complete. Watching for changes...',

package/dist/mp/template.d.ts

@@ -1,7 +1,7 @@
 import type { EmittedAsset } from 'rollup';
 import type { ElementNode } from '@vue/compiler-core';
 type LazyElementFn = (node: ElementNode, context: {
-    isMiniProgramComponent(name: string): 'plugin' | 'component' | 'dynamicLib' | undefined;
+    isMiniProgramComponent(name: string): 'plugin' | 'component' | 'dynamicLib' | 'ext' | undefined;
 }) => {
     [name: string]: {
         name: 'on' | 'bind';

package/dist/postcss/plugins/uniapp.js

@@ -62,7 +62,7 @@ function filterPrefersColorScheme(root, force = false) {
         const filePath = root.source?.input.file;
         if (force || (filePath && filePath.includes('@dcloudio'))) {
             root.walkAtRules((rule) => {
-                if (rule.params.includes('prefers-color-scheme')) {
+                if (/prefers-color-scheme\s*:\s*dark/.test(rule.params)) {
                     rule.remove();
                 }
             });

package/dist/preprocess/context.js

@@ -70,7 +70,7 @@ function initPreContext(platform, userPreContext, utsPlatform, isX) {
     }
     if (platform === 'app' || platform === 'app-plus') {
         defaultContext.APP = true;
-        defaultContext.APP_PLUS = true;
+        defaultContext.APP_PLUS = isX ? false : true;
         vueContext.APP_VUE = true;
         nvueContext.APP_NVUE = true;
         nvueContext.APP_PLUS_NVUE = true;

package/dist/preprocess/index.js

@@ -7,10 +7,16 @@ const { preprocess } = require('../../lib/preprocess');
 var context_2 = require("./context");
 Object.defineProperty(exports, "initPreContext", { enumerable: true, get: function () { return context_2.initPreContext; } });
 function preJs(jsCode) {
+    if (process.env.UNI_APP_X === 'true') {
+        return preUVueJs(jsCode);
+    }
     return preprocess(jsCode, (0, context_1.getPreVueContext)(), { type: 'js' });
 }
 exports.preJs = preJs;
 function preHtml(htmlCode) {
+    if (process.env.UNI_APP_X === 'true') {
+        return preUVueHtml(htmlCode);
+    }
     return preprocess(htmlCode, (0, context_1.getPreVueContext)(), { type: 'html' });
 }
 exports.preHtml = preHtml;

package/dist/uni_modules.d.ts

@@ -15,8 +15,14 @@ export type Defines = {
 export interface Exports {
     [name: string]: Define | Defines | false;
 }
+export declare function getUniExtApiProviders(): {
+    plugin: string;
+    service: string;
+    name?: string | undefined;
+    servicePlugin?: string | undefined;
+}[];
 export declare function parseUniExtApis(vite: boolean | undefined, platform: typeof process.env.UNI_UTS_PLATFORM, language?: UTSTargetLanguage): Injects;
-type Injects = {
+export type Injects = {
     [name: string]: string | [string, string] | [string, string, DefineOptions['app']] | false;
 };
 /**
@@ -41,4 +47,3 @@ type Injects = {
  * @returns
  */
 export declare function parseInjects(vite: boolean | undefined, platform: typeof process.env.UNI_UTS_PLATFORM, language: UTSTargetLanguage, source: string, uniModuleRootDir: string, exports?: Exports): Injects;
-export {};