enable-lean-builds

src/builders/android.ts

@@ -3,7 +3,6 @@ import path from 'path';
 import { AndroidShellApp, ImageUtils } from '@expo/xdl';
 import fs from 'fs-extra';
 import _ from 'lodash';
-import semver from 'semver';
 import { ANDROID_BUILD_TYPES } from 'turtle/constants';
 import uuidv4 from 'uuid/v4';
 
@@ -11,7 +10,7 @@ import getOrCreateCredentials from 'turtle/builders/utils/android/credentials';
 import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { resolveExplicitOptIn } from 'turtle/builders/utils/unimodules';
+import { resolveExplicitOptIn, resolveNativeModules } from 'turtle/builders/utils/unimodules';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
@@ -73,15 +72,20 @@ async function runShellAppBuilder(
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
   const workingDir = formatShellAppDirectory({ sdkVersion });
 
-  // (2019-07-31) We are explicitly choosing to disable this option until we have more
-  // infrastructure/tooling built around optional modules and OTA updates, as right now it's
-  // very easy for developers to break apps in production with optional modules.
+  // Default behaviour:
+  // - load all modules except [expo-branch]
+  // - load expo-branch only if present in package.json dependencies
   //
-  // to enable full resolver switch resolveExplicitOptIn to resolveNativeModules
+  // Behaviour with "enableDangerousExperimentalLeanBuilds" flag enabled
+  // - add unimodules from `manifest.dependencies` (project package.json dependecies)
+  // - add unimodules from react-native-unimodules package.json
+  // - add unimodules from expo package package.json
+  // - add recusively all dependecies of already added unimodules
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
-  const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
-    ? await resolveExplicitOptIn(workingDir, _.get(manifest, 'dependencies'))
-    : null;
+  const packageJsonDependecies = _.get(manifest, 'dependencies');
+  const enabledModules = _.get(manifest, 'android.enableDangerousExperimentalLeanBuilds')
+    ? await resolveNativeModules(workingDir, packageJsonDependecies)
+    : await resolveExplicitOptIn(workingDir, packageJsonDependecies);
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({