react-native-bootsplash 5.0.0-beta.1 → 5.0.0-beta.3

package/dist/typescript/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAEhB,MAAM,mCAAmC,CAAC;AAI3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAInC,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE;QACH,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,iBAAiB,QACwB,CAAC;AA0GvD,eAAO,MAAM,GAAG;kBACA,MAAM;iBACP,MAAM;mBACJ,MAAM,QAAQ,MAAM;iBAEtB,MAAM;CACpB,CAAC;AAEF,eAAO,MAAM,QAAQ,aACT,MAAM,eACH;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,SAK7C,CAAC;AAwFJ,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IAEnB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,EAAE,KAAK,CAAC;IAClB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IAEzB,cAAc,EAAE,KAAK,GAAG,SAAS,CAAC;IAClC,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;CAC9B,CAAC;AAaF,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAiWA,CAAC"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAEhB,MAAM,mCAAmC,CAAC;AAK3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAkB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAK/D,eAAO,MAAM,iBAAiB,QACwB,CAAC;AAEvD,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1C,CAAC;AA+EF,eAAO,MAAM,GAAG;kBACA,MAAM;iBACP,MAAM;mBACJ,MAAM,QAAQ,MAAM;iBAEtB,MAAM;CACpB,CAAC;AAEF,eAAO,MAAM,QAAQ,aACT,MAAM,eACH;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,SAK7C,CAAC;AAEJ,eAAO,MAAM,SAAS,SAAU,MAAM,QAAQ,MAAM,SAOnD,CAAC;AAEF,eAAO,MAAM,QAAQ,SACb,MAAM,OACP,MAAM,YACD,mBAAmB,SAkB9B,CAAC;AAwFF,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IAEnB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,EAAE,KAAK,CAAC;IAClB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IAEzB,cAAc,EAAE,KAAK,GAAG,SAAS,CAAC;IAClC,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;CAC9B,CAAC;AAaF,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CA6VA,CAAC"}

package/dist/typescript/index.d.ts

@@ -10,7 +10,6 @@ export type Manifest = {
         height: number;
     };
     brand?: {
-        bottom: number;
         width: number;
         height: number;
     };

package/dist/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,kBAAkB,EAGlB,SAAS,EAGV,MAAM,cAAc,CAAC;AAGtB,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,CAAC,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,QAAQ,CAAC;IAEnB,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAC3B,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAE/B,OAAO,EAAE,MAAM,IAAI,CAAC;IAEpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,wBAAgB,IAAI,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGvD;AAED,wBAAgB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAE5C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,oBAqJ9D;;;;;;AAED,wBAIE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,kBAAkB,EAGlB,SAAS,EAGV,MAAM,cAAc,CAAC;AAGtB,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,CAAC,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,QAAQ,CAAC;IAEnB,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAC3B,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAE/B,OAAO,EAAE,MAAM,IAAI,CAAC;IAEpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,wBAAgB,IAAI,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGvD;AAED,wBAAgB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAE5C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,oBAmJ9D;;;;;;AAED,wBAIE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootsplash",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.3",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",
@@ -9,12 +9,16 @@
   "module": "dist/module/index.js",
   "types": "dist/typescript/index.d.ts",
   "files": [
-    "/android",
-    "/dist",
-    "/ios",
-    "/src",
+    "dist",
+    "android",
+    "ios",
+    "src",
+    "!android/build",
+    "!android/.cxx",
+    "!android/.gradle",
+    "!ios/build",
+    "!src/addon",
     "RNBootSplash.podspec",
-    "package.json",
     "react-native.config.js"
   ],
   "repository": {
@@ -60,9 +64,11 @@
     "react-native": ">=0.70.0"
   },
   "dependencies": {
+    "detect-indent": "^6.1.0",
     "fs-extra": "^11.1.1",
     "picocolors": "^1.0.0",
-    "sharp": "^0.32.4"
+    "sharp": "^0.32.4",
+    "xml-formatter": "^3.5.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

package/src/generate.ts

@@ -3,26 +3,24 @@ import {
   CommandFunction,
   IOSProjectConfig,
 } from "@react-native-community/cli-types";
+import detectIndent from "detect-indent";
 import fs from "fs-extra";
 import path from "path";
 import pc from "picocolors";
 import type { Sharp } from "sharp";
 import sharp from "sharp";
+import xmlFormat, { XMLFormatterOptions } from "xml-formatter";
 import type { Manifest } from ".";
 
-export type Color = {
-  hex: string;
-  rgb: {
-    R: string;
-    G: string;
-    B: string;
-  };
-};
+const workingPath = process.env.INIT_CWD ?? process.env.PWD ?? process.cwd();
 
 export const androidColorRegex =
   /<color name="bootsplash_background">#\w+<\/color>/g;
 
-const workingPath = process.env.INIT_CWD ?? process.env.PWD ?? process.cwd();
+export type Color = {
+  hex: string;
+  rgb: { R: string; G: string; B: string };
+};
 
 const parseColor = (value: string): Color => {
   const up = value.toUpperCase().replace(/[^0-9A-F]/g, "");
@@ -42,31 +40,6 @@ const parseColor = (value: string): Color => {
   return { hex, rgb };
 };
 
-const ContentsJson = `{
-  "images": [
-    {
-      "idiom": "universal",
-      "filename": "bootsplash_logo.png",
-      "scale": "1x"
-    },
-    {
-      "idiom": "universal",
-      "filename": "bootsplash_logo@2x.png",
-      "scale": "2x"
-    },
-    {
-      "idiom": "universal",
-      "filename": "bootsplash_logo@3x.png",
-      "scale": "3x"
-    }
-  ],
-  "info": {
-    "author": "xcode",
-    "version": 1
-  }
-}
-`;
-
 const getStoryboard = ({
   logoHeight,
   logoWidth,
@@ -143,6 +116,38 @@ export const logWrite = (
       (dimensions != null ? ` (${dimensions.width}x${dimensions.height})` : ""),
   );
 
+export const writeJson = (file: string, json: object) => {
+  const amount = fs.existsSync(file)
+    ? detectIndent(fs.readFileSync(file, "utf-8")).amount || 2
+    : 2;
+
+  fs.writeFileSync(file, JSON.stringify(json, null, amount) + "\n", "utf-8");
+  logWrite(file);
+};
+
+export const writeXml = (
+  file: string,
+  xml: string,
+  options?: XMLFormatterOptions,
+) => {
+  const indentation = fs.existsSync(file)
+    ? detectIndent(fs.readFileSync(file, "utf-8")).indent || "    "
+    : "    ";
+
+  fs.writeFileSync(
+    file,
+    xmlFormat(xml, {
+      collapseContent: true,
+      ...options,
+      indentation,
+      lineSeparator: "\n",
+    }) + "\n",
+    "utf-8",
+  );
+
+  logWrite(file);
+};
+
 const ensureSupportedFormat = async (
   name: string,
   image: Sharp | undefined,
@@ -278,6 +283,14 @@ export const generate: CommandFunction<{
   { project: { android, ios } },
   { flavor, platforms, licenseKey, ...args },
 ) => {
+  const [nodeStringVersion = ""] = process.versions.node.split(".");
+  const nodeVersion = parseInt(nodeStringVersion, 10);
+
+  if (!isNaN(nodeVersion) && nodeVersion < 18) {
+    log.error("Requires Node 18 (or higher)");
+    process.exit(1);
+  }
+
   if (argsLogo == null) {
     log.error("Missing required argument 'logo'");
     process.exit(1);
@@ -402,32 +415,15 @@ export const generate: CommandFunction<{
     if (fs.existsSync(colorsXmlPath)) {
       const colorsXml = fs.readFileSync(colorsXmlPath, "utf-8");
 
-      if (colorsXml.match(androidColorRegex)) {
-        fs.writeFileSync(
-          colorsXmlPath,
-          colorsXml.replace(androidColorRegex, colorsXmlEntry),
-          "utf-8",
-        );
-      } else {
-        fs.writeFileSync(
-          colorsXmlPath,
-          colorsXml.replace(
-            /<\/resources>/g,
-            `    ${colorsXmlEntry}\n</resources>`,
-          ),
-          "utf-8",
-        );
-      }
+      const nextXml = colorsXml.match(androidColorRegex)
+        ? colorsXml.replace(androidColorRegex, colorsXmlEntry)
+        : colorsXml.replace(/<\/resources>/g, `${colorsXmlEntry}</resources>`);
+
+      writeXml(colorsXmlPath, nextXml);
     } else {
-      fs.writeFileSync(
-        colorsXmlPath,
-        `<resources>\n    ${colorsXmlEntry}\n</resources>\n`,
-        "utf-8",
-      );
+      writeXml(colorsXmlPath, `<resources>${colorsXmlEntry}</resources>`);
     }
 
-    logWrite(colorsXmlPath);
-
     await Promise.all(
       [
         { ratio: 1, suffix: "mdpi" },
@@ -511,11 +507,29 @@ export const generate: CommandFunction<{
 
     fs.ensureDirSync(imageSetPath);
 
-    fs.writeFileSync(
-      path.resolve(imageSetPath, "Contents.json"),
-      ContentsJson,
-      "utf-8",
-    );
+    writeJson(path.resolve(imageSetPath, "Contents.json"), {
+      images: [
+        {
+          idiom: "universal",
+          filename: "bootsplash_logo.png",
+          scale: "1x",
+        },
+        {
+          idiom: "universal",
+          filename: "bootsplash_logo@2x.png",
+          scale: "2x",
+        },
+        {
+          idiom: "universal",
+          filename: "bootsplash_logo@3x.png",
+          scale: "3x",
+        },
+      ],
+      info: {
+        author: "xcode",
+        version: 1,
+      },
+    });
 
     await Promise.all(
       [
@@ -545,26 +559,13 @@ export const generate: CommandFunction<{
 
     fs.ensureDirSync(assetsOutputPath);
 
-    const manifest: Manifest = {
+    writeJson(path.resolve(assetsOutputPath, "bootsplash_manifest.json"), {
       background: background.hex,
       logo: {
         width: logoWidth,
         height: logoHeight,
       },
-    };
-
-    const manifestPath = path.resolve(
-      assetsOutputPath,
-      "bootsplash_manifest.json",
-    );
-
-    fs.writeFileSync(
-      manifestPath,
-      JSON.stringify(manifest, null, 2) + "\n",
-      "utf-8",
-    );
-
-    logWrite(manifestPath);
+    } satisfies Manifest);
 
     await Promise.all(
       [

package/src/index.ts

@@ -22,7 +22,6 @@ export type Manifest = {
     height: number;
   };
   brand?: {
-    bottom: number;
     width: number;
     height: number;
   };
@@ -75,7 +74,6 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
   const hasBrand = manifest.brand != null && brandSrc != null;
   const logoWidth = manifest.logo.width;
   const logoHeight = manifest.logo.height;
-  const brandBottom = manifest.brand?.bottom;
   const brandWidth = manifest.brand?.width;
   const brandHeight = manifest.brand?.height;
 
@@ -158,7 +156,7 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
             source: brandFinalSrc,
             style: {
               position: "absolute",
-              bottom: brandBottom,
+              bottom: 60,
               width: brandWidth,
               height: brandHeight,
             },
@@ -195,7 +193,6 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
 
     logoWidth,
     logoHeight,
-    brandBottom,
     brandWidth,
     brandHeight,