@dcloudio/uni-cli-shared 3.0.0-alpha-3060820221026001 → 3.0.0-alpha-3060820221027001

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/json/app/manifest/index.js

@@ -29,8 +29,11 @@ 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);
+    pagesJson = (0, theme_1.initTheme)(manifestJson, pagesJson);
+    (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/statusbar.js

@@ -3,10 +3,10 @@ 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 = '#000000', backgroundColor = '#000000' } = ((_a = pagesJson.globalStyle) === null || _a === void 0 ? void 0 : _a.navigationBar) || {};
     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 = manifestJson[process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM] || {};
     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/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) {
@@ -127,6 +129,11 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
         appJson.darkmode = true;
         appJson.themeLocation = 'theme.json';
     }
+    else {
+        const manifestJson = (0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+        appJson = (0, theme_1.initTheme)(manifestJson, appJson);
+        pageJsons = (0, theme_1.initTheme)(manifestJson, pageJsons);
+    }
     return {
         appJson,
         pageJsons,

package/dist/json/pages.js

@@ -13,6 +13,8 @@ const json_1 = require("./json");
 const utils_2 = require("../vue/utils");
 const vite_1 = require("../vite");
 const constants_1 = require("../constants");
+const theme_1 = require("./theme");
+const manifest_1 = require("./manifest");
 const pagesCacheSet = new Set();
 function isUniPageFile(file, inputDir = process.env.UNI_INPUT_DIR) {
     if (inputDir && path_1.default.isAbsolute(file)) {
@@ -109,7 +111,9 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
     // 缓存页面列表
     pagesCacheSet.clear();
     pagesJson.pages.forEach((page) => pagesCacheSet.add(page.path));
-    return pagesJson;
+    return process.env.UNI_PLATFORM === 'app' || !process.env.UNI_INPUT_DIR
+        ? pagesJson
+        : (0, theme_1.initTheme)((0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR), pagesJson);
 }
 exports.normalizePagesJson = normalizePagesJson;
 function validatePages(pagesJson, jsonStr) {
@@ -271,8 +275,13 @@ function normalizeNavigationBar(pageStyle) {
         delete navigationBar.titleText;
     }
     if (!navigationBar.titleColor && (0, shared_1.hasOwn)(navigationBar, 'textStyle')) {
-        navigationBar.titleColor =
-            navigationBar.textStyle === 'black' ? '#000000' : '#ffffff';
+        const textStyle = navigationBar.textStyle;
+        if (constants_1.TEXT_STYLE.includes(textStyle)) {
+            navigationBar.titleColor = (0, uni_shared_1.normalizeTitleColor)(textStyle);
+        }
+        else {
+            navigationBar.titleColor = navigationBar.textStyle;
+        }
         delete navigationBar.textStyle;
     }
     if (pageStyle.navigationBarShadow &&
@@ -280,8 +289,9 @@ function normalizeNavigationBar(pageStyle) {
         navigationBar.shadowColorType = pageStyle.navigationBarShadow.colorType;
         delete pageStyle.navigationBarShadow;
     }
+    const parsedNavigationBar = (0, theme_1.initTheme)((0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR), navigationBar);
     if ((0, shared_1.isArray)(navigationBar.buttons)) {
-        navigationBar.buttons = navigationBar.buttons.map((btn) => normalizeNavigationBarButton(btn, navigationBar.type, navigationBar.titleColor));
+        navigationBar.buttons = navigationBar.buttons.map((btn) => normalizeNavigationBarButton(btn, navigationBar.type, parsedNavigationBar.titleColor));
     }
     if ((0, shared_1.isPlainObject)(navigationBar.searchInput)) {
         navigationBar.searchInput = normalizeNavigationBarSearchInput(navigationBar.searchInput);

package/dist/json/theme.d.ts

@@ -0,0 +1,3 @@
+export declare const parseThemeJson: (themeLocation?: string) => UniApp.ThemeJson;
+export declare const normalizeThemeConfigOnce: (manifestJsonPlatform?: Record<string, any>) => UniApp.ThemeJson;
+export declare function initTheme<T extends object>(manifestJson: Record<string, any>, pagesJson: T): T;

package/dist/json/theme.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const json_1 = require("./json");
+const uni_shared_1 = require("@dcloudio/uni-shared");
+const parseThemeJson = (themeLocation = 'theme.json') => {
+    if (!themeLocation) {
+        return {};
+    }
+    themeLocation = path_1.default.join(process.env.UNI_INPUT_DIR, themeLocation);
+    if (!fs_1.default.existsSync(themeLocation)) {
+        return {};
+    }
+    const jsonStr = fs_1.default.readFileSync(themeLocation, 'utf8');
+    return (0, json_1.parseJson)(jsonStr, true);
+};
+exports.parseThemeJson = parseThemeJson;
+exports.normalizeThemeConfigOnce = (0, uni_shared_1.once)((manifestJsonPlatform = {}) => (0, exports.parseThemeJson)(manifestJsonPlatform.themeLocation));
+function initTheme(manifestJson, pagesJson) {
+    const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
+    const manifestPlatform = manifestJson['plus'] || manifestJson[platform] || {};
+    const themeConfig = (0, exports.normalizeThemeConfigOnce)(manifestPlatform);
+    return (0, uni_shared_1.normalizeStyles)(pagesJson, themeConfig);
+}
+exports.initTheme = initTheme;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060820221026001",
+  "version": "3.0.0-alpha-3060820221027001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.18.13",
     "@babel/parser": "^7.18.13",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060820221026001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060820221026001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060820221027001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060820221027001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060820221026001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060820221027001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",