rnbuilder 0.5.26 → 0.5.28

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g rnbuilder
 $ rnbuilder COMMAND
 running command...
 $ rnbuilder (-v|--version|version)
-rnbuilder/0.5.26 darwin-arm64 node-v16.19.0
+rnbuilder/0.5.28 darwin-arm64 node-v16.19.0
 $ rnbuilder --help [COMMAND]
 USAGE
   $ rnbuilder COMMAND
@@ -49,6 +49,7 @@ OPTIONS
   -b, --branch=branch           Set the source branch used to build the app
   -c, --client=client           Set client that you want to build app
   -e, --env=staging|adhoc|prod  Set the environment: prod, adhoc, staging
+  -g, --ignore_git_reset        Ignore git reset when building
   -h, --help                    show CLI help
   -i, --installr=installr       If enabled, the build will be uploaded to installR
   -t, --target=android|ios      Set the build target: android, ios or both
@@ -59,7 +60,7 @@ EXAMPLE
   hello world from ./src/build.ts!
 ```
 
-_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.26/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.28/src/commands/build.ts)_
 
 ## `rnbuilder codepush [BUILD]`
 
@@ -78,7 +79,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.26/src/commands/codepush.ts)_
+_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.28/src/commands/codepush.ts)_
 
 ## `rnbuilder help [COMMAND]`
 
@@ -110,7 +111,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.26/src/commands/initialize.ts)_
+_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.28/src/commands/initialize.ts)_
 
 ## `rnbuilder match-nuke [BUILD]`
 
@@ -129,7 +130,7 @@ EXAMPLE
        Nuke certificates ./src/match-nuke.ts!
 ```
 
-_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.26/src/commands/match-nuke.ts)_
+_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.28/src/commands/match-nuke.ts)_
 
 ## `rnbuilder setup [SETUP]`
 
@@ -147,7 +148,7 @@ EXAMPLE
   hello world from ./src/setup.ts!
 ```
 
-_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.26/src/commands/setup.ts)_
+_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.28/src/commands/setup.ts)_
 
 ## `rnbuilder sync-udids [BUILD]`
 
@@ -166,5 +167,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.26/src/commands/sync-udids.ts)_
+_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.28/src/commands/sync-udids.ts)_
 <!-- commandsstop -->

package/lib/commands/build.d.ts

@@ -10,6 +10,7 @@ export default class Build extends Command {
         branch: flags.IOptionFlag<string | undefined>;
         version: flags.IOptionFlag<string | undefined>;
         installr: flags.IOptionFlag<string | undefined>;
+        ignore_git_reset: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
     };
     static args: {
         name: string;

package/lib/commands/build.js

@@ -197,14 +197,16 @@ class Build extends command_1.Command {
         const { client, target } = params, otherParams = tslib_1.__rest(params, ["client", "target"]);
         const jsonFile = this.getJsonFile(otherParams.env);
         const parameters = common_1.buildKeyValuePairs(Object.assign(Object.assign({}, otherParams), { json_file: jsonFile }));
-        shell.exec(`git reset --hard && git checkout ${params.branch} && git pull`);
-        shell.cd('fastlane');
-        shell.exec('bundle update --bundler');
-        shell.exec('bundle install');
-        shell.exec('bundle update fastlane');
-        shell.exec('bundle update cocoapods');
-        shell.cd('../');
-        shell.exec('yarn install && npx pod-install');
+        if (!flags.ignore_git_reset) {
+            shell.exec(`git reset --hard && git checkout ${params.branch} && git pull`);
+            shell.cd('fastlane');
+            shell.exec('bundle update --bundler');
+            shell.exec('bundle install');
+            shell.exec('bundle update fastlane');
+            shell.exec('bundle update cocoapods');
+            shell.cd('../');
+        }
+        shell.exec('yarn install');
         // Clean fastlane builds
         shell.exec('rm -rf fastlane/builds');
         // Clean android if any
@@ -213,6 +215,9 @@ class Build extends command_1.Command {
             shell.exec('./gradlew clean');
             shell.cd('../');
         }
+        if (target.includes('ios')) {
+            shell.exec('npx pod-install');
+        }
         if (client) {
             client.forEach((c) => {
                 shell.cd(`fastlane/clients/${c}`);
@@ -263,5 +268,9 @@ Build.flags = {
         char: 'i',
         description: 'If enabled, the build will be uploaded to installR',
     }),
+    ignore_git_reset: command_1.flags.boolean({
+        char: 'g',
+        description: 'Ignore git reset when building',
+    }),
 };
 Build.args = [{ name: 'build' }];

package/lib/utils/env.js

@@ -48,7 +48,8 @@ exports.saveEnvValues = (newValues, destFilePath) => {
  * @param {string} value Value to update/insert
  */
 exports.setEnvValue = (key, value, envVars) => {
-    envVars[key] = Object.assign(Object.assign({}, envVars[key]), { value });
+    envVars[key] = Object.assign(Object.assign({}, envVars[key]), { key,
+        value });
 };
 exports.updateServiceDomain = (envVars, domain) => {
     const result = {};
@@ -56,7 +57,7 @@ exports.updateServiceDomain = (envVars, domain) => {
         var _a;
         let data = envVars[key];
         if ((_a = data.value) === null || _a === void 0 ? void 0 : _a.includes('[domain]')) {
-            data = Object.assign(Object.assign({}, data), { value: data.value.replace('[domain]', domain) });
+            data = Object.assign(Object.assign({}, data), { key, value: data.value.replace('[domain]', domain) });
         }
         result[key] = data;
     });

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.5.26","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"}]},"setup":{"id":"setup","description":"Setup new client","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder build\nhello world from ./src/setup.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[{"name":"setup"}]},"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.28","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"},"ignore_git_reset":{"name":"ignore_git_reset","type":"boolean","char":"g","description":"Ignore git reset when building","allowNo":false}},"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"}]},"setup":{"id":"setup","description":"Setup new client","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder build\nhello world from ./src/setup.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[{"name":"setup"}]},"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.26",
+  "version": "0.5.28",
   "author": "Tuan Luong @r0b0t3d",
   "bin": {
     "rnbuilder": "./bin/run"