@revopush/code-push-cli 0.0.5 → 0.0.8-rc.0

package/script/command-executor.ts

@@ -1,35 +1,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import AccountManager = require("./management-sdk");
-
 const childProcess = require("child_process");
 import debugCommand from "./commands/debug";
 import * as fs from "fs";
 import * as chalk from "chalk";
-
-const g2js = require("gradle-to-js/lib/parser");
 import * as moment from "moment";
-
-const opener = require("opener");
 import * as os from "os";
 import * as path from "path";
-
-const plist = require("plist");
-const progress = require("progress");
-const prompt = require("prompt");
 import * as Q from "q";
-
-const rimraf = require("rimraf");
 import * as semver from "semver";
-
-const Table = require("cli-table");
-const which = require("which");
-import wordwrap = require("wordwrap");
 import * as cli from "../script/types/cli";
 import sign from "./sign";
-
-const xcode = require("xcode");
 import {
   AccessKey,
   Account,
@@ -45,14 +27,40 @@ import {
   Session,
   UpdateMetrics,
 } from "../script/types";
-import { getAndroidHermesEnabled, getiOSHermesEnabled, runHermesEmitBinaryCommand, isValidVersion } from "./react-native-utils";
-import { fileDoesNotExistOrIsDirectory, isBinaryOrZip, fileExists } from "./utils/file-utils";
+import {
+  getBundleSourceMapOutput,
+  getMinifyParams,
+  getReactNativePackagePath,
+  isHermesEnabled,
+  isValidVersion,
+  runHermesEmitBinaryCommand,
+  takeHermesBaseBytecode,
+} from "./react-native-utils";
+import { fileDoesNotExistOrIsDirectory, fileExists, isBinaryOrZip } from "./utils/file-utils";
+
+import AccountManager = require("./management-sdk");
+import wordwrap = require("wordwrap");
+import Promise = Q.Promise;
+import { ReactNativePackageInfo } from "./types/rest-definitions";
+
+const g2js = require("gradle-to-js/lib/parser");
+
+const opener = require("opener");
+
+const plist = require("plist");
+const progress = require("progress");
+const prompt = require("prompt");
+
+const rimraf = require("rimraf");
+
+const Table = require("cli-table");
+
+const xcode = require("xcode");
 
 const configFilePath: string = path.join(process.env.LOCALAPPDATA || process.env.HOME, ".revopush.config");
 const emailValidator = require("email-validator");
 const packageJson = require("../../package.json");
 const parseXml = Q.denodeify(require("xml2js").parseString);
-import Promise = Q.Promise;
 
 const properties = require("properties");
 
@@ -358,9 +366,11 @@ export const deploymentList = (command: cli.IDeploymentListCommand, showPackage:
 };
 
 function deploymentRemove(command: cli.IDeploymentRemoveCommand): Promise<void> {
-  return confirm(
-    "Are you sure you want to remove this deployment? Note that its deployment key will be PERMANENTLY unrecoverable."
-  ).then((wasConfirmed: boolean): Promise<void> => {
+  const confirmation = command.isForce
+    ? Q.resolve(true)
+    : confirm("Are you sure you want to remove this deployment? Note that its deployment key will be PERMANENTLY unrecoverable.");
+
+  return confirmation.then((wasConfirmed: boolean): Promise<void> => {
     if (wasConfirmed) {
       return sdk.removeDeployment(command.appName, command.deploymentName).then((): void => {
         log('Successfully removed the "' + command.deploymentName + '" deployment from the "' + command.appName + '" app.');
@@ -1200,75 +1210,33 @@ function patch(command: cli.IPatchCommand): Promise<void> {
 }
 
 export const release = (command: cli.IReleaseCommand): Promise<void> => {
-  if (isBinaryOrZip(command.package)) {
-    throw new Error(
-      "It is unnecessary to package releases in a .zip or binary file. Please specify the direct path to the update content's directory (e.g. /platforms/ios/www) or file (e.g. main.jsbundle)."
-    );
-  }
-
-  throwForInvalidSemverRange(command.appStoreVersion);
-  const filePath: string = command.package;
-  let isSingleFilePackage: boolean = true;
-
-  if (fs.lstatSync(filePath).isDirectory()) {
-    isSingleFilePackage = false;
-  }
-
-  let lastTotalProgress = 0;
-  const progressBar = new progress("Upload progress:[:bar] :percent :etas", {
-    complete: "=",
-    incomplete: " ",
-    width: 50,
-    total: 100,
-  });
-
-  const uploadProgress = (currentProgress: number): void => {
-    progressBar.tick(currentProgress - lastTotalProgress);
-    lastTotalProgress = currentProgress;
-  };
-
+  // for initial release we explicitly define release as optional, disabled, without rollout, with a special description
   const updateMetadata: PackageInfo = {
-    description: command.description,
-    isDisabled: command.disabled,
-    isMandatory: command.mandatory,
-    rollout: command.rollout,
+    description: command.initial ? `Zero release for v${command.appStoreVersion}` : command.description,
+    isDisabled: command.initial ? true : command.disabled,
+    isMandatory: command.initial ? false : command.mandatory,
+    isInitial: command.initial,
+    rollout: command.initial ? undefined : command.rollout,
+    appVersion: command.appStoreVersion,
   };
 
-  return sdk
-    .isAuthenticated(true)
-    .then((isAuth: boolean): Promise<void> => {
-      return sdk.release(command.appName, command.deploymentName, filePath, command.appStoreVersion, updateMetadata, uploadProgress);
-    })
-    .then((): void => {
-      log(
-        'Successfully released an update containing the "' +
-          command.package +
-          '" ' +
-          (isSingleFilePackage ? "file" : "directory") +
-          ' to the "' +
-          command.deploymentName +
-          '" deployment of the "' +
-          command.appName +
-          '" app.'
-      );
-    })
-    .catch((err: CodePushError) => releaseErrorHandler(err, command));
+  return doRelease(command, updateMetadata);
 };
 
 export const releaseReact = (command: cli.IReleaseReactCommand): Promise<void> => {
   let bundleName: string = command.bundleName;
   let entryFile: string = command.entryFile;
   const outputFolder: string = command.outputDir || path.join(os.tmpdir(), "CodePush");
+  const sourcemapOutputFolder: string = command.sourcemapOutput || path.join(os.tmpdir(), "CodePushSourceMap");
+  const baseReleaseTmpFolder: string = path.join(os.tmpdir(), "CodePushBaseRelease");
   const platform: string = (command.platform = command.platform.toLowerCase());
-  const releaseCommand: cli.IReleaseCommand = <any>command;
+  const releaseCommand: cli.IReleaseReactCommand = <any>command;
   // Check for app and deployment exist before releasing an update.
   // This validation helps to save about 1 minute or more in case user has typed wrong app or deployment name.
   return (
     sdk
       .getDeployment(command.appName, command.deploymentName)
-      .then((): any => {
-        releaseCommand.package = outputFolder;
-
+      .then(async () => {
         switch (platform) {
           case "android":
           case "ios":
@@ -1282,6 +1250,10 @@ export const releaseReact = (command: cli.IReleaseReactCommand): Promise<void> =
             throw new Error('Platform must be either "android", "ios" or "windows".');
         }
 
+        releaseCommand.package = outputFolder;
+        releaseCommand.outputDir = outputFolder;
+        releaseCommand.bundleName = bundleName;
+
         let projectName: string;
 
         try {
@@ -1319,8 +1291,9 @@ export const releaseReact = (command: cli.IReleaseReactCommand): Promise<void> =
           ? Q(command.appStoreVersion)
           : getReactNativeProjectAppVersion(command, projectName);
 
-        if (command.sourcemapOutput && !command.sourcemapOutput.endsWith(".map")) {
-          command.sourcemapOutput = path.join(command.sourcemapOutput, bundleName + ".map");
+        if (!sourcemapOutputFolder.endsWith(".map") && !command.sourcemapOutput) {
+          // create tmp dir only if no dir was given by user. User must crete a directory if --sourcemapOutput is passes
+          await createEmptyTempReleaseFolder(sourcemapOutputFolder);
         }
 
         return appVersionPromise;
@@ -1334,31 +1307,34 @@ export const releaseReact = (command: cli.IReleaseReactCommand): Promise<void> =
       // This is needed to clear the react native bundler cache:
       // https://github.com/facebook/react-native/issues/4289
       .then(() => deleteFolder(`${os.tmpdir()}/react-*`))
-      .then(() =>
-        runReactNativeBundleCommand(
+      .then(async () => {
+        await runReactNativeBundleCommand(
+          command,
           bundleName,
           command.development || false,
           entryFile,
           outputFolder,
+          sourcemapOutputFolder,
           platform,
-          command.sourcemapOutput,
           command.extraBundlerOptions
-        )
-      )
+        );
+      })
       .then(async () => {
-        const isHermesEnabled =
-          command.useHermes ||
-          (platform === "android" && (await getAndroidHermesEnabled(command.gradleFile))) || // Check if we have to run hermes to compile JS to Byte Code if Hermes is enabled in build.gradle and we're releasing an Android build
-          (platform === "ios" && (await getiOSHermesEnabled(command.podFile))); // Check if we have to run hermes to compile JS to Byte Code if Hermes is enabled in Podfile and we're releasing an iOS build
+        const isHermes = await isHermesEnabled(command, platform);
+
+        if (isHermes) {
+          await createEmptyTempReleaseFolder(baseReleaseTmpFolder);
+          const baseBytecode = await takeHermesBaseBytecode(command, baseReleaseTmpFolder, outputFolder, bundleName);
 
-        if (isHermesEnabled) {
           log(chalk.cyan("\nRunning hermes compiler...\n"));
           await runHermesEmitBinaryCommand(
+            command,
             bundleName,
             outputFolder,
-            command.sourcemapOutput,
+            sourcemapOutputFolder,
             command.extraHermesFlags,
-            command.gradleFile
+            command.gradleFile,
+            baseBytecode
           );
         }
       })
@@ -1372,20 +1348,90 @@ export const releaseReact = (command: cli.IReleaseReactCommand): Promise<void> =
       })
       .then(() => {
         log(chalk.cyan("\nReleasing update contents to CodePush:\n"));
-        return release(releaseCommand);
+        return releaseReactNative(releaseCommand);
       })
-      .then(() => {
+      .then(async () => {
         if (!command.outputDir) {
-          deleteFolder(outputFolder);
+          await deleteFolder(outputFolder);
         }
+
+        if (!command.sourcemapOutput) {
+          await deleteFolder(sourcemapOutputFolder);
+        }
+
+        await deleteFolder(baseReleaseTmpFolder);
       })
-      .catch((err: Error) => {
-        deleteFolder(outputFolder);
+      .catch(async (err: Error) => {
         throw err;
       })
   );
 };
 
+const releaseReactNative = (command: cli.IReleaseReactCommand): Promise<void> => {
+  // for initial release we explicitly define release as optional, disabled, without rollout, with a special description
+  const updateMetadata: ReactNativePackageInfo = {
+    description: command.initial ? `Zero release for v${command.appStoreVersion}` : command.description,
+    isDisabled: command.initial ? true : command.disabled,
+    isMandatory: command.initial ? false : command.mandatory,
+    isInitial: command.initial,
+    bundleName: command.bundleName,
+    outputDir: command.outputDir,
+    rollout: command.initial ? undefined : command.rollout,
+    appVersion: command.appStoreVersion,
+  };
+
+  return doRelease(command, updateMetadata);
+};
+
+const doRelease = (command: cli.IReleaseCommand | cli.IReleaseReactCommand, updateMetadata: PackageInfo): Promise<void> => {
+  if (isBinaryOrZip(command.package)) {
+    throw new Error(
+      "It is unnecessary to package releases in a .zip or binary file. Please specify the direct path to the update content's directory (e.g. /platforms/ios/www) or file (e.g. main.jsbundle)."
+    );
+  }
+
+  throwForInvalidSemverRange(command.appStoreVersion);
+  const filePath: string = command.package;
+  let isSingleFilePackage: boolean = true;
+
+  if (fs.lstatSync(filePath).isDirectory()) {
+    isSingleFilePackage = false;
+  }
+
+  let lastTotalProgress = 0;
+  const progressBar = new progress("Upload progress:[:bar] :percent :etas", {
+    complete: "=",
+    incomplete: " ",
+    width: 50,
+    total: 100,
+  });
+
+  const uploadProgress = (currentProgress: number): void => {
+    progressBar.tick(currentProgress - lastTotalProgress);
+    lastTotalProgress = currentProgress;
+  };
+
+  return sdk
+    .isAuthenticated(true)
+    .then((isAuth: boolean): Promise<void> => {
+      return sdk.release(command.appName, command.deploymentName, filePath, updateMetadata, uploadProgress);
+    })
+    .then((): void => {
+      log(
+        'Successfully released an update containing the "' +
+          command.package +
+          '" ' +
+          (isSingleFilePackage ? "file" : "directory") +
+          ' to the "' +
+          command.deploymentName +
+          '" deployment of the "' +
+          command.appName +
+          '" app.'
+      );
+    })
+    .catch((err: CodePushError) => releaseErrorHandler(err, command));
+};
+
 function rollback(command: cli.IRollbackCommand): Promise<void> {
   return confirm().then((wasConfirmed: boolean) => {
     if (!wasConfirmed) {
@@ -1427,15 +1473,16 @@ function requestAccessKey(): Promise<string> {
   });
 }
 
-export const runReactNativeBundleCommand = (
+export const runReactNativeBundleCommand = async (
+  command: cli.IReleaseReactCommand,
   bundleName: string,
   development: boolean,
   entryFile: string,
   outputFolder: string,
+  sourcemapOutputFolder: string,
   platform: string,
-  sourcemapOutput: string,
   extraBundlerOptions: string[]
-): Promise<void> => {
+) => {
   const reactNativeBundleArgs: string[] = [];
   const envNodeArgs: string = process.env.CODE_PUSH_NODE_ARGS;
 
@@ -1443,10 +1490,12 @@ export const runReactNativeBundleCommand = (
     Array.prototype.push.apply(reactNativeBundleArgs, envNodeArgs.trim().split(/\s+/));
   }
 
-  const isOldCLI = fs.existsSync(path.join("node_modules", "react-native", "local-cli", "cli.js"));
+  const reactNativePackagePath = getReactNativePackagePath();
+  const oldCliPath = path.join(reactNativePackagePath, "local-cli", "cli.js");
+  const cliPath = fs.existsSync(oldCliPath) ? oldCliPath : path.join(reactNativePackagePath, "cli.js");
 
   Array.prototype.push.apply(reactNativeBundleArgs, [
-    isOldCLI ? path.join("node_modules", "react-native", "local-cli", "cli.js") : path.join("node_modules", "react-native", "cli.js"),
+    cliPath,
     "bundle",
     "--assets-dest",
     outputFolder,
@@ -1458,12 +1507,22 @@ export const runReactNativeBundleCommand = (
     entryFile,
     "--platform",
     platform,
+    "--reset-cache",
   ]);
 
-  if (sourcemapOutput) {
-    reactNativeBundleArgs.push("--sourcemap-output", sourcemapOutput);
+  if (sourcemapOutputFolder) {
+    let bundleSourceMapOutput = sourcemapOutputFolder;
+    if (!sourcemapOutputFolder.endsWith(".map")) {
+      // user defined full path to source map. let's use that instead
+      bundleSourceMapOutput = await getBundleSourceMapOutput(command, bundleName, sourcemapOutputFolder);
+    }
+
+    reactNativeBundleArgs.push("--sourcemap-output", bundleSourceMapOutput);
   }
 
+  const minifyValue = await getMinifyParams(command);
+  Array.prototype.push.apply(reactNativeBundleArgs, minifyValue);
+
   if (extraBundlerOptions.length > 0) {
     reactNativeBundleArgs.push(...extraBundlerOptions);
   }

package/script/command-parser.ts

@@ -247,7 +247,13 @@ function deploymentRemove(commandName: string, yargs: yargs.Argv): void {
   yargs
     .usage(USAGE_PREFIX + " deployment " + commandName + " <appName> <deploymentName>")
     .demand(/*count*/ 2, /*max*/ 2) // Require exactly two non-option arguments
-    .example("deployment " + commandName + " MyApp MyDeployment", 'Removes deployment "MyDeployment" from app "MyApp"');
+    .example("deployment " + commandName + " MyApp MyDeployment", 'Removes deployment "MyDeployment" from app "MyApp"')
+    .option("force", {
+      default: false,
+      demand: false,
+      description: "Bypass confirmation when removing deployments",
+      type: "boolean",
+    });
 
   addCommonConfiguration(yargs);
 }
@@ -732,6 +738,13 @@ yargs
         demand: false,
         description: "Path to the gradle file which specifies the binary version you want to target this release at (android only).",
       })
+      .option("initial", {
+        alias: "i",
+        default: false,
+        demand: false,
+        description: "Specifies whether release is initial (base) for given targetBinaryVersion.",
+        type: "boolean",
+      })
       .option("mandatory", {
         alias: "m",
         default: false,
@@ -844,8 +857,7 @@ yargs
         alias: "eo",
         default: [],
         demand: false,
-        description:
-          "Option that gets passed to react-native bundler. Can be specified multiple times.",
+        description: "Option that gets passed to react-native bundler. Can be specified multiple times.",
         type: "array",
       })
       .check((argv: any, aliases: { [aliases: string]: string }): any => {
@@ -1107,6 +1119,7 @@ export function createCommand(): cli.ICommand {
 
               deploymentRemoveCommand.appName = arg2;
               deploymentRemoveCommand.deploymentName = arg3;
+              deploymentRemoveCommand.isForce = argv["force"] as any;
             }
             break;
 
@@ -1240,6 +1253,7 @@ export function createCommand(): cli.ICommand {
           releaseReactCommand.entryFile = argv["entryFile"] as any;
           releaseReactCommand.gradleFile = argv["gradleFile"] as any;
           releaseReactCommand.mandatory = argv["mandatory"] as any;
+          releaseReactCommand.initial = argv["initial"] as any;
           releaseReactCommand.noDuplicateReleaseError = argv["noDuplicateReleaseError"] as any;
           releaseReactCommand.plistFile = argv["plistFile"] as any;
           releaseReactCommand.plistFilePrefix = argv["plistFilePrefix"] as any;

package/script/management-sdk.ts

@@ -26,6 +26,7 @@ import {
   PackageInfo,
   ServerAccessKey,
   Session,
+  BaseRelease,
 } from "./types";
 
 const packageJson = require("../../package.json");
@@ -273,6 +274,12 @@ class AccountManager {
     return this.get(urlEncode([`/apps/${appName}/deployments/${deploymentName}`])).then((res: JsonResponse) => res.body.deployment);
   }
 
+  public getBaseRelease(appName: string, deploymentName: string, appVerison: string): Promise<BaseRelease> {
+    return this.get(urlEncode([`/apps/${appName}/deployments/${deploymentName}/basebundle?appVersion=${appVerison}`])).then(
+      (res: JsonResponse) => res.body.basebundle
+    );
+  }
+
   public renameDeployment(appName: string, oldDeploymentName: string, newDeploymentName: string): Promise<void> {
     return this.patch(
       urlEncode([`/apps/${appName}/deployments/${oldDeploymentName}`]),
@@ -300,12 +307,10 @@ class AccountManager {
     appName: string,
     deploymentName: string,
     filePath: string,
-    targetBinaryVersion: string,
     updateMetadata: PackageInfo,
     uploadProgressCallback?: (progress: number) => void
   ): Promise<void> {
     return Promise<void>((resolve, reject, notify) => {
-      updateMetadata.appVersion = targetBinaryVersion;
       const request: superagent.Request<any> = superagent.post(
         this._serverUrl + urlEncode([`/apps/${appName}/deployments/${deploymentName}/release`])
       );
@@ -569,7 +574,7 @@ class AccountManager {
 
     request.set("Accept", `application/vnd.code-push.v${AccountManager.API_VERSION}+json`);
     request.set("Authorization", `Bearer ${this._accessKey}`);
-    request.set("X-CodePush-SDK-Version", packageJson.version);
+    request.set("X-CodePush-SDK-Version", packageJson.version); // TODO get version differently without require("../../package.json");
   }
 }