rnbuilder 0.5.7 → 0.5.10

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g rnbuilder
 $ rnbuilder COMMAND
 running command...
 $ rnbuilder (-v|--version|version)
-rnbuilder/0.5.7 darwin-arm64 node-v16.13.0
+rnbuilder/0.5.10 darwin-arm64 node-v16.13.0
 $ rnbuilder --help [COMMAND]
 USAGE
   $ rnbuilder COMMAND
@@ -58,7 +58,7 @@ EXAMPLE
   hello world from ./src/build.ts!
 ```
 
-_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.7/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.10/src/commands/build.ts)_
 
 ## `rnbuilder codepush [BUILD]`
 
@@ -77,7 +77,7 @@ EXAMPLE
        Push changes to existing apps ./src/firebase-sync-udids.ts!
 ```
 
-_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.7/src/commands/codepush.ts)_
+_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.10/src/commands/codepush.ts)_
 
 ## `rnbuilder help [COMMAND]`
 
@@ -109,7 +109,7 @@ EXAMPLE
   initialize environment for first run from ./src/initialize.ts!
 ```
 
-_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.7/src/commands/initialize.ts)_
+_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.10/src/commands/initialize.ts)_
 
 ## `rnbuilder match-nuke [BUILD]`
 
@@ -128,7 +128,7 @@ EXAMPLE
        Nuke certificates ./src/match-nuke.ts!
 ```
 
-_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.7/src/commands/match-nuke.ts)_
+_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.10/src/commands/match-nuke.ts)_
 
 ## `rnbuilder sync-udids [BUILD]`
 
@@ -147,5 +147,5 @@ EXAMPLE
        Sync device UDIDs from firebase from ./src/firebase-sync-udids.ts!
 ```
 
-_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.7/src/commands/sync-udids.ts)_
+_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.10/src/commands/sync-udids.ts)_
 <!-- commandsstop -->

package/lib/commands/build.d.ts

@@ -15,7 +15,7 @@ export default class Build extends Command {
         name: string;
     }[];
     askForMissingFields: (flags: any) => Promise<any>;
-    updateAppVersion(targets: string[], client?: string, versionNumber?: string): void;
+    updateAppVersion(targets: string[], env: string, client?: string, versionNumber?: string): void;
     runPlatforms(target: string[], parameters: any, otherParams: any): void;
     run(): Promise<void>;
 }

package/lib/commands/build.js

@@ -12,7 +12,7 @@ class Build extends command_1.Command {
     constructor() {
         super(...arguments);
         this.askForMissingFields = async (flags) => {
-            const questions = [];
+            let questions = [];
             if (!flags.client) {
                 const clients = utils_1.getDirectories('./fastlane/clients');
                 if (clients.length > 0) {
@@ -65,8 +65,23 @@ class Build extends command_1.Command {
             if (result.branch) {
                 shell.exec(`git checkout ${result.branch} && git pull --rebase`);
             }
+            questions = [];
+            if (result.env === 'prod') {
+                questions.push({
+                    type: 'list',
+                    name: 'distribute',
+                    message: 'What would you like to distribute to?',
+                    default: 'store',
+                    choices: ['store', 'firebase'],
+                    filter(val) {
+                        return val.toLowerCase();
+                    },
+                });
+                const answers = await inquirer.prompt(questions);
+                result = Object.assign(Object.assign({}, result), answers);
+            }
             const postQuestions = [];
-            if (result.env !== 'prod') {
+            if (result.env !== 'prod' || result.distribute === 'firebase') {
                 postQuestions.push({
                     type: 'confirm',
                     name: 'firebase',
@@ -83,7 +98,7 @@ class Build extends command_1.Command {
                 }
             }
             else {
-                const appVersion = utils_1.getAppVersion(result.client, result.target);
+                const appVersion = utils_1.getAppVersion(result.env, result.client, result.target);
                 postQuestions.push({
                     type: 'input',
                     name: 'version_number',
@@ -136,10 +151,14 @@ class Build extends command_1.Command {
             return result;
         };
     }
-    updateAppVersion(targets, client, versionNumber) {
-        const appVersions = require(process.cwd() + '/app.json');
+    updateAppVersion(targets, env, client, versionNumber) {
+        let fileName = 'app';
+        if (env !== 'prod') {
+            fileName = `${fileName}.${env}`;
+        }
+        const appVersions = require(process.cwd() + `/${fileName}.json`);
         targets.forEach((t) => {
-            const appVersion = utils_1.getAppVersion(client, t);
+            const appVersion = utils_1.getAppVersion(env, client, t);
             const newVersion = Object.assign(Object.assign({}, appVersion), { build: appVersion.build + 1, buildDate: new Date().toDateString() });
             if (versionNumber) {
                 newVersion.version = versionNumber;
@@ -152,7 +171,7 @@ class Build extends command_1.Command {
             }
         });
         const json = JSON.stringify(appVersions, null, 2);
-        fs.writeFileSync(process.cwd() + '/app.json', json);
+        fs.writeFileSync(process.cwd() + `/${fileName}.json`, json);
     }
     runPlatforms(target, parameters, otherParams) {
         target.forEach((t) => {
@@ -166,11 +185,11 @@ class Build extends command_1.Command {
         const parameters = utils_1.buildKeyValuePairs(otherParams);
         if (client) {
             client.forEach((c) => {
-                this.updateAppVersion(target, c, otherParams.version_number);
+                this.updateAppVersion(target, otherParams.env, c, otherParams.version_number);
             });
         }
         else {
-            this.updateAppVersion(target, undefined, otherParams.version_number);
+            this.updateAppVersion(target, otherParams.env, undefined, otherParams.version_number);
         }
         shell.exec('git add . && git commit -m "bump version" && git push');
         shell.cd('fastlane');

package/lib/commands/codepush.js

@@ -58,7 +58,7 @@ class CodePush extends command_1.Command {
         if (client) {
             envPath += `/clients/${client}/fastlane`;
         }
-        const appVersion = utils_1.getAppVersion(client, target);
+        const appVersion = utils_1.getAppVersion(env, client, target);
         require('dotenv').config({ path: process.cwd() + '/' + envPath + '/.env' });
         const project = target === 'ios' ? process.env.CODE_PUSH_IOS_PROJECT : process.env.CODE_PUSH_ANDROID_PROJECT;
         shell.exec(`appcenter codepush release-react -a ${project} -d ${env === 'staging' ? 'Staging' : 'Production'} --target-binary-version ${appVersion.version} --token ${process.env.CODE_PUSH_TOKEN}`);

package/lib/utils.d.ts

@@ -1,6 +1,6 @@
 export declare const buildKeyValuePairs: (params: any) => string[];
 export declare const getDirectories: (path: string) => string[];
-export declare const getAppVersion: (client?: string | undefined, target?: string) => {
+export declare const getAppVersion: (env: string, client?: string | undefined, target?: string) => {
     version: string;
     build: number;
 };

package/lib/utils.js

@@ -16,8 +16,12 @@ const defaultVersion = {
     version: '0.0.1',
     build: 1,
 };
-exports.getAppVersion = (client, target = 'ios') => {
-    const appVersions = require(process.cwd() + '/app.json');
+exports.getAppVersion = (env, client, target = 'ios') => {
+    let fileName = 'app';
+    if (env !== 'prod') {
+        fileName = `${fileName}.${env}`;
+    }
+    const appVersions = require(process.cwd() + `/${fileName}.json`);
     let version = defaultVersion;
     if (client) {
         const clientVersion = appVersions[client];

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.5.7","commands":{"build":{"id":"build","description":"Build react native apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder build\nhello world from ./src/build.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Set client that you want to build app"},"target":{"name":"target","type":"option","char":"t","description":"Set the build target: android, ios or both","options":["android","ios"]},"env":{"name":"env","type":"option","char":"e","description":"Set the environment: prod, adhoc, staging","options":["staging","adhoc","prod"]},"branch":{"name":"branch","type":"option","char":"b","description":"Set the source branch used to build the app"},"version":{"name":"version","type":"option","char":"v","description":"Set the version number for this build"},"installr":{"name":"installr","type":"option","char":"i","description":"If enabled, the build will be uploaded to installR"}},"args":[{"name":"build"}]},"codepush":{"id":"codepush","description":"Push changes to existing apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder codepush\n    Push changes to existing apps ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to push update"}},"args":[{"name":"build"}]},"initialize":{"id":"initialize","description":"Initialize the environment for first run","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder initialize\ninitialize environment for first run from ./src/initialize.ts!\n"],"flags":{},"args":[]},"match-nuke":{"id":"match-nuke","description":"Nuke certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-nuke\n    Nuke certificates ./src/match-nuke.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]},"sync-udids":{"id":"sync-udids","description":"Sync device UDIDs from firebase","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder sync-udids\n    Sync device UDIDs from firebase from ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]}}}
+{"version":"0.5.10","commands":{"build":{"id":"build","description":"Build react native apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder build\nhello world from ./src/build.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Set client that you want to build app"},"target":{"name":"target","type":"option","char":"t","description":"Set the build target: android, ios or both","options":["android","ios"]},"env":{"name":"env","type":"option","char":"e","description":"Set the environment: prod, adhoc, staging","options":["staging","adhoc","prod"]},"branch":{"name":"branch","type":"option","char":"b","description":"Set the source branch used to build the app"},"version":{"name":"version","type":"option","char":"v","description":"Set the version number for this build"},"installr":{"name":"installr","type":"option","char":"i","description":"If enabled, the build will be uploaded to installR"}},"args":[{"name":"build"}]},"codepush":{"id":"codepush","description":"Push changes to existing apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder codepush\n    Push changes to existing apps ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to push update"}},"args":[{"name":"build"}]},"initialize":{"id":"initialize","description":"Initialize the environment for first run","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder initialize\ninitialize environment for first run from ./src/initialize.ts!\n"],"flags":{},"args":[]},"match-nuke":{"id":"match-nuke","description":"Nuke certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-nuke\n    Nuke certificates ./src/match-nuke.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]},"sync-udids":{"id":"sync-udids","description":"Sync device UDIDs from firebase","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder sync-udids\n    Sync device UDIDs from firebase from ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rnbuilder",
   "description": "React Native builder tool",
-  "version": "0.5.7",
+  "version": "0.5.10",
   "author": "Tuan Luong @r0b0t3d",
   "bin": {
     "rnbuilder": "./bin/run"