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

package/dist/json/index.d.ts

@@ -4,4 +4,4 @@ export * from './json';
 export * from './pages';
 export * from './manifest';
 export * from './theme';
-export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, checkPagesJson, parseUniXFlexDirection, parseUniXSplashScreen, } from './uni-x';
+export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, checkPagesJson, parseUniXFlexDirection, parseUniXSplashScreen, parseUniXUniStatistics, } from './uni-x';

package/dist/json/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.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.checkPagesJson = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
+exports.parseUniXUniStatistics = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.checkPagesJson = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
 __exportStar(require("./mp"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
@@ -27,3 +27,4 @@ Object.defineProperty(exports, "normalizeUniAppXAppConfig", { enumerable: true,
 Object.defineProperty(exports, "checkPagesJson", { enumerable: true, get: function () { return uni_x_1.checkPagesJson; } });
 Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return uni_x_1.parseUniXFlexDirection; } });
 Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return uni_x_1.parseUniXSplashScreen; } });
+Object.defineProperty(exports, "parseUniXUniStatistics", { enumerable: true, get: function () { return uni_x_1.parseUniXUniStatistics; } });

package/dist/json/mp/pages.d.ts

@@ -13,5 +13,5 @@ export declare function parseMiniProgramPagesJson(jsonStr: string, platform: Uni
     pageJsons: Record<string, PageWindowOptions>;
     nvuePages: string[];
 };
-export declare function mergeMiniProgramAppJson(appJson: Record<string, any>, platformJson?: Record<string, any>): void;
+export declare function mergeMiniProgramAppJson(appJson: Record<string, any>, platformJson?: Record<string, any>, source?: Record<string, any>): void;
 export {};

package/dist/json/mp/pages.js

@@ -28,7 +28,12 @@ const NON_APP_JSON_KEYS = [
     'mergeVirtualHostAttributes',
     'styleIsolation',
 ];
-function mergeMiniProgramAppJson(appJson, platformJson = {}) {
+function mergeMiniProgramAppJson(appJson, platformJson = {}, source = {}) {
+    Object.keys(source).forEach((key) => {
+        if (!project_1.projectKeys.includes(key)) {
+            project_1.projectKeys.push(key);
+        }
+    });
     Object.keys(platformJson).forEach((name) => {
         if (!(0, project_1.isMiniProgramProjectJsonKey)(name) &&
             !NON_APP_JSON_KEYS.includes(name)) {

package/dist/json/mp/project.d.ts

@@ -9,6 +9,7 @@ interface ProjectConfig {
         miniprogram?: UniApp.PagesJson['condition'];
     };
 }
+export declare const projectKeys: string[];
 export declare function isMiniProgramProjectJsonKey(name: string): boolean;
 export declare function parseMiniProgramProjectJson(jsonStr: string, platform: UniApp.PLATFORM, { template, pagesJson }: ParseMiniProgramProjectJsonOptions): ProjectConfig;
 export {};

package/dist/json/mp/project.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMiniProgramProjectJson = exports.isMiniProgramProjectJsonKey = void 0;
+exports.parseMiniProgramProjectJson = exports.isMiniProgramProjectJsonKey = exports.projectKeys = void 0;
 const shared_1 = require("@vue/shared");
 const merge_1 = require("merge");
 const json_1 = require("../json");
-const projectKeys = [
+exports.projectKeys = [
     'appid',
     'setting',
     'miniprogramRoot',
@@ -20,7 +20,7 @@ const projectKeys = [
     'cloudbaseRoot',
 ];
 function isMiniProgramProjectJsonKey(name) {
-    return projectKeys.includes(name);
+    return exports.projectKeys.includes(name);
 }
 exports.isMiniProgramProjectJsonKey = isMiniProgramProjectJsonKey;
 function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson }) {
@@ -28,9 +28,10 @@ function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson })
     const manifestJson = (0, json_1.parseJson)(jsonStr);
     if (manifestJson) {
         projectJson.projectname = manifestJson.name;
+        // 用户的平台配置
         const platformConfig = manifestJson[platform];
         if (platformConfig) {
-            projectKeys.forEach((name) => {
+            const setProjectJson = (name) => {
                 if ((0, shared_1.hasOwn)(platformConfig, name)) {
                     if ((0, shared_1.isPlainObject)(platformConfig[name]) &&
                         (0, shared_1.isPlainObject)(projectJson[name])) {
@@ -42,6 +43,16 @@ function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson })
                         projectJson[name] = platformConfig[name];
                     }
                 }
+            };
+            // 读取 template 中的配置
+            Object.keys(template).forEach((name) => {
+                if (!exports.projectKeys.includes(name)) {
+                    exports.projectKeys.push(name);
+                }
+            });
+            // common mp config
+            exports.projectKeys.forEach((name) => {
+                setProjectJson(name);
             });
             // 使用了微信小程序手势系统，自动开启 ES6=>ES5
             platform === 'mp-weixin' &&
@@ -57,6 +68,7 @@ function parseMiniProgramProjectJson(jsonStr, platform, { template, pagesJson })
         }
         projectJson.condition.miniprogram = miniprogram;
     }
+    // appid
     if (!projectJson.appid) {
         projectJson.appid = 'touristappid';
     }

package/dist/json/uni-x/index.d.ts

@@ -1,4 +1,4 @@
-export { parseUniXFlexDirection, parseUniXSplashScreen } from './manifest';
+export * from './manifest';
 export declare function checkPagesJson(jsonStr: string, inputDir: string): boolean;
 export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
 /**

package/dist/json/uni-x/index.js

@@ -1,9 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = exports.checkPagesJson = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
+exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = exports.checkPagesJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -15,9 +29,7 @@ const uniRoutes_1 = require("../app/pages/uniRoutes");
 const uniConfig_1 = require("./uniConfig");
 const utils_2 = require("../../vite/plugins/vitejs/utils");
 const preprocess_1 = require("../../preprocess");
-var manifest_1 = require("./manifest");
-Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return manifest_1.parseUniXFlexDirection; } });
-Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return manifest_1.parseUniXSplashScreen; } });
+__exportStar(require("./manifest"), exports);
 function checkPagesJson(jsonStr, inputDir) {
     if (!inputDir) {
         return false;

package/dist/json/uni-x/manifest.d.ts

@@ -1,2 +1,3 @@
 export declare function parseUniXFlexDirection(manifestJson: Record<string, any>): any;
 export declare function parseUniXSplashScreen(manifestJson: Record<string, any>): false | object;
+export declare function parseUniXUniStatistics(manifestJson: Record<string, any>): false | object;

package/dist/json/uni-x/manifest.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
+exports.parseUniXUniStatistics = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
 const shared_1 = require("@vue/shared");
 const flexDirs = ['row', 'row-reverse', 'column', 'column-reverse'];
 function parseUniXFlexDirection(manifestJson) {
@@ -19,3 +19,11 @@ function parseUniXSplashScreen(manifestJson) {
     return false;
 }
 exports.parseUniXSplashScreen = parseUniXSplashScreen;
+function parseUniXUniStatistics(manifestJson) {
+    const uniStatistics = manifestJson?.['app']?.['uniStatistics'];
+    if ((0, shared_1.isPlainObject)(uniStatistics)) {
+        return uniStatistics;
+    }
+    return false;
+}
+exports.parseUniXUniStatistics = parseUniXUniStatistics;

package/dist/uts.d.ts

@@ -10,7 +10,7 @@ import type { EasycomMatcher } from './easycom';
  */
 export declare function resolveUTSAppModule(platform: typeof process.env.UNI_UTS_PLATFORM, id: string, importer: string, includeUTSSDK?: boolean): string | undefined;
 export declare function resolveUTSModule(id: string, importer: string, includeUTSSDK?: boolean): string | undefined;
-export declare function resolveUTSCompiler(): typeof UTSCompiler;
+export declare function resolveUTSCompiler(throwError?: boolean): typeof UTSCompiler;
 export declare function isUTSComponent(name: string): boolean;
 export declare function getUTSComponentAutoImports(language: 'kotlin' | 'swift'): Record<string, [[string]]>;
 export declare function parseUTSComponent(name: string, type: 'kotlin' | 'swift'): {

package/dist/uts.js

@@ -105,7 +105,7 @@ function resolveUTSFile(dir, extensions = ['.uts', '.ts', '.js']) {
         }
     }
 }
-function resolveUTSCompiler() {
+function resolveUTSCompiler(throwError = false) {
     let compilerPath = '';
     if (process.env.UNI_COMPILE_TARGET === 'ext-api' &&
         process.env.UNI_APP_NEXT_WORKSPACE) {
@@ -124,6 +124,9 @@ function resolveUTSCompiler() {
             });
         }
         catch (e) {
+            if (throwError) {
+                throw `Error: Cannot find module '@dcloudio/uni-uts-v1'`;
+            }
             let utsCompilerVersion = '';
             try {
                 utsCompilerVersion = require('../package.json').version;

package/dist/vite/plugins/json.js

@@ -13,6 +13,10 @@ function uniJsonPlugin() {
         name: 'uni:json',
         enforce: 'pre',
         transform(code, id) {
+            // 如果已经被其他插件处理过了，就不再处理，比如 commonjs 插件，ICAPRegistrar.json?commonjs-external
+            if (id.startsWith('\0')) {
+                return;
+            }
             if (path_1.default.extname((0, utils_1.parseVueRequest)(id).filename) !== '.json') {
                 return;
             }

package/dist/vite/plugins/uts/uni_modules.js

@@ -16,6 +16,7 @@ const utils_2 = require("../../../utils");
 const json_1 = require("../../../json");
 const fs_1 = require("../../../fs");
 const context_1 = require("../../../preprocess/context");
+const hbx_1 = require("../../../hbx");
 /* eslint-disable no-restricted-globals */
 const { preprocess } = require('../../../../lib/preprocess');
 function createUniModulesSyncFilePreprocessor(platform, utsPlatform, isX) {
@@ -129,6 +130,19 @@ function uniUTSAppUniModulesPlugin(options = {}) {
     const inputDir = process.env.UNI_INPUT_DIR;
     process.env.UNI_UTS_USING_ROLLUP = 'true';
     const uniModulesDir = (0, utils_2.normalizePath)(path_1.default.resolve(inputDir, 'uni_modules'));
+    // 非 x 项目，非 HBuilderX
+    if (!isX && !(0, hbx_1.isInHBuilderX)()) {
+        try {
+            (0, uts_1.resolveUTSCompiler)(true);
+        }
+        catch (e) {
+            return {
+                name: 'uni:uts-uni_modules-placeholder',
+                apply: 'build',
+                enforce: 'pre',
+            };
+        }
+    }
     const { createUniXKotlinCompilerOnce, createUniXSwiftCompilerOnce, createUniXArkTSCompilerOnce, syncUniModuleFilesByCompiler, resolveTscUniModuleIndexFileName, } = (0, uts_1.resolveUTSCompiler)();
     const uniXKotlinCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-android' ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4030120240925001",
+  "version": "3.0.0-alpha-4030120241009001",
   "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-4030120240925001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4030120240925001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4030120241009001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4030120241009001",
     "@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-4030120240925001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4030120241009001",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",