@dcloudio/uni-cli-shared 3.0.0-3060520221121001 → 3.0.0-3061420221215001

package/dist/checkUpdate.js

@@ -157,6 +157,7 @@ function getMac() {
             else if (
             // Node >= v18
             typeof item.family === 'number' &&
+                // @ts-ignore
                 (item.family === 4 || item.family === 6)) {
                 mac = item.mac;
                 break;

package/dist/constants.d.ts

@@ -27,3 +27,4 @@ export declare const BASE_COMPONENTS_STYLE_PATH = "@dcloudio/uni-components/styl
 export declare const COMMON_EXCLUDE: RegExp[];
 export declare const KNOWN_ASSET_TYPES: string[];
 export declare const DEFAULT_ASSETS_RE: RegExp;
+export declare const TEXT_STYLE: string[];

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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_JS = exports.PAGES_JSON_JS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+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.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_JS = exports.PAGES_JSON_JS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = 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.EXTNAME_TS = ['.ts', '.tsx'];
@@ -77,3 +77,4 @@ exports.KNOWN_ASSET_TYPES = [
     'txt',
 ];
 exports.DEFAULT_ASSETS_RE = new RegExp(`\\.(` + exports.KNOWN_ASSET_TYPES.join('|') + `)(\\?.*)?$`);
+exports.TEXT_STYLE = ['black', 'white'];

package/dist/env/define.d.ts

@@ -15,4 +15,5 @@ export declare function initDefine(stringifyBoolean?: boolean): {
     'process.env.UNI_CLOUD_PROVIDER': string;
     'process.env.UNICLOUD_DEBUG': string;
     'process.env.VUE_APP_PLATFORM': string;
+    'process.env.VUE_APP_DARK_MODE': string;
 };

package/dist/env/define.js

@@ -5,6 +5,7 @@ const env_1 = require("../hbx/env");
 const json_1 = require("../json");
 function initDefine(stringifyBoolean = false) {
     const manifestJson = (0, json_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+    const platformManifestJson = (0, json_1.getPlatformManifestJsonOnce)();
     const isRunByHBuilderX = (0, env_1.runByHBuilderX)();
     const isDebug = !!manifestJson.debug;
     return {
@@ -30,6 +31,7 @@ function initDefine(stringifyBoolean = false) {
         'process.env.UNICLOUD_DEBUG': JSON.stringify(process.env.UNICLOUD_DEBUG || ''),
         // 兼容旧版本
         'process.env.VUE_APP_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM || ''),
+        'process.env.VUE_APP_DARK_MODE': JSON.stringify(platformManifestJson.darkmode || false),
     };
 }
 exports.initDefine = initDefine;

package/dist/esbuild.d.ts

@@ -1,3 +1,3 @@
-import { BuildOptions } from 'esbuild';
+import type { BuildOptions } from 'esbuild';
 export declare function transformWithEsbuild(code: string, filename: string, options: BuildOptions): Promise<import("esbuild").BuildResult>;
 export declare function esbuild(options: BuildOptions): Promise<import("esbuild").BuildResult>;

package/dist/filter.d.ts

@@ -1,7 +1,7 @@
 export declare function isWxs(id: string): boolean;
 export declare function isSjs(id: string): boolean;
 export declare function isRenderjs(id: string): boolean;
-declare type FilterType = 'wxs' | 'renderjs' | 'sjs';
+type FilterType = 'wxs' | 'renderjs' | 'sjs';
 export declare function parseRenderjs(id: string): {
     type: FilterType;
     name: string;

package/dist/hbx/alias.js

@@ -6,6 +6,7 @@ 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',
@@ -16,15 +17,15 @@ const hbxPlugins = {
 };
 function initModuleAlias() {
     const compilerSfcPath = require.resolve('@vue/compiler-sfc');
-    const serverRendererPath = require.resolve('@vue/server-renderer');
+    // const serverRendererPath = require.resolve('@vue/server-renderer')
     module_alias_1.default.addAliases({
         '@vue/shared': require.resolve('@vue/shared'),
         '@vue/shared/dist/shared.esm-bundler.js': require.resolve('@vue/shared/dist/shared.esm-bundler.js'),
         '@vue/compiler-dom': require.resolve('@vue/compiler-dom'),
         '@vue/compiler-sfc': compilerSfcPath,
-        '@vue/server-renderer': serverRendererPath,
+        // '@vue/server-renderer': serverRendererPath,
         'vue/compiler-sfc': compilerSfcPath,
-        'vue/server-renderer': serverRendererPath,
+        // 'vue/server-renderer': serverRendererPath,
     });
     if (process.env.VITEST) {
         module_alias_1.default.addAliases({
@@ -32,9 +33,18 @@ function initModuleAlias() {
         });
     }
     if ((0, env_1.isInHBuilderX)()) {
+        // 又是为了复用 HBuilderX 的插件逻辑，硬编码映射
         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);
+        };
     }
 }
 exports.initModuleAlias = initModuleAlias;
@@ -48,6 +58,7 @@ function installHBuilderXPlugin(plugin) {
     return console.error(`%HXRunUniAPPPluginName%${plugin}%HXRunUniAPPPluginName%`);
 }
 exports.installHBuilderXPlugin = installHBuilderXPlugin;
+const installPreprocessorTips = {};
 exports.moduleAliasFormatter = {
     test(msg) {
         return msg.includes('Preprocessor dependency');
@@ -68,6 +79,11 @@ exports.moduleAliasFormatter = {
             preprocessor = 'compile-stylus';
         }
         if (lang) {
+            // 仅提醒一次
+            if (installPreprocessorTips[lang]) {
+                return '';
+            }
+            installPreprocessorTips[lang] = true;
             installHBuilderXPlugin(preprocessor);
             return formatInstallHBuilderXPluginTips(lang, preprocessor);
         }

package/dist/hbx/env.d.ts

@@ -4,3 +4,4 @@ export declare const runByHBuilderX: () => boolean;
  * 增加 node_modules
  */
 export declare function initModulePaths(): void;
+export declare function fixBinaryPath(): void;

package/dist/hbx/env.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initModulePaths = exports.runByHBuilderX = exports.isInHBuilderX = void 0;
+exports.fixBinaryPath = exports.initModulePaths = exports.runByHBuilderX = exports.isInHBuilderX = void 0;
 const path_1 = __importDefault(require("path"));
 const module_1 = __importDefault(require("module"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const resolve_1 = require("../resolve");
+const utils_1 = require("../utils");
 exports.isInHBuilderX = (0, uni_shared_1.once)(() => {
     try {
         const { name } = require(path_1.default.resolve(process.cwd(), '../about/package.json'));
@@ -21,7 +23,8 @@ exports.isInHBuilderX = (0, uni_shared_1.once)(() => {
     return false;
 });
 exports.runByHBuilderX = (0, uni_shared_1.once)(() => {
-    return !!process.env.UNI_HBUILDERX_PLUGINS;
+    return (!!process.env.UNI_HBUILDERX_PLUGINS &&
+        (!!process.env.RUN_BY_HBUILDERX || !!process.env.HX_Version));
 });
 /**
  * 增加 node_modules
@@ -42,3 +45,30 @@ function initModulePaths() {
     };
 }
 exports.initModulePaths = initModulePaths;
+function resolveEsbuildModule(name) {
+    try {
+        return path_1.default.dirname(require.resolve(name + '/package.json', {
+            paths: [path_1.default.dirname((0, resolve_1.resolveBuiltIn)('esbuild/package.json'))],
+        }));
+    }
+    catch (e) { }
+    return '';
+}
+function fixBinaryPath() {
+    // cli 工程在 HBuilderX 中运行
+    if (!(0, exports.isInHBuilderX)() && (0, exports.runByHBuilderX)()) {
+        if (utils_1.isWindows) {
+            const win64 = resolveEsbuildModule('esbuild-windows-64');
+            if (win64) {
+                process.env.ESBUILD_BINARY_PATH = path_1.default.join(win64, 'esbuild.exe');
+            }
+        }
+        else {
+            const arm64 = resolveEsbuildModule('esbuild-darwin-arm64');
+            if (arm64) {
+                process.env.ESBUILD_BINARY_PATH = path_1.default.join(arm64, 'bin/esbuild');
+            }
+        }
+    }
+}
+exports.fixBinaryPath = fixBinaryPath;

package/dist/hbx/log.js

@@ -12,11 +12,38 @@ const utils_1 = require("../utils");
 const constants_1 = require("../constants");
 const ast_1 = require("../vite/utils/ast");
 const utils_2 = require("../vite/plugins/vitejs/utils");
-const SIGNAL_H5_LOCAL = ' > Local:';
-const SIGNAL_H5_NETWORK = ' > Network:';
+const SIGNAL_H5_LOCAL = ' ➜  Local:';
+const SIGNAL_H5_NETWORK = ' ➜  Network:';
 const networkLogs = [];
+const ZERO_WIDTH_CHAR = {
+    NOTE: '',
+    WARNING: '\u200B',
+    ERROR: '\u200C',
+    backup0: '\u200D',
+    backup1: '\u200E',
+    backup2: '\u200F',
+    backup3: '\uFEFF',
+};
+function overridedConsole(name, oldFn, char) {
+    console[name] = function (...args) {
+        oldFn.apply(this, args.map((arg) => {
+            let item;
+            if (typeof arg !== 'object') {
+                item = `${char}${arg}${char}`;
+            }
+            else {
+                item = `${char}${JSON.stringify(arg)}${char}`;
+            }
+            return item;
+        }));
+    };
+}
+if (typeof console !== 'undefined') {
+    overridedConsole('warn', console.log, ZERO_WIDTH_CHAR.WARNING);
+    // overridedConsole('error', console.error, ZERO_WIDTH_CHAR.ERROR)
+}
 function formatAtFilename(filename, line, column) {
-    return `at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename.split('?')[0])) +
+    return `at ${picocolors_1.default.cyan((0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename.replace('\x00', '').split('?')[0])) +
         ':' +
         (line || 1) +
         ':' +
@@ -29,19 +56,22 @@ exports.h5ServeFormatter = {
     },
     format(msg) {
         if (msg.includes(SIGNAL_H5_NETWORK)) {
-            networkLogs.push(msg);
+            networkLogs.push(msg.replace('➜ ', '*'));
             process.nextTick(() => {
                 if (networkLogs.length) {
-                    // 延迟打印所有 network,仅最后一个 network 替换 > 为 -，通知 hbx
+                    // 延迟打印所有 network,仅最后一个 network 替换 ➜ 为 -，通知 hbx
                     const len = networkLogs.length - 1;
-                    networkLogs[len] = networkLogs[len].replace('>', '-');
+                    networkLogs[len] = networkLogs[len].replace('* Network', '- Network');
                     console.log(networkLogs.join('\n'));
                     networkLogs.length = 0;
                 }
             });
             return '';
         }
-        return msg.replace('>', '-');
+        if (msg.includes(SIGNAL_H5_LOCAL)) {
+            return msg.replace('➜ ', '-');
+        }
+        return msg.replace('➜ ', '*');
     },
 };
 const REMOVED_MSGS = [

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export * from './env';
 export * from './hbx';
 export * from './ssr';
 export * from './vue';
+export * from './uts';
 export * from './logs';
 export * from './i18n';
 export * from './deps';
@@ -20,6 +21,7 @@ export * from './esbuild';
 export * from './resolve';
 export * from './scripts';
 export * from './platform';
+export { parseUniExtApis } from './uni_modules';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUpdate = exports.M = void 0;
+exports.checkUpdate = exports.M = exports.parseUniExtApis = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -22,6 +22,7 @@ __exportStar(require("./env"), exports);
 __exportStar(require("./hbx"), exports);
 __exportStar(require("./ssr"), exports);
 __exportStar(require("./vue"), exports);
+__exportStar(require("./uts"), exports);
 __exportStar(require("./logs"), exports);
 __exportStar(require("./i18n"), exports);
 __exportStar(require("./deps"), exports);
@@ -37,6 +38,8 @@ __exportStar(require("./esbuild"), exports);
 __exportStar(require("./resolve"), exports);
 __exportStar(require("./scripts"), exports);
 __exportStar(require("./platform"), exports);
+var uni_modules_1 = require("./uni_modules");
+Object.defineProperty(exports, "parseUniExtApis", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApis; } });
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

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

@@ -3,10 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCheckSystemWebview = void 0;
 function initCheckSystemWebview(manifestJson) {
     // 检查Android系统webview版本 || 下载X5后启动
-    let plusWebview = manifestJson.plus.webView;
-    if (plusWebview) {
-        manifestJson.plus['uni-app'].webView = plusWebview;
+    let plusWebView = manifestJson.plus.webView;
+    if (plusWebView) {
+        manifestJson.plus['uni-app'].webView = plusWebView;
         delete manifestJson.plus.webView;
     }
+    else {
+        manifestJson.plus['uni-app'].webView = {
+            minUserAgentVersion: '49.0',
+        };
+    }
 }
 exports.initCheckSystemWebview = initCheckSystemWebview;

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

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNVueFlexDirection = exports.getNVueStyleCompiler = exports.getNVueCompiler = exports.hasConfusionFile = exports.isConfusionFile = exports.APP_CONFUSION_FILENAME = exports.normalizeAppManifestJson = void 0;
+const shared_1 = require("@vue/shared");
 const merge_1 = require("./merge");
 const defaultManifestJson_1 = require("./defaultManifestJson");
 const statusbar_1 = require("./statusbar");
@@ -29,8 +30,12 @@ const launchwebview_1 = require("./launchwebview");
 const checksystemwebview_1 = require("./checksystemwebview");
 const tabBar_1 = require("./tabBar");
 const i18n_1 = require("./i18n");
+const theme_1 = require("../../theme");
 function normalizeAppManifestJson(userManifestJson, pagesJson) {
-    const manifestJson = (0, merge_1.initRecursiveMerge)((0, statusbar_1.initAppStatusbar)((0, defaultManifestJson_1.initDefaultManifestJson)(), pagesJson), userManifestJson);
+    const manifestJson = (0, merge_1.initRecursiveMerge)((0, defaultManifestJson_1.initDefaultManifestJson)(), userManifestJson);
+    const { pages, globalStyle, tabBar } = (0, theme_1.initTheme)(manifestJson, pagesJson);
+    (0, shared_1.extend)(pagesJson, JSON.parse(JSON.stringify({ pages, globalStyle, tabBar })));
+    (0, statusbar_1.initAppStatusbar)(manifestJson, pagesJson);
     (0, arguments_1.initArguments)(manifestJson, pagesJson);
     (0, plus_1.initPlus)(manifestJson, pagesJson);
     (0, nvue_1.initNVue)(manifestJson, pagesJson);

package/dist/json/app/manifest/nvue.d.ts

@@ -1,4 +1,4 @@
 export declare function initNVue(manifestJson: Record<string, any>, pagesJson: UniApp.PagesJson): void;
 export declare function getNVueCompiler(manifestJson: Record<string, any>): "uni-app" | "weex" | "vue" | "vite";
 export declare function getNVueStyleCompiler(manifestJson: Record<string, any>): "uni-app" | "weex";
-export declare function getNVueFlexDirection(manifestJson: Record<string, any>): "row" | "row-reverse" | "column" | "column-reverse";
+export declare function getNVueFlexDirection(manifestJson: Record<string, any>): "column" | "row" | "row-reverse" | "column-reverse";

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

@@ -35,6 +35,14 @@ function initPlus(manifestJson, pagesJson) {
             manifestJson.plus.distribute.plugins = distribute.sdkConfigs;
             delete manifestJson.plus.distribute.sdkConfigs;
         }
+        if (manifestJson.plus.darkmode) {
+            if (!(distribute.google || (distribute.google = {})).defaultNightMode) {
+                distribute.google.defaultNightMode = 'auto';
+            }
+            if (!(distribute.apple || (distribute.apple = {})).UIUserInterfaceStyle) {
+                distribute.apple.UIUserInterfaceStyle = 'Automatic';
+            }
+        }
     }
     // 屏幕启动方向
     if (manifestJson.plus.screenOrientation) {

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

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initAppStatusbar = void 0;
 function initAppStatusbar(manifestJson, pagesJson) {
-    var _a;
-    const { titleColor = '#000', backgroundColor = '#000000' } = ((_a = pagesJson.globalStyle) === null || _a === void 0 ? void 0 : _a.navigationBar) || {};
+    const titleColor = pagesJson.pages[0].style.navigationBar.titleColor ||
+        pagesJson.globalStyle.navigationBar.titleColor ||
+        '#ffffff';
+    const backgroundColor = pagesJson.globalStyle.navigationBar.backgroundColor || '#000000';
     manifestJson.plus.statusbar = {
         immersed: 'supportedDevice',
-        style: titleColor === '#000' ? 'dark' : 'light',
+        style: titleColor === '#000000' ? 'dark' : 'light',
         background: backgroundColor,
     };
     return manifestJson;

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

@@ -2,19 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initTabBar = void 0;
 const uni_shared_1 = require("@dcloudio/uni-shared");
-const borderStyles = {
-    black: 'rgba(0,0,0,0.4)',
-    white: 'rgba(255,255,255,0.4)',
-};
 function initTabBar(entryPagePath, manifestJson, pagesJson) {
     var _a, _b;
     if (!((_b = (_a = pagesJson.tabBar) === null || _a === void 0 ? void 0 : _a.list) === null || _b === void 0 ? void 0 : _b.length)) {
         return;
     }
     const tabBar = JSON.parse(JSON.stringify(pagesJson.tabBar));
-    if (tabBar.borderStyle in borderStyles) {
-        tabBar.borderStyle = borderStyles[tabBar.borderStyle];
-    }
+    tabBar.borderStyle = (0, uni_shared_1.normalizeTabBarStyles)(tabBar.borderStyle);
     if (!tabBar.selectedColor) {
         tabBar.selectedColor = uni_shared_1.SELECTED_COLOR;
     }

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

@@ -10,9 +10,11 @@ const manifest_1 = require("../../manifest");
 const manifest_2 = require("../manifest");
 const arguments_1 = require("../manifest/arguments");
 const splashscreen_1 = require("../manifest/splashscreen");
+const theme_1 = require("../../theme");
 function normalizeAppUniConfig(pagesJson, manifestJson) {
     var _a;
     const { autoclose, alwaysShowBeforeRender } = (0, splashscreen_1.getSplashscreen)(manifestJson);
+    const platformConfig = (0, manifest_1.getPlatformManifestJsonOnce)();
     const config = {
         pages: [],
         globalStyle: pagesJson.globalStyle,
@@ -32,6 +34,8 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
         networkTimeout: (0, manifest_1.normalizeNetworkTimeout)(manifestJson.networkTimeout),
         tabBar: pagesJson.tabBar,
         locales: (0, i18n_1.initLocales)(path_1.default.join(process.env.UNI_INPUT_DIR, 'locale')),
+        darkmode: platformConfig.darkmode || false,
+        themeConfig: (0, theme_1.normalizeThemeConfigOnce)(platformConfig),
     };
     // TODO 待支持分包
     return JSON.stringify(config);

package/dist/json/index.d.ts

@@ -3,3 +3,4 @@ export * from './app';
 export * from './json';
 export * from './pages';
 export * from './manifest';
+export * from './theme';

package/dist/json/index.js

@@ -19,3 +19,4 @@ __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
 __exportStar(require("./pages"), exports);
 __exportStar(require("./manifest"), exports);
+__exportStar(require("./theme"), exports);

package/dist/json/manifest.d.ts

@@ -29,4 +29,5 @@ export declare function getRouterOptions(manifestJson: Record<string, any>): {
 };
 export declare function isEnableTreeShaking(manifestJson: Record<string, any>): boolean;
 export declare function getDevServerOptions(manifestJson: Record<string, any>): any;
+export declare function getPlatformManifestJsonOnce(): any;
 export {};

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.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.getPlatformManifestJsonOnce = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = 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");
@@ -73,12 +73,12 @@ function isEnableUniPushV2(inputDir, platform) {
 }
 exports.isEnableUniPushV2 = isEnableUniPushV2;
 function isEnableSecureNetwork(inputDir, platform) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
     if (platform === 'app') {
-        return false; // 暂未支持app
+        return !!((_b = (_a = manifest['app-plus']) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.SecureNetwork);
     }
-    return ((_b = (_a = manifest[platform]) === null || _a === void 0 ? void 0 : _a.secureNetwork) === null || _b === void 0 ? void 0 : _b.enable) === true;
+    return ((_d = (_c = manifest[platform]) === null || _c === void 0 ? void 0 : _c.secureNetwork) === null || _d === void 0 ? void 0 : _d.enable) === true;
 }
 exports.isEnableSecureNetwork = isEnableSecureNetwork;
 function isUniPushOffline(inputDir) {
@@ -103,3 +103,10 @@ function getDevServerOptions(manifestJson) {
     return (0, shared_1.extend)({}, (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.devServer);
 }
 exports.getDevServerOptions = getDevServerOptions;
+function getPlatformManifestJsonOnce() {
+    const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
+    return !process.env.UNI_INPUT_DIR
+        ? {}
+        : (0, exports.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR)[platform] || {};
+}
+exports.getPlatformManifestJsonOnce = getPlatformManifestJsonOnce;

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';
+    [name: string]: 'plugin' | 'component' | 'dynamicLib';
 }
 export declare function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }: {
     filename: string;

package/dist/json/mp/jsonFile.js

@@ -124,8 +124,14 @@ function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, })
         (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
     }
     const jsonFile = findJsonFile((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(filename, inputDir)));
-    if (jsonFile === null || jsonFile === void 0 ? void 0 : jsonFile.usingComponents) {
-        (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
+    if (jsonFile) {
+        if (jsonFile.usingComponents) {
+            (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
+        }
+        // mp-baidu 特有
+        if (jsonFile.usingSwanComponents) {
+            (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingSwanComponents, componentsDir));
+        }
     }
     return miniProgramComponents;
 }
@@ -136,6 +142,9 @@ function findMiniProgramUsingComponent(usingComponents, componentsDir) {
         if (path.includes('plugin://')) {
             res[name] = 'plugin';
         }
+        else if (path.includes('dynamicLib://')) {
+            res[name] = 'dynamicLib';
+        }
         else if (componentsDir && path.includes(componentsDir + '/')) {
             res[name] = 'component';
         }

package/dist/json/mp/pages.js

@@ -12,6 +12,8 @@ const pages_1 = require("../pages");
 const utils_1 = require("./utils");
 const utils_2 = require("../../utils");
 const project_1 = require("./project");
+const manifest_1 = require("../manifest");
+const theme_1 = require("../theme");
 function parseMiniProgramPagesJson(jsonStr, platform, options = { subpackages: false }) {
     return parsePagesJson(jsonStr, platform, options);
 }
@@ -37,11 +39,11 @@ exports.mergeMiniProgramAppJson = mergeMiniProgramAppJson;
 function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, subpackages, windowOptionsMap, tabBarOptionsMap, tabBarItemOptionsMap, } = {
     subpackages: false,
 }) {
-    const appJson = {
+    let appJson = {
         pages: [],
     };
-    const pageJsons = {};
-    const nvuePages = [];
+    let pageJsons = {};
+    let nvuePages = [];
     // preprocess
     const pagesJson = (0, json_1.parseJson)(jsonStr, true);
     if (!pagesJson) {
@@ -123,9 +125,18 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
     if (networkTimeout) {
         appJson.networkTimeout = networkTimeout;
     }
-    if (darkmode) {
-        appJson.darkmode = true;
-        appJson.themeLocation = 'theme.json';
+    const manifestJson = (0, manifest_1.getPlatformManifestJsonOnce)();
+    if (!darkmode) {
+        const { pages, window, tabBar } = (0, theme_1.initTheme)(manifestJson, appJson);
+        (0, shared_1.extend)(appJson, JSON.parse(JSON.stringify({ pages, window, tabBar })));
+        delete appJson.darkmode;
+        delete appJson.themeLocation;
+        pageJsons = (0, theme_1.initTheme)(manifestJson, pageJsons);
+    }
+    else {
+        const themeLocation = manifestJson.themeLocation || 'theme.json';
+        if ((0, theme_1.hasThemeJson)(path_1.default.join(process.env.UNI_INPUT_DIR, themeLocation)))
+            appJson.themeLocation = themeLocation;
     }
     return {
         appJson,

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

@@ -15,12 +15,13 @@ interface ShareWindowOptions {
     onReachBottomDistance?: number;
     pageOrientation?: 'portrait' | 'landscape' | 'auto';
 }
-declare type Style = 'v2' | string;
-declare type RestartStrategy = 'homePage' | 'homePageAndLatestPage' | string;
+type Style = 'v2' | string;
+type RestartStrategy = 'homePage' | 'homePageAndLatestPage' | string;
 export interface PageWindowOptions extends ShareWindowOptions {
     component?: true;
     disableScroll?: boolean;
     usingComponents?: UsingComponents;
+    usingSwanComponents?: UsingComponents;
     initialRenderingCache?: 'static' | string;
     style?: Style;
     singlePage?: SinglePage;

package/dist/json/pages.d.ts

@@ -1,4 +1,5 @@
 export declare function isUniPageFile(file: string, inputDir?: string): boolean;
+export declare function isUniPageSetupAndTs(file: string): boolean;
 export declare function isUniPageSfcFile(file: string, inputDir?: string): boolean;
 /**
  * 小程序平台慎用，因为该解析不支持 subpackages