react-native-config 1.5.5 → 1.5.7

package/README.md

@@ -116,7 +116,13 @@ if cocoapods are used in the project then pod has to be installed as well:
 	Add `PackageProviders().Append(winrt::RNCConfig::ReactPackageProvider());` before `InitializeComponent();`.
 
 ### Extra step for Android
+#### Using RN-Integrate
+Apply extra steps automatically:
+```sh
+npx react-native-integrate react-native-config
+```
 
+#### Manual
 You'll also need to manually apply a plugin to your app, from `android/app/build.gradle`:
 
 ```

package/index.js

@@ -3,7 +3,34 @@
 // Bridge to:
 // Android: buildConfigField vars set in build.gradle, and exported via ReactConfig
 // iOS: config vars set in xcconfig and exposed via RNCConfig.m
-import { NativeModules } from 'react-native';
+import { NativeModules, TurboModuleRegistry, Platform } from 'react-native';
 
-export const Config = NativeModules.RNCConfigModule || {}
+// New-arch TurboModule name should match native module name
+const TM_NAME = 'RNCConfigModule';
+
+function getTurboModule() {
+	try {
+		if (TurboModuleRegistry?.get) {
+			return TurboModuleRegistry.get(TM_NAME);
+		}
+	} catch (_) {}
+	return null;
+}
+
+const Turbo = getTurboModule();
+const Paper = NativeModules?.RNCConfigModule;
+
+let config = {};
+if (Turbo) {
+	// Prefer TM sync getAll when available to return a plain object
+	if (typeof Turbo.getAll === 'function') {
+		try { config = Turbo.getAll() || {}; } catch (_) { config = {}; }
+	} else {
+		config = Turbo;
+	}
+} else if (Paper) {
+	config = Paper;
+}
+
+export const Config = config;
 export default Config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-config",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "Expose config variables to React Native apps",
   "keywords": [
     "env",
@@ -27,6 +27,7 @@
     "android/",
     "ios/",
     "windows/",
+    "src/",
     "index.js",
     "index.d.ts",
     "react-native-config.podspec",
@@ -36,7 +37,15 @@
   "license": "MIT",
   "devDependencies": {
     "@semantic-release/git": "^10.0.1",
-    "semantic-release": "^19.0.5"
+    "semantic-release": "^19.0.5",
+    "jest": "^29.7.0",
+    "@types/jest": "^29.5.12"
+  },
+  "dependencies": {
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.0",
+    "@babel/preset-react": "^7.24.7",
+    "babel-jest": "^29.7.0"
   },
   "peerDependencies": {
     "react-native-windows": ">=0.61"
@@ -45,5 +54,19 @@
     "react-native-windows": {
       "optional": true
     }
+  },
+  "codegenConfig": {
+    "name": "RNCConfigModule",
+    "type": "modules",
+    "jsSrcsDir": "./src",
+    "android": {
+      "javaPackageName": "com.luggit.reactnativeconfig"
+    },
+    "ios": {
+      "prefix": "RNC"
+    },
+    "windows": {
+      "cppNamespace": "RNCConfig"
+    }
   }
 }

package/src/NativeRNCConfig.ts

@@ -0,0 +1,12 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  // Synchronous getters (supported on Windows TurboModules)
+  getAll(): { [key: string]: string };
+  get(key: string): string;
+  // Optional Composition info hook
+  compositionInfo?(): string;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('RNCConfigModule');

package/windows/RNCConfig/RNCConfig.vcxproj

@@ -16,8 +16,8 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.16299.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="ReactNativeWindowsProps">

package/windows/code/RNCConfig.cpp

@@ -1,2 +1,41 @@
-#include "pch.h"
+ #include "pch.h"
 #include "RNCConfig.h"
+#if __has_include("RNCConfigValues.h")
+#include "RNCConfigValues.h"
+#endif
+#include <JSValue.h>
+using namespace Microsoft::ReactNative;
+
+namespace RNCConfig
+{
+	JSValueObject RNCConfigModule::getAll() noexcept
+	{
+		JSValueObject obj{};
+	#if __has_include("RNCConfigValuesObject.inc.g.h")
+	#include "RNCConfigValuesObject.inc.g.h"
+	#endif
+		return obj;
+	}
+
+	std::string RNCConfigModule::get(std::string const& key) noexcept
+	{
+	#if __has_include("RNCConfigValuesGet.inc.g.h")
+	#include "RNCConfigValuesGet.inc.g.h"
+	#endif
+		return std::string{};
+	}
+
+	void RNCConfigModule::ProvideConstants(ReactConstantProvider& provider) noexcept
+	{
+	#if __has_include("RNCConfigValuesConstants.inc.g.h")
+	#include "RNCConfigValuesConstants.inc.g.h"
+	#endif
+	}
+
+		std::string RNCConfigModule::compositionInfo() noexcept
+		{
+			// No-op informational string; placeholder to indicate Composition can be used in this module
+			// In a real implementation, you'd create a Compositor and maybe return feature info.
+			return std::string{"CompositionReady"};
+		}
+}

package/windows/code/RNCConfig.h

@@ -11,7 +11,26 @@ namespace RNCConfig
   REACT_MODULE(RNCConfigModule);
   struct RNCConfigModule
   {
+#if __has_include("RNCConfigValuesModule.inc.g.h")
 #include "RNCConfigValuesModule.inc.g.h"
+#else
+// Generated constants will be included at build-time
+#endif
+
+  // TurboModule-friendly sync APIs
+  REACT_SYNC_METHOD(getAll);
+  Microsoft::ReactNative::JSValueObject getAll() noexcept;
+
+  REACT_SYNC_METHOD(get);
+  std::string get(std::string const& key) noexcept;
+
+  // Keep constants available via the classic constants provider too
+  REACT_CONSTANT_PROVIDER(ProvideConstants);
+  void ProvideConstants(Microsoft::ReactNative::ReactConstantProvider& provider) noexcept;
+
+  // Example Windows.UI.Composition usage exposed via a sync method
+  REACT_SYNC_METHOD(compositionInfo);
+  std::string compositionInfo() noexcept;
   };
 }
 

package/windows/code/generate-header.js

@@ -32,8 +32,14 @@ if (fs.existsSync(envFile)) {
 function generateFiles(vars) {
   // Native code
   let nativeCode = '';
-  // React Native Module code
+  // React Native Module code: attribute-based constants block
   let rnCode = '';
+  // Snippets for building a JS object with all constants
+  let objectBuilder = '';
+  // Snippet for a key-based getter switch/if chain
+  let keyGetter = '';
+  // Snippet for ReactConstantProvider
+  let constantsProvider = '';
   nativeCode += '#include<string>\n'
   nativeCode += 'namespace ReactNativeConfig {\n'
   for (let {key, value} of vars) {
@@ -41,10 +47,16 @@ function generateFiles(vars) {
     nativeCode += `  inline static std::string ${key} = ${escaped};\n`
     rnCode += `REACT_CONSTANT(${key});\n`
     rnCode += `static inline const std::string ${key} = ${escaped};\n`;
+    objectBuilder += `  obj["${key}"] = ReactNativeConfig::${key};\n`;
+    keyGetter += `  if (key == "${key}") return ReactNativeConfig::${key};\n`;
+    constantsProvider += `  provider.Add("${key}", ReactNativeConfig::${key});\n`;
   }
   nativeCode +='}\n'
   updateFile(nativeCode, path.join(outDir, 'RNCConfigValues.h'))
   updateFile(rnCode, path.join(outDir, 'RNCConfigValuesModule.inc.g.h'))
+  updateFile(objectBuilder, path.join(outDir, 'RNCConfigValuesObject.inc.g.h'))
+  updateFile(keyGetter, path.join(outDir, 'RNCConfigValuesGet.inc.g.h'))
+  updateFile(constantsProvider, path.join(outDir, 'RNCConfigValuesConstants.inc.g.h'))
 }
 
 // Escape the string so it will work with C++