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

package/src/extras/expo.ts

@@ -362,9 +362,22 @@ export const withBootSplash = Expo.createRunOncePlugin<
     plugins.push(withWebAssets);
   }
 
+  const licenseKey = process.env["BOOTSPLASH_LICENSE_KEY"];
+
+  if ("licenseKey" in rawProps) {
+    log.warn(
+      "Passing licenseKey directly in plugin config is deprecated as it could be leaked by expo-constants. Use the BOOTSPLASH_LICENSE_KEY environment variable instead.",
+    );
+  }
+
+  const rawPropsWithEnvVariable = {
+    ...rawProps,
+    ...(licenseKey != null && { licenseKey }),
+  };
+
   return Expo.withPlugins(
     expoConfig,
-    plugins.map((plugin) => [plugin, rawProps]),
+    plugins.map((plugin) => [plugin, rawPropsWithEnvVariable]),
   );
 }, PACKAGE_NAME);
 

package/src/extras/utils.ts

@@ -24,7 +24,7 @@ export type BootSplashPluginConfig = {
   logo: string;
   /**
    * Background color (in hexadecimal format)
-   * @default #fff
+   * @default "#fff"
    */
   background?: string;
   /**
@@ -34,11 +34,12 @@ export type BootSplashPluginConfig = {
   logoWidth?: number;
   /**
    * Assets output directory path
-   * @default assets/bootsplash
+   * @default "assets/bootsplash"
    */
   assetsOutput?: string;
   /**
    * License key to enable brand and dark mode assets generation
+   * @deprecated Passing `licenseKey` directly in plugin config is deprecated as it could be leaked by `expo-constants`. Use the `BOOTSPLASH_LICENSE_KEY` environment variable instead.
    */
   licenseKey?: string;
   /**
@@ -66,7 +67,6 @@ export type BootSplashPluginConfig = {
   android?: {
     /**
      * Enforce system bars style
-     * @default `undefined`
      */
     darkContentBarsStyle?: boolean;
   };

package/android/app/build/generated/source/codegen/java/com/facebook/fbreact/specs/NativeRNBootSplashSpec.java

@@ -1,78 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleJavaSpec.js
- *
- * @nolint
- */
-
-package com.facebook.fbreact.specs;
-
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-public abstract class NativeRNBootSplashSpec extends ReactContextBaseJavaModule implements TurboModule {
-  public static final String NAME = "RNBootSplash";
-
-  public NativeRNBootSplashSpec(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  @Override
-  public @Nonnull String getName() {
-    return NAME;
-  }
-
-  protected abstract Map<String, Object> getTypedExportedConstants();
-
-  @Override
-  @DoNotStrip
-  public final @Nullable Map<String, Object> getConstants() {
-    Map<String, Object> constants = getTypedExportedConstants();
-    if (ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD) {
-      Set<String> obligatoryFlowConstants = new HashSet<>(Arrays.asList(
-          "darkModeEnabled"
-      ));
-      Set<String> optionalFlowConstants = new HashSet<>(Arrays.asList(
-          "logoSizeRatio",
-          "navigationBarHeight",
-          "statusBarHeight"
-      ));
-      Set<String> undeclaredConstants = new HashSet<>(constants.keySet());
-      undeclaredConstants.removeAll(obligatoryFlowConstants);
-      undeclaredConstants.removeAll(optionalFlowConstants);
-      if (!undeclaredConstants.isEmpty()) {
-        throw new IllegalStateException(String.format("Native Module Flow doesn't declare constants: %s", undeclaredConstants));
-      }
-      undeclaredConstants = obligatoryFlowConstants;
-      undeclaredConstants.removeAll(constants.keySet());
-      if (!undeclaredConstants.isEmpty()) {
-        throw new IllegalStateException(String.format("Native Module doesn't fill in constants: %s", undeclaredConstants));
-      }
-    }
-    return constants;
-  }
-
-  @ReactMethod
-  @DoNotStrip
-  public abstract void hide(boolean fade, Promise promise);
-
-  @ReactMethod
-  @DoNotStrip
-  public abstract void isVisible(Promise promise);
-}

package/android/app/build/generated/source/codegen/jni/CMakeLists.txt

@@ -1,36 +0,0 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-cmake_minimum_required(VERSION 3.13)
-set(CMAKE_VERBOSE_MAKEFILE on)
-
-file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/RNBootSplashSpec/*.cpp)
-
-add_library(
-  react_codegen_RNBootSplashSpec
-  OBJECT
-  ${react_codegen_SRCS}
-)
-
-target_include_directories(react_codegen_RNBootSplashSpec PUBLIC . react/renderer/components/RNBootSplashSpec)
-
-target_link_libraries(
-  react_codegen_RNBootSplashSpec
-  fbjni
-  jsi
-  # We need to link different libraries based on whether we are building rncore or not, that's necessary
-  # because we want to break a circular dependency between react_codegen_rncore and reactnative
-  reactnative
-)
-
-target_compile_options(
-  react_codegen_RNBootSplashSpec
-  PRIVATE
-  -DLOG_TAG=\"ReactNative\"
-  -fexceptions
-  -frtti
-  -std=c++20
-  -Wall
-)

package/android/app/build/generated/source/codegen/jni/RNBootSplashSpec-generated.cpp

@@ -1,44 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleJniCpp.js
- */
-
-#include "RNBootSplashSpec.h"
-
-namespace facebook::react {
-
-static facebook::jsi::Value __hostFunction_NativeRNBootSplashSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-  static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, ObjectKind, "getConstants", "()Ljava/util/Map;", args, count, cachedMethodId);
-}
-
-static facebook::jsi::Value __hostFunction_NativeRNBootSplashSpecJSI_hide(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-  static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "hide", "(ZLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
-}
-
-static facebook::jsi::Value __hostFunction_NativeRNBootSplashSpecJSI_isVisible(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-  static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "isVisible", "(Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
-}
-
-NativeRNBootSplashSpecJSI::NativeRNBootSplashSpecJSI(const JavaTurboModule::InitParams &params)
-  : JavaTurboModule(params) {
-  methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeRNBootSplashSpecJSI_getConstants};
-  methodMap_["hide"] = MethodMetadata {1, __hostFunction_NativeRNBootSplashSpecJSI_hide};
-  methodMap_["isVisible"] = MethodMetadata {0, __hostFunction_NativeRNBootSplashSpecJSI_isVisible};
-}
-
-std::shared_ptr<TurboModule> RNBootSplashSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
-  if (moduleName == "RNBootSplash") {
-    return std::make_shared<NativeRNBootSplashSpecJSI>(params);
-  }
-  return nullptr;
-}
-
-} // namespace facebook::react

package/android/app/build/generated/source/codegen/jni/RNBootSplashSpec.h

@@ -1,31 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleJniH.js
- */
-
-#pragma once
-
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
-#include <jsi/jsi.h>
-
-namespace facebook::react {
-
-/**
- * JNI C++ class for module 'NativeRNBootSplash'
- */
-class JSI_EXPORT NativeRNBootSplashSpecJSI : public JavaTurboModule {
-public:
-  NativeRNBootSplashSpecJSI(const JavaTurboModule::InitParams &params);
-};
-
-
-JSI_EXPORT
-std::shared_ptr<TurboModule> RNBootSplashSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
-
-} // namespace facebook::react

package/android/app/build/generated/source/codegen/jni/react/renderer/components/RNBootSplashSpec/RNBootSplashSpecJSI-generated.cpp

@@ -1,39 +0,0 @@
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include "RNBootSplashSpecJSI.h"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeRNBootSplashCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeRNBootSplashCxxSpecJSI *>(&turboModule)->getConstants(
-    rt
-  );
-}
-static jsi::Value __hostFunction_NativeRNBootSplashCxxSpecJSI_hide(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeRNBootSplashCxxSpecJSI *>(&turboModule)->hide(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asBool()
-  );
-}
-static jsi::Value __hostFunction_NativeRNBootSplashCxxSpecJSI_isVisible(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeRNBootSplashCxxSpecJSI *>(&turboModule)->isVisible(
-    rt
-  );
-}
-
-NativeRNBootSplashCxxSpecJSI::NativeRNBootSplashCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule("RNBootSplash", jsInvoker) {
-  methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeRNBootSplashCxxSpecJSI_getConstants};
-  methodMap_["hide"] = MethodMetadata {1, __hostFunction_NativeRNBootSplashCxxSpecJSI_hide};
-  methodMap_["isVisible"] = MethodMetadata {0, __hostFunction_NativeRNBootSplashCxxSpecJSI_isVisible};
-}
-
-
-} // namespace facebook::react

package/android/app/build/generated/source/codegen/jni/react/renderer/components/RNBootSplashSpec/RNBootSplashSpecJSI.h

@@ -1,85 +0,0 @@
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleH.js
- */
-
-#pragma once
-
-#include <ReactCommon/TurboModule.h>
-#include <react/bridging/Bridging.h>
-
-namespace facebook::react {
-
-
-  class JSI_EXPORT NativeRNBootSplashCxxSpecJSI : public TurboModule {
-protected:
-  NativeRNBootSplashCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
-
-public:
-  virtual jsi::Object getConstants(jsi::Runtime &rt) = 0;
-  virtual jsi::Value hide(jsi::Runtime &rt, bool fade) = 0;
-  virtual jsi::Value isVisible(jsi::Runtime &rt) = 0;
-
-};
-
-template <typename T>
-class JSI_EXPORT NativeRNBootSplashCxxSpec : public TurboModule {
-public:
-  jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.get(rt, propName);
-  }
-
-  static constexpr std::string_view kModuleName = "RNBootSplash";
-
-protected:
-  NativeRNBootSplashCxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(std::string{NativeRNBootSplashCxxSpec::kModuleName}, jsInvoker),
-      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
-
-
-private:
-  class Delegate : public NativeRNBootSplashCxxSpecJSI {
-  public:
-    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
-      NativeRNBootSplashCxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
-
-    }
-
-    jsi::Object getConstants(jsi::Runtime &rt) override {
-      static_assert(
-          bridging::getParameterCount(&T::getConstants) == 1,
-          "Expected getConstants(...) to have 1 parameters");
-
-      return bridging::callFromJs<jsi::Object>(
-          rt, &T::getConstants, jsInvoker_, instance_);
-    }
-    jsi::Value hide(jsi::Runtime &rt, bool fade) override {
-      static_assert(
-          bridging::getParameterCount(&T::hide) == 2,
-          "Expected hide(...) to have 2 parameters");
-
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::hide, jsInvoker_, instance_, std::move(fade));
-    }
-    jsi::Value isVisible(jsi::Runtime &rt) override {
-      static_assert(
-          bridging::getParameterCount(&T::isVisible) == 1,
-          "Expected isVisible(...) to have 1 parameters");
-
-      return bridging::callFromJs<jsi::Value>(
-          rt, &T::isVisible, jsInvoker_, instance_);
-    }
-
-  private:
-    friend class NativeRNBootSplashCxxSpec;
-    T *instance_;
-  };
-
-  Delegate delegate_;
-};
-
-} // namespace facebook::react

package/ios/RNBootSplash.xcodeproj/xcuserdata/zoontek.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>RNBootSplash.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>