react-native-update-cli 2.3.0 → 2.3.2

package/lib/bundle.js

@@ -109,15 +109,28 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
     let usingExpo = false;
     const getExpoCli = ()=>{
         try {
+            const searchPaths = [
+                process.cwd()
+            ];
+            // 尝试添加 expo 包的路径作为额外的搜索路径
+            try {
+                const expoPath = require.resolve('expo/package.json', {
+                    paths: [
+                        process.cwd()
+                    ]
+                });
+                // 获取 expo 包的目录路径
+                const expoDir = expoPath.replace(/\/package\.json$/, '');
+                searchPaths.push(expoDir);
+            } catch (e) {
+            // expo 包不存在，忽略
+            }
+            // 尝试从搜索路径中解析 @expo/cli
             cliPath = require.resolve('@expo/cli', {
-                paths: [
-                    process.cwd()
-                ]
+                paths: searchPaths
             });
             const expoCliVersion = JSON.parse(_fsextra.readFileSync(require.resolve('@expo/cli/package.json', {
-                paths: [
-                    process.cwd()
-                ]
+                paths: searchPaths
             })).toString()).version;
             // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
             if ((0, _compareversions.satisfies)(expoCliVersion, '>= 0.10.17')) {
@@ -244,6 +257,18 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
                 if (hermesEnabled) {
                     await compileHermesByteCode(bundleName, outputFolder, sourcemapOutput, !isSentry);
                 }
+                if (platform === 'harmony') {
+                    const harmonyRawAssetsPath = 'harmony/entry/src/main/resources/rawfile/assets';
+                    // copy all files in outputFolder to harmonyRawPath
+                    // assets should be in rawfile/assets
+                    _fsextra.ensureDirSync(harmonyRawAssetsPath);
+                    _fsextra.copySync(outputFolder, harmonyRawAssetsPath, {
+                        overwrite: true
+                    });
+                    _fsextra.moveSync(`${harmonyRawAssetsPath}/bundle.harmony.js`, `${harmonyRawAssetsPath}/../bundle.harmony.js`, {
+                        overwrite: true
+                    });
+                }
                 resolve(null);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {

package/src/bundle.ts

@@ -85,14 +85,30 @@ async function runReactNativeBundleCommand({
 
   const getExpoCli = () => {
     try {
+      const searchPaths = [process.cwd()];
+
+      // 尝试添加 expo 包的路径作为额外的搜索路径
+      try {
+        const expoPath = require.resolve('expo/package.json', {
+          paths: [process.cwd()],
+        });
+        // 获取 expo 包的目录路径
+        const expoDir = expoPath.replace(/\/package\.json$/, '');
+        searchPaths.push(expoDir);
+      } catch {
+        // expo 包不存在，忽略
+      }
+
+      // 尝试从搜索路径中解析 @expo/cli
       cliPath = require.resolve('@expo/cli', {
-        paths: [process.cwd()],
+        paths: searchPaths,
       });
+
       const expoCliVersion = JSON.parse(
         fs
           .readFileSync(
             require.resolve('@expo/cli/package.json', {
-              paths: [process.cwd()],
+              paths: searchPaths,
             }),
           )
           .toString(),
@@ -256,6 +272,19 @@ async function runReactNativeBundleCommand({
             !isSentry,
           );
         }
+        if (platform === 'harmony') {
+          const harmonyRawAssetsPath =
+            'harmony/entry/src/main/resources/rawfile/assets';
+          // copy all files in outputFolder to harmonyRawPath
+          // assets should be in rawfile/assets
+          fs.ensureDirSync(harmonyRawAssetsPath);
+          fs.copySync(outputFolder, harmonyRawAssetsPath, { overwrite: true });
+          fs.moveSync(
+            `${harmonyRawAssetsPath}/bundle.harmony.js`,
+            `${harmonyRawAssetsPath}/../bundle.harmony.js`,
+            { overwrite: true },
+          );
+        }
         resolve(null);
       }
     });