react-native-update-cli 2.1.3 → 2.2.1

package/lib/bundle.js

@@ -102,10 +102,10 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
     const reactNativeBundleArgs = [];
     const envArgs = process.env.PUSHY_ENV_ARGS;
     if (envArgs) {
-        Array.prototype.push.apply(reactNativeBundleArgs, envArgs.trim().split(/\s+/));
+        reactNativeBundleArgs.push(...envArgs.trim().split(/\s+/));
     }
     _fsextra.emptyDirSync(outputFolder);
-    let cliPath;
+    let cliPath = '';
     let usingExpo = false;
     const getExpoCli = ()=>{
         try {
@@ -123,7 +123,7 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
             if ((0, _compareversions.satisfies)(expoCliVersion, '>= 0.10.17')) {
                 usingExpo = true;
             } else {
-                cliPath = undefined;
+                cliPath = '';
             }
         } catch (e) {}
     };
@@ -183,52 +183,20 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
     } else if (cli.taro) {
         bundleCommand = 'build';
     }
-    if (platform === 'harmony') {
-        Array.prototype.push.apply(reactNativeBundleArgs, [
-            cliPath,
-            bundleCommand,
-            '--dev',
-            dev,
-            '--entry-file',
-            entryFile
-        ]);
-        if (sourcemapOutput) {
-            reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
-        }
-        if (config) {
-            reactNativeBundleArgs.push('--config', config);
-        }
+    reactNativeBundleArgs.push(cliPath, bundleCommand, '--assets-dest', outputFolder, '--bundle-output', _path.default.join(outputFolder, platform === 'harmony' ? 'bundle.harmony.js' : bundleName));
+    if (platform !== 'harmony') {
+        reactNativeBundleArgs.push('--platform', platform, '--reset-cache');
+    }
+    if (cli.taro) {
+        reactNativeBundleArgs.push('--type', 'rn');
     } else {
-        Array.prototype.push.apply(reactNativeBundleArgs, [
-            cliPath,
-            bundleCommand,
-            '--assets-dest',
-            outputFolder,
-            '--bundle-output',
-            _path.default.join(outputFolder, bundleName),
-            '--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);
-        }
-        if (config) {
-            reactNativeBundleArgs.push('--config', config);
-        }
+        reactNativeBundleArgs.push('--dev', dev, '--entry-file', entryFile);
+    }
+    if (sourcemapOutput) {
+        reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
+    }
+    if (config) {
+        reactNativeBundleArgs.push('--config', config);
     }
     const reactNativeBundleProcess = (0, _child_process.spawn)('node', reactNativeBundleArgs);
     console.log(`Running bundle command: node ${reactNativeBundleArgs.join(' ')}`);
@@ -544,6 +512,7 @@ async function diffFromPPK(origin, next, output) {
         throw new Error('Bundle file not found! Please use default bundle file name and path.');
     }
     const copies = {};
+    const copiesv2 = {};
     const zipfile = new _yazl.ZipFile();
     const writePromise = new Promise((resolve, reject)=>{
         zipfile.outputStream.on('error', (err)=>{
@@ -601,6 +570,7 @@ async function diffFromPPK(origin, next, output) {
                     addEntry(base);
                 }
                 copies[entry.fileName] = originMap[entry.crc32];
+                copiesv2[entry.crc32] = entry.fileName;
                 return;
             }
             // New file.
@@ -631,6 +601,7 @@ async function diffFromPPK(origin, next, output) {
     //console.log({copies, deletes});
     zipfile.addBuffer(Buffer.from(JSON.stringify({
         copies,
+        copiesv2,
         deletes
     })), '__diff.json');
     zipfile.end();
@@ -661,6 +632,7 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
         throw new Error('Bundle file not found! Please use default bundle file name and path.');
     }
     const copies = {};
+    const copiesv2 = {};
     const zipfile = new _yazl.ZipFile();
     const writePromise = new Promise((resolve, reject)=>{
         zipfile.outputStream.on('error', (err)=>{
@@ -697,6 +669,7 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
             // If moved from other place
             if (originMap[entry.crc32]) {
                 copies[entry.fileName] = originMap[entry.crc32];
+                copiesv2[entry.crc32] = entry.fileName;
                 return;
             }
             return new Promise((resolve, reject)=>{
@@ -714,7 +687,8 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
         }
     });
     zipfile.addBuffer(Buffer.from(JSON.stringify({
-        copies
+        copies,
+        copiesv2
     })), '__diff.json');
     zipfile.end();
     await writePromise;

package/package.json

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

package/src/bundle.ts

@@ -75,15 +75,12 @@ async function runReactNativeBundleCommand({
   const envArgs = process.env.PUSHY_ENV_ARGS;
 
   if (envArgs) {
-    Array.prototype.push.apply(
-      reactNativeBundleArgs,
-      envArgs.trim().split(/\s+/),
-    );
+    reactNativeBundleArgs.push(...envArgs.trim().split(/\s+/));
   }
 
   fs.emptyDirSync(outputFolder);
 
-  let cliPath: string | undefined;
+  let cliPath = '';
   let usingExpo = false;
 
   const getExpoCli = () => {
@@ -104,7 +101,7 @@ async function runReactNativeBundleCommand({
       if (satisfies(expoCliVersion, '>= 0.10.17')) {
         usingExpo = true;
       } else {
-        cliPath = undefined;
+        cliPath = '';
       }
     } catch (e) {}
   };
@@ -166,49 +163,34 @@ async function runReactNativeBundleCommand({
     bundleCommand = 'build';
   }
 
-  if (platform === 'harmony') {
-    Array.prototype.push.apply(reactNativeBundleArgs, [
-      cliPath,
-      bundleCommand,
-      '--dev',
-      dev,
-      '--entry-file',
-      entryFile,
-    ]);
+  reactNativeBundleArgs.push(
+    cliPath,
+    bundleCommand,
+    '--assets-dest',
+    outputFolder,
+    '--bundle-output',
+    path.join(
+      outputFolder,
+      platform === 'harmony' ? 'bundle.harmony.js' : bundleName,
+    ),
+  );
 
-    if (sourcemapOutput) {
-      reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
-    }
+  if (platform !== 'harmony') {
+    reactNativeBundleArgs.push('--platform', platform, '--reset-cache');
+  }
 
-    if (config) {
-      reactNativeBundleArgs.push('--config', config);
-    }
+  if (cli.taro) {
+    reactNativeBundleArgs.push('--type', 'rn');
   } else {
-    Array.prototype.push.apply(reactNativeBundleArgs, [
-      cliPath,
-      bundleCommand,
-      '--assets-dest',
-      outputFolder,
-      '--bundle-output',
-      path.join(outputFolder, bundleName),
-      '--platform',
-      platform,
-      '--reset-cache',
-    ]);
-
-    if (cli.taro) {
-      reactNativeBundleArgs.push(...['--type', 'rn']);
-    } else {
-      reactNativeBundleArgs.push(...['--dev', dev, '--entry-file', entryFile]);
-    }
+    reactNativeBundleArgs.push('--dev', dev, '--entry-file', entryFile);
+  }
 
-    if (sourcemapOutput) {
-      reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
-    }
+  if (sourcemapOutput) {
+    reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
+  }
 
-    if (config) {
-      reactNativeBundleArgs.push('--config', config);
-    }
+  if (config) {
+    reactNativeBundleArgs.push('--config', config);
   }
 
   const reactNativeBundleProcess = spawn('node', reactNativeBundleArgs);
@@ -597,6 +579,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
   }
 
   const copies = {};
+  const copiesv2 = {};
 
   const zipfile = new YazlZipFile();
 
@@ -668,6 +651,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
           addEntry(base);
         }
         copies[entry.fileName] = originMap[entry.crc32];
+        copiesv2[entry.crc32] = entry.fileName;
         return;
       }
 
@@ -700,7 +684,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
 
   //console.log({copies, deletes});
   zipfile.addBuffer(
-    Buffer.from(JSON.stringify({ copies, deletes })),
+    Buffer.from(JSON.stringify({ copies, copiesv2, deletes })),
     '__diff.json',
   );
   zipfile.end();
@@ -747,6 +731,7 @@ async function diffFromPackage(
   }
 
   const copies = {};
+  const copiesv2 = {};
 
   const zipfile = new YazlZipFile();
 
@@ -792,6 +777,7 @@ async function diffFromPackage(
       // If moved from other place
       if (originMap[entry.crc32]) {
         copies[entry.fileName] = originMap[entry.crc32];
+        copiesv2[entry.crc32] = entry.fileName;
         return;
       }
 
@@ -810,7 +796,10 @@ async function diffFromPackage(
     }
   });
 
-  zipfile.addBuffer(Buffer.from(JSON.stringify({ copies })), '__diff.json');
+  zipfile.addBuffer(
+    Buffer.from(JSON.stringify({ copies, copiesv2 })),
+    '__diff.json',
+  );
   zipfile.end();
   await writePromise;
 }