react-native-update-cli 2.3.1 → 2.4.0

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')) {

package/lib/versions.js

@@ -105,17 +105,6 @@ const bindVersionToPackages = async ({ appId, versionId, pkgs, rollout, dryRun }
         console.log(_chalk.default.yellow((0, _i18n.t)('dryRun')));
     }
     if (rollout !== undefined) {
-        const rolloutConfig = {};
-        for (const pkg of pkgs){
-            rolloutConfig[pkg.name] = rollout;
-        }
-        if (!dryRun) {
-            await (0, _api.put)(`/app/${appId}/version/${versionId}`, {
-                config: {
-                    rollout: rolloutConfig
-                }
-            });
-        }
         console.log(`${(0, _i18n.t)('rolloutConfigSet', {
             versions: pkgs.map((pkg)=>pkg.name).join(', '),
             rollout: rollout
@@ -123,8 +112,10 @@ const bindVersionToPackages = async ({ appId, versionId, pkgs, rollout, dryRun }
     }
     for (const pkg of pkgs){
         if (!dryRun) {
-            await (0, _api.put)(`/app/${appId}/package/${pkg.id}`, {
-                versionId
+            await (0, _api.post)(`/app/${appId}/binding`, {
+                versionId,
+                rollout,
+                packageId: pkg.id
             });
         }
         console.log(`${(0, _i18n.t)('versionBind', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "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(),

package/src/versions.ts

@@ -122,17 +122,6 @@ export const bindVersionToPackages = async ({
     console.log(chalk.yellow(t('dryRun')));
   }
   if (rollout !== undefined) {
-    const rolloutConfig: Record<string, number> = {};
-    for (const pkg of pkgs) {
-      rolloutConfig[pkg.name] = rollout;
-    }
-    if (!dryRun) {
-      await put(`/app/${appId}/version/${versionId}`, {
-        config: {
-          rollout: rolloutConfig,
-        },
-      });
-    }
     console.log(
       `${t('rolloutConfigSet', {
         versions: pkgs.map((pkg: Package) => pkg.name).join(', '),
@@ -142,8 +131,10 @@ export const bindVersionToPackages = async ({
   }
   for (const pkg of pkgs) {
     if (!dryRun) {
-      await put(`/app/${appId}/package/${pkg.id}`, {
+      await post(`/app/${appId}/binding`, {
         versionId,
+        rollout,
+        packageId: pkg.id,
       });
     }
     console.log(