react-native-bootsplash 7.0.1 → 7.1.0-beta.0

package/package.json

@@ -1,13 +1,37 @@
 {
   "name": "react-native-bootsplash",
-  "version": "7.0.1",
+  "version": "7.1.0-beta.0",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",
   "homepage": "https://github.com/zoontek/react-native-bootsplash",
-  "main": "dist/commonjs/index.js",
-  "module": "dist/module/index.js",
-  "types": "dist/typescript/index.d.ts",
+  "main": "./dist/commonjs/index.js",
+  "module": "./dist/module/index.js",
+  "types": "./dist/typescript/commonjs/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/typescript/module/index.d.ts",
+        "default": "./dist/module/index.js"
+      },
+      "require": {
+        "types": "./dist/typescript/commonjs/index.d.ts",
+        "default": "./dist/commonjs/index.js"
+      }
+    },
+    "./expo": {
+      "import": {
+        "types": "./dist/typescript/module/extras/expo.d.ts",
+        "default": "./dist/module/extras/expo.js"
+      },
+      "require": {
+        "types": "./dist/typescript/commonjs/extras/expo.d.ts",
+        "default": "./dist/commonjs/extras/expo.js"
+      }
+    },
+    "./package.json": "./package.json",
+    "./app.plugin.js": "./app.plugin.js"
+  },
   "files": [
     "dist",
     "android",
@@ -17,11 +41,10 @@
     "!android/.cxx",
     "!android/.gradle",
     "!ios/build",
-    "!src/addon",
+    "!src/extras/addon",
     "RNBootSplash.podspec",
-    "app.plugin.js",
     "cli.js",
-    "react-native.config.js"
+    "app.plugin.js"
   ],
   "bin": "./cli.js",
   "repository": {
@@ -45,16 +68,26 @@
     "format": "prettier '**/*' -u -w",
     "lint": "oxlint",
     "typecheck": "tsc --noEmit",
-    "build": "yarn clean && bob build && rm -rf dist/*/package.json",
+    "build": "yarn clean && bob build",
     "prepack": "prettier '**/*' -u -c && yarn lint && yarn typecheck && yarn build && node ../obfuscator"
   },
   "react-native-builder-bob": {
     "source": "src",
     "output": "dist",
     "targets": [
-      "commonjs",
-      "module",
-      "typescript"
+      "typescript",
+      [
+        "module",
+        {
+          "esm": true
+        }
+      ],
+      [
+        "commonjs",
+        {
+          "esm": true
+        }
+      ]
     ]
   },
   "prettier": {
@@ -68,12 +101,9 @@
   },
   "dependencies": {
     "@expo/config-plugins": "*",
-    "@react-native-community/cli-config-android": "^20.0.0",
-    "@react-native-community/cli-config-apple": "^20.0.0",
-    "@react-native-community/cli-tools": "^20.0.0",
-    "commander": "^14.0.2",
+    "commander": "^14.0.3",
     "detect-indent": "^6.1.0",
-    "fs-extra": "^11.3.3",
+    "fast-glob": "^3.3.3",
     "node-html-parser": "^7.0.2",
     "picocolors": "^1.1.1",
     "prettier": "^3.8.1",
@@ -85,17 +115,15 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.3",
-    "@react-native-community/cli-types": "^20.0.0",
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.19.30",
+    "@types/node": "^20.19.31",
     "@types/react": "^19.2.0",
     "@types/semver": "^7.7.1",
-    "oxlint": "^1.41.0",
+    "oxlint": "^1.49.0",
     "prettier-plugin-organize-imports": "^4.3.0",
-    "react": "19.2.0",
-    "react-native": "0.83.1",
-    "react-native-builder-bob": "^0.40.17",
-    "semver": "^7.7.3",
+    "react": "19.2.3",
+    "react-native": "0.84.0",
+    "react-native-builder-bob": "^0.40.18",
+    "semver": "^7.7.4",
     "typescript": "^5.9.3"
   },
   "codegenConfig": {

package/src/{expo.ts → extras/expo.ts}

@@ -8,32 +8,33 @@ import semver from "semver";
 import { dedent } from "ts-dedent";
 import util from "util";
 import {
-  type RawProps,
+  type BootSplashPluginConfig,
   hfs,
   log,
-  packageName,
+  PACKAGE_NAME,
   requireAddon,
-  setIsExpo,
+  setLoggerMode,
   transformProps,
   writeAndroidAssets,
   writeGenericAssets,
   writeIOSAssets,
   writeWebAssets,
-} from "./generate";
+} from "./utils";
 
 const promisifiedExec = util.promisify(childProcess.exec);
 
 const exec = (cmd: string) =>
   promisifiedExec(cmd).then(({ stdout, stderr }) => stdout || stderr);
 
-const withoutExpoSplashScreen: Expo.ConfigPlugin<RawProps> =
-  Expo.createRunOncePlugin(
-    (expoConfig) => expoConfig,
-    "expo-splash-screen",
-    "skip",
-  );
+type ConfigPlugin = Expo.ConfigPlugin<BootSplashPluginConfig>;
+
+const withoutExpoSplashScreen: ConfigPlugin = Expo.createRunOncePlugin(
+  (expoConfig) => expoConfig,
+  "expo-splash-screen",
+  "skip",
+);
 
-const withAndroidAssets: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
+const withAndroidAssets: ConfigPlugin = (expoConfig, rawProps) =>
   Expo.withDangerousMod(expoConfig, [
     "android",
     async (config) => {
@@ -56,7 +57,7 @@ const withAndroidAssets: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
     },
   ]);
 
-const withAndroidManifest: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
+const withAndroidManifest: ConfigPlugin = (expoConfig) =>
   Expo.withAndroidManifest(expoConfig, (config) => {
     config.modResults.manifest.application?.forEach((application) => {
       if (application.$["android:name"] === ".MainApplication") {
@@ -73,7 +74,7 @@ const withAndroidManifest: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
     return config;
   });
 
-const withMainActivity: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
+const withMainActivity: ConfigPlugin = (expoConfig) =>
   Expo.withMainActivity(expoConfig, (config) => {
     const { modResults } = config;
 
@@ -105,7 +106,7 @@ const withMainActivity: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
     };
   });
 
-const withAndroidStyles: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
+const withAndroidStyles: ConfigPlugin = (expoConfig, rawProps) =>
   Expo.withAndroidStyles(expoConfig, async (config) => {
     const { projectRoot } = config.modRequest;
     const { android, brand } = await transformProps(projectRoot, rawProps);
@@ -166,7 +167,7 @@ const withAndroidStyles: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
     };
   });
 
-const withAndroidColors: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
+const withAndroidColors: ConfigPlugin = (expoConfig, rawProps) =>
   Expo.withAndroidColors(expoConfig, async (config) => {
     const { projectRoot } = config.modRequest;
     const { background } = await transformProps(projectRoot, rawProps);
@@ -179,10 +180,7 @@ const withAndroidColors: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
     return config;
   });
 
-const withAndroidColorsNight: Expo.ConfigPlugin<RawProps> = (
-  expoConfig,
-  rawProps,
-) =>
+const withAndroidColorsNight: ConfigPlugin = (expoConfig, rawProps) =>
   Expo.withAndroidColorsNight(expoConfig, async (config) => {
     const { projectRoot } = config.modRequest;
     const props = await transformProps(projectRoot, rawProps);
@@ -193,7 +191,7 @@ const withAndroidColorsNight: Expo.ConfigPlugin<RawProps> = (
       : config;
   });
 
-const withIOSAssets: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
+const withIOSAssets: ConfigPlugin = (expoConfig, rawProps) =>
   Expo.withDangerousMod(expoConfig, [
     "ios",
     async (config) => {
@@ -214,7 +212,7 @@ const withIOSAssets: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
     },
   ]);
 
-const withAppDelegate: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
+const withAppDelegate: ConfigPlugin = (expoConfig) =>
   Expo.withAppDelegate(expoConfig, (config) => {
     const { modResults } = config;
     const { language } = modResults;
@@ -257,13 +255,13 @@ const withAppDelegate: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
     };
   });
 
-const withInfoPlist: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
+const withInfoPlist: ConfigPlugin = (expoConfig) =>
   Expo.withInfoPlist(expoConfig, (config) => {
     config.modResults["UILaunchStoryboardName"] = "BootSplash";
     return config;
   });
 
-const withXcodeProject: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
+const withXcodeProject: ConfigPlugin = (expoConfig) =>
   Expo.withXcodeProject(expoConfig, (config) => {
     const { projectName = "" } = config.modRequest;
 
@@ -284,7 +282,7 @@ const withXcodeProject: Expo.ConfigPlugin<RawProps> = (expoConfig) =>
     return config;
   });
 
-const withWebAssets: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
+const withWebAssets: ConfigPlugin = (expoConfig, rawProps) =>
   Expo.withDangerousMod(expoConfig, [
     expoConfig.platforms?.includes("ios") ? "ios" : "android",
     async (config) => {
@@ -306,7 +304,7 @@ const withWebAssets: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
     },
   ]);
 
-const withGenericAssets: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
+const withGenericAssets: ConfigPlugin = (expoConfig, rawProps) =>
   Expo.withDangerousMod(expoConfig, [
     expoConfig.platforms?.includes("ios") ? "ios" : "android",
     async (config) => {
@@ -322,11 +320,11 @@ const withGenericAssets: Expo.ConfigPlugin<RawProps> = (expoConfig, rawProps) =>
   ]);
 
 export const withBootSplash = Expo.createRunOncePlugin<
-  (Partial<RawProps> & { logo: string }) | undefined
+  (Partial<BootSplashPluginConfig> & { logo: string }) | undefined
 >((expoConfig, baseProps) => {
   const { platforms = [], sdkVersion = "0.1.0" } = expoConfig;
 
-  setIsExpo(true);
+  setLoggerMode({ type: "plugin" });
 
   if (semver.lt(sdkVersion, "54.0.0")) {
     log.error("Requires Expo 54.0.0 (or higher)");
@@ -338,7 +336,7 @@ export const withBootSplash = Expo.createRunOncePlugin<
     process.exit(1);
   }
 
-  const rawProps: RawProps = {
+  const rawProps: BootSplashPluginConfig = {
     assetsOutput: "assets/bootsplash",
     background: "#fff",
     brandWidth: 80,
@@ -346,10 +344,7 @@ export const withBootSplash = Expo.createRunOncePlugin<
     ...baseProps,
   };
 
-  const plugins: Expo.ConfigPlugin<RawProps>[] = [
-    withoutExpoSplashScreen,
-    withGenericAssets,
-  ];
+  const plugins: ConfigPlugin[] = [withoutExpoSplashScreen, withGenericAssets];
 
   if (platforms.includes("android")) {
     plugins.push(
@@ -379,4 +374,8 @@ export const withBootSplash = Expo.createRunOncePlugin<
     expoConfig,
     plugins.map((plugin) => [plugin, rawProps]),
   );
-}, packageName);
+}, PACKAGE_NAME);
+
+export default (
+  config: BootSplashPluginConfig,
+): [typeof PACKAGE_NAME, BootSplashPluginConfig] => [PACKAGE_NAME, config];