rnbuilder 0.6.80 → 0.6.82

package/README.md

@@ -40,7 +40,7 @@ $ npm install -g rnbuilder
 $ rnbuilder COMMAND
 running command...
 $ rnbuilder (-v|--version|version)
-rnbuilder/0.6.80 darwin-arm64 node-v24.13.0
+rnbuilder/0.6.82 darwin-arm64 node-v24.13.0
 $ rnbuilder --help [COMMAND]
 USAGE
   $ rnbuilder COMMAND
@@ -59,7 +59,6 @@ USAGE
 * [`rnbuilder initialize`](#rnbuilder-initialize)
 * [`rnbuilder match-check [MATCH-CHECK]`](#rnbuilder-match-check-match-check)
 * [`rnbuilder match-nuke [BUILD]`](#rnbuilder-match-nuke-build)
-* [`rnbuilder onesignal [BUILD]`](#rnbuilder-onesignal-build)
 * [`rnbuilder reject-review [REJECT-REVIEW]`](#rnbuilder-reject-review-reject-review)
 * [`rnbuilder setup [SETUP]`](#rnbuilder-setup-setup)
 * [`rnbuilder setup-gcp`](#rnbuilder-setup-gcp)
@@ -98,7 +97,7 @@ EXAMPLE
   hello world from ./src/build.ts!
 ```
 
-_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/build.ts)_
 
 ## `rnbuilder check-version [MATCH-CHECK]`
 
@@ -117,7 +116,7 @@ EXAMPLE
        Nuke certificates ./src/match-check.ts!
 ```
 
-_See code: [src/commands/check-version.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/check-version.ts)_
+_See code: [src/commands/check-version.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/check-version.ts)_
 
 ## `rnbuilder codepush [BUILD]`
 
@@ -136,7 +135,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.6.80/src/commands/codepush.ts)_
+_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/codepush.ts)_
 
 ## `rnbuilder google-key [MATCH-CHECK]`
 
@@ -155,7 +154,7 @@ EXAMPLE
        Nuke certificates ./src/match-check.ts!
 ```
 
-_See code: [src/commands/google-key.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/google-key.ts)_
+_See code: [src/commands/google-key.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/google-key.ts)_
 
 ## `rnbuilder help [COMMAND]`
 
@@ -187,7 +186,7 @@ EXAMPLE
   initialize environment for first run from ./src/initialize.ts!
 ```
 
-_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/initialize.ts)_
+_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/initialize.ts)_
 
 ## `rnbuilder match-check [MATCH-CHECK]`
 
@@ -206,7 +205,7 @@ EXAMPLE
        Check match certificates ./src/match-check.ts!
 ```
 
-_See code: [src/commands/match-check.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/match-check.ts)_
+_See code: [src/commands/match-check.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/match-check.ts)_
 
 ## `rnbuilder match-nuke [BUILD]`
 
@@ -225,29 +224,7 @@ EXAMPLE
        Nuke certificates ./src/match-nuke.ts!
 ```
 
-_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/match-nuke.ts)_
-
-## `rnbuilder onesignal [BUILD]`
-
-Create and upload push cerfiticate to One Signal
-
-```
-USAGE
-  $ rnbuilder onesignal [BUILD]
-
-OPTIONS
-  -c, --client=client                            Select client that you want to sync udids
-  -h, --help                                     show CLI help
-  --android_gcm_sender_id=android_gcm_sender_id
-  --android_token=android_token
-  --auth_token=auth_token                        Auth token for OneSignal
-
-EXAMPLE
-  $ rnbuilder onesignal
-       Create and upload push certificate to One Signal from ./src/commands/onesignal.ts!
-```
-
-_See code: [src/commands/onesignal.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/onesignal.ts)_
+_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/match-nuke.ts)_
 
 ## `rnbuilder reject-review [REJECT-REVIEW]`
 
@@ -265,7 +242,7 @@ EXAMPLE
   $ rnbuilder reject-review
 ```
 
-_See code: [src/commands/reject-review.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/reject-review.ts)_
+_See code: [src/commands/reject-review.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/reject-review.ts)_
 
 ## `rnbuilder setup [SETUP]`
 
@@ -283,7 +260,7 @@ EXAMPLE
   hello world from ./src/setup.ts!
 ```
 
-_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/setup.ts)_
+_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/setup.ts)_
 
 ## `rnbuilder setup-gcp`
 
@@ -297,7 +274,7 @@ OPTIONS
   -h, --help  show CLI help
 ```
 
-_See code: [src/commands/setup-gcp.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/setup-gcp.ts)_
+_See code: [src/commands/setup-gcp.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/setup-gcp.ts)_
 
 ## `rnbuilder submit-review [SUBMIT-REVIEW]`
 
@@ -316,7 +293,7 @@ EXAMPLE
        Push changes to existing apps ./src/firebase-sync-udids.ts!
 ```
 
-_See code: [src/commands/submit-review.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.80/src/commands/submit-review.ts)_
+_See code: [src/commands/submit-review.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/submit-review.ts)_
 
 ## `rnbuilder sync-udids [BUILD]`
 
@@ -335,5 +312,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.6.80/src/commands/sync-udids.ts)_
+_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.82/src/commands/sync-udids.ts)_
 <!-- commandsstop -->

package/lib/commands/setup.js

@@ -12,9 +12,9 @@ const launch_screen_1 = require("../utils/setup/launch-screen");
 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");
+const firebase_1 = require("../utils/setup/firebase");
 function addAppJsonEntry({ client, appName }) {
     const appJsonPath = path.join(process.cwd(), 'app.json');
     const appJson = common_1.checkFileExists(appJsonPath)
@@ -112,12 +112,7 @@ class Setup extends command_1.Command {
         env_1.setEnvValue('APPLICATION_ID', applicationId, prodEnvVars);
         env_1.saveEnvValues(prodEnvVars, prodEnvPath);
         // Setup fastlane
-        const { firebaseIosApp, firebaseAndroidApp } = await fastlane_1.setupFastlane({
-            client,
-            bundleId,
-            applicationId,
-            appName,
-        });
+        await fastlane_1.setupFastlane({ client });
         const fastlaneDir = path.join(process.cwd(), `fastlane/clients/${client}/fastlane`);
         const fastlaneEnvVars = env_1.readEnvVars(path.join(fastlaneDir, '/.env'));
         env_1.setEnvValue('CLIENT', client, fastlaneEnvVars);
@@ -138,25 +133,9 @@ class Setup extends command_1.Command {
             env_1.setEnvValue('ITC_TEAM_ID', itcTeamId, fastlaneEnvVars);
         }
         env_1.setEnvValue('FLAVOR', common_1.capitalize(client), fastlaneEnvVars);
-        if (firebaseIosApp) {
-            env_1.setEnvValue('FIREBASE_IOS_APP', firebaseIosApp, fastlaneEnvVars);
-        }
-        if (firebaseAndroidApp) {
-            env_1.setEnvValue('FIREBASE_ANDROID_APP', firebaseAndroidApp, fastlaneEnvVars);
-        }
         env_1.saveEnvValues(fastlaneEnvVars, fastlaneDir + '/.env');
-        // Onesignal — creates the push cert via fastlane, needs the client fastlane
-        // env (APPLE_TEAM_ID, APP_IDENTIFIER, CLIENT) already written above.
-        const { onesignal } = await onesignal_1.prepareOneSignal({
-            client,
-            fastlaneDir,
-            appleTeamId,
-            appName,
-        });
-        if (onesignal) {
-            env_1.setEnvValue('ONESIGNAL_APP_ID', onesignal, prodEnvVars);
-            env_1.saveEnvValues(prodEnvVars, prodEnvPath);
-        }
+        // Firebase apps + config files; needs the env files and fastlane .env written above.
+        await firebase_1.provisionFirebase({ client, fastlaneDir });
         addAppJsonEntry({ client, appName });
     }
 }

package/lib/utils/env.js

@@ -13,10 +13,16 @@ exports.readEnvVars = (envFilePath) => {
         if (!line) {
             return;
         }
-        const result = line.split('=');
-        envObject[result[0]] = {
-            key: result[0],
-            value: result[1],
+        const separatorIndex = line.indexOf('=');
+        // Comments and other lines without `=` are kept verbatim
+        if (line.trim().startsWith('#') || separatorIndex === -1) {
+            envObject[`__raw_${index}`] = { raw: line, order: index };
+            return;
+        }
+        const key = line.slice(0, separatorIndex);
+        envObject[key] = {
+            key,
+            value: line.slice(separatorIndex + 1),
             order: index,
         };
     });
@@ -33,7 +39,7 @@ exports.readEnvVars = (envFilePath) => {
 exports.saveEnvValues = (newValues, destFilePath) => {
     const payload = Object.values(newValues)
         .sort((a, b) => a.order - b.order)
-        .map((data) => `${data.key}=${data.value}`);
+        .map((data) => data.raw !== undefined ? data.raw : `${data.key}=${data.value}`);
     // write everything back to the file system
     const dirname = path.dirname(destFilePath);
     fs.mkdirSync(dirname, { recursive: true });

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

@@ -1,9 +1,3 @@
-export declare const setupFastlane: ({ client, bundleId, applicationId, appName, }: {
+export declare const setupFastlane: ({ client }: {
     client: string;
-    bundleId?: string | undefined;
-    applicationId?: string | undefined;
-    appName?: string | undefined;
-}) => Promise<{
-    firebaseIosApp: string;
-    firebaseAndroidApp: string;
-}>;
+}) => Promise<void>;

package/lib/utils/setup/fastlane.js

@@ -4,8 +4,7 @@ exports.setupFastlane = void 0;
 const common_1 = require("../common");
 const path = require("path");
 const inquirer = require("inquirer");
-const firebase_1 = require("./firebase");
-exports.setupFastlane = async ({ client, bundleId, applicationId, appName, }) => {
+exports.setupFastlane = async ({ client }) => {
     const clientDir = path.join(process.cwd(), `fastlane/clients/${client}`);
     const fastlaneDir = path.join(clientDir, 'fastlane');
     // Merge template files in without overwriting existing client files —
@@ -15,7 +14,7 @@ exports.setupFastlane = async ({ client, bundleId, applicationId, appName, }) =>
         {
             type: 'input',
             name: 'firebaseServiceAccountFile',
-            message: 'Firebase Service Account file?',
+            message: 'Firebase Service Account file (for App Distribution)?',
             default: process.env.FIREBASE_SERVICE_ACCOUNT_FILE,
         },
         {
@@ -24,86 +23,10 @@ exports.setupFastlane = async ({ client, bundleId, applicationId, appName, }) =>
             message: 'Path to Google json file? See https://docs.fastlane.tools/actions/supply/#setup',
         },
     ]);
-    let firebaseIosApp = '';
-    let firebaseAndroidApp = '';
-    const resolvedServiceAccount = common_1.normalise(firebaseServiceAccountFile) ||
-        process.env.FIREBASE_SERVICE_ACCOUNT_FILE;
-    if (resolvedServiceAccount) {
-        const { autoCreate } = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'autoCreate',
-                message: 'Auto-create Firebase apps?',
-                default: true,
-            },
-        ]);
-        if (autoCreate) {
-            const accessToken = await firebase_1.getAccessToken(resolvedServiceAccount);
-            const projectId = firebase_1.getProjectId(resolvedServiceAccount);
-            const displayName = appName || client;
-            console.log(`Creating Firebase apps in project ${projectId}...`);
-            const [iosAppId, androidAppId] = await Promise.all([
-                firebase_1.createFirebaseApp({
-                    accessToken,
-                    projectId,
-                    platform: 'ios',
-                    bundleId,
-                    displayName,
-                }),
-                firebase_1.createFirebaseApp({
-                    accessToken,
-                    projectId,
-                    platform: 'android',
-                    packageName: applicationId,
-                    displayName,
-                }),
-            ]);
-            firebaseIosApp = iosAppId;
-            firebaseAndroidApp = androidAppId;
-            console.log(`Firebase iOS App ID: ${iosAppId}`);
-            console.log(`Firebase Android App ID: ${androidAppId}`);
-        }
-        else {
-            const result = await inquirer.prompt([
-                {
-                    type: 'input',
-                    name: 'firebaseIosApp',
-                    message: 'What is Firebase iOS App Id?',
-                },
-                {
-                    type: 'input',
-                    name: 'firebaseAndroidApp',
-                    message: 'What is Firebase Android App Id?',
-                },
-            ]);
-            firebaseIosApp = result.firebaseIosApp;
-            firebaseAndroidApp = result.firebaseAndroidApp;
-        }
-    }
-    else {
-        const result = await inquirer.prompt([
-            {
-                type: 'input',
-                name: 'firebaseIosApp',
-                message: 'What is Firebase iOS App Id?',
-            },
-            {
-                type: 'input',
-                name: 'firebaseAndroidApp',
-                message: 'What is Firebase Android App Id?',
-            },
-        ]);
-        firebaseIosApp = result.firebaseIosApp;
-        firebaseAndroidApp = result.firebaseAndroidApp;
-    }
     if (firebaseServiceAccountFile) {
         await common_1.copyFile(common_1.normalise(firebaseServiceAccountFile), path.join(fastlaneDir, 'firebase.json'));
     }
     if (jsonKeyFile) {
         await common_1.copyFile(common_1.normalise(jsonKeyFile), path.join(clientDir, 'key.json'));
     }
-    return {
-        firebaseIosApp,
-        firebaseAndroidApp,
-    };
 };

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

@@ -1,10 +1,4 @@
-export declare function getProjectId(serviceAccountPath: string): string;
-export declare function getAccessToken(serviceAccountPath: string): Promise<string>;
-export declare function createFirebaseApp({ accessToken, projectId, platform, bundleId, packageName, displayName, }: {
-    accessToken: string;
-    projectId: string;
-    platform: 'ios' | 'android';
-    bundleId?: string;
-    packageName?: string;
-    displayName: string;
-}): Promise<string>;
+export declare const provisionFirebase: ({ client, fastlaneDir, }: {
+    client: string;
+    fastlaneDir: string;
+}) => Promise<void>;

package/lib/utils/setup/firebase.js

@@ -1,131 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFirebaseApp = exports.getAccessToken = exports.getProjectId = void 0;
-const crypto = require("crypto");
+exports.provisionFirebase = void 0;
 const fs = require("fs");
-const https = require("https");
-function base64url(input) {
-    const buf = typeof input === 'string' ? Buffer.from(input) : input;
-    return buf
-        .toString('base64')
-        .replace(/=/g, '')
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_');
-}
-function createJWT(serviceAccount) {
-    const now = Math.floor(Date.now() / 1000);
-    const header = base64url(JSON.stringify({ alg: 'RS256', typ: 'JWT' }));
-    const payload = base64url(JSON.stringify({
-        iss: serviceAccount.client_email,
-        scope: 'https://www.googleapis.com/auth/cloud-platform',
-        aud: 'https://oauth2.googleapis.com/token',
-        iat: now,
-        exp: now + 3600,
-    }));
-    const data = `${header}.${payload}`;
-    const sign = crypto.createSign('RSA-SHA256');
-    sign.update(data);
-    return `${data}.${base64url(sign.sign(serviceAccount.private_key))}`;
-}
-function httpsRequest(url, method, headers, body) {
-    return new Promise((resolve, reject) => {
-        const { hostname, pathname, search } = new URL(url);
-        const req = https.request({
-            hostname,
-            path: pathname + search,
-            method,
-            headers: body
-                ? Object.assign(Object.assign({}, headers), { 'Content-Length': Buffer.byteLength(body) }) : headers,
-        }, res => {
-            let raw = '';
-            res.on('data', chunk => (raw += chunk));
-            res.on('end', () => {
-                try {
-                    resolve(JSON.parse(raw));
-                }
-                catch (_a) {
-                    resolve(raw);
-                }
-            });
-        });
-        req.on('error', reject);
-        if (body)
-            req.write(body);
-        req.end();
+const inquirer = require("inquirer");
+const path = require("path");
+const shell = require("shelljs");
+// Firebase apps are provisioned by the project's own script with the operator's
+// `firebase login`. The client → Firebase project mapping lives in the project too.
+const CLIENTS_FILE = 'scripts/firebase-clients.json';
+const PROVISION_SCRIPT = 'scripts/firebase-provision.js';
+const pickProject = async (clients) => {
+    const counts = {};
+    Object.values(clients).forEach(({ project }) => {
+        counts[project] = (counts[project] || 0) + 1;
     });
-}
-function sleep(ms) {
-    return new Promise(r => setTimeout(r, ms));
-}
-async function pollOperation(operationName, accessToken) {
-    const url = `https://firebase.googleapis.com/v1beta1/${operationName}`;
-    for (let i = 0; i < 20; i++) {
-        await sleep(3000);
-        const op = await httpsRequest(url, 'GET', {
-            Authorization: `Bearer ${accessToken}`,
+    const { project } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'project',
+            message: 'Firebase project for this client? (2 apps per client, max 30 apps per project)',
+            choices: Object.keys(counts).map(p => ({
+                name: `${p} (${counts[p]} clients)`,
+                value: p,
+            })),
+        },
+    ]);
+    return project;
+};
+// Needs configs/<client>/.env.prod and fastlane/clients/<client>/fastlane/.env written:
+// the script reads the package / bundle IDs and writes FIREBASE_ANDROID_APP / FIREBASE_IOS_APP.
+exports.provisionFirebase = async ({ client, fastlaneDir, }) => {
+    const clientsPath = path.join(process.cwd(), CLIENTS_FILE);
+    if (!fs.existsSync(clientsPath) ||
+        !fs.existsSync(path.join(process.cwd(), PROVISION_SCRIPT))) {
+        throw new Error(`Firebase setup needs ${PROVISION_SCRIPT} and ${CLIENTS_FILE} in the project`);
+    }
+    const clients = JSON.parse(fs.readFileSync(clientsPath, 'utf-8'));
+    if (clients[client]) {
+        console.log(`${client} is mapped to ${clients[client].project}`);
+    }
+    else {
+        clients[client] = { project: await pickProject(clients) };
+        const sorted = {};
+        Object.keys(clients)
+            .sort()
+            .forEach(key => {
+            sorted[key] = clients[key];
         });
-        if (op.done) {
-            if (op.error)
-                throw new Error(`Firebase app creation failed: ${JSON.stringify(op.error)}`);
-            return op.response.appId;
-        }
+        fs.writeFileSync(clientsPath, JSON.stringify(sorted, null, 2) + '\n');
+    }
+    const result = shell.exec(`node ${PROVISION_SCRIPT} ${client}`);
+    if (result.code !== 0) {
+        console.warn(`Firebase provisioning failed; fix the error above and re-run: node ${PROVISION_SCRIPT} ${client}`);
     }
-    throw new Error('Firebase app creation timed out after 60s');
-}
-function getProjectId(serviceAccountPath) {
-    const sa = JSON.parse(fs.readFileSync(serviceAccountPath, 'utf-8'));
-    return sa.project_id;
-}
-exports.getProjectId = getProjectId;
-async function getAccessToken(serviceAccountPath) {
-    const sa = JSON.parse(fs.readFileSync(serviceAccountPath, 'utf-8'));
-    const jwt = createJWT(sa);
-    const body = new URLSearchParams({
-        grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-        assertion: jwt,
-    }).toString();
-    const result = await httpsRequest('https://oauth2.googleapis.com/token', 'POST', { 'Content-Type': 'application/x-www-form-urlencoded' }, body);
-    if (!result.access_token)
-        throw new Error(`Auth failed: ${JSON.stringify(result)}`);
-    return result.access_token;
-}
-exports.getAccessToken = getAccessToken;
-async function findExistingAppId({ accessToken, projectId, platform, bundleId, packageName, }) {
-    const endpoint = platform === 'ios' ? 'iosApps' : 'androidApps';
-    const result = await httpsRequest(`https://firebase.googleapis.com/v1beta1/projects/${projectId}/${endpoint}`, 'GET', { Authorization: `Bearer ${accessToken}` });
-    const apps = result.apps || [];
-    const match = platform === 'ios'
-        ? apps.find((app) => app.bundleId === bundleId)
-        : apps.find((app) => app.packageName === packageName);
-    return match === null || match === void 0 ? void 0 : match.appId;
-}
-async function createFirebaseApp({ accessToken, projectId, platform, bundleId, packageName, displayName, }) {
-    const endpoint = platform === 'ios' ? 'iosApps' : 'androidApps';
-    const payload = platform === 'ios'
-        ? { bundleId, displayName }
-        : { packageName, displayName };
-    const result = await httpsRequest(`https://firebase.googleapis.com/v1beta1/projects/${projectId}/${endpoint}`, 'POST', {
-        Authorization: `Bearer ${accessToken}`,
-        'Content-Type': 'application/json',
-    }, JSON.stringify(payload));
-    if (result.error) {
-        if (result.error.status === 'ALREADY_EXISTS') {
-            const existingAppId = await findExistingAppId({
-                accessToken,
-                projectId,
-                platform,
-                bundleId,
-                packageName,
-            });
-            if (existingAppId)
-                return existingAppId;
-        }
-        throw new Error(`Firebase API error: ${JSON.stringify(result.error)}`);
+    const { apnsKey } = await inquirer.prompt([
+        {
+            type: 'confirm',
+            name: 'apnsKey',
+            message: 'Create or reuse the APNs key via fastlane sync_apns_key now (Apple ID login)?',
+            default: true,
+        },
+    ]);
+    if (apnsKey) {
+        shell.exec('bundle exec fastlane sync_apns_key', { cwd: fastlaneDir });
     }
-    if (result.done)
-        return result.response.appId;
-    if (result.name)
-        return pollOperation(result.name, accessToken);
-    throw new Error(`Unexpected response: ${JSON.stringify(result)}`);
-}
-exports.createFirebaseApp = createFirebaseApp;
+};

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.6.80","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","android,ios"]},"env":{"name":"env","type":"option","char":"e","description":"Set the environment: prod, staging, dev"},"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"},"distribute":{"name":"distribute","type":"option","char":"d","description":"Specify where to distribute app"},"firebase":{"name":"firebase","type":"boolean","char":"f","description":"If enabled, the build will be uploaded to firebase","allowNo":false},"testersIos":{"name":"testersIos","type":"option","char":"t","description":"Tester ids for iOS distribution"},"testersAndroid":{"name":"testersAndroid","type":"option","char":"u","description":"Tester ids for Android distribution"},"gitReset":{"name":"gitReset","type":"boolean","char":"g","description":"Do git reset when building","allowNo":false},"cleanup":{"name":"cleanup","type":"boolean","char":"s","description":"Do cleanup when building","allowNo":false},"groupsIos":{"name":"groupsIos","type":"option","description":"Groups ids for iOS distribution"},"groupsAndroid":{"name":"groupsAndroid","type":"option","description":"Groups ids for Android distribution"},"skipCheckVersion":{"name":"skipCheckVersion","type":"boolean","description":"Skip checking current version on stores","allowNo":false},"install":{"name":"install","type":"boolean","char":"n","description":"Install dependencies before building","allowNo":false}},"args":[{"name":"build"}]},"check-version":{"id":"check-version","description":"Check live versions","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder check-version\n    Nuke certificates ./src/match-check.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":"match-check"}]},"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"}]},"google-key":{"id":"google-key","description":"Nuke certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-check\n    Nuke certificates ./src/match-check.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":"match-check"}]},"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-check":{"id":"match-check","description":"Check match certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-check\n    Check match certificates ./src/match-check.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 check match certificates"}},"args":[{"name":"match-check"}]},"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"}]},"onesignal":{"id":"onesignal","description":"Create and upload push cerfiticate to One Signal","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder onesignal\n    Create and upload push certificate to One Signal from ./src/commands/onesignal.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"},"auth_token":{"name":"auth_token","type":"option","description":"Auth token for OneSignal"},"android_token":{"name":"android_token","type":"option"},"android_gcm_sender_id":{"name":"android_gcm_sender_id","type":"option"}},"args":[{"name":"build"}]},"reject-review":{"id":"reject-review","description":"Reject current App Store review version (In Review or Pending Developer Release)","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder reject-review\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 to reject App Store review version"}},"args":[{"name":"reject-review"}]},"setup-gcp":{"id":"setup-gcp","description":"Setup GCP service account impersonation","pluginName":"rnbuilder","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"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"}]},"submit-review":{"id":"submit-review","description":"Submit ios for review","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder submit-review\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":"submit-review"}]},"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.6.82","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","android,ios"]},"env":{"name":"env","type":"option","char":"e","description":"Set the environment: prod, staging, dev"},"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"},"distribute":{"name":"distribute","type":"option","char":"d","description":"Specify where to distribute app"},"firebase":{"name":"firebase","type":"boolean","char":"f","description":"If enabled, the build will be uploaded to firebase","allowNo":false},"testersIos":{"name":"testersIos","type":"option","char":"t","description":"Tester ids for iOS distribution"},"testersAndroid":{"name":"testersAndroid","type":"option","char":"u","description":"Tester ids for Android distribution"},"gitReset":{"name":"gitReset","type":"boolean","char":"g","description":"Do git reset when building","allowNo":false},"cleanup":{"name":"cleanup","type":"boolean","char":"s","description":"Do cleanup when building","allowNo":false},"groupsIos":{"name":"groupsIos","type":"option","description":"Groups ids for iOS distribution"},"groupsAndroid":{"name":"groupsAndroid","type":"option","description":"Groups ids for Android distribution"},"skipCheckVersion":{"name":"skipCheckVersion","type":"boolean","description":"Skip checking current version on stores","allowNo":false},"install":{"name":"install","type":"boolean","char":"n","description":"Install dependencies before building","allowNo":false}},"args":[{"name":"build"}]},"check-version":{"id":"check-version","description":"Check live versions","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder check-version\n    Nuke certificates ./src/match-check.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":"match-check"}]},"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"}]},"google-key":{"id":"google-key","description":"Nuke certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-check\n    Nuke certificates ./src/match-check.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":"match-check"}]},"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-check":{"id":"match-check","description":"Check match certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-check\n    Check match certificates ./src/match-check.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 check match certificates"}},"args":[{"name":"match-check"}]},"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"}]},"reject-review":{"id":"reject-review","description":"Reject current App Store review version (In Review or Pending Developer Release)","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder reject-review\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 to reject App Store review version"}},"args":[{"name":"reject-review"}]},"setup-gcp":{"id":"setup-gcp","description":"Setup GCP service account impersonation","pluginName":"rnbuilder","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"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"}]},"submit-review":{"id":"submit-review","description":"Submit ios for review","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder submit-review\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":"submit-review"}]},"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.6.80",
+  "version": "0.6.82",
   "author": "Tuan Luong @r0b0t3d",
   "bin": "./bin/run",
   "bugs": "https://github.com/r0b0t3d/rnbuilder/issues",

package/lib/commands/onesignal.d.ts

@@ -1,17 +0,0 @@
-import { Command, flags } from '@oclif/command';
-export default class OneSignalCertificate extends Command {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
-        client: flags.IOptionFlag<string | undefined>;
-        auth_token: flags.IOptionFlag<string | undefined>;
-        android_token: flags.IOptionFlag<string | undefined>;
-        android_gcm_sender_id: flags.IOptionFlag<string | undefined>;
-    };
-    static args: {
-        name: string;
-    }[];
-    askForMissingFields: (flags: any) => Promise<any>;
-    run(): Promise<void>;
-}

package/lib/commands/onesignal.js

@@ -1,85 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-/* eslint-disable no-negated-condition */
-const command_1 = require("@oclif/command");
-const shell = require("shelljs");
-const inquirer = require("inquirer");
-const common_1 = require("../utils/common");
-inquirer.registerPrompt('checkbox-plus', require('inquirer-checkbox-plus-prompt'));
-class OneSignalCertificate extends command_1.Command {
-    constructor() {
-        super(...arguments);
-        this.askForMissingFields = async (flags) => {
-            const questions = [];
-            if (!flags.client) {
-                const clients = common_1.getDirectories('./fastlane/clients');
-                if (clients.length > 0) {
-                    questions.push({
-                        type: 'checkbox-plus',
-                        name: 'client',
-                        message: 'What is the client?',
-                        pageSize: 100,
-                        highlight: true,
-                        searchable: true,
-                        default: [],
-                        source: (answersSoFar, input) => {
-                            input = input || '';
-                            return new Promise(resolve => {
-                                const result = clients.filter(client => client.includes(input.toLowerCase()));
-                                resolve(result);
-                            });
-                        },
-                        validate: (input) => {
-                            return new Promise(resolve => {
-                                if (input.length === 0) {
-                                    resolve('You need to select at least 1 client');
-                                }
-                                else {
-                                    resolve(true);
-                                }
-                            });
-                        },
-                    });
-                }
-            }
-            let result = flags;
-            if (questions.length > 0) {
-                const answers = await inquirer.prompt(questions);
-                result = Object.assign(Object.assign({}, flags), answers);
-            }
-            return result;
-        };
-    }
-    async run() {
-        const { flags } = this.parse(OneSignalCertificate);
-        const params = await this.askForMissingFields(flags);
-        const { client } = params, otherParams = tslib_1.__rest(params, ["client"]);
-        const parameters = common_1.buildKeyValuePairs(otherParams);
-        shell.exec('bundle install');
-        if (client) {
-            shell.cd(`fastlane/clients/${client}`);
-        }
-        shell.exec(`bundle exec fastlane sync_onesignal ${parameters.join(' ')}`);
-    }
-}
-exports.default = OneSignalCertificate;
-OneSignalCertificate.description = 'Create and upload push cerfiticate to One Signal';
-OneSignalCertificate.examples = [
-    `$ rnbuilder onesignal
-    Create and upload push certificate to One Signal from ./src/commands/onesignal.ts!
-`,
-];
-OneSignalCertificate.flags = {
-    help: command_1.flags.help({ char: 'h' }),
-    client: command_1.flags.string({
-        char: 'c',
-        description: 'Select client that you want to sync udids',
-    }),
-    auth_token: command_1.flags.string({
-        description: 'Auth token for OneSignal',
-    }),
-    android_token: command_1.flags.string(),
-    android_gcm_sender_id: command_1.flags.string(),
-};
-OneSignalCertificate.args = [{ name: 'build' }];

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

@@ -1,9 +0,0 @@
-export declare const prepareOneSignal: ({ client, fastlaneDir, appleTeamId, appName, }: {
-    client: string;
-    fastlaneDir: string;
-    appleTeamId?: string | undefined;
-    appName?: string | undefined;
-}) => Promise<{
-    onesignal?: string | undefined;
-    onesignalRestApiKey?: string | undefined;
-}>;

package/lib/utils/setup/onesignal.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareOneSignal = void 0;
-const inquirer = require("inquirer");
-const shell = require("shelljs");
-const common_1 = require("../common");
-function parseValue(output, key) {
-    var _a;
-    const match = output.match(new RegExp(`^(?:\\[\\d{2}:\\d{2}:\\d{2}\\]:\\s*)?${key}=(.*)$`, 'm'));
-    const value = (_a = match === null || match === void 0 ? void 0 : match[1]) === null || _a === void 0 ? void 0 : _a.trim();
-    return value ? value : undefined;
-}
-async function askAppIdManually() {
-    const { onesignal } = await inquirer.prompt([
-        {
-            type: 'input',
-            name: 'onesignal',
-            message: 'What is OneSignal App Id?',
-        },
-    ]);
-    return { onesignal, onesignalRestApiKey: undefined };
-}
-exports.prepareOneSignal = async ({ client, fastlaneDir, appleTeamId, appName, }) => {
-    const fastlaneConfigs = common_1.getFastlaneConfigs();
-    let authToken = fastlaneConfigs.onesignalAuthToken;
-    if (!authToken) {
-        const { inputToken } = await inquirer.prompt([
-            {
-                type: 'input',
-                name: 'inputToken',
-                message: 'OneSignal Organization Auth Token (add "onesignalAuthToken" to fastlane/configs.json to skip this prompt)?',
-            },
-        ]);
-        authToken = inputToken;
-    }
-    if (!authToken) {
-        return askAppIdManually();
-    }
-    const { autoCreate } = await inquirer.prompt([
-        {
-            type: 'confirm',
-            name: 'autoCreate',
-            message: `Create OneSignal app "${client}" + push certificate via fastlane now?`,
-            default: true,
-        },
-    ]);
-    if (!autoCreate) {
-        return askAppIdManually();
-    }
-    let teamId = appleTeamId;
-    if (!teamId) {
-        const { inputTeamId } = await inquirer.prompt([
-            {
-                type: 'input',
-                name: 'inputTeamId',
-                message: 'Apple Developer Team ID (for the push certificate)?',
-            },
-        ]);
-        teamId = inputTeamId;
-    }
-    const organizationId = fastlaneConfigs.onesignalOrganizationId;
-    const parameters = common_1.buildKeyValuePairs(Object.assign(Object.assign(Object.assign({ auth_token: authToken }, (appName ? { app_name: appName } : {})), (organizationId ? { organization_id: organizationId } : {})), (teamId ? { team_id: teamId } : {})));
-    // shell.exec('bundle install', { cwd: fastlaneDir } as any);
-    const result = shell.exec(`bundle exec fastlane sync_onesignal ${parameters.join(' ')}`, { cwd: fastlaneDir });
-    const output = `${result.stdout}\n${result.stderr}`;
-    const onesignal = parseValue(output, 'ONESIGNAL_APP_ID');
-    const onesignalRestApiKey = parseValue(output, 'ONESIGNAL_APP_AUTH_KEY');
-    if (!onesignal) {
-        console.warn('Could not parse OneSignal App Id from fastlane output — check the logs above and set ONESIGNAL_APP_ID manually if needed.');
-    }
-    return { onesignal, onesignalRestApiKey };
-};