@htyf-mp/cli 0.2.0-beta.1 → 0.2.2

package/src/webpack.config.mjs

@@ -7,30 +7,26 @@ 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 { getProjectRoot } from './utils.mjs';
 
 // 获取当前文件和目录路径
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const projectPath = path.resolve(__dirname, '../../../');
 
 // 微前端暴露配置，通常为JSON字符串
 const appExposesOptions = process.env.APP_EXPOSES_OPTIONS;
+const appRootIndexPath = process.env.APP_ROOT_INDEX_PATH;
 
-// 读取package.json，获取应用基本信息
-const appConfig = fse.readJsonSync(path.join(projectPath, './app.json'));
 // 读取依赖共享配置
 const dependencies = fse.readJsonSync(path.join(__dirname, './shared-output.json'));
-const htyf = appConfig.htyf || {}
-const htyfHostConfig = {
-  "version": htyf.version,
-  "name": htyf.name,
-  "appid": htyf.appid,
-  "appUrlConfig": htyf.appUrlConfig,
-  "zipUrl": htyf.zipUrl
-}
+
 // 记录构建时间戳
 const time = Date.now();
 
+const version = process.env.APP_VERSION;
+const appid = process.env.APP_ID;
+
 // 构建Module Federation共享依赖对象
 const sharedObj = {};
 for (const key in dependencies) {
@@ -39,11 +35,13 @@ for (const key in dependencies) {
     /** 是否运行为单例 */
     singleton: true,
     /** host模式下必须为true，微应用为false */
-    eager: false,
-    requiredVersion: p.version,
+    eager: true,
+    version: p.version,
   };
 }
 
+const projectRoot = getProjectRoot();
+
 /**
  * Webpack配置导出函数
  * @param {object} env - 构建环境变量
@@ -51,9 +49,9 @@ for (const key in dependencies) {
  */
 export default (env = {}) => {
   // 设置构建上下文
-  env.context = __dirname;
-  const { entry = './index.js', platform = 'ios' } = env;
-  const context = env.context || projectPath;
+  env.context = projectRoot || __dirname;
+  const { entry = appRootIndexPath, platform = 'ios' } = env;
+  const context = env.context || __dirname;
   // 获取Repack的resolve配置
   const _options = Repack.getResolveOptions();
 
@@ -62,30 +60,67 @@ export default (env = {}) => {
   if (appExposesOptions) {
     mpOptions = JSON.parse(decodeURI(appExposesOptions));
   }
-
+  
+  // 处理 exposes 路径，确保路径正确解析
+  // Module Federation 需要相对于 context 的路径，如果路径不以 ./ 开头，需要添加
+  if (mpOptions.exposes) {
+    const processedExposes = {};
+    for (const [key, value] of Object.entries(mpOptions.exposes)) {
+      // 如果路径不是绝对路径且不以 ./ 开头，添加 ./ 前缀
+      if (value && typeof value === 'string' && !path.isAbsolute(value) && !value.startsWith('./') && !value.startsWith('../')) {
+        processedExposes[key] = `./${value}`;
+      } else {
+        processedExposes[key] = value;
+      }
+    }
+    mpOptions.exposes = processedExposes;
+  }
+  
+  console.log('\n');
+  console.log('=====mpOptions (after processing)=====');
+  console.log('\n');
+  console.log('context:', projectRoot);
+  console.log('\n');
+  console.log('entry:', entry);
+  console.log('\n');
+  console.log('exposes (processed):', JSON.stringify(mpOptions.exposes, null, 2));
+  console.log('\n');
+  console.log(JSON.stringify(mpOptions, null, 2));
+  console.log('\n');
+  console.log('=====mpOptions=====');
+  console.log('\n');
   // 基础Webpack配置
   const mpConfig = {
     context,
     entry,
     resolve: {
       ..._options,
+      // 确保扩展名解析正确
+      extensions: ['.tsx', '.ts', '.jsx', '.js', '.json', ...(_options.extensions || [])],
     },
     output: {
       // 默认输出路径，host模式下会被覆盖
       path: mpOptions.outputPath,
-      uniqueName: mpOptions.uniqueName,
+      publicPath: mpOptions.outputPath,
+      // uniqueName: `htyf_mp_for_${mpOptions.name}`,
     },
     module: {
       rules: [
         // 处理js/ts/tsx文件，使用babel-loader
         {
           test: /\.[cm]?[jt]sx?$/,
-          use: 'babel-loader',
+          use: {
+            loader: 'babel-loader',
+            // options: {
+            //   configFile: path.resolve(__dirname, './babel.config.js'),
+            // }
+          },
           type: 'javascript/auto',
         },
         // 处理静态资源（图片等），支持inline模式
         ...Repack.getAssetTransformRules({
-          inline: true,
+          inline: !!mpOptions.extraChunksPath,
+          svg: 'xml',
         }),
       ],
     },
@@ -107,12 +142,12 @@ export default (env = {}) => {
     plugins: [
       // 注入全局常量（appid、版本、构建时间）
       new webpack.DefinePlugin({
-        __APP_DEFINE_APPID__: `"${htyfHostConfig.name}"`,
-        __APP_DEFINE_VERSION__: `"${htyfHostConfig.version}"`,
+        __APP_DEFINE_APPID__: `"${appid}"`,
+        __APP_DEFINE_VERSION__: `"${version}"`,
         __APP_DEFINE_BUILD_TIME__: `"${time}"`,
       }),
       // Repack主插件，支持extraChunks配置
-      new Repack.RepackPlugin(mpOptions.extraChunksPath ? {
+      new Repack.RepackPlugin({
         platform,
         extraChunks: [
           {
@@ -121,15 +156,14 @@ export default (env = {}) => {
             outputPath: `${mpOptions.extraChunksPath}`,
           },
         ],
-      } : {
-        platform,
       }),
       // Expo模块支持
       new ExpoModulesPlugin(),
       // Reanimated支持
       new ReanimatedPlugin(),
       // Module Federation V2插件，支持host和remote两种模式
-      new Repack.plugins.ModuleFederationPluginV2(mpOptions.exposes ? {
+      new Repack.plugins.ModuleFederationPluginV2({
+        dts: false,
         // 微应用模式
         name: mpOptions.name,
         filename: mpOptions.filename,
@@ -140,22 +174,18 @@ export default (env = {}) => {
           'react-native': { singleton: true, eager: true },
         },
         shareStrategy: 'loaded-first',
-      } : {
-        // host模式
-        name: 'HTYF_HOST_APP',
-        remotes: {},
-        shared: {
-          ...sharedObj,
-          react: { singleton: true, eager: true },
-          'react-native': { singleton: true, eager: true },
-        },
-        shareStrategy: 'loaded-first',
+      }),
+      new HtyfModulesPlugin({
+        codeSigning: true,
+        appid: mpOptions.appid,
+        version: mpOptions.version,
+        manifest: mpOptions.manifest,
       }),
       new webpack.optimize.LimitChunkCountPlugin({
         maxChunks: 2, // 限制最大chunk数，便于远程加载
-      }),
+      })
     ],
   };
 
   return mpConfig;
-};
+};

package/cli.js

@@ -1,288 +0,0 @@
-#!/usr/bin/env node
-
-import chalk from 'chalk'
-import path from 'path'
-import fs from 'fs'
-import fse from 'fs-extra'
-import { Command } from 'commander'
-import select from '@inquirer/select'
-import { input } from '@inquirer/prompts';
-import {execa, execaCommand} from 'execa'
-import ora from 'ora'
-import childProcess from 'child_process'
-import { v4 as uuidv4 } from 'uuid';
-import md5 from 'md5'
-import os from 'os'
-
-const v4options = {
-  random: [
-    0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea, 0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36,
-  ],
-};
-
-const log = console.log
-const program = new Command()
-const green = chalk.green
-
-const repoUrl = 'https://github.com/htyf-mp-community/htyf-mp.git'
-const codingRepoUrl = 'https://e.coding.net/dagouzhi/hongtangyun_mobile/htyf-mp.git'
-
-const taroTempPath = 'mini-apps-template';
-const expoTempPath = 'mini-apps-template';
-const gameTempPath = 'mini-game-template';
-
-const isYarnInstalled = () => {
-  try {
-    childProcess.execSync('yarn --version');
-    return true;
-  } catch {
-    return false; 
-  }
-}
-
-const isBunInstalled = () => {
-  try {
-    childProcess.execSync('bun --version')
-    return true;
-  } catch(err) {
-    return false; 
-  }
-}
-
-async function main() {
-  const spinner = ora({
-    text: '创建代码库'
-  })
-  try {
-    const kebabRegez = /^([a-z]+)(-[a-z0-9]+)*$/
-
-    program
-      .name('红糖云服APP-小程序')
-      .description('快速创建红糖云服APP小程序')
-  
-    program.parse(process.argv)
-  
-    const args = program.args
-    let appName = args[0]
-  
-    if (!appName || !kebabRegez.test(args[0])) {
-      appName = await input({
-        message: '输入应用程序目录名称',
-        default: 'my-htyf-mp',
-        validate: d => {
-         if(!kebabRegez.test(d)) {
-          return '请以my-app-name格式输入您的应用程序英文目录名称'
-         }
-         return true
-        }
-      })
-    }
-
-    const displayNameRegez = /^[\u4e00-\u9fa5a-zA-Z0-9]{2,4}$/
-
-    let displayName = ''
-    if (!displayName) {
-      displayName = await input({
-        message: '输入应用程序名称',
-        default: '小程序',
-        validate: d => {
-         if(!displayNameRegez.test(d)) {
-          return '只能中文、字母和数字, 不能包含特殊字符, 限2-4个字符'
-         }
-         return true
-        }
-      })
-    }
-  
-    const tempType = await select({
-      message: '请选择模板类型?',
-      choices: [
-        {
-          name: 'Expo (https://docs.expo.dev/)',
-          value: 'expo',
-        },
-        {
-          name: 'Taro (https://docs.taro.zone/)',
-          value: 'taro',
-        },
-        {
-          name: 'Game (https://docs.cocos.com/)',
-          value: 'game-cocos',
-        }
-      ]
-    })
-
-    const repoType = await select({
-      message: '请选择模板镜像?',
-      choices: [
-        {
-          name: 'github(最新)',
-          value: repoUrl,
-        },
-        {
-          name: 'coding(最快)',
-          value: codingRepoUrl,
-        },
-      ]
-    })
-
-    const appid = md5(uuidv4(v4options));
-  
-    let config =  {
-      "type": "app",
-      "name": appName,
-      "projectname": displayName,
-      "appid": appid,
-      "appUrlConfig": "https://xxx.cos.ap-chengdu.myqcloud.com/assets/testMiniApps/htyanimation/app.json",
-      "zipUrl": "https://xxxxx.myqcloud.com/assets/testMiniApps/xxxxx/outputs/dist.dgz"
-    }
-
-    log(`\n初始化项目. \n`)
-
-    
-    const root_path = path.join(process.cwd(), `${appName}`);
-    const isExists = fs.existsSync(root_path);
-    if (isExists) {
-      console.error('目录已经存在。')
-      return;
-    }
-    if (/[\u4e00-\u9fa5]/gi.test(root_path)) {
-      console.error('禁止目录中包含中文字符')
-      return;
-    }
-    spinner.start()
-    const tmpdir = path.join(os.tmpdir(), md5(`__HTYF__`), appName);
-    fse.emptyDirSync(tmpdir)
-    await execa('git', ['clone', repoType, tmpdir])
-    let appRootPath = '';
-    const taro_path = path.join(tmpdir, `${taroTempPath}`)
-    const expo_path = path.join(tmpdir, `${expoTempPath}`)
-    const game_path = path.join(tmpdir, `${gameTempPath}`)
-    const cli_path = path.join(tmpdir, `cli`)
-    const git_path = path.join(tmpdir, `.git`)
-    const docs_path = path.join(tmpdir, `docs`)
-    const README_path = path.join(tmpdir, `README.md`)
-    try {
-      if (tempType === 'taro') {
-        appRootPath = taro_path
-        fse.removeSync(game_path)
-      }
-      if (tempType === 'expo') {
-        appRootPath = expo_path
-        fse.removeSync(game_path)
-      }
-      if (tempType === 'game-cocos') {
-        appRootPath = game_path
-        fse.removeSync(taro_path)
-        fse.removeSync(expo_path)
-      }
-      fse.removeSync(cli_path)
-      fse.removeSync(git_path)
-      fse.removeSync(docs_path)
-      fse.removeSync(README_path)
-    } catch (err) {}
-    const __TEMP_PATH__ = path.join(appRootPath, '__TEMP__');
-    const pkg_path = path.join(appRootPath, './package.json');
-    const dgzJosn = path.join(`${appRootPath}`, 'project.dgz.json')
-    console.log(' ')
-    console.log(tempType)
-    console.log(__TEMP_PATH__)
-    console.log(' ')
-    if (tempType === 'taro') {
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'taro_src'),
-        path.join(appRootPath, './src') 
-      )
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'taro.App.tsx'),
-        path.join(appRootPath, './App.tsx') 
-      )
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'taro.index.js'),
-        path.join(appRootPath, './index.js') 
-      )
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'taro.babel.config.js'),
-        path.join(appRootPath, './babel.config.js') 
-      )
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'taro.project.dgz.json'),
-        path.join(appRootPath, './project.dgz.json') 
-      )
-      const pkg_info = fse.readJSONSync(pkg_path)
-      pkg_info['scripts'] = {
-        ...(pkg_info['scripts'] || {}),
-        "build:weapp": "taro build --type weapp",
-        "build:swan": "taro build --type swan",
-        "build:alipay": "taro build --type alipay",
-        "build:tt": "taro build --type tt",
-        "build:h5": "taro build --type h5",
-        "build:rn": "taro build --type rn",
-        "build:qq": "taro build --type qq",
-        "build:jd": "taro build --type jd",
-        "build:quickapp": "taro build --type quickapp",
-        "dev:weapp": "npm run build:weapp -- --watch",
-        "dev:swan": "npm run build:swan -- --watch",
-        "dev:alipay": "npm run build:alipay -- --watch",
-        "dev:tt": "npm run build:tt -- --watch",
-        "dev:h5": "npm run build:h5 -- --watch",
-        "dev:rn": "npm run build:rn -- --watch",
-        "dev:qq": "npm run build:qq -- --watch",
-        "dev:jd": "npm run build:jd -- --watch",
-        "dev:quickapp": "npm run build:quickapp -- --watch",
-      }
-      delete pkg_info['scripts']['web']
-      delete pkg_info['scripts']['web:dev']
-      fse.writeJSONSync(pkg_path, pkg_info, {
-        spaces: 2
-      })
-    }
-    if (tempType === 'expo') {
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'expo_src'),
-        path.join(appRootPath, './src') 
-      )
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'expo.App.tsx'),
-        path.join(appRootPath, './App.tsx') 
-      )
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'expo.index.js'),
-        path.join(appRootPath, './index.js') 
-      )
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'expo.babel.config.js'),
-        path.join(appRootPath, './babel.config.js') 
-      )
-      fse.copySync(
-        path.join(__TEMP_PATH__, 'expo.project.dgz.json'),
-        path.join(appRootPath, './project.dgz.json') 
-      )
-    }
-    if (tempType === 'game-cocos') {
-      
-    }
-
-    fs.writeFileSync(dgzJosn, JSON.stringify(config, undefined, 2))
-    console.log(dgzJosn)
-    
-    fse.removeSync(__TEMP_PATH__)
-    
-    spinner.text = ''
-
-    fse.moveSync(appRootPath, root_path)
-
-    spinner.stop() 
-    log(`${green.bold('Success!')} 创建项目 ${appName} 在 ${root_path} \n`)
-    log(`切换到【 ${root_path} 】目录并运行开发`)
-    log('\n')
-  } catch (err) {
-    console.log(err)
-    log('\n')
-    if (err.exitCode == 128) {
-      log('Error: 目录已经存在。')
-    }
-    spinner.stop()
-  }
-}
-main()

package/src/ListImportsPlugin.mjs

@@ -1,98 +0,0 @@
-
-import path from 'path';
-import fse from 'fs-extra'
-import { fileURLToPath } from 'url'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const sharedPkg = fse.readJSONSync(path.join(__dirname, 'shared-output.json'))
-
-function trimTemplateStrings(strings, ...values) {
-  let fullString = strings.reduce((acc, str, i) => acc + str + (values[i] || ''), '');
-  return fullString.replace(/^[ \t]+/gm, '');
-}
-
-export class AnalyzeThirdPartyModulesPlugin {
-  constructor(appConfig) {
-    this.config = appConfig;
-  }
-  apply(compiler) {
-    const config = this.config;
-    compiler.hooks.emit.tapAsync('AnalyzeThirdPartyModulesPlugin', (compilation, callback) => {
-      let thirdPartyModules = new Set();
-
-      compilation.modules.forEach(module => {
-        if (module.context && module.context.includes('node_modules')) {
-          let packageName = module.context.split('node_modules/')[1].split('/')[0];
-          if (packageName.startsWith('@')) {
-            packageName = module.context.split('node_modules/')[1].split('/').splice(0,2).join('/');
-          }
-          const ios_path = path.join(__dirname, '../node_modules/', packageName, 'ios');
-          const and_path = path.join(__dirname, '../node_modules/', packageName, 'android');
-          const isNative = fse.pathExistsSync(ios_path) || fse.pathExistsSync(and_path);
-          if (isNative) {
-            thirdPartyModules.add(packageName);
-          }
-        }
-      });
-      const nonsupport = []
-      thirdPartyModules = Array.from(thirdPartyModules);
-      for (const key in thirdPartyModules) {
-        const pkg = thirdPartyModules[key];
-        if (!sharedPkg[pkg]) {
-          if (
-            pkg !== 'expo-splash-screen' &&
-            pkg !== '@callstack/repack' &&
-            pkg !== 'react-native-iap'
-          ) {
-            nonsupport.push(pkg)
-          }
-        }
-      }
-      if (nonsupport.length) {
-        const msgArr = ['红糖云服暂不支持以上第三方native组件']
-        console.log(' ')
-        console.log('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
-        console.log('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
-        console.log(' ')
-        console.log('红糖云服暂不支持以下第三方native组件: ')
-        for (const key in nonsupport) {
-          const element = nonsupport[key];
-          const _msg = `${Number(key) + 1}. ${element}`;
-          console.log(_msg)
-          msgArr.push(_msg)
-        }
-        console.log(' ')
-        console.log('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
-        console.log('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
-        console.log(' ')
-        console.log(' ')
-        callback(msgArr.join(`\n`));
-      } else {
-        callback();
-      }
-    });
-    if (config.codeSigning) {
-      compiler.hooks.emit.tapAsync('WrapCodePlugin', (compilation, callback) => {
-        // 遍历所有编译过的资源文件
-        for (const filename in compilation.assets) {
-          if (compilation.assets.hasOwnProperty(filename)) {
-            // 获取文件内容
-            let source = compilation.assets[filename].source();
-
-            // 包裹代码
-            const wrappedSource = trimTemplateStrings`
-              ${source}
-            `;
-
-            // 更新文件内容
-            compilation.assets[filename] = {
-              source: () => wrappedSource,
-              size: () => wrappedSource.length
-            };
-          }
-        }
-        callback();
-      });
-    }
-  }
-}