@htyf-mp/cli 0.2.2 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
   "bin": {

package/src/build.mjs

@@ -148,6 +148,8 @@ export async function mpBuildShell(newAppInfo, isGodot = false) {
 
   // 构建 app.json 配置
   const appJson = {
+    ...newAppInfo,
+    rotate: newAppInfo.rotate || 'portrait',
     type: isGodot ? 'game' : 'app',  // Godot 项目类型为 'game'，普通小程序为 'app'
     engines: '2.0.0',
     name: newAppInfo.name,
@@ -207,8 +209,39 @@ export async function mpBuildShell(newAppInfo, isGodot = false) {
   try {
     if (!isGodot) {
       // ========== 普通小程序构建流程 ==========
-      Logger.info('使用 Webpack 构建小程序包...');
-      const command = `npx cross-env APP_ROOT_INDEX_PATH=${rootIndexPath} APP_EXPOSES_OPTIONS=${encodeURI(JSON.stringify(mpOptions))} webpack --config ${webpackConfigPath}`;
+      Logger.info('使用 React Native 构建小程序包...');
+      
+      // 计算 react-native CLI 路径
+      const reactNativePath = path.resolve(__dirname, '../../../.bin/react-native');
+      const entryFile = newAppInfo.entry
+        ? path.resolve(PROJECT_ROOT, newAppInfo.entry)
+        : rootIndexPath;
+      const bundlePlatform = (CONSTANTS.BUNDLE_PLATFORM || 'ios').toLowerCase();
+      const bundleOutput = path.join(mpOptions.extraChunksPath, `${scriptName}.${bundlePlatform}.jsbundle`);
+      const assetsDest = path.join(mpOptions.extraChunksPath, 'assets');
+      
+      await fse.ensureDir(path.dirname(bundleOutput));
+      await fse.ensureDir(assetsDest);
+      
+      const command = [
+        'npx',
+        'cross-env',
+        `APP_ROOT_INDEX_PATH=${rootIndexPath}`,
+        `APP_EXPOSES_OPTIONS=${encodeURI(JSON.stringify(mpOptions))}`,
+        'node',
+        reactNativePath,
+        'bundle',
+        '--entry-file',
+        rootIndexPath,
+        '--platform',
+        bundlePlatform,
+        '--dev',
+        'false',
+        '--reset-cache',
+        '--minify',
+        'false',
+      ].join(' ');
+      console.log('command', command);
       await CommandExecutor.execute(command, {
         description: '构建小程序包',
         timeout: 120000,  // 2 分钟超时

package/src/project-initializer.mjs

@@ -193,8 +193,26 @@ export class ProjectInitializer {
       const projectConfig = this.config.createProjectConfig(appName, displayName, appid);
 
       // 写入配置文件
-      const configPath = path.join(appRootPath, 'htyf.json');
-      fs.writeFileSync(configPath, JSON.stringify(projectConfig, undefined, 2));
+      const configPath = path.join(appRootPath, 'app.json');
+      let existingConfig = {};
+      
+      // 检查 app.json 是否存在
+      if (fs.existsSync(configPath)) {
+        // 如果存在，读取现有内容
+        const existingContent = fs.readFileSync(configPath, 'utf-8');
+        try {
+          existingConfig = JSON.parse(existingContent);
+        } catch (error) {
+          Logger.warn('app.json 格式错误，将创建新配置');
+          existingConfig = {};
+        }
+      }
+      
+      // 添加 htyf 字段
+      existingConfig.htyf = projectConfig;
+      
+      // 写入配置文件
+      fs.writeFileSync(configPath, JSON.stringify(existingConfig, undefined, 2));
 
       // 清理临时文件
       spinner.text = '正在清理临时文件...';

package/src/template-processor.mjs

@@ -89,7 +89,7 @@ export class TemplateProcessor {
     // 复制模板文件
     Object.entries(template.files).forEach(([key, fileName]) => {
       const srcPath = path.join(tempPath, fileName);
-      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'htyf.json'}`);
+      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'app.json'}`);
 
       if (fs.existsSync(srcPath)) {
         fse.copySync(srcPath, destPath);
@@ -125,7 +125,7 @@ export class TemplateProcessor {
     // 复制模板文件
     Object.entries(template.files).forEach(([key, fileName]) => {
       const srcPath = path.join(tempPath, fileName);
-      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'htyf.json'}`);
+      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'app.json'}`);
 
       if (fs.existsSync(srcPath)) {
         fse.copySync(srcPath, destPath);

package/src/webpack.config.mjs

@@ -7,7 +7,7 @@ import TerserPlugin from 'terser-webpack-plugin';
 import * as Repack from '@callstack/repack';
 import { ExpoModulesPlugin } from '@callstack/repack-plugin-expo-modules';
 import { ReanimatedPlugin } from '@callstack/repack-plugin-reanimated';
-import { HtyfModulesPlugin } from './HtyfImportsPlugin.mjs';
+import { HtyfModulesPlugin } from '@htyf-mp/cli/HtyfImportsPlugin.mjs';
 import { getProjectRoot } from './utils.mjs';
 
 // 获取当前文件和目录路径
@@ -149,13 +149,17 @@ export default (env = {}) => {
       // Repack主插件，支持extraChunks配置
       new Repack.RepackPlugin({
         platform,
-        extraChunks: [
+        extraChunks: mpOptions.extraChunksPath ? [
           {
+            // 排除 remoteEntry chunk，让它保留在 output.path 中供 Manifest Plugin 使用
+            // remoteEntry 文件名由 ModuleFederationPluginV2 的 filename 配置决定
+            // 使用 exclude 排除 remoteEntry，其他 chunk 输出到 extraChunksPath
+            exclude: mpOptions.filename ? new RegExp(`^${mpOptions.filename.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`) : /^remoteEntry/,
             include: /.*/,
             type: 'remote',
             outputPath: `${mpOptions.extraChunksPath}`,
           },
-        ],
+        ] : undefined,
       }),
       // Expo模块支持
       new ExpoModulesPlugin(),