react-native-bootsplash 6.2.6 → 6.3.1

package/src/expo.ts

@@ -5,18 +5,18 @@ import { mergeContents } from "@expo/config-plugins/build/utils/generateCode";
 import path from "path";
 import { dedent } from "ts-dedent";
 import { Manifest } from ".";
-import { cleanIOSAssets, getExpoConfig, hfs } from "./generate";
+import { cleanIOSAssets, getExpoConfig, hfs, log } from "./generate";
 
-type ExpoPlugin = Expo.ConfigPlugin<{
+type Props = {
   assetsDir?: string;
   android?: {
     parentTheme?: "TransparentStatus" | "EdgeToEdge";
     darkContentBarsStyle?: boolean;
   };
-}>;
+};
 
 const withExpoVersionCheck =
-  (platform: "android" | "ios"): ExpoPlugin =>
+  (platform: "android" | "ios"): Expo.ConfigPlugin<Props> =>
   (config) =>
     Expo.withDangerousMod(config, [
       platform,
@@ -26,7 +26,7 @@ const withExpoVersionCheck =
       },
     ]);
 
-const withAndroidAssets: ExpoPlugin = (config, props) =>
+const withAndroidAssets: Expo.ConfigPlugin<Props> = (config, props) =>
   Expo.withDangerousMod(config, [
     "android",
     (config) => {
@@ -35,6 +35,12 @@ const withAndroidAssets: ExpoPlugin = (config, props) =>
 
       const srcDir = path.resolve(projectRoot, assetsDir, "android");
 
+      if (!hfs.exists(srcDir)) {
+        const error = `"${path.relative(projectRoot, srcDir)}" doesn't exist. Did you ran the asset generation command?`;
+        log.error(error);
+        process.exit(1);
+      }
+
       const destDir = path.resolve(
         platformProjectRoot,
         "app",
@@ -47,13 +53,15 @@ const withAndroidAssets: ExpoPlugin = (config, props) =>
         const srcDrawableDir = path.join(srcDir, drawableDir);
         const destDrawableDir = path.join(destDir, drawableDir);
 
-        hfs.ensureDir(destDrawableDir);
+        if (hfs.isDir(srcDrawableDir)) {
+          hfs.ensureDir(destDrawableDir);
 
-        for (const file of hfs.readDir(srcDrawableDir)) {
-          hfs.copy(
-            path.join(srcDrawableDir, file),
-            path.join(destDrawableDir, file),
-          );
+          for (const file of hfs.readDir(srcDrawableDir)) {
+            hfs.copy(
+              path.join(srcDrawableDir, file),
+              path.join(destDrawableDir, file),
+            );
+          }
         }
       }
 
@@ -61,7 +69,7 @@ const withAndroidAssets: ExpoPlugin = (config, props) =>
     },
   ]);
 
-const withAndroidManifest: ExpoPlugin = (config) =>
+const withAndroidManifest: Expo.ConfigPlugin<Props> = (config) =>
   Expo.withAndroidManifest(config, (config) => {
     config.modResults.manifest.application?.forEach((application) => {
       if (application.$["android:name"] === ".MainApplication") {
@@ -78,7 +86,7 @@ const withAndroidManifest: ExpoPlugin = (config) =>
     return config;
   });
 
-const withMainActivity: ExpoPlugin = (config) =>
+const withMainActivity: Expo.ConfigPlugin<Props> = (config) =>
   Expo.withMainActivity(config, (config) => {
     const { modResults } = config;
     const { language } = modResults;
@@ -113,7 +121,7 @@ const withMainActivity: ExpoPlugin = (config) =>
     };
   });
 
-const withAndroidStyles: ExpoPlugin = (config, props) =>
+const withAndroidStyles: Expo.ConfigPlugin<Props> = (config, props) =>
   Expo.withAndroidStyles(config, async (config) => {
     const { assetsDir = "assets/bootsplash", android = {} } = props;
     const { parentTheme, darkContentBarsStyle } = android;
@@ -182,7 +190,7 @@ const withAndroidStyles: ExpoPlugin = (config, props) =>
     };
   });
 
-const withAndroidColors: ExpoPlugin = (config, props) =>
+const withAndroidColors: Expo.ConfigPlugin<Props> = (config, props) =>
   Expo.withAndroidColors(config, async (config) => {
     const { assetsDir = "assets/bootsplash" } = props;
     const { projectRoot } = config.modRequest;
@@ -199,7 +207,7 @@ const withAndroidColors: ExpoPlugin = (config, props) =>
     return config;
   });
 
-const withAndroidColorsNight: ExpoPlugin = (config, props) =>
+const withAndroidColorsNight: Expo.ConfigPlugin<Props> = (config, props) =>
   Expo.withAndroidColorsNight(config, async (config) => {
     const { assetsDir = "assets/bootsplash" } = props;
     const { projectRoot } = config.modRequest;
@@ -218,7 +226,7 @@ const withAndroidColorsNight: ExpoPlugin = (config, props) =>
     return config;
   });
 
-const withIOSAssets: ExpoPlugin = (config, props) =>
+const withIOSAssets: Expo.ConfigPlugin<Props> = (config, props) =>
   Expo.withDangerousMod(config, [
     "ios",
     (config) => {
@@ -233,6 +241,12 @@ const withIOSAssets: ExpoPlugin = (config, props) =>
       const srcDir = path.resolve(projectRoot, assetsDir, "ios");
       const destDir = path.resolve(platformProjectRoot, projectName);
 
+      if (!hfs.exists(srcDir)) {
+        const error = `"${path.relative(projectRoot, srcDir)}" doesn't exist. Did you ran the asset generation command?`;
+        log.error(error);
+        process.exit(1);
+      }
+
       cleanIOSAssets(destDir);
 
       hfs.copy(
@@ -244,13 +258,15 @@ const withIOSAssets: ExpoPlugin = (config, props) =>
         const srcXcassetsDir = path.join(srcDir, xcassetsDir);
         const destXcassetsDir = path.join(destDir, xcassetsDir);
 
-        hfs.ensureDir(destXcassetsDir);
+        if (hfs.isDir(srcXcassetsDir)) {
+          hfs.ensureDir(destXcassetsDir);
 
-        for (const file of hfs.readDir(srcXcassetsDir)) {
-          hfs.copy(
-            path.join(srcXcassetsDir, file),
-            path.join(destXcassetsDir, file),
-          );
+          for (const file of hfs.readDir(srcXcassetsDir)) {
+            hfs.copy(
+              path.join(srcXcassetsDir, file),
+              path.join(destXcassetsDir, file),
+            );
+          }
         }
       }
 
@@ -258,7 +274,7 @@ const withIOSAssets: ExpoPlugin = (config, props) =>
     },
   ]);
 
-const withAppDelegate: ExpoPlugin = (config) =>
+const withAppDelegate: Expo.ConfigPlugin<Props> = (config) =>
   Expo.withAppDelegate(config, (config) => {
     const { modResults } = config;
     const { language } = modResults;
@@ -301,13 +317,13 @@ const withAppDelegate: ExpoPlugin = (config) =>
     };
   });
 
-const withInfoPlist: ExpoPlugin = (config) =>
+const withInfoPlist: Expo.ConfigPlugin<Props> = (config) =>
   Expo.withInfoPlist(config, (config) => {
     config.modResults["UILaunchStoryboardName"] = "BootSplash";
     return config;
   });
 
-const withXcodeProject: ExpoPlugin = (config) =>
+const withXcodeProject: Expo.ConfigPlugin<Props> = (config) =>
   Expo.withXcodeProject(config, (config) => {
     const { projectName = "" } = config.modRequest;
 
@@ -328,14 +344,14 @@ const withXcodeProject: ExpoPlugin = (config) =>
     return config;
   });
 
-const withoutExpoSplashScreen: ExpoPlugin = Expo.createRunOncePlugin(
-  (config) => config,
-  "expo-splash-screen",
-  "skip",
-);
+const withoutExpoSplashScreen: Expo.ConfigPlugin<Props> =
+  Expo.createRunOncePlugin((config) => config, "expo-splash-screen", "skip");
 
-export const withBootSplash: ExpoPlugin = (config, props = {}) => {
-  const plugins: ExpoPlugin[] = [];
+export const withBootSplash: Expo.ConfigPlugin<Props | undefined> = (
+  config,
+  props = {},
+) => {
+  const plugins: Expo.ConfigPlugin<Props>[] = [];
   const { platforms = [] } = config;
 
   plugins.push(withoutExpoSplashScreen);

package/src/generate.ts

@@ -1,10 +1,8 @@
 import * as Expo from "@expo/config-plugins";
 import plist from "@expo/plist";
+import { projectConfig as getAndroidProjectConfig } from "@react-native-community/cli-config-android";
+import { getProjectConfig as getAppleProjectConfig } from "@react-native-community/cli-config-apple";
 import { findProjectRoot } from "@react-native-community/cli-tools";
-import {
-  AndroidProjectConfig,
-  IOSProjectConfig,
-} from "@react-native-community/cli-types";
 import childProcess from "child_process";
 import crypto from "crypto";
 import detectIndent from "detect-indent";
@@ -26,6 +24,10 @@ import { Manifest } from ".";
 const workingPath = process.env.INIT_CWD ?? process.env.PWD ?? process.cwd();
 const projectRoot = findProjectRoot(workingPath);
 
+const getIOSProjectConfig = getAppleProjectConfig({ platformName: "ios" });
+const ios = getIOSProjectConfig(projectRoot, {});
+const android = getAndroidProjectConfig(projectRoot);
+
 type PackageJson = {
   version?: string;
   dependencies?: Record<string, string>;
@@ -416,7 +418,6 @@ const ensureSupportedFormat = async (
 };
 
 const getAndroidOutputPath = ({
-  android,
   assetsOutputPath,
   brandHeight,
   brandWidth,
@@ -426,7 +427,6 @@ const getAndroidOutputPath = ({
   logoWidth,
   platforms,
 }: {
-  android: AndroidProjectConfig | undefined;
   assetsOutputPath: string;
   brandHeight: number;
   brandWidth: number;
@@ -487,12 +487,10 @@ const getAndroidOutputPath = ({
 };
 
 const getIOSOutputPath = ({
-  ios,
   assetsOutputPath,
   isExpo,
   platforms,
 }: {
-  ios: IOSProjectConfig | undefined;
   assetsOutputPath: string;
   isExpo: boolean;
   platforms: Platforms;
@@ -627,8 +625,6 @@ const requireAddon = ():
 };
 
 export const generate = async ({
-  android,
-  ios,
   projectType,
   platforms,
   html,
@@ -636,9 +632,6 @@ export const generate = async ({
   licenseKey,
   ...args
 }: {
-  android?: AndroidProjectConfig;
-  ios?: IOSProjectConfig;
-
   logo: string;
   projectType: ProjectType;
   platforms: Platforms;
@@ -756,7 +749,6 @@ export const generate = async ({
   });
 
   const androidOutputPath = getAndroidOutputPath({
-    android,
     assetsOutputPath,
     brandHeight,
     brandWidth,
@@ -769,7 +761,6 @@ export const generate = async ({
 
   const iosOutputPath = getIOSOutputPath({
     assetsOutputPath,
-    ios,
     isExpo,
     platforms,
   });

package/dist/module/package.json

@@ -1 +0,0 @@
-{"type":"module"}