feat: make new config nullable

Author: thymikee

docs/dependencies.md

@@ -55,9 +55,9 @@ type AndroidDependencyParams = {
   packageImportPath?: string;
   packageInstance?: string;
   buildTypes?: string[];
-  libraryName?: string;
-  componentDescriptors?: string[];
-  androidMkPath?: string;
+  libraryName?: string | null;
+  componentDescriptors?: string[] | null;
+  androidMkPath?: string | null;
 };
 ```
 

docs/platforms.md

@@ -118,8 +118,8 @@ type AndroidDependencyConfig = {
   packageInstance: string;
   dependencyConfiguration?: string;
   buildTypes: string[];
-  libraryName?: string;
-  componentDescriptors?: string[];
-  androidMkPath?: string;
+  libraryName?: string | null;
+  componentDescriptors?: string[] | null;
+  androidMkPath?: string | null;
 };
 ```

packages/cli-config/src/schema.ts

@@ -83,9 +83,9 @@ export const dependencyConfig = t
                 packageInstance: t.string(),
                 dependencyConfiguration: t.string(),
                 buildTypes: t.array().items(t.string()).default([]),
-                libraryName: t.string(),
-                componentDescriptors: t.array().items(t.string()),
-                androidMkPath: t.string(),
+                libraryName: t.string().allow(null),
+                componentDescriptors: t.array().items(t.string()).allow(null),
+                androidMkPath: t.string().allow(null),
               })
               .default({}),
           })
@@ -134,9 +134,9 @@ export const projectConfig = t
                 packageInstance: t.string(),
                 dependencyConfiguration: t.string(),
                 buildTypes: t.array().items(t.string()).default([]),
-                libraryName: t.string(),
-                componentDescriptors: t.array().items(t.string()),
-                androidMkPath: t.string(),
+                libraryName: t.string().allow(null),
+                componentDescriptors: t.array().items(t.string()).allow(null),
+                androidMkPath: t.string().allow(null),
               })
               .allow(null),
           }),

packages/cli-types/src/android.ts

@@ -19,9 +19,9 @@ export type AndroidDependencyConfig = {
   packageInstance: string;
   dependencyConfiguration?: string;
   buildTypes: string[];
-  libraryName?: string;
-  componentDescriptors?: string[];
-  androidMkPath?: string;
+  libraryName?: string | null;
+  componentDescriptors?: string[] | null;
+  androidMkPath?: string | null;
 };
 
 export type AndroidDependencyParams = {
@@ -32,7 +32,7 @@ export type AndroidDependencyParams = {
   packageImportPath?: string;
   packageInstance?: string;
   buildTypes?: string[];
-  libraryName?: string;
-  componentDescriptors?: string[];
-  androidMkPath?: string;
+  libraryName?: string | null;
+  componentDescriptors?: string[] | null;
+  androidMkPath?: string | null;
 };

packages/platform-android/native_modules.gradle

@@ -257,11 +257,11 @@ class ReactNativeModules {
 
     if (packages.size() > 0) {
       libraryIncludes = packages.collect {
-        "include ${it.androidMkPath}"
-      }.join('\n')
+        it.androidMkPath ? "include ${it.androidMkPath}" : null
+      }.minus(null).join('\n')
       libraryModules = packages.collect {
-        "${codegenLibPrefix}${it.libraryName}"
-      }.join(" \\\n  ")
+        it.libraryName ? "${codegenLibPrefix}${it.libraryName}" : null
+      }.minus(null).join(" \\\n  ")
     }
 
     String generatedFileContents = generatedFileContentsTemplate
@@ -285,21 +285,24 @@ class ReactNativeModules {
 
     if (packages.size() > 0) {
       rncliCppIncludes = packages.collect {
+        if (!it.libraryName) {
+          return null
+        }
         def result = "#include <${it.libraryName}.h>"
-        if (it.componentDescriptors.size() > 0) {
+        if (it.componentDescriptors && it.componentDescriptors.size() > 0) {
           result += "\n#include <${codegenReactComponentsDir}/${it.libraryName}/${codegenComponentDescriptorsHeaderFile}>"
         }
         result
-      }.join('\n')
+      }.minus(null).join('\n')
       rncliCppModuleProviders = packages.collect {
-        """  auto module_${it.libraryName} = ${it.libraryName}_ModuleProvider(moduleName, params);
+        it.libraryName ? """  auto module_${it.libraryName} = ${it.libraryName}_ModuleProvider(moduleName, params);
   if (module_${it.libraryName} != nullptr) {
     return module_${it.libraryName};
-  }"""
-      }.join("\n")
+  }""" : null
+      }.minus(null).join("\n")
       rncliCppComponentDescriptors = packages.collect {
         def result = ""
-        if (it.componentDescriptors.size() > 0) {
+        if (it.componentDescriptors && it.componentDescriptors.size() > 0) {
           result += it.componentDescriptors.collect {
             "  providerRegistry->add(concreteComponentDescriptorProvider<${it}>());"
           }.join('\n')