rnbuilder 0.6.5 → 0.6.6

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g rnbuilder
 $ rnbuilder COMMAND
 running command...
 $ rnbuilder (-v|--version|version)
-rnbuilder/0.6.5 darwin-arm64 node-v16.19.0
+rnbuilder/0.6.6 darwin-arm64 node-v16.19.0
 $ rnbuilder --help [COMMAND]
 USAGE
   $ rnbuilder COMMAND
@@ -63,7 +63,7 @@ EXAMPLE
   hello world from ./src/build.ts!
 ```
 
-_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.5/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.6/src/commands/build.ts)_
 
 ## `rnbuilder codepush [BUILD]`
 
@@ -82,7 +82,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.5/src/commands/codepush.ts)_
+_See code: [src/commands/codepush.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.6/src/commands/codepush.ts)_
 
 ## `rnbuilder help [COMMAND]`
 
@@ -114,7 +114,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.5/src/commands/initialize.ts)_
+_See code: [src/commands/initialize.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.6/src/commands/initialize.ts)_
 
 ## `rnbuilder match-nuke [BUILD]`
 
@@ -133,7 +133,7 @@ EXAMPLE
        Nuke certificates ./src/match-nuke.ts!
 ```
 
-_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.5/src/commands/match-nuke.ts)_
+_See code: [src/commands/match-nuke.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.6/src/commands/match-nuke.ts)_
 
 ## `rnbuilder onesignal [BUILD]`
 
@@ -144,15 +144,18 @@ USAGE
   $ rnbuilder onesignal [BUILD]
 
 OPTIONS
-  -c, --client=client  Select client that you want to sync udids
-  -h, --help           show CLI help
+  -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.5/src/commands/onesignal.ts)_
+_See code: [src/commands/onesignal.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.6/src/commands/onesignal.ts)_
 
 ## `rnbuilder setup [SETUP]`
 
@@ -170,7 +173,7 @@ EXAMPLE
   hello world from ./src/setup.ts!
 ```
 
-_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.5/src/commands/setup.ts)_
+_See code: [src/commands/setup.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.6/src/commands/setup.ts)_
 
 ## `rnbuilder submit-review [SUBMIT-REVIEW]`
 
@@ -189,7 +192,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.5/src/commands/submit-review.ts)_
+_See code: [src/commands/submit-review.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.6/src/commands/submit-review.ts)_
 
 ## `rnbuilder sync-udids [BUILD]`
 
@@ -208,5 +211,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.5/src/commands/sync-udids.ts)_
+_See code: [src/commands/sync-udids.ts](https://github.com/r0b0t3d/rnbuilder/blob/v0.6.6/src/commands/sync-udids.ts)_
 <!-- commandsstop -->

package/lib/commands/build.js

@@ -228,6 +228,8 @@ class Build extends command_1.Command {
         else {
             shell.cd('fastlane');
             this.runPlatforms(target, parameters, otherParams);
+            shell.cd('..');
+            shell.exec('pwd');
         }
     }
 }

package/lib/commands/onesignal.d.ts

@@ -5,6 +5,9 @@ export default class OneSignalCertificate extends Command {
     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;

package/lib/commands/onesignal.js

@@ -1,5 +1,6 @@
 "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");
@@ -53,12 +54,13 @@ class OneSignalCertificate extends command_1.Command {
     async run() {
         const { flags } = this.parse(OneSignalCertificate);
         const params = await this.askForMissingFields(flags);
-        const { client } = params;
+        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');
+        shell.exec(`bundle exec fastlane sync_onesignal ${parameters.join(' ')}`);
     }
 }
 exports.default = OneSignalCertificate;
@@ -74,5 +76,10 @@ OneSignalCertificate.flags = {
         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/common.d.ts

@@ -5,6 +5,8 @@ export declare const getAppVersion: (env: string, client?: string | undefined, t
     build: number;
 };
 export declare const copyDir: (src: string, dest: string) => 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>;
 export declare const checkFileExists: (path: string) => boolean;
 export declare const normalise: (input: string) => string;

package/lib/utils/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalize = exports.normalise = exports.checkFileExists = exports.copyFile = exports.copyDir = exports.getAppVersion = exports.getDirectories = exports.buildKeyValuePairs = void 0;
+exports.capitalize = exports.normalise = exports.checkFileExists = exports.copyFile = exports.exists = exports.ensureDir = 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) => {
@@ -45,8 +45,13 @@ exports.copyDir = (src, dest) => new Promise((resolve, reject) => {
         }
     });
 });
+exports.ensureDir = (path) => {
+    if (!fs.existsSync(path)) {
+        fs.mkdirSync(path, { recursive: true });
+    }
+};
+exports.exists = (path) => fs.existsSync(path);
 exports.copyFile = (srcFile, destFile) => new Promise((resolve, reject) => {
-    console.log('Copy file', srcFile, destFile);
     fs.cp(srcFile, destFile, (err) => {
         if (err) {
             reject(err);

package/lib/utils/setup/fastlane.js

@@ -7,8 +7,10 @@ const inquirer = require("inquirer");
 exports.setupFastlane = async ({ client }) => {
     const clientDir = path.join(process.cwd(), `fastlane/clients/${client}`);
     const fastlaneDir = path.join(clientDir, 'fastlane');
-    // Copy template folders
-    await common_1.copyDir(path.join(process.cwd(), 'template/fastlane'), fastlaneDir);
+    if (!common_1.exists(fastlaneDir)) {
+        // Copy template folders
+        await common_1.copyDir(path.join(process.cwd(), 'template/fastlane'), fastlaneDir);
+    }
     const { firebaseServiceAccountFile, firebaseIosApp, firebaseAndroidApp, jsonKeyFile, } = await inquirer.prompt([
         {
             type: 'input',

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

@@ -89,10 +89,18 @@ exports.prepareLaunchScreen = async ({ iosAssetFolder, androidAssetFolder, }) =>
     }
     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'));
+            // Android
+            common_1.ensureDir(path.join(androidAssetFolder, 'layout'));
+            common_1.ensureDir(path.join(androidAssetFolder, 'drawable'));
+            await common_1.copyFile('./template/splash.xml', path.join(androidAssetFolder, 'layout/splash.xml'));
+            await sharp(inputFile)
+                .png()
+                .toFile(path.join(androidAssetFolder, 'drawable/splash.png'));
         }
     }
     return { launchScreen, launchScreenColor };

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.6.5","commands":{"build":{"id":"build","description":"Build react native apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder build\nhello world from ./src/build.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Set client that you want to build app"},"target":{"name":"target","type":"option","char":"t","description":"Set the build target: android, ios or both","options":["android","ios"]},"env":{"name":"env","type":"option","char":"e","description":"Set the environment: prod, adhoc, staging","options":["staging","adhoc","prod"]},"branch":{"name":"branch","type":"option","char":"b","description":"Set the source branch used to build the app"},"version":{"name":"version","type":"option","char":"v","description":"Set the version number for this build"},"installr":{"name":"installr","type":"option","char":"i","description":"If enabled, the build will be uploaded to installR"},"ignore_git_reset":{"name":"ignore_git_reset","type":"boolean","char":"g","description":"Ignore git reset when building","allowNo":false},"ignore_cleanup":{"name":"ignore_cleanup","type":"boolean","char":"s","description":"Ignore cleanup when building","allowNo":false}},"args":[{"name":"build"}]},"codepush":{"id":"codepush","description":"Push changes to existing apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder codepush\n    Push changes to existing apps ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to push update"}},"args":[{"name":"build"}]},"initialize":{"id":"initialize","description":"Initialize the environment for first run","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder initialize\ninitialize environment for first run from ./src/initialize.ts!\n"],"flags":{},"args":[]},"match-nuke":{"id":"match-nuke","description":"Nuke certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-nuke\n    Nuke certificates ./src/match-nuke.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]},"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"}},"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"}]},"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.6","commands":{"build":{"id":"build","description":"Build react native apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder build\nhello world from ./src/build.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Set client that you want to build app"},"target":{"name":"target","type":"option","char":"t","description":"Set the build target: android, ios or both","options":["android","ios"]},"env":{"name":"env","type":"option","char":"e","description":"Set the environment: prod, adhoc, staging","options":["staging","adhoc","prod"]},"branch":{"name":"branch","type":"option","char":"b","description":"Set the source branch used to build the app"},"version":{"name":"version","type":"option","char":"v","description":"Set the version number for this build"},"installr":{"name":"installr","type":"option","char":"i","description":"If enabled, the build will be uploaded to installR"},"ignore_git_reset":{"name":"ignore_git_reset","type":"boolean","char":"g","description":"Ignore git reset when building","allowNo":false},"ignore_cleanup":{"name":"ignore_cleanup","type":"boolean","char":"s","description":"Ignore cleanup when building","allowNo":false}},"args":[{"name":"build"}]},"codepush":{"id":"codepush","description":"Push changes to existing apps","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder codepush\n    Push changes to existing apps ./src/firebase-sync-udids.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to push update"}},"args":[{"name":"build"}]},"initialize":{"id":"initialize","description":"Initialize the environment for first run","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder initialize\ninitialize environment for first run from ./src/initialize.ts!\n"],"flags":{},"args":[]},"match-nuke":{"id":"match-nuke","description":"Nuke certificates","pluginName":"rnbuilder","pluginType":"core","aliases":[],"examples":["$ rnbuilder match-nuke\n    Nuke certificates ./src/match-nuke.ts!\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"client":{"name":"client","type":"option","char":"c","description":"Select client that you want to sync udids"}},"args":[{"name":"build"}]},"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"}]},"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.5",
+  "version": "0.6.6",
   "author": "Tuan Luong @r0b0t3d",
   "bin": {
     "rnbuilder": "./bin/run"