fix taro cli path

# Conflicts:
#	package.json
#	src/bundle.js

cli.json

@@ -145,6 +145,15 @@
         },
         "sourcemap": {
           "default": false
+        },
+        "taro": {
+          "default": false
+        },
+        "expo": {
+          "default": false
+        },
+        "rncli": {
+          "default": false
         }
       }
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.39.1",
+  "version": "1.40.0-beta.1",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {

src/bundle.ts

@@ -22,16 +22,33 @@ try {
   hdiff = require('node-hdiffpatch').diff;
 } catch (e) {}
 
-async function runReactNativeBundleCommand(
+async function runReactNativeBundleCommand({
   bundleName,
-  development,
+  dev,
   entryFile,
   outputFolder,
   platform,
   sourcemapOutput,
   config,
-) {
+  cli,
-  let gradleConfig = {};
+}: {
+  bundleName: string;
+  dev: string;
+  entryFile: string;
+  outputFolder: string;
+  platform: string;
+  sourcemapOutput: string;
+  config?: string;
+  cli: {
+    taro?: boolean;
+    expo?: boolean;
+    rncli?: boolean;
+  };
+}) {
+  let gradleConfig: {
+    crunchPngs?: boolean;
+    enableHermes?: boolean;
+  } = {};
   if (platform === 'android') {
     gradleConfig = await checkGradleConfig();
     if (gradleConfig.crunchPngs !== false) {
@@ -41,7 +58,7 @@ async function runReactNativeBundleCommand(
     }
   }
 
-  const reactNativeBundleArgs = [];
+  const reactNativeBundleArgs: string[] = [];
 
   const envArgs = process.env.PUSHY_ENV_ARGS;
 
@@ -54,9 +71,10 @@ async function runReactNativeBundleCommand(
 
   fs.emptyDirSync(outputFolder);
 
-  let cliPath;
+  let cliPath: string | undefined;
-
   let usingExpo = false;
+
+  const getExpoCli = () => {
     try {
       cliPath = require.resolve('@expo/cli', {
         paths: [process.cwd()],
@@ -71,9 +89,13 @@ async function runReactNativeBundleCommand(
       // expo cli 0.10.17 (expo 49) 开始支持 bundle:embed
       if (semverSatisfies(expoCliVersion, '>= 0.10.17')) {
         usingExpo = true;
+      } else {
+        cliPath = undefined;
       }
     } catch (e) {}
-  if (!usingExpo) {
+  };
+
+  const getRnCli = () => {
     try {
       // rn >= 0.75
       cliPath = require.resolve('@react-native-community/cli/build/bin.js', {
@@ -85,20 +107,49 @@ async function runReactNativeBundleCommand(
         paths: [process.cwd()],
       });
     }
+  };
+
+  const getTaroCli = () => {
+    try {
+      cliPath = require.resolve('@tarojs/cli/bin/taro', {
+        paths: [process.cwd()],
+      });
+    } catch (e) {}
+  };
+
+  if (cli.expo) {
+    getExpoCli();
+  } else if (cli.taro) {
+    getTaroCli();
+  } else if (cli.rncli) {
+    getRnCli();
   }
+
+  if (!cliPath) {
+    getExpoCli();
+    if (!usingExpo) {
+      getRnCli();
+    }
+  }
+
   const bundleParams = await checkPlugins();
   const isSentry = bundleParams.sentry;
-  const bundleCommand = usingExpo
+
-    ? 'export:embed'
+  let bundleCommand = 'bundle';
-    : platform === 'harmony'
+  if (usingExpo) {
-    ? 'bundle-harmony'
+    bundleCommand = 'export:embed';
-    : 'bundle';
+  } else if (platform === 'harmony') {
+    bundleCommand = 'bundle-harmony';
+  } else if (cli.taro) {
+    bundleCommand = 'build';
+  }
+
   if (platform === 'harmony') {
     Array.prototype.push.apply(reactNativeBundleArgs, [
       cliPath,
       bundleCommand,
       '--dev',
-      development,
+      dev,
       '--entry-file',
       entryFile,
     ]);
@@ -118,15 +169,25 @@ async function runReactNativeBundleCommand(
       outputFolder,
       '--bundle-output',
       path.join(outputFolder, bundleName),
-      '--dev',
-      development,
-      '--entry-file',
-      entryFile,
       '--platform',
       platform,
       '--reset-cache',
     ]);
     
+    if (cli.taro) {
+      reactNativeBundleArgs.push(...[
+        '--type',
+        'rn',
+      ])
+    } else {
+      reactNativeBundleArgs.push(...[
+        '--dev',
+        dev,
+        '--entry-file',
+        entryFile,
+      ]) 
+    }
+
     if (sourcemapOutput) {
       reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
     }
@@ -158,17 +219,19 @@ async function runReactNativeBundleCommand(
           ),
         );
       } else {
-        let hermesEnabled = false;
+        let hermesEnabled: boolean | undefined = false;
 
         if (platform === 'android') {
-          const gradlePropeties = await new Promise((resolve) => {
+          const gradlePropeties = await new Promise<{
+            hermesEnabled?: boolean;
+          }>((resolve) => {
             properties.parse(
               './android/gradle.properties',
               { path: true },
-              (error, props) => {
+              (error: any, props: { hermesEnabled?: boolean }) => {
                 if (error) {
                   console.error(error);
-                  resolve(null);
+                  resolve({});
                 }
 
                 resolve(props);
@@ -201,7 +264,7 @@ async function runReactNativeBundleCommand(
   });
 }
 
-async function copyHarmonyBundle(outputFolder) {
+async function copyHarmonyBundle(outputFolder: string) {
   const harmonyRawPath = 'harmony/entry/src/main/resources/rawfile';
   try {
     await fs.ensureDir(harmonyRawPath);
@@ -215,7 +278,7 @@ async function copyHarmonyBundle(outputFolder) {
 
     await fs.ensureDir(outputFolder);
     await fs.copy(harmonyRawPath, outputFolder);
-  } catch (error) {
+  } catch (error: any) {
     console.error('copyHarmonyBundle 错误:', error);
     throw new Error(`复制文件失败: ${error.message}`);
   }
@@ -253,10 +316,10 @@ async function checkGradleConfig() {
 }
 
 async function compileHermesByteCode(
-  bundleName,
+  bundleName: string,
-  outputFolder,
+  outputFolder: string,
-  sourcemapOutput,
+  sourcemapOutput: string,
-  shouldCleanSourcemap,
+  shouldCleanSourcemap: boolean,
 ) {
   console.log('Hermes enabled, now compiling to hermes bytecode:\n');
   // >= rn 0.69
@@ -318,7 +381,11 @@ async function compileHermesByteCode(
   }
 }
 
-async function copyDebugidForSentry(bundleName, outputFolder, sourcemapOutput) {
+async function copyDebugidForSentry(
+  bundleName: string,
+  outputFolder: string,
+  sourcemapOutput: string,
+) {
   if (sourcemapOutput) {
     let copyDebugidPath;
     try {
@@ -355,10 +422,10 @@ async function copyDebugidForSentry(bundleName, outputFolder, sourcemapOutput) {
 }
 
 async function uploadSourcemapForSentry(
-  bundleName,
+  bundleName: string,
-  outputFolder,
+  outputFolder: string,
-  sourcemapOutput,
+  sourcemapOutput: string,
-  version,
+  version: string,
 ) {
   if (sourcemapOutput) {
     let sentryCliPath;
@@ -405,19 +472,24 @@ async function uploadSourcemapForSentry(
   }
 }
 
-async function pack(dir, output) {
+const ignorePackingFileNames = ['.', '..', 'index.bundlejs.map'];
+const ignorePackingExtensions = ['DS_Store'];
+async function pack(dir: string, output: string) {
   console.log('Packing');
   fs.ensureDirSync(path.dirname(output));
-  await new Promise((resolve, reject) => {
+  await new Promise<void>((resolve, reject) => {
     const zipfile = new ZipFile();
 
-    function addDirectory(root, rel) {
+    function addDirectory(root: string, rel: string) {
       if (rel) {
         zipfile.addEmptyDirectory(rel);
       }
       const childs = fs.readdirSync(root);
       for (const name of childs) {
-        if (name === '.' || name === '..' || name === 'index.bundlejs.map' || name === 'index.bundlejs.txt.map') {
+        if (
+          ignorePackingFileNames.includes(name) ||
+          ignorePackingExtensions.some((ext) => name.endsWith(`.${ext}`))
+        ) {
           continue;
         }
         const fullPath = path.join(root, name);
@@ -434,7 +506,7 @@ async function pack(dir, output) {
 
     addDirectory(dir, '');
 
-    zipfile.outputStream.on('error', (err) => reject(err));
+    zipfile.outputStream.on('error', (err: any) => reject(err));
     zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', () => {
       resolve();
     });
@@ -443,12 +515,12 @@ async function pack(dir, output) {
   console.log(`ppk热更包已生成并保存到: ${output}`);
 }
 
-export function readEntire(entry, zipFile) {
+export function readEntire(entry: string, zipFile: ZipFile) {
-  const buffers = [];
+  const buffers: Buffer[] = [];
   return new Promise((resolve, reject) => {
-    zipFile.openReadStream(entry, (err, stream) => {
+    zipFile.openReadStream(entry, (err: any, stream: any) => {
       stream.pipe({
-        write(chunk) {
+        write(chunk: Buffer) {
           buffers.push(chunk);
         },
         end() {
@@ -463,12 +535,12 @@ export function readEntire(entry, zipFile) {
   });
 }
 
-function basename(fn) {
+function basename(fn: string) {
   const m = /^(.+\/)[^\/]+\/?$/.exec(fn);
   return m?.[1];
 }
 
-async function diffFromPPK(origin, next, output) {
+async function diffFromPPK(origin: string, next: string, output: string) {
   fs.ensureDirSync(path.dirname(output));
 
   const originEntries = {};
@@ -513,7 +585,7 @@ async function diffFromPPK(origin, next, output) {
 
   const addedEntry = {};
 
-  function addEntry(fn) {
+  function addEntry(fn: string) {
     //console.log(fn);
     if (!fn || addedEntry[fn]) {
       return;
@@ -610,11 +682,11 @@ async function diffFromPPK(origin, next, output) {
 }
 
 async function diffFromPackage(
-  origin,
+  origin: string,
-  next,
+  next: string,
-  output,
+  output: string,
-  originBundleName,
+  originBundleName: string,
-  transformPackagePath = (v) => v,
+  transformPackagePath = (v: string) => v,
 ) {
   fs.ensureDirSync(path.dirname(output));
 
@@ -623,7 +695,7 @@ async function diffFromPackage(
 
   let originSource;
 
-  await enumZipEntries(origin, (entry, zipFile) => {
+  await enumZipEntries(origin, (entry: any, zipFile: any) => {
     if (!/\/$/.test(entry.fileName)) {
       const fn = transformPackagePath(entry.fileName);
       if (!fn) {
@@ -717,9 +789,16 @@ async function diffFromPackage(
   await writePromise;
 }
 
-export async function enumZipEntries(zipFn, callback, nestedPath = '') {
+export async function enumZipEntries(
+  zipFn: string,
+  callback: (entry: any, zipFile: any) => void,
+  nestedPath = '',
+) {
   return new Promise((resolve, reject) => {
-    openZipFile(zipFn, { lazyEntries: true }, async (err, zipfile) => {
+    openZipFile(
+      zipFn,
+      { lazyEntries: true },
+      async (err: any, zipfile: ZipFile) => {
         if (err) {
           return reject(err);
         }
@@ -734,7 +813,10 @@ export async function enumZipEntries(zipFn, callback, nestedPath = '') {
               !entry.fileName.endsWith('/') &&
               entry.fileName.toLowerCase().endsWith('.hap')
             ) {
-            const tempDir = path.join(os.tmpdir(), `nested_zip_${Date.now()}`);
+              const tempDir = path.join(
+                os.tmpdir(),
+                `nested_zip_${Date.now()}`,
+              );
               await fs.ensureDir(tempDir);
               const tempZipPath = path.join(tempDir, 'temp.zip');
 
@@ -765,7 +847,8 @@ export async function enumZipEntries(zipFn, callback, nestedPath = '') {
         });
 
         zipfile.readEntry();
-    });
+      },
+    );
   });
 }
 
@@ -811,8 +894,17 @@ export const commands = {
       options.platform || (await question('平台(ios/android/harmony):')),
     );
 
-    const { bundleName, entryFile, intermediaDir, output, dev, sourcemap } =
+    const {
-      translateOptions({
+      bundleName,
+      entryFile,
+      intermediaDir,
+      output,
+      dev,
+      sourcemap,
+      taro,
+      expo,
+      rncli,
+    } = translateOptions({
       ...options,
       platform,
     });
@@ -833,14 +925,19 @@ export const commands = {
 
     console.log(`Bundling with react-native: ${version}`);
 
-    await runReactNativeBundleCommand(
+    await runReactNativeBundleCommand({
       bundleName,
       dev,
       entryFile,
-      intermediaDir,
+      outputFolder: intermediaDir,
       platform,
-      sourcemap || sourcemapPlugin ? sourcemapOutput : '',
+      sourcemapOutput: sourcemap || sourcemapPlugin ? sourcemapOutput : '',
-    );
+      cli: {
+        taro,
+        expo,
+        rncli,
+      },
+    });
 
     await pack(path.resolve(intermediaDir), realOutput);