Guarantee miniapps import order in composite

Author: belemaire

ern-composite-gen/src/createIndexJs.ts

@@ -1,26 +1,33 @@
 import path from 'path';
 import fs from 'fs-extra';
-import { readPackageJson } from 'ern-core';
+import { readPackageJson, PackagePath } from 'ern-core';
 
 export async function createIndexJs({
   cwd,
-  extraImports = [],
+  miniApps,
 }: {
   cwd: string;
-  extraImports?: string[];
+  miniApps: PackagePath[];
 }) {
   let entryIndexJsContent = '';
 
-  const dependencies: string[] = [...extraImports];
   const compositePackageJson = await readPackageJson(cwd);
-  for (const dependency of Object.keys(
-    compositePackageJson.dependencies || [],
-  )) {
-    dependencies.push(dependency);
+  for (const miniApp of miniApps) {
+    // Add miniapp imports strictly matching miniapps array order
+    // For git based miniapps we have to rely on some trickery to
+    // find the package name, as it won't be set in the PackagePath
+    // We just look in the composite package.json for a match on
+    // the path, and get the package name from there.
+    //
+    // Sample git package in package.json:
+    // "bar": "git+ssh://github.com/foo/bar.git#master"
+    const pkgName = miniApp.isGitPath
+      ? Object.entries(compositePackageJson.dependencies).find(
+          ([, v]) => v === miniApp.fullPath,
+        )![0]
+      : miniApp.name;
+    entryIndexJsContent += `import '${pkgName}'\n`;
   }
-  dependencies.forEach((d) => {
-    entryIndexJsContent += `import '${d}'\n`;
-  });
 
   await fs.writeFile(path.join(cwd, 'index.js'), entryIndexJsContent);
   // Still also generate index.android.js and index.ios.js for backward compatibility with

ern-composite-gen/src/generateComposite.ts

@@ -151,11 +151,6 @@ async function generateFullComposite(
   const remoteMiniapps = miniApps.filter((p) => !p.isFilePath);
   const localMiniApps = miniApps.filter((p) => p.isFilePath);
   const localMiniAppsPaths = localMiniApps.map((m) => m.basePath);
-  const localMiniAppsPkgNames = [];
-  for (const x of localMiniApps) {
-    const pJson = await readPackageJson(x.basePath);
-    localMiniAppsPkgNames.push(pJson.name);
-  }
   const extraNodeModules: { [pkg: string]: string } = {};
 
   try {
@@ -201,7 +196,10 @@ async function generateFullComposite(
 
     await addRNStartScriptToPjson({ cwd: outDir });
 
-    await createIndexJs({ cwd: outDir, extraImports: localMiniAppsPkgNames });
+    await createIndexJs({
+      cwd: outDir,
+      miniApps,
+    });
 
     await createWatchmanConfig({ cwd: outDir });