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

package/bin/script/command-executor.js

@@ -3,35 +3,34 @@
 // Licensed under the MIT License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runReactNativeBundleCommand = exports.releaseReact = exports.release = exports.execute = exports.deploymentList = exports.createEmptyTempReleaseFolder = exports.confirm = exports.execSync = exports.spawn = exports.sdk = exports.log = void 0;
-const AccountManager = require("./management-sdk");
 const childProcess = require("child_process");
 const debug_1 = require("./commands/debug");
 const fs = require("fs");
 const chalk = require("chalk");
-const g2js = require("gradle-to-js/lib/parser");
 const moment = require("moment");
-const opener = require("opener");
 const os = require("os");
 const path = require("path");
-const plist = require("plist");
-const progress = require("progress");
-const prompt = require("prompt");
 const Q = require("q");
-const rimraf = require("rimraf");
 const semver = require("semver");
-const Table = require("cli-table");
-const which = require("which");
-const wordwrap = require("wordwrap");
 const cli = require("../script/types/cli");
 const sign_1 = require("./sign");
-const xcode = require("xcode");
 const react_native_utils_1 = require("./react-native-utils");
 const file_utils_1 = require("./utils/file-utils");
+const AccountManager = require("./management-sdk");
+const wordwrap = require("wordwrap");
+var Promise = Q.Promise;
+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 = 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);
-var Promise = Q.Promise;
 const properties = require("properties");
 const CLI_HEADERS = {
     "X-CodePush-CLI-Version": packageJson.version,
@@ -271,7 +270,10 @@ const deploymentList = (command, showPackage = true) => {
 };
 exports.deploymentList = deploymentList;
 function deploymentRemove(command) {
-    return (0, exports.confirm)("Are you sure you want to remove this deployment? Note that its deployment key will be PERMANENTLY unrecoverable.").then((wasConfirmed) => {
+    const confirmation = command.isForce
+        ? Q.resolve(true)
+        : (0, exports.confirm)("Are you sure you want to remove this deployment? Note that its deployment key will be PERMANENTLY unrecoverable.");
+    return confirmation.then((wasConfirmed) => {
         if (wasConfirmed) {
             return exports.sdk.removeDeployment(command.appName, command.deploymentName).then(() => {
                 (0, exports.log)('Successfully removed the "' + command.deploymentName + '" deployment from the "' + command.appName + '" app.');
@@ -971,63 +973,31 @@ function patch(command) {
     throw new Error("At least one property must be specified to patch a release.");
 }
 const release = (command) => {
-    if ((0, file_utils_1.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 = command.package;
-    let isSingleFilePackage = 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) => {
-        progressBar.tick(currentProgress - lastTotalProgress);
-        lastTotalProgress = currentProgress;
-    };
+    // for initial release we explicitly define release as optional, disabled, without rollout, with a special description
     const updateMetadata = {
-        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 exports.sdk
-        .isAuthenticated(true)
-        .then((isAuth) => {
-        return exports.sdk.release(command.appName, command.deploymentName, filePath, command.appStoreVersion, updateMetadata, uploadProgress);
-    })
-        .then(() => {
-        (0, exports.log)('Successfully released an update containing the "' +
-            command.package +
-            '" ' +
-            (isSingleFilePackage ? "file" : "directory") +
-            ' to the "' +
-            command.deploymentName +
-            '" deployment of the "' +
-            command.appName +
-            '" app.');
-    })
-        .catch((err) => releaseErrorHandler(err, command));
+    return doRelease(command, updateMetadata);
 };
 exports.release = release;
 const releaseReact = (command) => {
     let bundleName = command.bundleName;
     let entryFile = command.entryFile;
     const outputFolder = command.outputDir || path.join(os.tmpdir(), "CodePush");
+    const sourcemapOutputFolder = command.sourcemapOutput || path.join(os.tmpdir(), "CodePushSourceMap");
+    const baseReleaseTmpFolder = path.join(os.tmpdir(), "CodePushBaseRelease");
     const platform = (command.platform = command.platform.toLowerCase());
     const releaseCommand = 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 (exports.sdk
         .getDeployment(command.appName, command.deploymentName)
-        .then(() => {
-        releaseCommand.package = outputFolder;
+        .then(async () => {
         switch (platform) {
             case "android":
             case "ios":
@@ -1039,6 +1009,9 @@ const releaseReact = (command) => {
             default:
                 throw new Error('Platform must be either "android", "ios" or "windows".');
         }
+        releaseCommand.package = outputFolder;
+        releaseCommand.outputDir = outputFolder;
+        releaseCommand.bundleName = bundleName;
         let projectName;
         try {
             const projectPackageJson = require(path.join(process.cwd(), "package.json"));
@@ -1070,8 +1043,9 @@ const releaseReact = (command) => {
         const appVersionPromise = command.appStoreVersion
             ? 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 (0, exports.createEmptyTempReleaseFolder)(sourcemapOutputFolder);
         }
         return appVersionPromise;
     })
@@ -1083,14 +1057,16 @@ const releaseReact = (command) => {
         // This is needed to clear the react native bundler cache:
         // https://github.com/facebook/react-native/issues/4289
         .then(() => deleteFolder(`${os.tmpdir()}/react-*`))
-        .then(() => (0, exports.runReactNativeBundleCommand)(bundleName, command.development || false, entryFile, outputFolder, platform, command.sourcemapOutput, command.extraBundlerOptions))
         .then(async () => {
-        const isHermesEnabled = command.useHermes ||
-            (platform === "android" && (await (0, react_native_utils_1.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 (0, react_native_utils_1.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
-        if (isHermesEnabled) {
+        await (0, exports.runReactNativeBundleCommand)(command, bundleName, command.development || false, entryFile, outputFolder, sourcemapOutputFolder, platform, command.extraBundlerOptions);
+    })
+        .then(async () => {
+        const isHermes = await (0, react_native_utils_1.isHermesEnabled)(command, platform);
+        if (isHermes) {
+            await (0, exports.createEmptyTempReleaseFolder)(baseReleaseTmpFolder);
+            const baseBytecode = await (0, react_native_utils_1.takeHermesBaseBytecode)(command, baseReleaseTmpFolder, outputFolder, bundleName);
             (0, exports.log)(chalk.cyan("\nRunning hermes compiler...\n"));
-            await (0, react_native_utils_1.runHermesEmitBinaryCommand)(bundleName, outputFolder, command.sourcemapOutput, command.extraHermesFlags, command.gradleFile);
+            await (0, react_native_utils_1.runHermesEmitBinaryCommand)(command, bundleName, outputFolder, sourcemapOutputFolder, command.extraHermesFlags, command.gradleFile, baseBytecode);
         }
     })
         .then(async () => {
@@ -1104,19 +1080,75 @@ const releaseReact = (command) => {
     })
         .then(() => {
         (0, exports.log)(chalk.cyan("\nReleasing update contents to CodePush:\n"));
-        return (0, exports.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) => {
-        deleteFolder(outputFolder);
+        .catch(async (err) => {
         throw err;
     }));
 };
 exports.releaseReact = releaseReact;
+const releaseReactNative = (command) => {
+    // for initial release we explicitly define release as optional, disabled, without rollout, with a special description
+    const updateMetadata = {
+        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, updateMetadata) => {
+    if ((0, file_utils_1.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 = command.package;
+    let isSingleFilePackage = 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) => {
+        progressBar.tick(currentProgress - lastTotalProgress);
+        lastTotalProgress = currentProgress;
+    };
+    return exports.sdk
+        .isAuthenticated(true)
+        .then((isAuth) => {
+        return exports.sdk.release(command.appName, command.deploymentName, filePath, updateMetadata, uploadProgress);
+    })
+        .then(() => {
+        (0, exports.log)('Successfully released an update containing the "' +
+            command.package +
+            '" ' +
+            (isSingleFilePackage ? "file" : "directory") +
+            ' to the "' +
+            command.deploymentName +
+            '" deployment of the "' +
+            command.appName +
+            '" app.');
+    })
+        .catch((err) => releaseErrorHandler(err, command));
+};
 function rollback(command) {
     return (0, exports.confirm)().then((wasConfirmed) => {
         if (!wasConfirmed) {
@@ -1149,15 +1181,17 @@ function requestAccessKey() {
         });
     });
 }
-const runReactNativeBundleCommand = (bundleName, development, entryFile, outputFolder, platform, sourcemapOutput, extraBundlerOptions) => {
+const runReactNativeBundleCommand = async (command, bundleName, development, entryFile, outputFolder, sourcemapOutputFolder, platform, extraBundlerOptions) => {
     const reactNativeBundleArgs = [];
     const envNodeArgs = process.env.CODE_PUSH_NODE_ARGS;
     if (typeof envNodeArgs !== "undefined") {
         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 = (0, react_native_utils_1.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,
@@ -1169,10 +1203,18 @@ const runReactNativeBundleCommand = (bundleName, development, entryFile, outputF
         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 (0, react_native_utils_1.getBundleSourceMapOutput)(command, bundleName, sourcemapOutputFolder);
+        }
+        reactNativeBundleArgs.push("--sourcemap-output", bundleSourceMapOutput);
     }
+    const minifyValue = await (0, react_native_utils_1.getMinifyParams)(command);
+    Array.prototype.push.apply(reactNativeBundleArgs, minifyValue);
     if (extraBundlerOptions.length > 0) {
         reactNativeBundleArgs.push(...extraBundlerOptions);
     }

package/bin/script/command-parser.js

@@ -203,7 +203,13 @@ function deploymentRemove(commandName, yargs) {
     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);
 }
 function deploymentHistory(commandName, yargs) {
@@ -616,6 +622,13 @@ yargs
         default: null,
         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",
@@ -933,6 +946,7 @@ function createCommand() {
                             const deploymentRemoveCommand = cmd;
                             deploymentRemoveCommand.appName = arg2;
                             deploymentRemoveCommand.deploymentName = arg3;
+                            deploymentRemoveCommand.isForce = argv["force"];
                         }
                         break;
                     case "rename":
@@ -1039,6 +1053,7 @@ function createCommand() {
                     releaseReactCommand.entryFile = argv["entryFile"];
                     releaseReactCommand.gradleFile = argv["gradleFile"];
                     releaseReactCommand.mandatory = argv["mandatory"];
+                    releaseReactCommand.initial = argv["initial"];
                     releaseReactCommand.noDuplicateReleaseError = argv["noDuplicateReleaseError"];
                     releaseReactCommand.plistFile = argv["plistFile"];
                     releaseReactCommand.plistFilePrefix = argv["plistFilePrefix"];

package/bin/script/management-sdk.js

@@ -195,6 +195,9 @@ class AccountManager {
     getDeployment(appName, deploymentName) {
         return this.get(urlEncode([`/apps/${appName}/deployments/${deploymentName}`])).then((res) => res.body.deployment);
     }
+    getBaseRelease(appName, deploymentName, appVerison) {
+        return this.get(urlEncode([`/apps/${appName}/deployments/${deploymentName}/basebundle?appVersion=${appVerison}`])).then((res) => res.body.basebundle);
+    }
     renameDeployment(appName, oldDeploymentName, newDeploymentName) {
         return this.patch(urlEncode([`/apps/${appName}/deployments/${oldDeploymentName}`]), JSON.stringify({ name: newDeploymentName })).then(() => null);
     }
@@ -207,9 +210,8 @@ class AccountManager {
     getDeploymentHistory(appName, deploymentName) {
         return this.get(urlEncode([`/apps/${appName}/deployments/${deploymentName}/history`])).then((res) => res.body.history);
     }
-    release(appName, deploymentName, filePath, targetBinaryVersion, updateMetadata, uploadProgressCallback) {
+    release(appName, deploymentName, filePath, updateMetadata, uploadProgressCallback) {
         return Promise((resolve, reject, notify) => {
-            updateMetadata.appVersion = targetBinaryVersion;
             const request = superagent.post(this._serverUrl + urlEncode([`/apps/${appName}/deployments/${deploymentName}/release`]));
             this.attachCredentials(request);
             const getPackageFilePromise = Q.Promise((resolve, reject) => {
@@ -414,7 +416,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");
     }
 }
 module.exports = AccountManager;