@revopush/code-push-cli 0.0.3 → 0.0.5

package/bin/script/command-executor.js

@@ -237,11 +237,12 @@ function deploymentHistoryClear(command) {
 const deploymentList = (command, showPackage = true) => {
     throwForInvalidOutputFormat(command.format);
     let deployments;
+    const DEPLOYMENTS_MAX_LENGTH = 10; // do not take metrics if number of deployment higher than this
     return exports.sdk
         .getDeployments(command.appName)
         .then((retrievedDeployments) => {
         deployments = retrievedDeployments;
-        if (showPackage) {
+        if (showPackage && deployments.length < DEPLOYMENTS_MAX_LENGTH) {
             const metricsPromises = deployments.map((deployment) => {
                 if (deployment.package) {
                     return exports.sdk.getDeploymentMetrics(command.appName, deployment.name).then((metrics) => {
@@ -1082,7 +1083,7 @@ 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))
+        .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
@@ -1148,7 +1149,7 @@ function requestAccessKey() {
         });
     });
 }
-const runReactNativeBundleCommand = (bundleName, development, entryFile, outputFolder, platform, sourcemapOutput) => {
+const runReactNativeBundleCommand = (bundleName, development, entryFile, outputFolder, platform, sourcemapOutput, extraBundlerOptions) => {
     const reactNativeBundleArgs = [];
     const envNodeArgs = process.env.CODE_PUSH_NODE_ARGS;
     if (typeof envNodeArgs !== "undefined") {
@@ -1172,6 +1173,9 @@ const runReactNativeBundleCommand = (bundleName, development, entryFile, outputF
     if (sourcemapOutput) {
         reactNativeBundleArgs.push("--sourcemap-output", sourcemapOutput);
     }
+    if (extraBundlerOptions.length > 0) {
+        reactNativeBundleArgs.push(...extraBundlerOptions);
+    }
     (0, exports.log)(chalk.cyan('Running "react-native bundle" command:\n'));
     const reactNativeBundleProcess = (0, exports.spawn)("node", reactNativeBundleArgs);
     (0, exports.log)(`node ${reactNativeBundleArgs.join(" ")}`);

package/bin/script/command-parser.js

@@ -718,6 +718,13 @@ yargs
         demand: false,
         description: "Name of build configuration which specifies the binary version you want to target this release at. For example, 'Debug' or 'Release' (iOS only)",
         type: "string",
+    })
+        .option("extraBundlerOption", {
+        alias: "eo",
+        default: [],
+        demand: false,
+        description: "Option that gets passed to react-native bundler. Can be specified multiple times.",
+        type: "array",
     })
         .check((argv, aliases) => {
         return checkValidReleaseOptions(argv);
@@ -1045,6 +1052,7 @@ function createCommand() {
                     releaseReactCommand.xcodeProjectFile = argv["xcodeProjectFile"];
                     releaseReactCommand.xcodeTargetName = argv["xcodeTargetName"];
                     releaseReactCommand.buildConfigurationName = argv["buildConfigurationName"];
+                    releaseReactCommand.extraBundlerOptions = argv["extraBundlerOption"];
                 }
                 break;
             case "rollback":

package/bin/test/cli.js

@@ -1264,6 +1264,38 @@ describe("CLI", () => {
         })
             .done();
     });
+    it("release-react applies extraBundlerOptions to bundler command", (done) => {
+        var bundleName = "bundle.js";
+        var command = {
+            type: cli.CommandType.releaseReact,
+            appName: "a",
+            appStoreVersion: null,
+            bundleName: bundleName,
+            deploymentName: "Staging",
+            description: "Test default entry file",
+            mandatory: false,
+            rollout: null,
+            platform: "ios",
+            extraBundlerOptions: ["--foo=bar", "--baz"],
+        };
+        ensureInTestAppDirectory();
+        var release = sandbox.stub(cmdexec, "release");
+        cmdexec
+            .execute(command)
+            .then(() => {
+            var releaseCommand = command;
+            releaseCommand.package = path.join(os.tmpdir(), "CodePush");
+            releaseCommand.appStoreVersion = "1.2.3";
+            sinon.assert.calledOnce(spawn);
+            var spawnCommand = spawn.args[0][0];
+            var spawnCommandArgs = spawn.args[0][1].join(" ");
+            assert.equal(spawnCommand, "node");
+            assert.equal(spawnCommandArgs, `${path.join("node_modules", "react-native", "local-cli", "cli.js")} bundle --assets-dest ${path.join(os.tmpdir(), "CodePush")} --bundle-output ${path.join(os.tmpdir(), "CodePush", bundleName)} --dev false --entry-file index.ios.js --platform ios --foo=bar --baz`);
+            assertJsonDescribesObject(JSON.stringify(release.args[0][0], /*replacer=*/ null, /*spacing=*/ 2), releaseCommand);
+            done();
+        })
+            .done();
+    });
     it("sessionList lists session name and expires fields", (done) => {
         var command = {
             type: cli.CommandType.sessionList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/code-push-cli",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Management CLI for the CodePush service",
   "main": "./script/cli.js",
   "scripts": {
@@ -53,20 +53,22 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
-    "@types/jest": "^29.5.2",
-    "@types/mocha": "^10.0.1",
+    "@types/jest": "^29.5.14",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^20.3.1",
-    "@types/q": "^1.5.5",
+    "@types/q": "^1.5.8",
     "@types/sinon": "^10.0.15",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.45.0",
     "express": "^4.19.2",
     "mkdirp": "^3.0.1",
+    "mocha": "^11.1.0",
     "prettier": "^2.8.8",
     "sinon": "15.1.2",
     "superagent-mock": "^4.0.0",
     "typescript": "^5.1.3",
+    "ts-node": "^10.9.2",
     "which": "^3.0.1"
   }
 }

package/script/command-executor.ts

@@ -323,12 +323,13 @@ function deploymentHistoryClear(command: cli.IDeploymentHistoryClearCommand): Pr
 export const deploymentList = (command: cli.IDeploymentListCommand, showPackage: boolean = true): Promise<void> => {
   throwForInvalidOutputFormat(command.format);
   let deployments: Deployment[];
+  const DEPLOYMENTS_MAX_LENGTH = 10; // do not take metrics if number of deployment higher than this
 
   return sdk
     .getDeployments(command.appName)
     .then((retrievedDeployments: Deployment[]) => {
       deployments = retrievedDeployments;
-      if (showPackage) {
+      if (showPackage && deployments.length < DEPLOYMENTS_MAX_LENGTH) {
         const metricsPromises: Promise<void>[] = deployments.map((deployment: Deployment) => {
           if (deployment.package) {
             return sdk.getDeploymentMetrics(command.appName, deployment.name).then((metrics: DeploymentMetrics): void => {
@@ -1340,7 +1341,8 @@ export const releaseReact = (command: cli.IReleaseReactCommand): Promise<void> =
           entryFile,
           outputFolder,
           platform,
-          command.sourcemapOutput
+          command.sourcemapOutput,
+          command.extraBundlerOptions
         )
       )
       .then(async () => {
@@ -1431,7 +1433,8 @@ export const runReactNativeBundleCommand = (
   entryFile: string,
   outputFolder: string,
   platform: string,
-  sourcemapOutput: string
+  sourcemapOutput: string,
+  extraBundlerOptions: string[]
 ): Promise<void> => {
   const reactNativeBundleArgs: string[] = [];
   const envNodeArgs: string = process.env.CODE_PUSH_NODE_ARGS;
@@ -1461,6 +1464,10 @@ export const runReactNativeBundleCommand = (
     reactNativeBundleArgs.push("--sourcemap-output", sourcemapOutput);
   }
 
+  if (extraBundlerOptions.length > 0) {
+    reactNativeBundleArgs.push(...extraBundlerOptions);
+  }
+
   log(chalk.cyan('Running "react-native bundle" command:\n'));
   const reactNativeBundleProcess = spawn("node", reactNativeBundleArgs);
   log(`node ${reactNativeBundleArgs.join(" ")}`);

package/script/command-parser.ts

@@ -840,6 +840,14 @@ yargs
           "Name of build configuration which specifies the binary version you want to target this release at. For example, 'Debug' or 'Release' (iOS only)",
         type: "string",
       })
+      .option("extraBundlerOption", {
+        alias: "eo",
+        default: [],
+        demand: false,
+        description:
+          "Option that gets passed to react-native bundler. Can be specified multiple times.",
+        type: "array",
+      })
       .check((argv: any, aliases: { [aliases: string]: string }): any => {
         return checkValidReleaseOptions(argv);
       });
@@ -1245,6 +1253,7 @@ export function createCommand(): cli.ICommand {
           releaseReactCommand.xcodeProjectFile = argv["xcodeProjectFile"] as any;
           releaseReactCommand.xcodeTargetName = argv["xcodeTargetName"] as any;
           releaseReactCommand.buildConfigurationName = argv["buildConfigurationName"] as any;
+          releaseReactCommand.extraBundlerOptions = argv["extraBundlerOption"] as any;
         }
         break;
 

package/script/types/cli.ts

@@ -206,6 +206,7 @@ export interface IReleaseReactCommand extends IReleaseBaseCommand {
   xcodeProjectFile?: string;
   xcodeTargetName?: string;
   buildConfigurationName?: string;
+  extraBundlerOptions?: string[];
 }
 
 export interface IRollbackCommand extends ICommand {

package/test/cli.ts

@@ -1595,6 +1595,50 @@ describe("CLI", () => {
       .done();
   });
 
+  it("release-react applies extraBundlerOptions to bundler command", (done: Mocha.Done): void => {
+    var bundleName = "bundle.js";
+    var command: cli.IReleaseReactCommand = {
+      type: cli.CommandType.releaseReact,
+      appName: "a",
+      appStoreVersion: null,
+      bundleName: bundleName,
+      deploymentName: "Staging",
+      description: "Test default entry file",
+      mandatory: false,
+      rollout: null,
+      platform: "ios",
+      extraBundlerOptions: ["--foo=bar", "--baz"],
+    };
+
+    ensureInTestAppDirectory();
+
+    var release: sinon.SinonSpy = sandbox.stub(cmdexec, "release");
+
+    cmdexec
+      .execute(command)
+      .then(() => {
+        var releaseCommand: cli.IReleaseCommand = <any>command;
+        releaseCommand.package = path.join(os.tmpdir(), "CodePush");
+        releaseCommand.appStoreVersion = "1.2.3";
+
+        sinon.assert.calledOnce(spawn);
+        var spawnCommand: string = spawn.args[0][0];
+        var spawnCommandArgs: string = spawn.args[0][1].join(" ");
+        assert.equal(spawnCommand, "node");
+        assert.equal(
+          spawnCommandArgs,
+          `${path.join("node_modules", "react-native", "local-cli", "cli.js")} bundle --assets-dest ${path.join(
+            os.tmpdir(),
+            "CodePush"
+          )} --bundle-output ${path.join(os.tmpdir(), "CodePush", bundleName)} --dev false --entry-file index.ios.js --platform ios --foo=bar --baz`
+        );
+        assertJsonDescribesObject(JSON.stringify(release.args[0][0], /*replacer=*/ null, /*spacing=*/ 2), releaseCommand);
+
+        done();
+      })
+      .done();
+  });
+
   it("sessionList lists session name and expires fields", (done: Mocha.Done): void => {
     var command: cli.IAccessKeyListCommand = {
       type: cli.CommandType.sessionList,