rnbuilder 0.5.24 → 0.5.25

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g rnbuilder
 $ rnbuilder COMMAND
 running command...
 $ rnbuilder (-v|--version|version)
-rnbuilder/0.5.24 darwin-arm64 node-v16.19.0
+rnbuilder/0.5.25 darwin-arm64 node-v16.19.0
 $ rnbuilder --help [COMMAND]
 USAGE
   $ rnbuilder COMMAND
@@ -59,7 +59,7 @@ EXAMPLE
   hello world from ./src/build.ts!
 ```
 
-_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.24/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.25/src/commands/build.ts)_
 
 ## `rnbuilder codepush [BUILD]`
 
@@ -78,7 +78,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.24/src/commands/codepush.ts)_
+_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.25/src/commands/codepush.ts)_
 
 ## `rnbuilder help [COMMAND]`
 
@@ -110,7 +110,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.24/src/commands/initialize.ts)_
+_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.25/src/commands/initialize.ts)_
 
 ## `rnbuilder match-nuke [BUILD]`
 
@@ -129,7 +129,7 @@ EXAMPLE
        Nuke certificates ./src/match-nuke.ts!
 ```
 
-_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.24/src/commands/match-nuke.ts)_
+_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.25/src/commands/match-nuke.ts)_
 
 ## `rnbuilder setup [SETUP]`
 
@@ -147,7 +147,7 @@ EXAMPLE
   hello world from ./src/setup.ts!
 ```
 
-_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.24/src/commands/setup.ts)_
+_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.25/src/commands/setup.ts)_
 
 ## `rnbuilder sync-udids [BUILD]`
 
@@ -166,5 +166,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.24/src/commands/sync-udids.ts)_
+_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.5.25/src/commands/sync-udids.ts)_
 <!-- commandsstop -->

package/lib/commands/build.js

@@ -205,6 +205,8 @@ class Build extends command_1.Command {
         shell.exec('bundle update cocoapods');
         shell.cd('../');
         shell.exec('yarn install && npx pod-install');
+        // Clean fastlane builds
+        shell.exec('rm -rf fastlane/builds');
         // Clean android if any
         if (target.includes('android')) {
             shell.cd('./android');

package/lib/commands/setup.js

@@ -11,6 +11,8 @@ const client_1 = require("../utils/setup/client");
 const env_1 = require("../utils/env");
 const apple_1 = require("../utils/setup/apple");
 const onesignal_1 = require("../utils/setup/onesignal");
+const common_1 = require("../utils/common");
+const fastlane_1 = require("../utils/setup/fastlane");
 class Setup extends command_1.Command {
     async run() {
         const envVars = env_1.readEnvVars(path.join(process.cwd(), 'template/env.template'));
@@ -79,6 +81,22 @@ class Setup extends command_1.Command {
         const prodEnvVars = env_1.updateServiceDomain(envVars, 'app');
         env_1.setEnvValue('APP_NAME', appName, prodEnvVars);
         env_1.saveEnvValues(prodEnvVars, path.join(process.cwd(), `/configs/${client}/.env.prod`));
+        // Setup fastlane
+        const { firebaseIosApp, firebaseAndroidApp } = await fastlane_1.setupFastlane({
+            client,
+        });
+        const fastlaneDir = path.join(process.cwd(), `fastlane/${client}/fastlane`);
+        const fastlaneEnvVars = env_1.readEnvVars(path.join(fastlaneDir, '/.env'));
+        env_1.setEnvValue('CLIENT', client, fastlaneEnvVars);
+        env_1.setEnvValue('APP_IDENTIFIER', bundleId, fastlaneEnvVars);
+        env_1.setEnvValue('APP_NAME', appName, fastlaneEnvVars);
+        env_1.setEnvValue('XCODEPROJ_SCHEME', `${client} prod`, fastlaneEnvVars);
+        env_1.setEnvValue('APPLE_TEAM_ID', appleTeamId, fastlaneEnvVars);
+        env_1.setEnvValue('ITC_TEAM_ID', itcTeamId, fastlaneEnvVars);
+        env_1.setEnvValue('FLAVOR', common_1.capitalize(client), fastlaneEnvVars);
+        env_1.setEnvValue('FIREBASE_IOS_APP', firebaseIosApp, fastlaneEnvVars);
+        env_1.setEnvValue('FIREBASE_ANDROID_APP', firebaseAndroidApp, fastlaneEnvVars);
+        env_1.saveEnvValues(fastlaneEnvVars, fastlaneDir + '/.env');
     }
 }
 exports.default = Setup;

package/lib/utils/common.d.ts

@@ -6,3 +6,4 @@ export declare const getAppVersion: (env: string, client?: string | undefined, t
 };
 export declare const copyDir: (src: string, dest: string) => Promise<unknown>;
 export declare const normalise: (input: string) => string;
+export declare const capitalize: (string: string) => string;

package/lib/utils/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalise = exports.copyDir = exports.getAppVersion = exports.getDirectories = exports.buildKeyValuePairs = void 0;
+exports.capitalize = exports.normalise = exports.copyDir = exports.getAppVersion = exports.getDirectories = exports.buildKeyValuePairs = void 0;
 const fs = require("fs");
 exports.buildKeyValuePairs = (params) => Object.keys(params).map(key => `${key}:${params[key]}`);
 exports.getDirectories = (path) => {
@@ -46,3 +46,6 @@ exports.copyDir = (src, dest) => new Promise((resolve, reject) => {
     });
 });
 exports.normalise = (input) => input.replace(/'/g, '').trim();
+exports.capitalize = (string) => {
+    return string.charAt(0).toUpperCase() + string.slice(1);
+};

package/lib/utils/setup/fastlane.d.ts

@@ -0,0 +1,4 @@
+export declare const setupFastlane: ({ client }: any) => Promise<{
+    firebaseIosApp: any;
+    firebaseAndroidApp: any;
+}>;

package/lib/utils/setup/fastlane.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupFastlane = void 0;
+const common_1 = require("../common");
+const path = require("path");
+const inquirer = require("inquirer");
+exports.setupFastlane = async ({ client }) => {
+    const fastlaneDir = path.join(process.cwd(), `fastlane/${client}/fastlane`);
+    // Copy template folders
+    await common_1.copyDir(path.join(process.cwd(), 'template/fastlane'), fastlaneDir);
+    const { firebaseServiceAccountFile, firebaseIosApp, firebaseAndroidApp, jsonKeyFile, } = inquirer.prompt([
+        {
+            type: 'input',
+            name: 'firebaseServiceAccountFile',
+            message: 'Firebase Service Account file?',
+        },
+        {
+            type: 'input',
+            name: 'firebaseIosApp',
+            message: 'What is Firebase iOS App Id?',
+        },
+        {
+            type: 'input',
+            name: 'firebaseAndroidApp',
+            message: 'What is Firebase Android App Id?',
+        },
+        {
+            type: 'input',
+            name: 'jsonKeyFile',
+            message: 'Path to json file? See https://docs.fastlane.tools/actions/supply/#setup',
+        },
+    ]);
+    if (firebaseServiceAccountFile) {
+        await common_1.copyDir(common_1.normalise(firebaseServiceAccountFile), path.join(fastlaneDir, 'firebase.json'));
+    }
+    if (jsonKeyFile) {
+        await common_1.copyDir(common_1.normalise(jsonKeyFile), path.join(fastlaneDir, '../key.json'));
+    }
+    return {
+        firebaseIosApp,
+        firebaseAndroidApp,
+    };
+};

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.5.24","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.25","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"}]}}}

package/package.json

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