Fix transient dependencies for CI builds

Author: CompuIves

packages/app/src/sandbox/eval/npm/fetch-npm-module.ts

@@ -285,7 +285,7 @@ function resolvePath(
             }
 
             // eslint-disable-next-line
-            const subDepVersionVersionInfo = await findDependencyVersion(
+            const subDepVersionVersionInfo = await getDependencyVersion(
               currentTModule,
               manager,
               defaultExtensions,
@@ -346,10 +346,10 @@ type DependencyVersionResult =
       packageJSONPath: null;
     };
 
-async function findDependencyVersion(
+async function getDependencyVersion(
   currentTModule: TranspiledModule,
   manager: Manager,
-  defaultExtensions: Array<string> = ['js', 'jsx', 'json'],
+  defaultExtensions: string[] = ['js', 'jsx', 'json'],
   dependencyName: string
 ): Promise<DependencyVersionResult | null> {
   const { manifest } = manager;
@@ -428,7 +428,7 @@ export default async function fetchModule(
     path.replace(/.*\/node_modules\//, '')
   );
 
-  const versionInfo = await findDependencyVersion(
+  const versionInfo = await getDependencyVersion(
     currentTModule,
     manager,
     defaultExtensions,

packages/app/src/sandbox/version-resolving/merge-dependency.ts

@@ -163,7 +163,9 @@ export function mergeDependencies(responses: ILambdaResponse[]) {
       if (
         rootDependency &&
         !intersects(rootDependency.version, newDepDep.semver) &&
+        // If the resolved or semver is the same we don't have to actually replace dependency info
         rootDependency.version !== newDepDep.resolved &&
+        rootDependency.version !== newDepDep.semver &&
         rootDependency.name !== r.dependency.name // and this dependency doesn't require an older version of itself
       ) {
         // If a root dependency is in conflict with a child dependency, we always

packages/app/src/sandbox/version-resolving/resolve-dependency.ts

@@ -5,12 +5,14 @@ import { ILambdaResponse } from './merge-dependency';
 import { downloadDependency } from '../eval/npm/fetch-npm-module';
 import { IParsedResolution } from './resolutions';
 
-function getPackageJSON(dep: string, version: string) {
-  return downloadDependency(dep, version, '/package.json').then(m => m.code);
+async function getPackageJSON(dep: string, version: string) {
+  const m = await downloadDependency(dep, version, '/package.json');
+  return m.code;
 }
 
-function getLatestVersionForSemver(dep: string, version: string) {
-  return getPackageJSON(dep, version).then(p => JSON.parse(p).version);
+async function getLatestVersionForSemver(dep: string, version: string) {
+  const p = await getPackageJSON(dep, version);
+  return JSON.parse(p).version;
 }
 
 interface IPeerDependencyResult {