@dcloudio/uni-cli-shared 3.0.0-alpha-4020620240822001 → 3.0.0-alpha-4020720240904001

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/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/package.json

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