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

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");
@@ -32,7 +33,8 @@ const i18n_1 = require("./i18n");
 const theme_1 = require("../../theme");
 function normalizeAppManifestJson(userManifestJson, pagesJson) {
     const manifestJson = (0, merge_1.initRecursiveMerge)((0, defaultManifestJson_1.initDefaultManifestJson)(), userManifestJson);
-    pagesJson = (0, theme_1.initTheme)(manifestJson, pagesJson);
+    const { pages, globalStyle, tabBar } = (0, theme_1.initTheme)(manifestJson, pagesJson);
+    (0, shared_1.extend)(pagesJson, { pages, globalStyle, tabBar });
     (0, statusbar_1.initAppStatusbar)(manifestJson, pagesJson);
     (0, arguments_1.initArguments)(manifestJson, pagesJson);
     (0, plus_1.initPlus)(manifestJson, pagesJson);

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/mp/pages.js

@@ -131,7 +131,8 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
     }
     else {
         const manifestJson = (0, manifest_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
-        appJson = (0, theme_1.initTheme)(manifestJson, appJson);
+        const { pages, window, tabBar } = (0, theme_1.initTheme)(manifestJson, appJson);
+        (0, shared_1.extend)(appJson, { pages, window, tabBar });
         pageJsons = (0, theme_1.initTheme)(manifestJson, pageJsons);
     }
     return {

package/dist/json/pages.js

@@ -113,7 +113,8 @@ function normalizePagesJson(jsonStr, platform, { subpackages, } = { subpackages:
     pagesJson.pages.forEach((page) => pagesCacheSet.add(page.path));
     const manifestJsonPlatform = (0, manifest_1.getPlatformManifestJsonOnce)();
     if (!manifestJsonPlatform.darkmode) {
-        pagesJson = (0, theme_1.initTheme)(manifestJsonPlatform, pagesJson);
+        const { pages, globalStyle, tabBar } = (0, theme_1.initTheme)(manifestJsonPlatform, pagesJson);
+        (0, shared_1.extend)(pagesJson, { pages, globalStyle, tabBar });
     }
     return pagesJson;
 }
@@ -364,8 +365,8 @@ 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('@'))
+    const themeConfig = (0, theme_1.normalizeThemeConfigOnce)()['light'] || {};
+    if (themeConfig[filepath.replace('@', '')])
         return filepath;
     if (!(SCHEME_RE.test(filepath) || DATA_RE.test(filepath)) &&
         filepath.indexOf('/') !== 0) {

package/dist/messages/en.d.ts

@@ -9,6 +9,7 @@ declare const _default: {
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
+    readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";
     readonly 'stat.warn.version': "The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat";
     readonly 'stat.warn.tip': "uni statistics version: {version}";
@@ -21,5 +22,7 @@ declare const _default: {
     readonly 'file.notfound': "{file} is not found";
     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...";
+    readonly 'uts.ios.windows.tips': "When running on Windows to iOS mobile phone, the modification of the uts plugin code needs to be submitted to the cloud to package the custom playground to take effect.";
+    readonly 'uts.ios.standard.tips': "When the standard playground runs to an IOS phone, the uts plugin is temporarily not supported. If you need to call the uts plugin, please use a custom playground";
 };
 export default _default;

package/dist/messages/en.js

@@ -11,6 +11,7 @@ exports.default = {
     'dev.watching.end': 'DONE  Build complete. Watching for changes...',
     'dev.watching.end.pages': 'DONE  Build complete. PAGES:{pages}',
     'dev.watching.end.files': 'DONE  Build complete. FILES:{files}',
+    'compiler.build.failed': 'Build failed with errors.',
     'stat.warn.appid': 'The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303',
     'stat.warn.version': 'The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat',
     'stat.warn.tip': 'uni statistics version: {version}',
@@ -23,4 +24,6 @@ exports.default = {
     'file.notfound': '{file} is not found',
     '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...',
+    'uts.ios.windows.tips': 'When running on Windows to iOS mobile phone, the modification of the uts plugin code needs to be submitted to the cloud to package the custom playground to take effect.',
+    'uts.ios.standard.tips': 'When the standard playground runs to an IOS phone, the uts plugin is temporarily not supported. If you need to call the uts plugin, please use a custom playground',
 };

package/dist/messages/index.d.ts

@@ -9,6 +9,7 @@ export declare const M: {
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
+    readonly 'compiler.build.failed': "编译失败";
     readonly 'stat.warn.appid': "当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303";
     readonly 'stat.warn.version': "当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat";
     readonly 'stat.warn.tip': "已开启 uni统计{version} 版本";
@@ -21,6 +22,8 @@ export declare const M: {
     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 'uts.ios.windows.tips': "iOS手机在windows上真机运行时uts插件代码修改需提交云端打包自定义基座才能生效";
+    readonly 'uts.ios.standard.tips': "iOS手机在标准基座真机运行暂不支持uts插件，如需调用uts插件请使用自定义基座";
 } | {
     readonly 'app.compiler.version': "Compiler version: {version}";
     readonly compiling: "Compiling...";
@@ -32,6 +35,7 @@ export declare const M: {
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
+    readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";
     readonly 'stat.warn.version': "The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat";
     readonly 'stat.warn.tip': "uni statistics version: {version}";
@@ -44,4 +48,6 @@ export declare const M: {
     readonly 'file.notfound': "{file} is not found";
     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...";
+    readonly 'uts.ios.windows.tips': "When running on Windows to iOS mobile phone, the modification of the uts plugin code needs to be submitted to the cloud to package the custom playground to take effect.";
+    readonly 'uts.ios.standard.tips': "When the standard playground runs to an IOS phone, the uts plugin is temporarily not supported. If you need to call the uts plugin, please use a custom playground";
 };

package/dist/messages/zh_CN.d.ts

@@ -9,6 +9,7 @@ declare const _default: {
     readonly 'dev.watching.end': "DONE  Build complete. Watching for changes...";
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
+    readonly 'compiler.build.failed': "编译失败";
     readonly 'stat.warn.appid': "当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303";
     readonly 'stat.warn.version': "当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat";
     readonly 'stat.warn.tip': "已开启 uni统计{version} 版本";
@@ -21,5 +22,7 @@ declare const _default: {
     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 'uts.ios.windows.tips': "iOS手机在windows上真机运行时uts插件代码修改需提交云端打包自定义基座才能生效";
+    readonly 'uts.ios.standard.tips': "iOS手机在标准基座真机运行暂不支持uts插件，如需调用uts插件请使用自定义基座";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -11,6 +11,7 @@ exports.default = {
     'dev.watching.end': 'DONE  Build complete. Watching for changes...',
     'dev.watching.end.pages': 'DONE  Build complete. PAGES:{pages}',
     'dev.watching.end.files': 'DONE  Build complete. FILES:{files}',
+    'compiler.build.failed': '编译失败',
     'stat.warn.appid': '当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303',
     'stat.warn.version': '当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat',
     'stat.warn.tip': '已开启 uni统计{version} 版本',
@@ -23,4 +24,6 @@ exports.default = {
     '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 运行扩展...',
+    'uts.ios.windows.tips': 'iOS手机在windows上真机运行时uts插件代码修改需提交云端打包自定义基座才能生效',
+    'uts.ios.standard.tips': 'iOS手机在标准基座真机运行暂不支持uts插件，如需调用uts插件请使用自定义基座',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060820221027003",
+  "version": "3.0.0-alpha-3060820221027004",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@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",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060820221027004",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060820221027004",
     "@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-3060820221027003",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3060820221027004",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",