@dcloudio/uni-cli-shared 3.0.0-alpha-4030120241009001 → 3.0.0-alpha-4030120241024001

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

@@ -37,5 +37,11 @@ const defaultManifestJson = `{
         },
         "popGesture": "close",
         "launchwebview": {}
+    },
+    "app-harmony": {
+        "useragent": {
+            "value": "",
+            "concatenate": true
+        }
     }
-  }`;
+}`;

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

@@ -25,6 +25,17 @@ function initLaunchwebview(manifestJson, pagesJson) {
             manifestJson.plus.useragent.value = 'uni-app';
         }
     }
+    if (manifestJson['app-harmony'].useragent.concatenate) {
+        if (manifestJson['app-harmony'].useragent.value) {
+            manifestJson['app-harmony'].useragent.value = [
+                'uni-app',
+                manifestJson['app-harmony'].useragent.value,
+            ].join(' ');
+        }
+        else {
+            manifestJson['app-harmony'].useragent.value = 'uni-app';
+        }
+    }
     (0, shared_1.extend)(manifestJson.plus.launchwebview, {
         id: '1',
         kernel: 'WKWebview',

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

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initRecursiveMerge = void 0;
 const merge_1 = require("merge");
 function initRecursiveMerge(manifestJson, userManifestJson) {
+    const platformConfig = {
+        plus: userManifestJson['app-plus'],
+    };
+    platformConfig['app-harmony'] = userManifestJson['app-harmony'];
     return (0, merge_1.recursive)(true, manifestJson, {
         id: userManifestJson.appid || '',
         name: userManifestJson.name || '',
@@ -13,6 +17,6 @@ function initRecursiveMerge(manifestJson, userManifestJson) {
         },
         locale: userManifestJson.locale,
         uniStatistics: userManifestJson.uniStatistics,
-    }, { plus: userManifestJson['app-plus'] });
+    }, platformConfig);
 }
 exports.initRecursiveMerge = initRecursiveMerge;

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

@@ -95,6 +95,7 @@ function initUniStatistics(manifestJson) {
     // 根节点配置了统计
     if (manifestJson.uniStatistics) {
         manifestJson.plus.uniStatistics = (0, merge_1.recursive)(true, manifestJson.uniStatistics, manifestJson.plus.uniStatistics);
+        manifestJson['app-harmony'].uniStatistics = (0, merge_1.recursive)(true, manifestJson.uniStatistics, manifestJson['app-harmony'].uniStatistics);
         delete manifestJson.uniStatistics;
     }
     if (!process.env.UNI_CLOUD_PROVIDER) {

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

@@ -12,6 +12,14 @@ function initSafearea(manifestJson, pagesJson) {
                 },
             };
         }
+        if (!manifestJson['app-harmony'].safearea) {
+            manifestJson['app-harmony'].safearea = {
+                background: pagesJson.tabBar.backgroundColor || '#FFFFFF',
+                bottom: {
+                    offset: 'auto',
+                },
+            };
+        }
     }
     else {
         if (!manifestJson.plus.launchwebview) {

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

@@ -37,7 +37,7 @@ function normalizeAppUniConfig(pagesJson, manifestJson) {
         darkmode: platformConfig.darkmode || false,
         themeConfig: (0, theme_1.normalizeThemeConfigOnce)(platformConfig),
         // @ts-expect-error
-        qqMapKey: platformConfig?.distribute?.sdkConfigs?.maps?.qqmap?.key,
+        qqMapKey: platformConfig?.distribute?.sdkConfigs?.maps?.tencent?.key,
     };
     // TODO 待支持分包
     return JSON.stringify(config);

package/dist/utils.js

@@ -199,10 +199,14 @@ function normalizeEmitAssetFileName(fileName) {
     return fileName;
 }
 exports.normalizeEmitAssetFileName = normalizeEmitAssetFileName;
-function createIdent() {
+function createIdent(platform) {
     if (process.env.UNI_INPUT_DIR) {
         const manifestJson = (0, json_1.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
-        const id = (manifestJson.appid || '').replace('__UNI__', '');
+        let id = (manifestJson.appid || '').replace('__UNI__', '');
+        const platformAppId = manifestJson[platform]?.appid;
+        if (platformAppId) {
+            id += '%%' + platformAppId;
+        }
         if (id) {
             return Buffer.from(Buffer.from(id).toString('base64')).toString('hex');
         }
@@ -212,7 +216,7 @@ function createIdent() {
 function createShadowImageUrl(cdn, type = 'grey') {
     let identStr = '';
     if (process.env.UNI_PLATFORM !== 'h5' && process.env.UNI_PLATFORM !== 'web') {
-        const ident = createIdent();
+        const ident = createIdent(process.env.UNI_PLATFORM);
         identStr = ident ? `${ident}/` : '';
     }
     return `https://cdn${(cdn || 0) + (process.env.UNI_APP_X === 'true' ? 1000 : 0) || ''}.dcloud.net.cn/${identStr}img/shadow-${type}.png`;

package/dist/vite/autoImport.js

@@ -85,7 +85,7 @@ const uniH5Preset = {
     ],
 };
 const cloudPreset = {
-    '@dcloudio/uni-cloud': [['default', 'uniCloud'], 'UniCloudError'],
+    '@dcloudio/uni-cloud': ['uniCloud', 'UniCloudError'],
 };
 const vuePreset = {
     from: 'vue',

package/dist/vite/plugins/copy.js

@@ -8,13 +8,14 @@ const uni_shared_1 = require("@dcloudio/uni-shared");
 function uniViteCopyPlugin({ targets, }) {
     let resolvedConfig;
     let initialized = false;
+    let isFirstBuild = true;
     return {
         name: 'uni:copy',
         apply: 'build',
         configResolved(config) {
             resolvedConfig = config;
         },
-        writeBundle() {
+        async writeBundle() {
             if (initialized) {
                 return;
             }
@@ -27,6 +28,9 @@ function uniViteCopyPlugin({ targets, }) {
             const onChange = is_prod
                 ? undefined
                 : (0, uni_shared_1.debounce)(() => {
+                    if (isFirstBuild) {
+                        return;
+                    }
                     (0, logs_1.resetOutput)('log');
                     (0, logs_1.output)('log', messages_1.M['dev.watching.end']);
                 }, 100, { setTimeout, clearTimeout });
@@ -46,6 +50,9 @@ function uniViteCopyPlugin({ targets, }) {
                 })).then(() => resolve());
             });
         },
+        closeBundle() {
+            isFirstBuild = false;
+        },
     };
 }
 exports.uniViteCopyPlugin = uniViteCopyPlugin;

package/dist/vite/plugins/uts/uni_modules.d.ts

@@ -1,5 +1,6 @@
 import type { Plugin } from 'vite';
 import type { SyncUniModulesFilePreprocessor } from '@dcloudio/uni-uts-v1';
+export declare function rewriteUniModulesConsoleExpr(fileName: string, content: string): string;
 export declare function createAppAndroidUniModulesSyncFilePreprocessorOnce(isX: boolean): SyncUniModulesFilePreprocessor;
 export declare function createAppIosUniModulesSyncFilePreprocessorOnce(isX: boolean): SyncUniModulesFilePreprocessor;
 export declare function createAppHarmonyUniModulesSyncFilePreprocessorOnce(isX: boolean): SyncUniModulesFilePreprocessor;

package/dist/vite/plugins/uts/uni_modules.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.uniDecryptUniModulesPlugin = exports.resolveExtApiProvider = exports.buildUniExtApis = exports.uniUTSAppUniModulesPlugin = exports.getCurrentCompiledUTSPlugins = exports.createAppHarmonyUniModulesSyncFilePreprocessorOnce = exports.createAppIosUniModulesSyncFilePreprocessorOnce = exports.createAppAndroidUniModulesSyncFilePreprocessorOnce = void 0;
+exports.uniDecryptUniModulesPlugin = exports.resolveExtApiProvider = exports.buildUniExtApis = exports.uniUTSAppUniModulesPlugin = exports.getCurrentCompiledUTSPlugins = exports.createAppHarmonyUniModulesSyncFilePreprocessorOnce = exports.createAppIosUniModulesSyncFilePreprocessorOnce = exports.createAppAndroidUniModulesSyncFilePreprocessorOnce = exports.rewriteUniModulesConsoleExpr = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
@@ -17,8 +17,20 @@ const json_1 = require("../../../json");
 const fs_1 = require("../../../fs");
 const context_1 = require("../../../preprocess/context");
 const hbx_1 = require("../../../hbx");
+const console_1 = require("../../../logs/console");
 /* eslint-disable no-restricted-globals */
 const { preprocess } = require('../../../../lib/preprocess');
+function rewriteUniModulesConsoleExpr(fileName, content) {
+    // 仅开发模式补充console.log的at信息
+    if (process.env.NODE_ENV !== 'development') {
+        return content;
+    }
+    if (content.includes('console.')) {
+        return (0, console_1.rewriteConsoleExpr)('__f__', '', (0, utils_2.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, fileName.split('?')[0])), content, false).code;
+    }
+    return content;
+}
+exports.rewriteUniModulesConsoleExpr = rewriteUniModulesConsoleExpr;
 function createUniModulesSyncFilePreprocessor(platform, utsPlatform, isX) {
     const { preVueContext, preUVueContext } = (0, context_1.initScopedPreContext)(platform, undefined, utsPlatform, isX);
     const preContext = isX ? preUVueContext : preVueContext;
@@ -48,10 +60,10 @@ function createUniModulesSyncFilePreprocessor(platform, utsPlatform, isX) {
             });
         }
         else if (extname === '.uts' || extname === '.ts') {
-            return preJs(content);
+            return rewriteUniModulesConsoleExpr(fileName, preJs(content));
         }
         else if (extname === '.uvue' || extname === '.vue') {
-            return preJs(preHtml(content));
+            return rewriteUniModulesConsoleExpr(fileName, preJs(preHtml(content)));
         }
         return content;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4030120241009001",
+  "version": "3.0.0-alpha-4030120241024001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.23.3",
     "@babel/parser": "^7.23.9",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4030120241009001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4030120241009001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4030120241024001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4030120241024001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -71,7 +71,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4030120241009001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4030120241024001",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",