@bravemobile/react-native-code-push 9.0.0-alpha.3 → 9.0.0-beta.0

package/CodePush.js

@@ -121,8 +121,8 @@ async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchC
 
       if (!updateInfo) {
         return null;
-      } else if (updateInfo.update_app_version) {
-        return { updateAppVersion: true, appVersion: updateInfo.target_binary_range };
+      } else if (!updateInfo.download_url) {
+        return null;
       } else if (!updateInfo.is_available) {
         return null;
       }

package/cli/commands/bundleCommand/bundleCodePush.js

@@ -1,31 +1,39 @@
+const fs = require('fs');
 const { prepareToBundleJS } = require('../../functions/prepareToBundleJS');
 const { runReactNativeBundleCommand } = require('../../functions/runReactNativeBundleCommand');
 const { getReactTempDir } = require('../../functions/getReactTempDir');
 const { runHermesEmitBinaryCommand } = require('../../functions/runHermesEmitBinaryCommand');
 const { makeCodePushBundle } = require('../../functions/makeCodePushBundle');
+const { ROOT_OUTPUT_DIR, ENTRY_FILE } = require('../../constant');
 
 /**
  * @param platform {string} 'ios' | 'android'
  * @param outputRootPath {string}
  * @param entryFile {string}
- * @param bundleName {string|undefined}
- * @return {Promise<{bundleFileName: string, packageHash: string}>}
+ * @param jsBundleName {string|undefined}
+ * @param bundleDirectory {string}
+ * @return {Promise<string>} CodePush bundle file name (equals to packageHash)
  */
 async function bundleCodePush(
   platform = 'ios',
-  outputRootPath = 'build',
-  entryFile = 'index.ts',
-  bundleName,
+  outputRootPath = ROOT_OUTPUT_DIR,
+  entryFile = ENTRY_FILE,
+  jsBundleName, // JS bundle file name (not CodePush bundle file)
+  bundleDirectory, // CodePush bundle output directory
 ) {
+    if (fs.existsSync(outputRootPath)) {
+        fs.rmSync(outputRootPath, { recursive: true });
+    }
+
     const OUTPUT_CONTENT_PATH = `${outputRootPath}/CodePush`;
-    const BUNDLE_NAME_DEFAULT = platform === 'ios' ? 'main.jsbundle' : 'index.android.bundle';
-    const _bundleName = bundleName ? bundleName : BUNDLE_NAME_DEFAULT;
-    const SOURCEMAP_OUTPUT = `${outputRootPath}/${_bundleName}.map`;
+    const DEFAULT_JS_BUNDLE_NAME = platform === 'ios' ? 'main.jsbundle' : 'index.android.bundle';
+    const _jsBundleName = jsBundleName || DEFAULT_JS_BUNDLE_NAME; // react-native JS bundle output name
+    const SOURCEMAP_OUTPUT = `${outputRootPath}/${_jsBundleName}.map`;
 
     prepareToBundleJS({ deleteDirs: [outputRootPath, getReactTempDir()], makeDir: OUTPUT_CONTENT_PATH });
 
     runReactNativeBundleCommand(
-      _bundleName,
+      _jsBundleName,
       OUTPUT_CONTENT_PATH,
       platform,
       SOURCEMAP_OUTPUT,
@@ -34,16 +42,16 @@ async function bundleCodePush(
     console.log('log: JS bundling complete');
 
     await runHermesEmitBinaryCommand(
-      _bundleName,
+      _jsBundleName,
       OUTPUT_CONTENT_PATH,
       SOURCEMAP_OUTPUT,
     );
     console.log('log: Hermes compilation complete');
 
-    const { bundleFileName, packageHash } = await makeCodePushBundle(OUTPUT_CONTENT_PATH);
-    console.log(`log: CodePush bundle created (file name: ${bundleFileName})`);
+    const { bundleFileName: codePushBundleFileName } = await makeCodePushBundle(OUTPUT_CONTENT_PATH, bundleDirectory);
+    console.log(`log: CodePush bundle created (file path: ./${bundleDirectory}/${codePushBundleFileName})`);
 
-    return { bundleFileName, packageHash }; // returns for release command implementation
+    return codePushBundleFileName;
 }
 
 module.exports = { bundleCodePush: bundleCodePush };

package/cli/commands/bundleCommand/index.js

@@ -1,18 +1,21 @@
 const { program, Option } = require("commander");
 const { bundleCodePush } = require("./bundleCodePush");
+const { OUTPUT_BUNDLE_DIR, ROOT_OUTPUT_DIR, ENTRY_FILE } = require('../../constant');
 
 program.command('bundle')
     .description('Creates a CodePush bundle file (assumes Hermes is enabled).')
     .addOption(new Option('-p, --platform <type>', 'platform').choices(['ios', 'android']).default('ios'))
-    .option('-o, --output-path <string>', 'path to output root directory', 'build')
-    .option('-e, --entry-file <string>', 'path to JS/TS entry file', 'index.ts')
+    .option('-o, --output-path <string>', 'path to output root directory', ROOT_OUTPUT_DIR)
+    .option('-e, --entry-file <string>', 'path to JS/TS entry file', ENTRY_FILE)
     .option('-b, --bundle-name <string>', 'bundle file name (default-ios: "main.jsbundle" / default-android: "index.android.bundle")')
+    .option('--output-bundle-dir <string>', 'name of directory containing the bundle file created by the "bundle" command', OUTPUT_BUNDLE_DIR)
     /**
      * @param {Object} options
      * @param {string} options.platform
      * @param {string} options.outputPath
      * @param {string} options.entryFile
      * @param {string} options.bundleName
+     * @param {string} options.outputBundleDir
      * @return {void}
      */
     .action((options) => {
@@ -21,5 +24,6 @@ program.command('bundle')
             options.outputPath,
             options.entryFile,
             options.bundleName,
+            `${options.outputPath}/${options.outputBundleDir}`,
         )
     });

package/cli/commands/createHistoryCommand/index.js

@@ -1,13 +1,14 @@
 const { program, Option } = require("commander");
 const { findAndReadConfigFile } = require("../../utils/fsUtils");
 const { createReleaseHistory } = require("./createReleaseHistory");
+const { CONFIG_FILE_NAME } = require('../../constant');
 
 program.command('create-history')
     .description('Creates a new release history for the binary app.')
     .requiredOption('-b, --binary-version <string>', '(Required) The target binary version')
     .addOption(new Option('-p, --platform <type>', 'platform').choices(['ios', 'android']).default('ios'))
     .option('-i, --identifier <string>', 'reserved characters to distinguish the release.')
-    .option('-c, --config <path>', 'set config file name (JS/TS)', 'code-push.config.ts')
+    .option('-c, --config <path>', 'set config file name (JS/TS)', CONFIG_FILE_NAME)
     /**
      * @param {Object} options
      * @param {string} options.binaryVersion

package/cli/commands/releaseCommand/index.js

@@ -1,7 +1,7 @@
 const { program, Option } = require("commander");
-const SemVer = require('semver');
 const { findAndReadConfigFile } = require("../../utils/fsUtils");
 const { release } = require("./release");
+const { OUTPUT_BUNDLE_DIR, CONFIG_FILE_NAME, ROOT_OUTPUT_DIR, ENTRY_FILE } = require('../../constant');
 
 program.command('release')
     .description('Deploys a new CodePush update for a target binary app.\nAfter creating the CodePush bundle, it uploads the file and updates the ReleaseHistory information.\n`bundleUploader`, `getReleaseHistory`, and `setReleaseHistory` functions should be implemented in the config file.')
@@ -9,12 +9,14 @@ program.command('release')
     .requiredOption('-v, --app-version <string>', '(Required) The app version to be released. It must be greater than the binary version.')
     .addOption(new Option('-p, --platform <type>', 'platform').choices(['ios', 'android']).default('ios'))
     .option('-i, --identifier <string>', 'reserved characters to distinguish the release.')
-    .option('-c, --config <path>', 'set config file name (JS/TS)', 'code-push.config.ts')
-    .option('-o, --output-path <string>', 'path to output root directory', 'build')
-    .option('-e, --entry-file <string>', 'path to JS/TS entry file', 'index.ts')
+    .option('-c, --config <path>', 'set config file name (JS/TS)', CONFIG_FILE_NAME)
+    .option('-o, --output-path <string>', 'path to output root directory', ROOT_OUTPUT_DIR)
+    .option('-e, --entry-file <string>', 'path to JS/TS entry file', ENTRY_FILE)
     .option('-j, --js-bundle-name <string>', 'JS bundle file name (default-ios: "main.jsbundle" / default-android: "index.android.bundle")')
     .option('-m, --mandatory <bool>', 'make the release to be mandatory', parseBoolean, false)
     .option('--enable <bool>', 'make the release to be enabled', parseBoolean, true)
+    .option('--skip-bundle <bool>', 'skip bundle process', parseBoolean, false)
+    .option('--output-bundle-dir <string>', 'name of directory containing the bundle file created by the "bundle" command', OUTPUT_BUNDLE_DIR)
     /**
      * @param {Object} options
      * @param {string} options.binaryVersion
@@ -27,6 +29,8 @@ program.command('release')
      * @param {string} options.bundleName
      * @param {string} options.mandatory
      * @param {string} options.enable
+     * @param {string} options.skipBundle
+     * @param {string} options.outputBundleDir
      * @return {void}
      */
     .action(async (options) => {
@@ -45,6 +49,8 @@ program.command('release')
             options.bundleName,
             options.mandatory,
             options.enable,
+            options.skipBundle,
+            `${options.outputPath}/${options.outputBundleDir}`,
         )
 
         console.log('🚀 Release completed.')

package/cli/commands/releaseCommand/release.js

@@ -1,3 +1,4 @@
+const fs = require('fs');
 const { bundleCodePush } = require("../bundleCommand/bundleCodePush");
 const { addToReleaseHistory } = require("./addToReleaseHistory");
 
@@ -31,6 +32,8 @@ const { addToReleaseHistory } = require("./addToReleaseHistory");
  * @param jsBundleName {string}
  * @param mandatory {boolean}
  * @param enable {boolean}
+ * @param skipBundle {boolean}
+ * @param bundleDirectory {string}
  * @return {Promise<void>}
  */
 async function release(
@@ -46,17 +49,17 @@ async function release(
     jsBundleName,
     mandatory,
     enable,
+    skipBundle,
+    bundleDirectory,
 ) {
-    const { bundleFileName, packageHash } = await bundleCodePush(
-        platform,
-        outputPath,
-        entryFile,
-        jsBundleName,
-    );
+    const bundleFileName = skipBundle
+        ? readBundleFileNameFrom(bundleDirectory)
+        : await bundleCodePush(platform, outputPath, entryFile, jsBundleName, bundleDirectory);
+    const bundleFilePath = `${bundleDirectory}/${bundleFileName}`;
 
     const downloadUrl = await (async () => {
         try {
-            const { downloadUrl } = await bundleUploader(`./${bundleFileName}`, platform, identifier);
+            const { downloadUrl } = await bundleUploader(bundleFilePath, platform, identifier);
             return downloadUrl
         } catch (error) {
             console.error('Failed to upload the bundle file. Exiting the program.', error)
@@ -68,7 +71,7 @@ async function release(
         appVersion,
         binaryVersion,
         downloadUrl,
-        packageHash,
+        bundleFileName,
         getReleaseHistory,
         setReleaseHistory,
         platform,
@@ -77,12 +80,26 @@ async function release(
         enable,
     )
 
-    deleteUploadedBundleFile(bundleFileName);
+    cleanUpOutputs(outputPath);
+}
+
+function cleanUpOutputs(dir) {
+    fs.rmSync(dir, { recursive: true });
 }
 
-function deleteUploadedBundleFile(bundleFileName) {
-    const fs = require('fs');
-    fs.unlinkSync(`./${bundleFileName}`);
+/**
+ * @param bundleDirectory {string}
+ * @return {string}
+ */
+function readBundleFileNameFrom(bundleDirectory) {
+    const files = fs.readdirSync(bundleDirectory);
+    if (files.length !== 1) {
+        console.error('The bundlePath must contain only one file.');
+        process.exit(1);
+    }
+    const path = require('path');
+    const bundleFilePath = path.join(bundleDirectory, files[0]);
+    return path.basename(bundleFilePath);
 }
 
 module.exports = { release: release }

package/cli/commands/showHistoryCommand/index.js

@@ -1,12 +1,13 @@
 const { program, Option } = require("commander");
 const { findAndReadConfigFile } = require("../../utils/fsUtils");
+const { CONFIG_FILE_NAME } = require('../../constant');
 
 program.command('show-history')
     .description('Retrieves and prints the release history of a specific binary version.\n`getReleaseHistory` function should be implemented in the config file.')
     .requiredOption('-b, --binary-version <string>', '(Required) The target binary version for retrieving the release history.')
     .addOption(new Option('-p, --platform <type>', 'platform').choices(['ios', 'android']).default('ios'))
     .option('-i, --identifier <string>', 'reserved characters to distinguish the release.')
-    .option('-c, --config <path>', 'configuration file name (JS/TS)', 'code-push.config.ts')
+    .option('-c, --config <path>', 'configuration file name (JS/TS)', CONFIG_FILE_NAME)
     /**
      * @param {Object} options
      * @param {string} options.binaryVersion

package/cli/commands/updateHistoryCommand/index.js

@@ -1,6 +1,7 @@
 const { program, Option } = require("commander");
 const { findAndReadConfigFile } = require("../../utils/fsUtils");
 const { updateReleaseHistory } = require("./updateReleaseHistory");
+const { CONFIG_FILE_NAME } = require('../../constant');
 
 program.command('update-history')
     .description('Updates the release history for a specific binary version.\n`getReleaseHistory`, `setReleaseHistory` functions should be implemented in the config file.')
@@ -8,7 +9,7 @@ program.command('update-history')
     .requiredOption('-b, --binary-version <string>', '(Required) The target binary version of the app for which update information is to be modified.')
     .addOption(new Option('-p, --platform <type>', 'platform').choices(['ios', 'android']).default('ios'))
     .option('-i, --identifier <string>', 'reserved characters to distinguish the release.')
-    .option('-c, --config <path>', 'set config file name (JS/TS)', 'code-push.config.ts')
+    .option('-c, --config <path>', 'set config file name (JS/TS)', CONFIG_FILE_NAME)
     .option('-m, --mandatory <bool>', 'make the release to be mandatory', parseBoolean, undefined)
     .option('-e, --enable <bool>', 'make the release to be enabled', parseBoolean, undefined)
     /**

package/cli/constant.js

@@ -1,3 +1,6 @@
 module.exports = {
-  configFileName: "code-push.config.ts",
+  CONFIG_FILE_NAME: "code-push.config.ts",
+  OUTPUT_BUNDLE_DIR: "bundleOutput",
+  ROOT_OUTPUT_DIR: "build",
+  ENTRY_FILE: "index.ts",
 };

package/cli/functions/makeCodePushBundle.js

@@ -1,4 +1,3 @@
-const { randomUUID } = require('crypto');
 const path = require('path');
 const shell = require('shelljs');
 const zip = require('../utils/zip');
@@ -8,19 +7,21 @@ const {generatePackageHashFromDirectory} = require('../utils/hash-utils');
  * Create a CodePush bundle file and return the information.
  *
  * @param contentsPath {string} The directory path containing the contents to be made into a CodePush bundle (usually the 'build/CodePush' directory))
- * @return {Promise<{ bundleFileName: string, packageHash: string }>}
+ * @param bundleDirectory {string} The directory path to save the CodePush bundle file
+ * @return {Promise<{ bundleFileName: string }>}
  */
-async function makeCodePushBundle(contentsPath) {
+async function makeCodePushBundle(contentsPath, bundleDirectory) {
     const updateContentsZipPath = await zip(contentsPath);
 
-    const bundleFileName = randomUUID();
-    shell.mv(updateContentsZipPath, `./${bundleFileName}`);
-
     const packageHash = await generatePackageHashFromDirectory(contentsPath, path.join(contentsPath, '..'));
 
+    shell.mkdir('-p', `./${bundleDirectory}`);
+    shell.mv(updateContentsZipPath, `./${bundleDirectory}/${packageHash}`);
+
     return {
-        bundleFileName: bundleFileName,
-        packageHash: packageHash,
+        // To allow the "release" command to get the file and hash value from the result of the "bundle" command,
+        // use the hash value as the name of the file.
+        bundleFileName: packageHash,
     };
 }
 

package/cli/functions/runReactNativeBundleCommand.js

@@ -21,7 +21,7 @@ function runReactNativeBundleCommand(
     outputPath,
     platform,
     sourcemapOutput,
-    entryFile = 'index.ts',
+    entryFile,
     extraBundlerOptions = [],
 ) {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "9.0.0-alpha.3",
+  "version": "9.0.0-beta.0",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",

package/typings/react-native-code-push.d.ts

@@ -524,7 +524,7 @@ export interface CliConfigInterface {
      * Used in the `release` command, and must return a URL that allows downloading the file after the upload is completed.
      * The URL is recorded in the ReleaseHistory, and the CodePush runtime library downloads the bundle file from this address.
      *
-     * @param source The relative path of the generated bundle file. (e.g., ./2f156929-e474-46cd-9c9c-27a841043d98)
+     * @param source The relative path of the generated bundle file. (e.g. build/bundleOutput/1087bc338fc45a961c...)
      * @param platform The target platform of the bundle file. This is the string passed when executing the CLI command. ('ios'/'android')
      * @param identifier An additional identifier string. This can be used to distinguish execution environments by incorporating it into the upload path or file name. This string is passed when executing the CLI command.
      */