@dcloudio/uni-cli-shared 3.0.0-alpha-4020620240822002 → 3.0.0-alpha-4020720240905001

package/dist/json/manifest.d.ts

@@ -30,6 +30,7 @@ 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 getPlatformManifestJson(manifestJson: any, platform?: UniApp.PLATFORM): any;
 export declare function getPlatformManifestJsonOnce(): any;
 export declare function validateThemeValue(value: string): boolean;
 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.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getPlatformManifestJson = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = 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");
@@ -24,7 +24,8 @@ exports.parseRpx2UnitOnce = (0, uni_shared_1.once)((inputDir, platform = 'h5') =
     const rpx2unit = platform === 'h5' || platform === 'app' || platform === 'app-harmony'
         ? uni_shared_1.defaultRpx2Unit
         : uni_shared_1.defaultMiniProgramRpx2Unit;
-    const platformOptions = (0, exports.parseManifestJsonOnce)(inputDir)[platform];
+    const manifestJson = (0, exports.parseManifestJsonOnce)(inputDir);
+    let platformOptions = getPlatformManifestJson(manifestJson, platform);
     if (platformOptions && platformOptions.rpx) {
         return (0, shared_1.extend)({}, rpx2unit, platformOptions);
     }
@@ -50,10 +51,8 @@ function normalizeNetworkTimeout(networkTimeout) {
 exports.normalizeNetworkTimeout = normalizeNetworkTimeout;
 function getUniStatistics(inputDir, platform) {
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
-    if (platform === 'app') {
-        platform = 'app-plus';
-    }
-    return (0, shared_1.extend)({}, manifest.uniStatistics, manifest[platform] && manifest[platform].uniStatistics);
+    let platformManifest = getPlatformManifestJson(manifest, platform);
+    return (0, shared_1.extend)({}, manifest.uniStatistics, platformManifest && platformManifest.uniStatistics);
 }
 exports.getUniStatistics = getUniStatistics;
 function isEnableUniPushV1(inputDir, platform) {
@@ -72,19 +71,20 @@ function isEnableUniPushV1(inputDir, platform) {
 exports.isEnableUniPushV1 = isEnableUniPushV1;
 function isEnableUniPushV2(inputDir, platform) {
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
+    const platformManifest = getPlatformManifestJson(manifest, platform);
     if (platform === 'app') {
-        return (manifest['app-plus']?.distribute?.sdkConfigs?.push?.unipush?.version ==
-            '2');
+        return (platformManifest?.distribute?.sdkConfigs?.push?.unipush?.version == '2');
     }
-    return manifest[platform]?.unipush?.enable === true;
+    return platformManifest?.unipush?.enable === true;
 }
 exports.isEnableUniPushV2 = isEnableUniPushV2;
 function isEnableSecureNetwork(inputDir, platform) {
     const manifest = (0, exports.parseManifestJsonOnce)(inputDir);
+    const platformManifest = getPlatformManifestJson(manifest, platform);
     if (platform === 'app') {
-        return !!manifest['app-plus']?.modules?.SecureNetwork;
+        return !!platformManifest?.modules?.SecureNetwork;
     }
-    return manifest[platform]?.secureNetwork?.enable === true;
+    return platformManifest?.secureNetwork?.enable === true;
 }
 exports.isEnableSecureNetwork = isEnableSecureNetwork;
 function hasPushModule(inputDir) {
@@ -99,7 +99,7 @@ function isUniPushOffline(inputDir) {
 }
 exports.isUniPushOffline = isUniPushOffline;
 function getRouterOptions(manifestJson) {
-    return (0, shared_1.extend)({}, manifestJson.h5?.router);
+    return (0, shared_1.extend)({}, getPlatformManifestJson(manifestJson, 'h5')?.router);
 }
 exports.getRouterOptions = getRouterOptions;
 function isEnableTreeShaking(manifestJson) {
@@ -107,18 +107,33 @@ function isEnableTreeShaking(manifestJson) {
     if (process.env.UNI_AUTOMATOR_WS_ENDPOINT) {
         return false;
     }
-    return manifestJson.h5?.optimization?.treeShaking?.enable !== false;
+    const platformManifest = getPlatformManifestJson(manifestJson, 'h5');
+    return platformManifest?.optimization?.treeShaking?.enable !== false;
 }
 exports.isEnableTreeShaking = isEnableTreeShaking;
 function getDevServerOptions(manifestJson) {
-    return (0, shared_1.extend)({}, manifestJson.h5?.devServer);
+    const platformManifest = getPlatformManifestJson(manifestJson, 'h5');
+    return (0, shared_1.extend)({}, platformManifest?.devServer);
 }
 exports.getDevServerOptions = getDevServerOptions;
+function getPlatformManifestJson(manifestJson, platform) {
+    if (!platform) {
+        platform = process.env.UNI_PLATFORM;
+    }
+    if (platform === 'app') {
+        return manifestJson['app-plus'] || manifestJson['plus'] || {};
+    }
+    if (platform === 'h5') {
+        return manifestJson.web || manifestJson.h5 || {};
+    }
+    return manifestJson[platform] || {};
+}
+exports.getPlatformManifestJson = getPlatformManifestJson;
 function getPlatformManifestJsonOnce() {
-    const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
-    return !process.env.UNI_INPUT_DIR
+    const manifestJson = !process.env.UNI_INPUT_DIR
         ? {}
-        : (0, exports.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR)[platform] || {};
+        : (0, exports.parseManifestJsonOnce)(process.env.UNI_INPUT_DIR);
+    return getPlatformManifestJson(manifestJson);
 }
 exports.getPlatformManifestJsonOnce = getPlatformManifestJsonOnce;
 const themeValues = ['dark', 'light', 'auto'];

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

@@ -1,4 +1,4 @@
 export * from './jsonFile';
-export { AppJson, ComponentJson } from './types';
+export { AppJson, ComponentJson, MiniProgramComponentsType } from './types';
 export { mergeMiniProgramAppJson, parseMiniProgramPagesJson } from './pages';
 export { parseMiniProgramProjectJson } from './project';

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

@@ -1,4 +1,4 @@
-import type { ComponentJson, PageWindowOptions, UsingComponents } from './types';
+import type { ComponentJson, MiniProgramComponentsType, PageWindowOptions, UsingComponents } from './types';
 export declare function isMiniProgramPageFile(file: string, inputDir?: string): boolean;
 export declare function isMiniProgramPageSfcFile(file: string, inputDir?: string): boolean;
 export declare function hasJsonFile(filename: string): boolean;
@@ -17,11 +17,12 @@ export declare function isMiniProgramUsingComponent(name: string, options: {
     componentsDir?: string;
 }): boolean;
 interface MiniProgramComponents {
-    [name: string]: 'plugin' | 'component' | 'dynamicLib' | 'ext';
+    [name: string]: MiniProgramComponentsType;
 }
 export declare function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }: {
     filename: string;
     inputDir: string;
     componentsDir?: string;
 }): MiniProgramComponents;
+export declare function findUsingComponentsJson(pathInpages: string, componentsDir: string): Record<any, any>;
 export {};

package/dist/json/mp/jsonFile.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.findUsingComponents = exports.findJsonFile = exports.getComponentJsonFilenames = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
+exports.findUsingComponentsJson = exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.findUsingComponents = exports.findJsonFile = exports.getComponentJsonFilenames = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
 const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 const shared_1 = require("@vue/shared");
 const utils_1 = require("../../utils");
 const resolve_1 = require("../../resolve");
@@ -152,9 +153,39 @@ function findMiniProgramUsingComponent(usingComponents, componentsDir) {
             // mp-toutiao
             res[name] = 'ext';
         }
+        else if (componentsDir &&
+            path.includes(componentsDir + '/') &&
+            findUsingComponentsJson(path, componentsDir).renderer === 'xr-frame') {
+            // mp-weixin & x-frame
+            res[name] = 'xr-frame';
+        }
         else if (componentsDir && path.includes(componentsDir + '/')) {
             res[name] = 'component';
         }
         return res;
     }, {});
 }
+function findUsingComponentsJson(pathInpages, componentsDir) {
+    // 兼容test case
+    if (!process.env.UNI_INPUT_DIR)
+        return {};
+    let [, dir] = pathInpages.split(componentsDir);
+    if (dir === '') {
+        console.warn(`${pathInpages} 路径里没有找到对应的 ${componentsDir} 目录`);
+        return {};
+    }
+    dir = '.' + dir;
+    const fulldir = path_1.default.resolve(process.env.UNI_INPUT_DIR, componentsDir, dir);
+    let filename = path_1.default.parse(pathInpages).name + '.json';
+    let jsonPath = path_1.default.resolve(fulldir, filename);
+    if (fs_1.default.existsSync(jsonPath)) {
+        return require(jsonPath);
+    }
+    jsonPath = path_1.default.resolve(fulldir, 'index.json');
+    if (fs_1.default.existsSync(jsonPath)) {
+        return require(jsonPath);
+    }
+    console.warn(`${pathInpages} 路径下没有找到对应的json文件`);
+    return {};
+}
+exports.findUsingComponentsJson = findUsingComponentsJson;

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

@@ -119,4 +119,5 @@ export interface AppJson {
     restartStrategy?: RestartStrategy;
     [name: string]: unknown;
 }
+export type MiniProgramComponentsType = 'plugin' | 'component' | 'dynamicLib' | 'ext' | 'xr-frame';
 export {};

package/dist/json/theme.js

@@ -8,6 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const json_1 = require("./json");
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const manifest_1 = require("./manifest");
 function hasThemeJson(themeLocation) {
     if (!fs_1.default.existsSync(themeLocation)) {
         return false;
@@ -84,7 +85,7 @@ exports.normalizeThemeConfigOnce = (0, uni_shared_1.once)((manifestJsonPlatform
 });
 function initTheme(manifestJson, pagesJson) {
     const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
-    const manifestPlatform = manifestJson['plus'] || manifestJson[platform] || {};
+    const manifestPlatform = (0, manifest_1.getPlatformManifestJson)(manifestJson, platform) || {};
     const themeConfig = (0, exports.normalizeThemeConfigOnce)(manifestPlatform);
     return (0, uni_shared_1.normalizeStyles)(pagesJson, themeConfig);
 }

package/dist/mp/template.d.ts

@@ -1,7 +1,8 @@
 import type { EmittedAsset } from 'rollup';
 import type { ElementNode } from '@vue/compiler-core';
+import type { MiniProgramComponentsType } from '../json/mp/types';
 type LazyElementFn = (node: ElementNode, context: {
-    isMiniProgramComponent(name: string): 'plugin' | 'component' | 'dynamicLib' | 'ext' | undefined;
+    isMiniProgramComponent(name: string): MiniProgramComponentsType | undefined;
 }) => {
     [name: string]: {
         name: 'on' | 'bind';

package/dist/vite/features.js

@@ -135,9 +135,10 @@ function initManifestFeature({ manifestJson, command, platform, }) {
         // features.wxs = false
         // features.longpress = false
     }
-    if (manifestJson.h5 &&
-        manifestJson.h5.router &&
-        manifestJson.h5.router.mode === 'history') {
+    const webManifest = manifestJson.web || manifestJson.h5;
+    if (webManifest &&
+        webManifest.router &&
+        webManifest.router.mode === 'history') {
         features.routerMode = '"history"';
     }
     // TODO other features

package/package.json

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