Add custom metro cfg support for create-container

electrode-io · Nov 25, 2020 · 13a2273 · 13a2273
1 parent 49cfa3d
commit 13a2273
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/ern-local-cli/src/commands/create-container.ts b/ern-local-cli/src/commands/create-container.ts
@@ -183,15 +183,16 @@ Output directory should either not exist (it will be created) or should be empty
           'You cannot create a container for a non-existing native application version.',
       },
     });
-    const compositeGenConfig = await cauldron.getCompositeGeneratorConfig(
-      descriptor,
-    );
-    baseComposite =
-      baseComposite ||
-      (compositeGenConfig?.baseComposite &&
-        PackagePath.fromString(compositeGenConfig.baseComposite));
   }
 
+  const compositeGenConfig = await cauldron.getCompositeGeneratorConfig(
+    descriptor,
+  );
+  baseComposite =
+    baseComposite ||
+    (compositeGenConfig?.baseComposite &&
+      PackagePath.fromString(compositeGenConfig.baseComposite));
+
   if (!descriptor && miniapps) {
     platform = platform || (await askUserToSelectAPlatform());
 
@@ -205,6 +206,7 @@ Output directory should either not exist (it will be created) or should be empty
       runLocalCompositeGen({
         baseComposite,
         jsApiImpls,
+        metroExtraNodeModules: compositeGenConfig?.metroExtraNodeModules,
         miniApps: miniapps,
         outDir: compositeDir,
       }),

diff --git a/ern-orchestrator/src/composite.ts b/ern-orchestrator/src/composite.ts
@@ -15,12 +15,14 @@ export async function runLocalCompositeGen(
   {
     baseComposite,
     jsApiImpls,
+    metroExtraNodeModules,
     miniApps,
     outDir,
     resolutions,
   }: {
     baseComposite?: PackagePath;
     jsApiImpls?: PackagePath[];
+    metroExtraNodeModules?: { [pkg: string]: string };
     miniApps: PackagePath[];
     outDir: string;
     resolutions?: { [pkg: string]: string };
@@ -31,6 +33,7 @@ export async function runLocalCompositeGen(
       GeneratedComposite.generate({
         baseComposite,
         jsApiImplDependencies: jsApiImpls,
+        metroExtraNodeModules,
         miniApps,
         outDir,
         resolutions,