rnbuilder 0.6.72 → 0.6.74

package/README.md

@@ -40,7 +40,7 @@ $ npm install -g rnbuilder
 $ rnbuilder COMMAND
 running command...
 $ rnbuilder (-v|--version|version)
-rnbuilder/0.6.72 darwin-arm64 node-v24.13.0
+rnbuilder/0.6.74 darwin-arm64 node-v24.13.0
 $ rnbuilder --help [COMMAND]
 USAGE
   $ rnbuilder COMMAND
@@ -98,7 +98,7 @@ EXAMPLE
   hello world from ./src/build.ts!
 ```
 
-_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.72/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/build.ts)_
 
 ## `rnbuilder check-version [MATCH-CHECK]`
 
@@ -117,7 +117,7 @@ EXAMPLE
        Nuke certificates ./src/match-check.ts!
 ```
 
-_See code: [src/commands/check-version.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.72/src/commands/check-version.ts)_
+_See code: [src/commands/check-version.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/check-version.ts)_
 
 ## `rnbuilder codepush [BUILD]`
 
@@ -136,7 +136,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.72/src/commands/codepush.ts)_
+_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/codepush.ts)_
 
 ## `rnbuilder google-key [MATCH-CHECK]`
 
@@ -155,7 +155,7 @@ EXAMPLE
        Nuke certificates ./src/match-check.ts!
 ```
 
-_See code: [src/commands/google-key.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.72/src/commands/google-key.ts)_
+_See code: [src/commands/google-key.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/google-key.ts)_
 
 ## `rnbuilder help [COMMAND]`
 
@@ -187,7 +187,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.72/src/commands/initialize.ts)_
+_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/initialize.ts)_
 
 ## `rnbuilder match-check [MATCH-CHECK]`
 
@@ -206,7 +206,7 @@ EXAMPLE
        Check match certificates ./src/match-check.ts!
 ```
 
-_See code: [src/commands/match-check.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.72/src/commands/match-check.ts)_
+_See code: [src/commands/match-check.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/match-check.ts)_
 
 ## `rnbuilder match-nuke [BUILD]`
 
@@ -225,7 +225,7 @@ EXAMPLE
        Nuke certificates ./src/match-nuke.ts!
 ```
 
-_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.72/src/commands/match-nuke.ts)_
+_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/match-nuke.ts)_
 
 ## `rnbuilder onesignal [BUILD]`
 
@@ -247,7 +247,7 @@ EXAMPLE
        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.72/src/commands/onesignal.ts)_
+_See code: [src/commands/onesignal.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/onesignal.ts)_
 
 ## `rnbuilder reject-review [REJECT-REVIEW]`
 
@@ -265,7 +265,7 @@ EXAMPLE
   $ rnbuilder reject-review
 ```
 
-_See code: [src/commands/reject-review.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.72/src/commands/reject-review.ts)_
+_See code: [src/commands/reject-review.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/reject-review.ts)_
 
 ## `rnbuilder setup [SETUP]`
 
@@ -283,7 +283,7 @@ EXAMPLE
   hello world from ./src/setup.ts!
 ```
 
-_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.72/src/commands/setup.ts)_
+_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/setup.ts)_
 
 ## `rnbuilder setup-gcp`
 
@@ -297,7 +297,7 @@ OPTIONS
   -h, --help  show CLI help
 ```
 
-_See code: [src/commands/setup-gcp.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.72/src/commands/setup-gcp.ts)_
+_See code: [src/commands/setup-gcp.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/setup-gcp.ts)_
 
 ## `rnbuilder submit-review [SUBMIT-REVIEW]`
 
@@ -316,7 +316,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.72/src/commands/submit-review.ts)_
+_See code: [src/commands/submit-review.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/submit-review.ts)_
 
 ## `rnbuilder sync-udids [BUILD]`
 
@@ -335,5 +335,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.72/src/commands/sync-udids.ts)_
+_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.74/src/commands/sync-udids.ts)_
 <!-- commandsstop -->

package/lib/commands/setup.js

@@ -52,6 +52,7 @@ class Setup extends command_1.Command {
         // shell.exec(`mkdir configs/${client}`);
         const { appIconFile } = await app_icon_1.prepareAppIcon({
             iosAssetFolder,
+            androidAssetFolder,
         });
         const { launchScreen, launchScreenColor } = await launch_screen_1.prepareLaunchScreen({
             iosAssetFolder,
@@ -64,11 +65,9 @@ class Setup extends command_1.Command {
         if (launchScreenColor) {
             env_1.setEnvValue('LAUNCH_SCREEN_BACKGROUND_COLOR', launchScreenColor, envVars);
         }
-        // Onesignal
-        const { onesignal } = await onesignal_1.prepareOneSignal();
-        if (onesignal) {
-            env_1.setEnvValue('ONESIGNAL_APP_ID', onesignal, envVars);
-        }
+        const devEnvPath = path.join(process.cwd(), `/configs/${client}/.env.dev`);
+        const stagingEnvPath = path.join(process.cwd(), `/configs/${client}/.env.staging`);
+        const prodEnvPath = path.join(process.cwd(), `/configs/${client}/.env.prod`);
         // Store dev env
         env_1.setEnvValue('ENV', 'dev', envVars);
         const devEnvVars = env_1.updateServiceDomain(envVars, 'app');
@@ -77,7 +76,7 @@ class Setup extends command_1.Command {
         }
         env_1.setEnvValue('BUNDLE_ID', `${bundleId}.dev`, devEnvVars);
         env_1.setEnvValue('APPLICATION_ID', `${applicationId}.dev`, devEnvVars);
-        env_1.saveEnvValues(devEnvVars, path.join(process.cwd(), `/configs/${client}/.env.dev`));
+        env_1.saveEnvValues(devEnvVars, devEnvPath);
         // Store staging env
         env_1.setEnvValue('ENV', 'staging', envVars);
         const stagingEnvVars = env_1.updateServiceDomain(envVars, 'app');
@@ -86,7 +85,7 @@ class Setup extends command_1.Command {
         }
         env_1.setEnvValue('BUNDLE_ID', `${bundleId}.staging`, stagingEnvVars);
         env_1.setEnvValue('APPLICATION_ID', `${applicationId}.staging`, stagingEnvVars);
-        env_1.saveEnvValues(stagingEnvVars, path.join(process.cwd(), `/configs/${client}/.env.staging`));
+        env_1.saveEnvValues(stagingEnvVars, stagingEnvPath);
         // Store prod env
         env_1.setEnvValue('ENV', 'prod', envVars);
         const prodEnvVars = env_1.updateServiceDomain(envVars, 'com');
@@ -95,7 +94,7 @@ class Setup extends command_1.Command {
         }
         env_1.setEnvValue('BUNDLE_ID', bundleId, prodEnvVars);
         env_1.setEnvValue('APPLICATION_ID', applicationId, prodEnvVars);
-        env_1.saveEnvValues(prodEnvVars, path.join(process.cwd(), `/configs/${client}/.env.prod`));
+        env_1.saveEnvValues(prodEnvVars, prodEnvPath);
         // Setup fastlane
         const { firebaseIosApp, firebaseAndroidApp } = await fastlane_1.setupFastlane({
             client,
@@ -110,7 +109,7 @@ class Setup extends command_1.Command {
             env_1.setEnvValue('APP_IDENTIFIER', bundleId, fastlaneEnvVars);
         }
         if (applicationId) {
-            env_1.setEnvValue('APP_IDENTIFIER_ANDROID', bundleId, fastlaneEnvVars);
+            env_1.setEnvValue('APP_IDENTIFIER_ANDROID', applicationId, fastlaneEnvVars);
         }
         if (appName) {
             env_1.setEnvValue('APP_NAME', appName, fastlaneEnvVars);
@@ -130,6 +129,25 @@ class Setup extends command_1.Command {
             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, onesignalRestApiKey } = await onesignal_1.prepareOneSignal({
+            client,
+            fastlaneDir,
+        });
+        if (onesignal) {
+            env_1.setEnvValue('ONESIGNAL_APP_ID', onesignal, devEnvVars);
+            env_1.setEnvValue('ONESIGNAL_APP_ID', onesignal, stagingEnvVars);
+            env_1.setEnvValue('ONESIGNAL_APP_ID', onesignal, prodEnvVars);
+            env_1.saveEnvValues(devEnvVars, devEnvPath);
+            env_1.saveEnvValues(stagingEnvVars, stagingEnvPath);
+            env_1.saveEnvValues(prodEnvVars, prodEnvPath);
+            env_1.setEnvValue('ONESIGNAL_APP_ID', onesignal, fastlaneEnvVars);
+            if (onesignalRestApiKey) {
+                env_1.setEnvValue('ONESIGNAL_REST_API_KEY', onesignalRestApiKey, fastlaneEnvVars);
+            }
+            env_1.saveEnvValues(fastlaneEnvVars, fastlaneDir + '/.env');
+        }
     }
 }
 exports.default = Setup;

package/lib/utils/common.d.ts

@@ -6,7 +6,7 @@ export declare const getAppVersion: (env: string, client?: string | undefined, t
     version: string;
     build: number;
 };
-export declare const copyDir: (src: string, dest: string) => Promise<unknown>;
+export declare const copyDir: (src: string, dest: string, force?: boolean) => Promise<unknown>;
 export declare const ensureDir: (path: string) => void;
 export declare const exists: (path: string) => boolean;
 export declare const copyFile: (srcFile: string, destFile: string) => Promise<unknown>;

package/lib/utils/common.js

@@ -50,8 +50,8 @@ exports.getAppVersion = (env, client, target = 'ios') => {
     }
     return version;
 };
-exports.copyDir = (src, dest) => new Promise((resolve, reject) => {
-    fs.cp(src, dest, { recursive: true }, (err) => {
+exports.copyDir = (src, dest, force = true) => new Promise((resolve, reject) => {
+    fs.cp(src, dest, { recursive: true, force }, (err) => {
         if (err) {
             reject(err);
         }

package/lib/utils/setup/android-icon.d.ts

@@ -0,0 +1,4 @@
+export declare function generateAndroidIcons({ sourceFile, androidAssetFolder, }: {
+    sourceFile: string;
+    androidAssetFolder: string;
+}): Promise<void>;

package/lib/utils/setup/android-icon.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateAndroidIcons = void 0;
+const fs = require("fs");
+const path = require("path");
+const sharp = require("sharp");
+const common_1 = require("../common");
+const DENSITIES = [
+    { folder: 'mdpi', scale: 1 },
+    { folder: 'hdpi', scale: 1.5 },
+    { folder: 'xhdpi', scale: 2 },
+    { folder: 'xxhdpi', scale: 3 },
+    { folder: 'xxxhdpi', scale: 4 },
+];
+const LEGACY_BASE_SIZE = 48;
+const ADAPTIVE_CANVAS_BASE_SIZE = 108;
+const ADAPTIVE_SAFE_ZONE_BASE_SIZE = 66;
+const NOTIFICATION_BASE_SIZE = 24;
+const ADAPTIVE_ICON_XML = `<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
+`;
+function circleMask(size) {
+    return Buffer.from(`<svg width="${size}" height="${size}"><circle cx="${size / 2}" cy="${size / 2}" r="${size / 2}" fill="#fff"/></svg>`);
+}
+async function generateLegacyIcons(sourceFile, mipmapDir, size) {
+    const square = await sharp(sourceFile).resize(size, size).png().toBuffer();
+    await sharp(square).toFile(path.join(mipmapDir, 'ic_launcher.png'));
+    await sharp(square)
+        .composite([{ input: circleMask(size), blend: 'dest-in' }])
+        .png()
+        .toFile(path.join(mipmapDir, 'ic_launcher_round.png'));
+}
+async function generateAdaptiveLayers(sourceFile, mipmapDir, canvasSize, safeZoneSize) {
+    await sharp({
+        create: { width: canvasSize, height: canvasSize, channels: 4, background: { r: 255, g: 255, b: 255, alpha: 1 } },
+    })
+        .png()
+        .toFile(path.join(mipmapDir, 'ic_launcher_background.png'));
+    const offset = Math.round((canvasSize - safeZoneSize) / 2);
+    const foreground = await sharp(sourceFile).resize(safeZoneSize, safeZoneSize).toBuffer();
+    await sharp({
+        create: { width: canvasSize, height: canvasSize, channels: 4, background: { r: 0, g: 0, b: 0, alpha: 0 } },
+    })
+        .composite([{ input: foreground, left: offset, top: offset }])
+        .png()
+        .toFile(path.join(mipmapDir, 'ic_launcher_foreground.png'));
+}
+// Notification icons must be a white silhouette on transparent. If the source
+// has an alpha channel we use it directly (correct shape); otherwise we fall
+// back to a luminance threshold, which assumes a dark mark on a light background.
+async function buildSilhouetteMask(sourceFile, size) {
+    const meta = await sharp(sourceFile).metadata();
+    if (meta.hasAlpha) {
+        return sharp(sourceFile).resize(size, size).ensureAlpha().png().toBuffer();
+    }
+    const alphaChannel = await sharp(sourceFile)
+        .resize(size, size)
+        .greyscale()
+        .negate()
+        .threshold(128)
+        .toBuffer();
+    const rgb = await sharp({
+        create: { width: size, height: size, channels: 3, background: { r: 255, g: 255, b: 255 } },
+    })
+        .png()
+        .toBuffer();
+    return sharp(rgb).joinChannel(alphaChannel).png().toBuffer();
+}
+async function generateNotificationIcon(sourceFile, drawableDir, size) {
+    const mask = await buildSilhouetteMask(sourceFile, size);
+    const white = await sharp({
+        create: { width: size, height: size, channels: 4, background: { r: 255, g: 255, b: 255, alpha: 1 } },
+    })
+        .png()
+        .toBuffer();
+    await sharp(white)
+        .composite([{ input: mask, blend: 'dest-in' }])
+        .png()
+        .toFile(path.join(drawableDir, 'ic_notification.png'));
+}
+async function generateAndroidIcons({ sourceFile, androidAssetFolder, }) {
+    const anydpiDir = path.join(androidAssetFolder, 'mipmap-anydpi-v26');
+    common_1.ensureDir(anydpiDir);
+    fs.writeFileSync(path.join(anydpiDir, 'ic_launcher.xml'), ADAPTIVE_ICON_XML, 'utf-8');
+    fs.writeFileSync(path.join(anydpiDir, 'ic_launcher_round.xml'), ADAPTIVE_ICON_XML, 'utf-8');
+    for (const { folder, scale } of DENSITIES) {
+        const mipmapDir = path.join(androidAssetFolder, `mipmap-${folder}`);
+        const drawableDir = path.join(androidAssetFolder, `drawable-${folder}`);
+        common_1.ensureDir(mipmapDir);
+        common_1.ensureDir(drawableDir);
+        await generateLegacyIcons(sourceFile, mipmapDir, Math.round(LEGACY_BASE_SIZE * scale));
+        await generateAdaptiveLayers(sourceFile, mipmapDir, Math.round(ADAPTIVE_CANVAS_BASE_SIZE * scale), Math.round(ADAPTIVE_SAFE_ZONE_BASE_SIZE * scale));
+        await generateNotificationIcon(sourceFile, drawableDir, Math.round(NOTIFICATION_BASE_SIZE * scale));
+    }
+    console.log(`Generated Android launcher + adaptive + notification icons in ${androidAssetFolder}`);
+    console.log('Note: reference "ic_notification" from AndroidManifest.xml / push SDK config manually if not already wired.');
+}
+exports.generateAndroidIcons = generateAndroidIcons;

package/lib/utils/setup/app-icon.d.ts

@@ -1,3 +1,3 @@
-export declare const prepareAppIcon: ({ iosAssetFolder }: any) => Promise<{
+export declare const prepareAppIcon: ({ iosAssetFolder, androidAssetFolder }: any) => Promise<{
     appIconFile: string;
 }>;

package/lib/utils/setup/app-icon.js

@@ -5,29 +5,27 @@ const inquirer = require("inquirer");
 const path = require("path");
 const sharp = require("sharp");
 const common_1 = require("../common");
-exports.prepareAppIcon = async ({ iosAssetFolder }) => {
+const android_icon_1 = require("./android-icon");
+exports.prepareAppIcon = async ({ iosAssetFolder, androidAssetFolder }) => {
     const questions = [
-        {
-            type: 'confirm',
-            name: 'android-icon',
-            message: 'It is recommend to use Android Studio to create App icon and notification icon for android',
-        },
         {
             type: 'input',
             name: 'appIconFile',
-            message: 'App Icon file for iOS?',
+            message: 'App Icon file (1024x1024, used for iOS + Android)?',
         },
     ];
     const { appIconFile } = await inquirer.prompt(questions);
     if (appIconFile) {
+        const normalisedIcon = common_1.normalise(appIconFile);
         // Generate app icon for ios
         // Copy template files
         await common_1.copyDir('./template/AppIcon.appiconset', path.join(iosAssetFolder, 'AppIcon.appiconset'));
-        await sharp(common_1.normalise(appIconFile))
+        await sharp(normalisedIcon)
             .resize(1024, 1024)
             .png()
             .removeAlpha()
             .toFile(path.join(iosAssetFolder, 'AppIcon.appiconset/ItunesArtwork@2x.png'));
+        await android_icon_1.generateAndroidIcons({ sourceFile: normalisedIcon, androidAssetFolder });
     }
     return { appIconFile: common_1.normalise(appIconFile) };
 };

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

@@ -1 +1,7 @@
-export declare const getAppleTeam: () => Promise<any>;
+export declare const getAppleTeam: () => Promise<{
+    appleTeamId?: undefined;
+    itcTeamId?: undefined;
+} | {
+    appleTeamId: any;
+    itcTeamId: any;
+}>;

package/lib/utils/setup/apple.js

@@ -3,6 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppleTeam = void 0;
 const inquirer = require("inquirer");
 const shell = require("shelljs");
+function stripAnsi(input) {
+    // eslint-disable-next-line no-control-regex
+    return input.replace(/\x1b\[[0-9;]*m/g, '');
+}
+function parseTeamIds(output, sectionHeader) {
+    const startIdx = output.indexOf(sectionHeader);
+    if (startIdx === -1)
+        return [];
+    const rest = output.slice(startIdx + sectionHeader.length);
+    const nextSectionIdx = rest.indexOf('----');
+    const section = nextSectionIdx === -1 ? rest : rest.slice(0, nextSectionIdx);
+    const matches = [...section.matchAll(/([^\r\n(]+?)\s+\(([A-Za-z0-9]+)\)/g)];
+    return matches.map(m => ({ name: m[1].trim(), id: m[2] }));
+}
+async function resolveTeamId(candidates, label) {
+    if (candidates.length === 0)
+        return undefined;
+    if (candidates.length === 1)
+        return candidates[0].id;
+    const { chosen } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'chosen',
+            message: `Multiple ${label} found — pick one:`,
+            choices: candidates.map(c => ({ name: `${c.name} (${c.id})`, value: c.id })),
+        },
+    ]);
+    return chosen;
+}
 exports.getAppleTeam = async () => {
     const { account } = await inquirer.prompt([
         {
@@ -21,17 +50,35 @@ exports.getAppleTeam = async () => {
             message: 'What is Apple team name (using for searching)?',
         },
     ]);
-    shell.exec(`fastlane get_team_names search:${team} id:${account}`);
-    return inquirer.prompt([
-        {
+    const result = shell.exec(`fastlane get_team_names search:${team} id:${account}`);
+    const output = stripAnsi(`${result.stdout}\n${result.stderr}`);
+    const devTeams = parseTeamIds(output, 'Developer teams for');
+    const itcTeams = parseTeamIds(output, 'Appstore Connect teams for');
+    const appleTeamId = await resolveTeamId(devTeams, 'Apple Developer teams');
+    const itcTeamId = await resolveTeamId(itcTeams, 'App Store Connect teams');
+    if (appleTeamId && itcTeamId) {
+        return { appleTeamId, itcTeamId };
+    }
+    const manualQuestions = [];
+    if (!appleTeamId) {
+        manualQuestions.push({
             type: 'input',
             name: 'appleTeamId',
             message: 'What is Developer Team Id?',
-        },
-        {
+        });
+    }
+    if (!itcTeamId) {
+        manualQuestions.push({
             type: 'input',
             name: 'itcTeamId',
             message: 'What is Appstore Connect Team Id?',
-        },
-    ]);
+        });
+    }
+    const manual = manualQuestions.length
+        ? await inquirer.prompt(manualQuestions)
+        : {};
+    return {
+        appleTeamId: appleTeamId || manual.appleTeamId,
+        itcTeamId: itcTeamId || manual.itcTeamId,
+    };
 };

package/lib/utils/setup/fastlane.js

@@ -8,9 +8,9 @@ const firebase_1 = require("./firebase");
 exports.setupFastlane = async ({ client, bundleId, applicationId, appName, }) => {
     const clientDir = path.join(process.cwd(), `fastlane/clients/${client}`);
     const fastlaneDir = path.join(clientDir, 'fastlane');
-    if (!common_1.exists(fastlaneDir)) {
-        await common_1.copyDir(path.join(process.cwd(), 'template/fastlane'), fastlaneDir);
-    }
+    // Merge template files in without overwriting existing client files —
+    // fills gaps left by a partial/previous setup run (e.g. missing .env).
+    await common_1.copyDir(path.join(process.cwd(), 'template/fastlane'), fastlaneDir, false);
     const { firebaseServiceAccountFile, jsonKeyFile } = await inquirer.prompt([
         {
             type: 'input',

package/lib/utils/setup/firebase.js

@@ -90,6 +90,15 @@ async function getAccessToken(serviceAccountPath) {
     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'
@@ -99,8 +108,20 @@ async function createFirebaseApp({ accessToken, projectId, platform, bundleId, p
         Authorization: `Bearer ${accessToken}`,
         'Content-Type': 'application/json',
     }, JSON.stringify(payload));
-    if (result.error)
+    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)}`);
+    }
     if (result.done)
         return result.response.appId;
     if (result.name)

package/lib/utils/setup/launch-screen.js

@@ -53,14 +53,14 @@ exports.prepareLaunchScreen = async ({ iosAssetFolder, androidAssetFolder, fallb
                 .png()
                 .toFile(path.join(iosAssetFolder, 'BootSplashLogo.imageset/bootsplash_logo.png'));
         }
-        else if (launchScreen === 'fullscreen') {
-            if (inputFile) {
-                // ios
-                await common_1.copyDir('./template/BootSplashImage.imageset', path.join(iosAssetFolder, 'BootSplashImage.imageset'));
-                await sharp(inputFile)
-                    .png()
-                    .toFile(path.join(iosAssetFolder, 'BootSplashImage.imageset/splashTablet.png'));
-            }
+    }
+    else if (launchScreen === 'fullscreen') {
+        if (inputFile) {
+            // ios
+            await common_1.copyDir('./template/BootSplashImage.imageset', path.join(iosAssetFolder, 'BootSplashImage.imageset'));
+            await sharp(inputFile)
+                .png()
+                .toFile(path.join(iosAssetFolder, 'BootSplashImage.imageset/splashTablet.png'));
         }
     }
     // There is no full screen for android, so generate icon

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

@@ -1,3 +1,7 @@
-export declare const prepareOneSignal: () => Promise<any> & {
-    ui: import("inquirer/lib/ui/prompt");
-};
+export declare const prepareOneSignal: ({ client, fastlaneDir, }: {
+    client: string;
+    fastlaneDir: string;
+}) => Promise<{
+    onesignal?: string | undefined;
+    onesignalRestApiKey?: string | undefined;
+}>;

package/lib/utils/setup/onesignal.js

@@ -2,12 +2,71 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareOneSignal = void 0;
 const inquirer = require("inquirer");
-exports.prepareOneSignal = () => {
-    return inquirer.prompt([
+const shell = require("shelljs");
+const common_1 = require("../common");
+function parseValue(output, key) {
+    var _a;
+    const match = output.match(new RegExp(`^${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, }) => {
+    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();
+    }
+    const { androidToken, androidGcmSenderId } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'androidToken',
+            message: 'Android GCM key (optional)?',
+        },
+        {
+            type: 'input',
+            name: 'androidGcmSenderId',
+            message: 'Android GCM Sender Id (optional)?',
+        },
+    ]);
+    const parameters = common_1.buildKeyValuePairs(Object.assign(Object.assign({ auth_token: authToken }, (androidToken ? { android_token: androidToken } : {})), (androidGcmSenderId ? { android_gcm_sender_id: androidGcmSenderId } : {})));
+    // 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 };
 };

package/oclif.manifest.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rnbuilder",
   "description": "React Native builder tool",
-  "version": "0.6.72",
+  "version": "0.6.74",
   "author": "Tuan Luong @r0b0t3d",
   "bin": "./bin/run",
   "bugs": "https://github.com/r0b0t3d/rnbuilder/issues",