@dcloudio/uni-cli-shared 3.0.0-alpha-3060820221027002 → 3.0.0-alpha-3060820221027003
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +2 -1
- package/dist/env/define.d.ts +1 -0
- package/dist/env/define.js +2 -0
- package/dist/json/app/manifest/index.js +4 -1
- package/dist/json/app/manifest/statusbar.js +2 -2
- package/dist/json/app/manifest/tabBar.js +1 -7
- package/dist/json/app/pages/uniConfig.js +4 -0
- package/dist/json/index.d.ts +1 -0
- package/dist/json/index.js +1 -0
- package/dist/json/manifest.d.ts +1 -0
- package/dist/json/manifest.js +8 -1
- package/dist/json/mp/pages.js +10 -3
- package/dist/json/pages.js +21 -20
- package/dist/json/theme.d.ts +3 -0
- package/dist/json/theme.js +30 -0
- package/dist/messages/en.d.ts +2 -1
- package/dist/messages/en.js +2 -1
- package/dist/messages/index.d.ts +3 -1
- package/dist/messages/zh_CN.d.ts +1 -0
- package/dist/messages/zh_CN.js +1 -0
- package/dist/mp/index.d.ts +1 -1
- package/dist/mp/index.js +2 -1
- package/dist/mp/plugin.d.ts +1 -0
- package/dist/mp/plugin.js +22 -1
- package/dist/postcss/plugins/uniapp.js +14 -0
- package/lib/.DS_Store +0 -0
- package/lib/vue-i18n/.DS_Store +0 -0
- package/package.json +9 -9
package/dist/constants.d.ts
CHANGED
|
@@ -27,3 +27,4 @@ export declare const BASE_COMPONENTS_STYLE_PATH = "@dcloudio/uni-components/styl
|
|
|
27
27
|
export declare const COMMON_EXCLUDE: RegExp[];
|
|
28
28
|
export declare const KNOWN_ASSET_TYPES: string[];
|
|
29
29
|
export declare const DEFAULT_ASSETS_RE: RegExp;
|
|
30
|
+
export declare const TEXT_STYLE: string[];
|
package/dist/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
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;
|
|
3
|
+
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;
|
|
4
4
|
exports.PUBLIC_DIR = 'static';
|
|
5
5
|
exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
|
|
6
6
|
exports.EXTNAME_TS = ['.ts', '.tsx'];
|
|
@@ -77,3 +77,4 @@ exports.KNOWN_ASSET_TYPES = [
|
|
|
77
77
|
'txt',
|
|
78
78
|
];
|
|
79
79
|
exports.DEFAULT_ASSETS_RE = new RegExp(`\\.(` + exports.KNOWN_ASSET_TYPES.join('|') + `)(\\?.*)?$`);
|
|
80
|
+
exports.TEXT_STYLE = ['black', 'white'];
|
package/dist/env/define.d.ts
CHANGED
package/dist/env/define.js
CHANGED
|
@@ -5,6 +5,7 @@ const env_1 = require("../hbx/env");
|
|
|
5
5
|
const json_1 = require("../json");
|
|
6
6
|
function initDefine(stringifyBoolean = false) {
|
|
7
7
|
const manifestJson = (0, json_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
|
|
8
|
+
const platformManifestJson = (0, json_1.getPlatformManifestJsonOnce)();
|
|
8
9
|
const isRunByHBuilderX = (0, env_1.runByHBuilderX)();
|
|
9
10
|
const isDebug = !!manifestJson.debug;
|
|
10
11
|
return {
|
|
@@ -30,6 +31,7 @@ function initDefine(stringifyBoolean = false) {
|
|
|
30
31
|
'process.env.UNICLOUD_DEBUG': JSON.stringify(process.env.UNICLOUD_DEBUG || ''),
|
|
31
32
|
// 兼容旧版本
|
|
32
33
|
'process.env.VUE_APP_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM || ''),
|
|
34
|
+
'process.env.VUE_APP_DARK_MODE': JSON.stringify(platformManifestJson.darkmode || false),
|
|
33
35
|
};
|
|
34
36
|
}
|
|
35
37
|
exports.initDefine = initDefine;
|
|
@@ -29,8 +29,11 @@ const launchwebview_1 = require("./launchwebview");
|
|
|
29
29
|
const checksystemwebview_1 = require("./checksystemwebview");
|
|
30
30
|
const tabBar_1 = require("./tabBar");
|
|
31
31
|
const i18n_1 = require("./i18n");
|
|
32
|
+
const theme_1 = require("../../theme");
|
|
32
33
|
function normalizeAppManifestJson(userManifestJson, pagesJson) {
|
|
33
|
-
const manifestJson = (0, merge_1.initRecursiveMerge)((0,
|
|
34
|
+
const manifestJson = (0, merge_1.initRecursiveMerge)((0, defaultManifestJson_1.initDefaultManifestJson)(), userManifestJson);
|
|
35
|
+
pagesJson = (0, theme_1.initTheme)(manifestJson, pagesJson);
|
|
36
|
+
(0, statusbar_1.initAppStatusbar)(manifestJson, pagesJson);
|
|
34
37
|
(0, arguments_1.initArguments)(manifestJson, pagesJson);
|
|
35
38
|
(0, plus_1.initPlus)(manifestJson, pagesJson);
|
|
36
39
|
(0, nvue_1.initNVue)(manifestJson, pagesJson);
|
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.initAppStatusbar = void 0;
|
|
4
4
|
function initAppStatusbar(manifestJson, pagesJson) {
|
|
5
5
|
var _a;
|
|
6
|
-
const { titleColor = '#
|
|
6
|
+
const { titleColor = '#000000', backgroundColor = '#000000' } = ((_a = pagesJson.globalStyle) === null || _a === void 0 ? void 0 : _a.navigationBar) || {};
|
|
7
7
|
manifestJson.plus.statusbar = {
|
|
8
8
|
immersed: 'supportedDevice',
|
|
9
|
-
style: titleColor === '#
|
|
9
|
+
style: titleColor === '#000000' ? 'dark' : 'light',
|
|
10
10
|
background: backgroundColor,
|
|
11
11
|
};
|
|
12
12
|
return manifestJson;
|
|
@@ -2,19 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initTabBar = void 0;
|
|
4
4
|
const uni_shared_1 = require("@dcloudio/uni-shared");
|
|
5
|
-
const borderStyles = {
|
|
6
|
-
black: 'rgba(0,0,0,0.4)',
|
|
7
|
-
white: 'rgba(255,255,255,0.4)',
|
|
8
|
-
};
|
|
9
5
|
function initTabBar(entryPagePath, manifestJson, pagesJson) {
|
|
10
6
|
var _a, _b;
|
|
11
7
|
if (!((_b = (_a = pagesJson.tabBar) === null || _a === void 0 ? void 0 : _a.list) === null || _b === void 0 ? void 0 : _b.length)) {
|
|
12
8
|
return;
|
|
13
9
|
}
|
|
14
10
|
const tabBar = JSON.parse(JSON.stringify(pagesJson.tabBar));
|
|
15
|
-
|
|
16
|
-
tabBar.borderStyle = borderStyles[tabBar.borderStyle];
|
|
17
|
-
}
|
|
11
|
+
tabBar.borderStyle = (0, uni_shared_1.normalizeTabBarStyles)(tabBar.borderStyle);
|
|
18
12
|
if (!tabBar.selectedColor) {
|
|
19
13
|
tabBar.selectedColor = uni_shared_1.SELECTED_COLOR;
|
|
20
14
|
}
|
|
@@ -10,9 +10,11 @@ const manifest_1 = require("../../manifest");
|
|
|
10
10
|
const manifest_2 = require("../manifest");
|
|
11
11
|
const arguments_1 = require("../manifest/arguments");
|
|
12
12
|
const splashscreen_1 = require("../manifest/splashscreen");
|
|
13
|
+
const theme_1 = require("../../theme");
|
|
13
14
|
function normalizeAppUniConfig(pagesJson, manifestJson) {
|
|
14
15
|
var _a;
|
|
15
16
|
const { autoclose, alwaysShowBeforeRender } = (0, splashscreen_1.getSplashscreen)(manifestJson);
|
|
17
|
+
const platformConfig = (0, manifest_1.getPlatformManifestJsonOnce)();
|
|
16
18
|
const config = {
|
|
17
19
|
pages: [],
|
|
18
20
|
globalStyle: pagesJson.globalStyle,
|
|
@@ -32,6 +34,8 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
|
|
|
32
34
|
networkTimeout: (0, manifest_1.normalizeNetworkTimeout)(manifestJson.networkTimeout),
|
|
33
35
|
tabBar: pagesJson.tabBar,
|
|
34
36
|
locales: (0, i18n_1.initLocales)(path_1.default.join(process.env.UNI_INPUT_DIR, 'locale')),
|
|
37
|
+
darkmode: platformConfig.darkmode || false,
|
|
38
|
+
themeConfig: (0, theme_1.normalizeThemeConfigOnce)(platformConfig),
|
|
35
39
|
};
|
|
36
40
|
// TODO 待支持分包
|
|
37
41
|
return JSON.stringify(config);
|
package/dist/json/index.d.ts
CHANGED
package/dist/json/index.js
CHANGED
package/dist/json/manifest.d.ts
CHANGED
|
@@ -29,4 +29,5 @@ export declare function getRouterOptions(manifestJson: Record<string, any>): {
|
|
|
29
29
|
};
|
|
30
30
|
export declare function isEnableTreeShaking(manifestJson: Record<string, any>): boolean;
|
|
31
31
|
export declare function getDevServerOptions(manifestJson: Record<string, any>): any;
|
|
32
|
+
export declare function getPlatformManifestJsonOnce(): any;
|
|
32
33
|
export {};
|
package/dist/json/manifest.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
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;
|
|
6
|
+
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;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const shared_1 = require("@vue/shared");
|
|
@@ -103,3 +103,10 @@ function getDevServerOptions(manifestJson) {
|
|
|
103
103
|
return (0, shared_1.extend)({}, (_a = manifestJson.h5) === null || _a === void 0 ? void 0 : _a.devServer);
|
|
104
104
|
}
|
|
105
105
|
exports.getDevServerOptions = getDevServerOptions;
|
|
106
|
+
function getPlatformManifestJsonOnce() {
|
|
107
|
+
const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
|
|
108
|
+
return !process.env.UNI_INPUT_DIR
|
|
109
|
+
? {}
|
|
110
|
+
: (0, exports.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR)[platform] || {};
|
|
111
|
+
}
|
|
112
|
+
exports.getPlatformManifestJsonOnce = getPlatformManifestJsonOnce;
|
package/dist/json/mp/pages.js
CHANGED
|
@@ -12,6 +12,8 @@ const pages_1 = require("../pages");
|
|
|
12
12
|
const utils_1 = require("./utils");
|
|
13
13
|
const utils_2 = require("../../utils");
|
|
14
14
|
const project_1 = require("./project");
|
|
15
|
+
const manifest_1 = require("../manifest");
|
|
16
|
+
const theme_1 = require("../theme");
|
|
15
17
|
function parseMiniProgramPagesJson(jsonStr, platform, options = { subpackages: false }) {
|
|
16
18
|
return parsePagesJson(jsonStr, platform, options);
|
|
17
19
|
}
|
|
@@ -37,11 +39,11 @@ exports.mergeMiniProgramAppJson = mergeMiniProgramAppJson;
|
|
|
37
39
|
function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, subpackages, windowOptionsMap, tabBarOptionsMap, tabBarItemOptionsMap, } = {
|
|
38
40
|
subpackages: false,
|
|
39
41
|
}) {
|
|
40
|
-
|
|
42
|
+
let appJson = {
|
|
41
43
|
pages: [],
|
|
42
44
|
};
|
|
43
|
-
|
|
44
|
-
|
|
45
|
+
let pageJsons = {};
|
|
46
|
+
let nvuePages = [];
|
|
45
47
|
// preprocess
|
|
46
48
|
const pagesJson = (0, json_1.parseJson)(jsonStr, true);
|
|
47
49
|
if (!pagesJson) {
|
|
@@ -127,6 +129,11 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
|
|
|
127
129
|
appJson.darkmode = true;
|
|
128
130
|
appJson.themeLocation = 'theme.json';
|
|
129
131
|
}
|
|
132
|
+
else {
|
|
133
|
+
const manifestJson = (0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
|
|
134
|
+
appJson = (0, theme_1.initTheme)(manifestJson, appJson);
|
|
135
|
+
pageJsons = (0, theme_1.initTheme)(manifestJson, pageJsons);
|
|
136
|
+
}
|
|
130
137
|
return {
|
|
131
138
|
appJson,
|
|
132
139
|
pageJsons,
|
package/dist/json/pages.js
CHANGED
|
@@ -13,6 +13,8 @@ const json_1 = require("./json");
|
|
|
13
13
|
const utils_2 = require("../vue/utils");
|
|
14
14
|
const vite_1 = require("../vite");
|
|
15
15
|
const constants_1 = require("../constants");
|
|
16
|
+
const theme_1 = require("./theme");
|
|
17
|
+
const manifest_1 = require("./manifest");
|
|
16
18
|
const pagesCacheSet = new Set();
|
|
17
19
|
function isUniPageFile(file, inputDir = process.env.UNI_INPUT_DIR) {
|
|
18
20
|
if (inputDir && path_1.default.isAbsolute(file)) {
|
|
@@ -109,6 +111,10 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
|
|
|
109
111
|
// 缓存页面列表
|
|
110
112
|
pagesCacheSet.clear();
|
|
111
113
|
pagesJson.pages.forEach((page) => pagesCacheSet.add(page.path));
|
|
114
|
+
const manifestJsonPlatform = (0, manifest_1.getPlatformManifestJsonOnce)();
|
|
115
|
+
if (!manifestJsonPlatform.darkmode) {
|
|
116
|
+
pagesJson = (0, theme_1.initTheme)(manifestJsonPlatform, pagesJson);
|
|
117
|
+
}
|
|
112
118
|
return pagesJson;
|
|
113
119
|
}
|
|
114
120
|
exports.normalizePagesJson = normalizePagesJson;
|
|
@@ -271,8 +277,13 @@ function normalizeNavigationBar(pageStyle) {
|
|
|
271
277
|
delete navigationBar.titleText;
|
|
272
278
|
}
|
|
273
279
|
if (!navigationBar.titleColor && (0, shared_1.hasOwn)(navigationBar, 'textStyle')) {
|
|
274
|
-
navigationBar.
|
|
275
|
-
|
|
280
|
+
const textStyle = navigationBar.textStyle;
|
|
281
|
+
if (constants_1.TEXT_STYLE.includes(textStyle)) {
|
|
282
|
+
navigationBar.titleColor = (0, uni_shared_1.normalizeTitleColor)(textStyle);
|
|
283
|
+
}
|
|
284
|
+
else {
|
|
285
|
+
navigationBar.titleColor = navigationBar.textStyle;
|
|
286
|
+
}
|
|
276
287
|
delete navigationBar.textStyle;
|
|
277
288
|
}
|
|
278
289
|
if (pageStyle.navigationBarShadow &&
|
|
@@ -280,8 +291,9 @@ function normalizeNavigationBar(pageStyle) {
|
|
|
280
291
|
navigationBar.shadowColorType = pageStyle.navigationBarShadow.colorType;
|
|
281
292
|
delete pageStyle.navigationBarShadow;
|
|
282
293
|
}
|
|
294
|
+
const parsedNavigationBar = (0, theme_1.initTheme)((0, manifest_1.getPlatformManifestJsonOnce)(), navigationBar);
|
|
283
295
|
if ((0, shared_1.isArray)(navigationBar.buttons)) {
|
|
284
|
-
navigationBar.buttons = navigationBar.buttons.map((btn) => normalizeNavigationBarButton(btn, navigationBar.type,
|
|
296
|
+
navigationBar.buttons = navigationBar.buttons.map((btn) => normalizeNavigationBarButton(btn, navigationBar.type, parsedNavigationBar.titleColor));
|
|
285
297
|
}
|
|
286
298
|
if ((0, shared_1.isPlainObject)(navigationBar.searchInput)) {
|
|
287
299
|
navigationBar.searchInput = normalizeNavigationBarSearchInput(navigationBar.searchInput);
|
|
@@ -334,20 +346,6 @@ function normalizeTabBar(tabBar, platform) {
|
|
|
334
346
|
return;
|
|
335
347
|
}
|
|
336
348
|
tabBar = (0, shared_1.extend)({}, DEFAULT_TAB_BAR, tabBar);
|
|
337
|
-
if (platform === 'h5') {
|
|
338
|
-
const len = list.length;
|
|
339
|
-
if (len % 2 === 0 && (0, shared_1.isPlainObject)(midButton)) {
|
|
340
|
-
list.splice(Math.floor(len / 2), 0, (0, shared_1.extend)({
|
|
341
|
-
type: 'midButton',
|
|
342
|
-
width: '50px',
|
|
343
|
-
height: '50px',
|
|
344
|
-
iconWidth: '24px',
|
|
345
|
-
}, midButton));
|
|
346
|
-
}
|
|
347
|
-
else {
|
|
348
|
-
delete tabBar.midButton;
|
|
349
|
-
}
|
|
350
|
-
}
|
|
351
349
|
list.forEach((item) => {
|
|
352
350
|
if (item.iconPath) {
|
|
353
351
|
item.iconPath = normalizeFilepath(item.iconPath);
|
|
@@ -355,10 +353,10 @@ function normalizeTabBar(tabBar, platform) {
|
|
|
355
353
|
if (item.selectedIconPath) {
|
|
356
354
|
item.selectedIconPath = normalizeFilepath(item.selectedIconPath);
|
|
357
355
|
}
|
|
358
|
-
if (item.type === 'midButton' && item.backgroundImage) {
|
|
359
|
-
item.backgroundImage = normalizeFilepath(item.backgroundImage);
|
|
360
|
-
}
|
|
361
356
|
});
|
|
357
|
+
if (midButton && midButton.backgroundImage) {
|
|
358
|
+
midButton.backgroundImage = normalizeFilepath(midButton.backgroundImage);
|
|
359
|
+
}
|
|
362
360
|
tabBar.selectedIndex = 0;
|
|
363
361
|
tabBar.shown = true;
|
|
364
362
|
return tabBar;
|
|
@@ -366,6 +364,9 @@ function normalizeTabBar(tabBar, platform) {
|
|
|
366
364
|
const SCHEME_RE = /^([a-z-]+:)?\/\//i;
|
|
367
365
|
const DATA_RE = /^data:.*,.*/;
|
|
368
366
|
function normalizeFilepath(filepath) {
|
|
367
|
+
const manifestJsonPlatform = (0, manifest_1.getPlatformManifestJsonOnce)();
|
|
368
|
+
if (manifestJsonPlatform.darkmode && filepath.startsWith('@'))
|
|
369
|
+
return filepath;
|
|
369
370
|
if (!(SCHEME_RE.test(filepath) || DATA_RE.test(filepath)) &&
|
|
370
371
|
filepath.indexOf('/') !== 0) {
|
|
371
372
|
return (0, uni_shared_1.addLeadingSlash)(filepath);
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
export declare const parseThemeJson: (themeLocation?: string) => UniApp.ThemeJson;
|
|
2
|
+
export declare const normalizeThemeConfigOnce: (manifestJsonPlatform?: Record<string, any>) => UniApp.ThemeJson;
|
|
3
|
+
export declare function initTheme<T extends object>(manifestJson: Record<string, any>, pagesJson: T): T;
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.initTheme = exports.normalizeThemeConfigOnce = exports.parseThemeJson = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const json_1 = require("./json");
|
|
10
|
+
const uni_shared_1 = require("@dcloudio/uni-shared");
|
|
11
|
+
const parseThemeJson = (themeLocation = 'theme.json') => {
|
|
12
|
+
if (!themeLocation || !process.env.UNI_INPUT_DIR) {
|
|
13
|
+
return {};
|
|
14
|
+
}
|
|
15
|
+
themeLocation = path_1.default.join(process.env.UNI_INPUT_DIR, themeLocation);
|
|
16
|
+
if (!fs_1.default.existsSync(themeLocation)) {
|
|
17
|
+
return {};
|
|
18
|
+
}
|
|
19
|
+
const jsonStr = fs_1.default.readFileSync(themeLocation, 'utf8');
|
|
20
|
+
return (0, json_1.parseJson)(jsonStr, true);
|
|
21
|
+
};
|
|
22
|
+
exports.parseThemeJson = parseThemeJson;
|
|
23
|
+
exports.normalizeThemeConfigOnce = (0, uni_shared_1.once)((manifestJsonPlatform = {}) => (0, exports.parseThemeJson)(manifestJsonPlatform.themeLocation));
|
|
24
|
+
function initTheme(manifestJson, pagesJson) {
|
|
25
|
+
const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
|
|
26
|
+
const manifestPlatform = manifestJson['plus'] || manifestJson[platform] || {};
|
|
27
|
+
const themeConfig = (0, exports.normalizeThemeConfigOnce)(manifestPlatform);
|
|
28
|
+
return (0, uni_shared_1.normalizeStyles)(pagesJson, themeConfig);
|
|
29
|
+
}
|
|
30
|
+
exports.initTheme = initTheme;
|
package/dist/messages/en.d.ts
CHANGED
|
@@ -19,6 +19,7 @@ declare const _default: {
|
|
|
19
19
|
readonly 'mp.component.args[1]': "{0} requires two parameters";
|
|
20
20
|
readonly 'mp.360.unsupported': "360 is unsupported";
|
|
21
21
|
readonly 'file.notfound': "{file} is not found";
|
|
22
|
-
readonly 'uts.ios.tips': "The project uses the uts
|
|
22
|
+
readonly 'uts.ios.tips': "The project uses the uts plugin. After the uts plug-in code is modified, the [Custom playground native runner](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground) needs to be regenerated to take effect";
|
|
23
|
+
readonly 'uts.android.compiler.server': "The project uses the uts plugin, installing the uts Android runtime extension...";
|
|
23
24
|
};
|
|
24
25
|
export default _default;
|
package/dist/messages/en.js
CHANGED
|
@@ -21,5 +21,6 @@ exports.default = {
|
|
|
21
21
|
'mp.component.args[1]': '{0} requires two parameters',
|
|
22
22
|
'mp.360.unsupported': '360 is unsupported',
|
|
23
23
|
'file.notfound': '{file} is not found',
|
|
24
|
-
'uts.ios.tips': 'The project uses the uts
|
|
24
|
+
'uts.ios.tips': 'The project uses the uts plugin. After the uts plug-in code is modified, the [Custom playground native runner](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground) needs to be regenerated to take effect',
|
|
25
|
+
'uts.android.compiler.server': 'The project uses the uts plugin, installing the uts Android runtime extension...',
|
|
25
26
|
};
|
package/dist/messages/index.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ export declare const M: {
|
|
|
20
20
|
readonly 'mp.360.unsupported': "vue3暂不支持360小程序";
|
|
21
21
|
readonly 'file.notfound': "{file} 文件不存在";
|
|
22
22
|
readonly 'uts.ios.tips': "项目使用了uts插件,iOS平台uts插件代码修改后需要重新生成[自定义基座](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground)才能生效";
|
|
23
|
+
readonly 'uts.android.compiler.server': "项目使用了uts插件,正在安装 uts Android 运行扩展...";
|
|
23
24
|
} | {
|
|
24
25
|
readonly 'app.compiler.version': "Compiler version: {version}";
|
|
25
26
|
readonly compiling: "Compiling...";
|
|
@@ -41,5 +42,6 @@ export declare const M: {
|
|
|
41
42
|
readonly 'mp.component.args[1]': "{0} requires two parameters";
|
|
42
43
|
readonly 'mp.360.unsupported': "360 is unsupported";
|
|
43
44
|
readonly 'file.notfound': "{file} is not found";
|
|
44
|
-
readonly 'uts.ios.tips': "The project uses the uts
|
|
45
|
+
readonly 'uts.ios.tips': "The project uses the uts plugin. After the uts plug-in code is modified, the [Custom playground native runner](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground) needs to be regenerated to take effect";
|
|
46
|
+
readonly 'uts.android.compiler.server': "The project uses the uts plugin, installing the uts Android runtime extension...";
|
|
45
47
|
};
|
package/dist/messages/zh_CN.d.ts
CHANGED
|
@@ -20,5 +20,6 @@ declare const _default: {
|
|
|
20
20
|
readonly 'mp.360.unsupported': "vue3暂不支持360小程序";
|
|
21
21
|
readonly 'file.notfound': "{file} 文件不存在";
|
|
22
22
|
readonly 'uts.ios.tips': "项目使用了uts插件,iOS平台uts插件代码修改后需要重新生成[自定义基座](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground)才能生效";
|
|
23
|
+
readonly 'uts.android.compiler.server': "项目使用了uts插件,正在安装 uts Android 运行扩展...";
|
|
23
24
|
};
|
|
24
25
|
export default _default;
|
package/dist/messages/zh_CN.js
CHANGED
|
@@ -22,4 +22,5 @@ exports.default = {
|
|
|
22
22
|
'mp.360.unsupported': 'vue3暂不支持360小程序',
|
|
23
23
|
'file.notfound': '{file} 文件不存在',
|
|
24
24
|
'uts.ios.tips': '项目使用了uts插件,iOS平台uts插件代码修改后需要重新生成[自定义基座](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground)才能生效',
|
|
25
|
+
'uts.android.compiler.server': '项目使用了uts插件,正在安装 uts Android 运行扩展...',
|
|
25
26
|
};
|
package/dist/mp/index.d.ts
CHANGED
|
@@ -7,6 +7,6 @@ export * from './assets';
|
|
|
7
7
|
export * from './template';
|
|
8
8
|
export * from './constants';
|
|
9
9
|
export { HTML_TO_MINI_PROGRAM_TAGS } from './tags';
|
|
10
|
-
export { copyMiniProgramPluginJson } from './plugin';
|
|
10
|
+
export { copyMiniProgramPluginJson, copyMiniProgramThemeJson } from './plugin';
|
|
11
11
|
export { parseMainDescriptor, parseScriptDescriptor, parseTemplateDescriptor, transformDynamicImports, updateMiniProgramGlobalComponents, updateMiniProgramComponentsByMainFilename, updateMiniProgramComponentsByScriptFilename, updateMiniProgramComponentsByTemplateFilename, } from './usingComponents';
|
|
12
12
|
export { hasExternalClasses, parseExternalClasses, findMiniProgramComponentExternalClasses, updateMiniProgramComponentExternalClasses, } from './externalClasses';
|
package/dist/mp/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.updateMiniProgramComponentExternalClasses = exports.findMiniProgramComponentExternalClasses = exports.parseExternalClasses = exports.hasExternalClasses = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.transformDynamicImports = exports.parseTemplateDescriptor = exports.parseScriptDescriptor = exports.parseMainDescriptor = exports.copyMiniProgramPluginJson = exports.HTML_TO_MINI_PROGRAM_TAGS = void 0;
|
|
17
|
+
exports.updateMiniProgramComponentExternalClasses = exports.findMiniProgramComponentExternalClasses = exports.parseExternalClasses = exports.hasExternalClasses = exports.updateMiniProgramComponentsByTemplateFilename = exports.updateMiniProgramComponentsByScriptFilename = exports.updateMiniProgramComponentsByMainFilename = exports.updateMiniProgramGlobalComponents = exports.transformDynamicImports = exports.parseTemplateDescriptor = exports.parseScriptDescriptor = exports.parseMainDescriptor = exports.copyMiniProgramThemeJson = exports.copyMiniProgramPluginJson = exports.HTML_TO_MINI_PROGRAM_TAGS = void 0;
|
|
18
18
|
__exportStar(require("./ast"), exports);
|
|
19
19
|
__exportStar(require("./wxs"), exports);
|
|
20
20
|
__exportStar(require("./nvue"), exports);
|
|
@@ -27,6 +27,7 @@ var tags_1 = require("./tags");
|
|
|
27
27
|
Object.defineProperty(exports, "HTML_TO_MINI_PROGRAM_TAGS", { enumerable: true, get: function () { return tags_1.HTML_TO_MINI_PROGRAM_TAGS; } });
|
|
28
28
|
var plugin_1 = require("./plugin");
|
|
29
29
|
Object.defineProperty(exports, "copyMiniProgramPluginJson", { enumerable: true, get: function () { return plugin_1.copyMiniProgramPluginJson; } });
|
|
30
|
+
Object.defineProperty(exports, "copyMiniProgramThemeJson", { enumerable: true, get: function () { return plugin_1.copyMiniProgramThemeJson; } });
|
|
30
31
|
var usingComponents_1 = require("./usingComponents");
|
|
31
32
|
Object.defineProperty(exports, "parseMainDescriptor", { enumerable: true, get: function () { return usingComponents_1.parseMainDescriptor; } });
|
|
32
33
|
Object.defineProperty(exports, "parseScriptDescriptor", { enumerable: true, get: function () { return usingComponents_1.parseScriptDescriptor; } });
|
package/dist/mp/plugin.d.ts
CHANGED
package/dist/mp/plugin.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.copyMiniProgramPluginJson = void 0;
|
|
3
|
+
exports.copyMiniProgramThemeJson = exports.copyMiniProgramPluginJson = void 0;
|
|
4
4
|
const json_1 = require("../json/json");
|
|
5
|
+
const manifest_1 = require("../json/manifest");
|
|
5
6
|
exports.copyMiniProgramPluginJson = {
|
|
6
7
|
src: ['plugin.json'],
|
|
7
8
|
get dest() {
|
|
@@ -11,3 +12,23 @@ exports.copyMiniProgramPluginJson = {
|
|
|
11
12
|
return JSON.stringify((0, json_1.parseJson)(source.toString(), true), null, 2);
|
|
12
13
|
},
|
|
13
14
|
};
|
|
15
|
+
const copyMiniProgramThemeJson = () => {
|
|
16
|
+
if (!process.env.UNI_INPUT_DIR)
|
|
17
|
+
return [];
|
|
18
|
+
const manifestJson = (0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR)[process.env.UNI_PLATFORM] || {};
|
|
19
|
+
return (manifestJson.darkmode && manifestJson.themeLocation) ||
|
|
20
|
+
(manifestJson.themeLocation = 'theme.json')
|
|
21
|
+
? [
|
|
22
|
+
{
|
|
23
|
+
src: [manifestJson.themeLocation],
|
|
24
|
+
get dest() {
|
|
25
|
+
return process.env.UNI_OUTPUT_DIR;
|
|
26
|
+
},
|
|
27
|
+
transform(source) {
|
|
28
|
+
return JSON.stringify((0, json_1.parseJson)(source.toString(), true), null, 2);
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
]
|
|
32
|
+
: [];
|
|
33
|
+
};
|
|
34
|
+
exports.copyMiniProgramThemeJson = copyMiniProgramThemeJson;
|
|
@@ -56,6 +56,19 @@ function walkDecls(rpx2unit) {
|
|
|
56
56
|
decl.value = rpx2unit(decl.value);
|
|
57
57
|
};
|
|
58
58
|
}
|
|
59
|
+
function filterPrefersColorScheme(root) {
|
|
60
|
+
var _a;
|
|
61
|
+
if (process.env.VUE_APP_DARK_MODE !== 'true') {
|
|
62
|
+
const filePath = (_a = root.source) === null || _a === void 0 ? void 0 : _a.input.file;
|
|
63
|
+
if (filePath && filePath.includes('@dcloudio')) {
|
|
64
|
+
root.walkAtRules((rule) => {
|
|
65
|
+
if (rule.params.includes('prefers-color-scheme')) {
|
|
66
|
+
rule.remove();
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
59
72
|
const baiduTags = {
|
|
60
73
|
navigator: 'nav',
|
|
61
74
|
};
|
|
@@ -96,6 +109,7 @@ const uniapp = (opts) => {
|
|
|
96
109
|
OnceExit(root) {
|
|
97
110
|
root.walkDecls(walkDecls(rpx2unit));
|
|
98
111
|
const rewriteTag = transforms[platform];
|
|
112
|
+
filterPrefersColorScheme(root);
|
|
99
113
|
if (rewriteTag) {
|
|
100
114
|
root.walkRules(walkRules({
|
|
101
115
|
rewriteTag,
|
package/lib/.DS_Store
ADDED
|
Binary file
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcloudio/uni-cli-shared",
|
|
3
|
-
"version": "3.0.0-alpha-
|
|
3
|
+
"version": "3.0.0-alpha-3060820221027003",
|
|
4
4
|
"description": "@dcloudio/uni-cli-shared",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -22,11 +22,11 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@ampproject/remapping": "^2.1.2",
|
|
25
|
-
"@babel/core": "^7.
|
|
26
|
-
"@babel/parser": "^7.
|
|
27
|
-
"@babel/types": "^7.
|
|
28
|
-
"@dcloudio/uni-i18n": "3.0.0-alpha-
|
|
29
|
-
"@dcloudio/uni-shared": "3.0.0-alpha-
|
|
25
|
+
"@babel/core": "^7.19.6",
|
|
26
|
+
"@babel/parser": "^7.19.6",
|
|
27
|
+
"@babel/types": "^7.20.0",
|
|
28
|
+
"@dcloudio/uni-i18n": "3.0.0-alpha-3060820221027003",
|
|
29
|
+
"@dcloudio/uni-shared": "3.0.0-alpha-3060820221027003",
|
|
30
30
|
"@intlify/core-base": "9.1.9",
|
|
31
31
|
"@intlify/shared": "9.1.9",
|
|
32
32
|
"@intlify/vue-devtools": "9.1.9",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@vue/compiler-sfc": "3.2.41",
|
|
37
37
|
"@vue/server-renderer": "3.2.41",
|
|
38
38
|
"@vue/shared": "3.2.41",
|
|
39
|
-
"autoprefixer": "^10.4.
|
|
39
|
+
"autoprefixer": "^10.4.13",
|
|
40
40
|
"base64url": "^3.0.1",
|
|
41
41
|
"chokidar": "^3.5.3",
|
|
42
42
|
"compare-versions": "^3.6.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"fs-extra": "^10.0.0",
|
|
49
49
|
"hash-sum": "^2.0.0",
|
|
50
50
|
"jsonc-parser": "^3.0.0",
|
|
51
|
-
"magic-string": "^0.26.
|
|
51
|
+
"magic-string": "^0.26.7",
|
|
52
52
|
"merge": "^2.1.1",
|
|
53
53
|
"mime": "^3.0.0",
|
|
54
54
|
"module-alias": "^2.2.2",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
},
|
|
65
65
|
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@dcloudio/uni-uts-v1": "3.0.0-alpha-
|
|
67
|
+
"@dcloudio/uni-uts-v1": "3.0.0-alpha-3060820221027003",
|
|
68
68
|
"@types/babel__core": "^7.1.19",
|
|
69
69
|
"@types/debug": "^4.1.7",
|
|
70
70
|
"@types/estree": "^0.0.51",
|