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

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/json/app/pages/uniConfig.js

@@ -14,7 +14,7 @@ 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 platformConfig = (0, manifest_1.getPlatformManifestJsonOnce)();
     const config = {
         pages: [],
         globalStyle: pagesJson.globalStyle,

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");
@@ -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/pages.js

@@ -111,9 +111,11 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
     // 缓存页面列表
     pagesCacheSet.clear();
     pagesJson.pages.forEach((page) => pagesCacheSet.add(page.path));
-    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);
+    const manifestJsonPlatform = (0, manifest_1.getPlatformManifestJsonOnce)();
+    if (!manifestJsonPlatform.darkmode) {
+        pagesJson = (0, theme_1.initTheme)(manifestJsonPlatform, pagesJson);
+    }
+    return pagesJson;
 }
 exports.normalizePagesJson = normalizePagesJson;
 function validatePages(pagesJson, jsonStr) {
@@ -289,7 +291,7 @@ 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);
+    const parsedNavigationBar = (0, theme_1.initTheme)((0, manifest_1.getPlatformManifestJsonOnce)(), navigationBar);
     if ((0, shared_1.isArray)(navigationBar.buttons)) {
         navigationBar.buttons = navigationBar.buttons.map((btn) => normalizeNavigationBarButton(btn, navigationBar.type, parsedNavigationBar.titleColor));
     }
@@ -344,20 +346,6 @@ function normalizeTabBar(tabBar, platform) {
         return;
     }
     tabBar = (0, shared_1.extend)({}, DEFAULT_TAB_BAR, tabBar);
-    if (platform === 'h5') {
-        const len = list.length;
-        if (len % 2 === 0 && (0, shared_1.isPlainObject)(midButton)) {
-            list.splice(Math.floor(len / 2), 0, (0, shared_1.extend)({
-                type: 'midButton',
-                width: '50px',
-                height: '50px',
-                iconWidth: '24px',
-            }, midButton));
-        }
-        else {
-            delete tabBar.midButton;
-        }
-    }
     list.forEach((item) => {
         if (item.iconPath) {
             item.iconPath = normalizeFilepath(item.iconPath);
@@ -365,10 +353,10 @@ function normalizeTabBar(tabBar, platform) {
         if (item.selectedIconPath) {
             item.selectedIconPath = normalizeFilepath(item.selectedIconPath);
         }
-        if (item.type === 'midButton' && item.backgroundImage) {
-            item.backgroundImage = normalizeFilepath(item.backgroundImage);
-        }
     });
+    if (midButton && midButton.backgroundImage) {
+        midButton.backgroundImage = normalizeFilepath(midButton.backgroundImage);
+    }
     tabBar.selectedIndex = 0;
     tabBar.shown = true;
     return tabBar;
@@ -376,6 +364,9 @@ function normalizeTabBar(tabBar, platform) {
 const SCHEME_RE = /^([a-z-]+:)?\/\//i;
 const DATA_RE = /^data:.*,.*/;
 function normalizeFilepath(filepath) {
+    const manifestJsonPlatform = (0, manifest_1.getPlatformManifestJsonOnce)();
+    if (manifestJsonPlatform.darkmode && filepath.startsWith('@'))
+        return filepath;
     if (!(SCHEME_RE.test(filepath) || DATA_RE.test(filepath)) &&
         filepath.indexOf('/') !== 0) {
         return (0, uni_shared_1.addLeadingSlash)(filepath);

package/dist/json/theme.js

@@ -9,7 +9,7 @@ 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) {
+    if (!themeLocation || !process.env.UNI_INPUT_DIR) {
         return {};
     }
     themeLocation = path_1.default.join(process.env.UNI_INPUT_DIR, themeLocation);

package/dist/messages/en.d.ts

@@ -19,6 +19,7 @@ declare const _default: {
     readonly 'mp.component.args[1]': "{0} requires two parameters";
     readonly 'mp.360.unsupported': "360 is unsupported";
     readonly 'file.notfound': "{file} is not found";
-    readonly 'uts.ios.tips': "The project uses the uts plug-in. 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";
+    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";
+    readonly 'uts.android.compiler.server': "The project uses the uts plugin, installing the uts Android runtime extension...";
 };
 export default _default;

package/dist/messages/en.js

@@ -21,5 +21,6 @@ exports.default = {
     'mp.component.args[1]': '{0} requires two parameters',
     'mp.360.unsupported': '360 is unsupported',
     'file.notfound': '{file} is not found',
-    'uts.ios.tips': 'The project uses the uts plug-in. 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',
+    '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',
+    'uts.android.compiler.server': 'The project uses the uts plugin, installing the uts Android runtime extension...',
 };

package/dist/messages/index.d.ts

@@ -20,6 +20,7 @@ export declare const M: {
     readonly 'mp.360.unsupported': "vue3暂不支持360小程序";
     readonly 'file.notfound': "{file} 文件不存在";
     readonly 'uts.ios.tips': "项目使用了uts插件，iOS平台uts插件代码修改后需要重新生成[自定义基座](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground)才能生效";
+    readonly 'uts.android.compiler.server': "项目使用了uts插件，正在安装 uts Android 运行扩展...";
 } | {
     readonly 'app.compiler.version': "Compiler version: {version}";
     readonly compiling: "Compiling...";
@@ -41,5 +42,6 @@ export declare const M: {
     readonly 'mp.component.args[1]': "{0} requires two parameters";
     readonly 'mp.360.unsupported': "360 is unsupported";
     readonly 'file.notfound': "{file} is not found";
-    readonly 'uts.ios.tips': "The project uses the uts plug-in. 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";
+    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";
+    readonly 'uts.android.compiler.server': "The project uses the uts plugin, installing the uts Android runtime extension...";
 };

package/dist/messages/zh_CN.d.ts

@@ -20,5 +20,6 @@ declare const _default: {
     readonly 'mp.360.unsupported': "vue3暂不支持360小程序";
     readonly 'file.notfound': "{file} 文件不存在";
     readonly 'uts.ios.tips': "项目使用了uts插件，iOS平台uts插件代码修改后需要重新生成[自定义基座](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground)才能生效";
+    readonly 'uts.android.compiler.server': "项目使用了uts插件，正在安装 uts Android 运行扩展...";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -22,4 +22,5 @@ exports.default = {
     'mp.360.unsupported': 'vue3暂不支持360小程序',
     'file.notfound': '{file} 文件不存在',
     'uts.ios.tips': '项目使用了uts插件，iOS平台uts插件代码修改后需要重新生成[自定义基座](https://uniapp.dcloud.net.cn/tutorial/run/run-app.html#customplayground)才能生效',
+    'uts.android.compiler.server': '项目使用了uts插件，正在安装 uts Android 运行扩展...',
 };

package/dist/mp/index.d.ts

@@ -7,6 +7,6 @@ export * from './assets';
 export * from './template';
 export * from './constants';
 export { HTML_TO_MINI_PROGRAM_TAGS } from './tags';
-export { copyMiniProgramPluginJson } from './plugin';
+export { copyMiniProgramPluginJson, copyMiniProgramThemeJson } from './plugin';
 export { parseMainDescriptor, parseScriptDescriptor, parseTemplateDescriptor, transformDynamicImports, updateMiniProgramGlobalComponents, updateMiniProgramComponentsByMainFilename, updateMiniProgramComponentsByScriptFilename, updateMiniProgramComponentsByTemplateFilename, } from './usingComponents';
 export { hasExternalClasses, parseExternalClasses, findMiniProgramComponentExternalClasses, updateMiniProgramComponentExternalClasses, } from './externalClasses';

package/dist/mp/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.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;
+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;
 __exportStar(require("./ast"), exports);
 __exportStar(require("./wxs"), exports);
 __exportStar(require("./nvue"), exports);
@@ -27,6 +27,7 @@ var tags_1 = require("./tags");
 Object.defineProperty(exports, "HTML_TO_MINI_PROGRAM_TAGS", { enumerable: true, get: function () { return tags_1.HTML_TO_MINI_PROGRAM_TAGS; } });
 var plugin_1 = require("./plugin");
 Object.defineProperty(exports, "copyMiniProgramPluginJson", { enumerable: true, get: function () { return plugin_1.copyMiniProgramPluginJson; } });
+Object.defineProperty(exports, "copyMiniProgramThemeJson", { enumerable: true, get: function () { return plugin_1.copyMiniProgramThemeJson; } });
 var usingComponents_1 = require("./usingComponents");
 Object.defineProperty(exports, "parseMainDescriptor", { enumerable: true, get: function () { return usingComponents_1.parseMainDescriptor; } });
 Object.defineProperty(exports, "parseScriptDescriptor", { enumerable: true, get: function () { return usingComponents_1.parseScriptDescriptor; } });

package/dist/mp/plugin.d.ts

@@ -1,2 +1,3 @@
 import { UniViteCopyPluginTarget } from '../vite/plugins/copy';
 export declare const copyMiniProgramPluginJson: UniViteCopyPluginTarget;
+export declare const copyMiniProgramThemeJson: () => UniViteCopyPluginTarget[];

package/dist/mp/plugin.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyMiniProgramPluginJson = void 0;
+exports.copyMiniProgramThemeJson = exports.copyMiniProgramPluginJson = void 0;
 const json_1 = require("../json/json");
+const manifest_1 = require("../json/manifest");
 exports.copyMiniProgramPluginJson = {
     src: ['plugin.json'],
     get dest() {
@@ -11,3 +12,23 @@ exports.copyMiniProgramPluginJson = {
         return JSON.stringify((0, json_1.parseJson)(source.toString(), true), null, 2);
     },
 };
+const copyMiniProgramThemeJson = () => {
+    if (!process.env.UNI_INPUT_DIR)
+        return [];
+    const manifestJson = (0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR)[process.env.UNI_PLATFORM] || {};
+    return (manifestJson.darkmode && manifestJson.themeLocation) ||
+        (manifestJson.themeLocation = 'theme.json')
+        ? [
+            {
+                src: [manifestJson.themeLocation],
+                get dest() {
+                    return process.env.UNI_OUTPUT_DIR;
+                },
+                transform(source) {
+                    return JSON.stringify((0, json_1.parseJson)(source.toString(), true), null, 2);
+                },
+            },
+        ]
+        : [];
+};
+exports.copyMiniProgramThemeJson = copyMiniProgramThemeJson;

package/dist/postcss/plugins/uniapp.js

@@ -56,6 +56,19 @@ function walkDecls(rpx2unit) {
         decl.value = rpx2unit(decl.value);
     };
 }
+function filterPrefersColorScheme(root) {
+    var _a;
+    if (process.env.VUE_APP_DARK_MODE !== 'true') {
+        const filePath = (_a = root.source) === null || _a === void 0 ? void 0 : _a.input.file;
+        if (filePath && filePath.includes('@dcloudio')) {
+            root.walkAtRules((rule) => {
+                if (rule.params.includes('prefers-color-scheme')) {
+                    rule.remove();
+                }
+            });
+        }
+    }
+}
 const baiduTags = {
     navigator: 'nav',
 };
@@ -96,6 +109,7 @@ const uniapp = (opts) => {
                 OnceExit(root) {
                     root.walkDecls(walkDecls(rpx2unit));
                     const rewriteTag = transforms[platform];
+                    filterPrefersColorScheme(root);
                     if (rewriteTag) {
                         root.walkRules(walkRules({
                             rewriteTag,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060820221027001",
+  "version": "3.0.0-alpha-3060820221027003",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@ampproject/remapping": "^2.1.2",
-    "@babel/core": "^7.18.13",
-    "@babel/parser": "^7.18.13",
-    "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060820221027001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060820221027001",
+    "@babel/core": "^7.19.6",
+    "@babel/parser": "^7.19.6",
+    "@babel/types": "^7.20.0",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060820221027003",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060820221027003",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -36,7 +36,7 @@
     "@vue/compiler-sfc": "3.2.41",
     "@vue/server-renderer": "3.2.41",
     "@vue/shared": "3.2.41",
-    "autoprefixer": "^10.4.12",
+    "autoprefixer": "^10.4.13",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
     "compare-versions": "^3.6.0",
@@ -48,7 +48,7 @@
     "fs-extra": "^10.0.0",
     "hash-sum": "^2.0.0",
     "jsonc-parser": "^3.0.0",
-    "magic-string": "^0.26.3",
+    "magic-string": "^0.26.7",
     "merge": "^2.1.1",
     "mime": "^3.0.0",
     "module-alias": "^2.2.2",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060820221027001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060820221027003",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",