fix: pass Android manifest parse errors through; remove manual link w…

…arnings
react-native-community · Sep 17, 2020 · 8686ca8 · 8686ca8
1 parent c23e161
commit 8686ca8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 120 deletions.
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -30,17 +30,20 @@ const handleError = (err: Error) => {
   } else {
     // Some error messages (esp. custom ones) might have `.` at the end already.
     const message = err.message.replace(/\.$/, '');
-    logger.error(
-      `${message}. ${chalk.dim(
+    logger.error(`${message}.`);
+  }
+  if (err.stack) {
+    logger.log(err.stack);
+  }
+  if (!commander.verbose) {
+    logger.info(
+      chalk.dim(
         `Run CLI with ${chalk.reset('--verbose')} ${chalk.dim(
           'flag for more details.',
         )}`,
-      )}`,
+      ),
     );
   }
-  if (err.stack) {
-    logger.log(chalk.dim(err.stack));
-  }
   process.exit(1);
 };
 

diff --git a/packages/platform-android/src/commands/runAndroid/index.ts b/packages/platform-android/src/commands/runAndroid/index.ts
@@ -21,11 +21,9 @@ import {
   getDefaultUserTerminal,
   CLIError,
 } from '@react-native-community/cli-tools';
-import warnAboutManuallyLinkedLibs from '../../link/warnAboutManuallyLinkedLibs';
 import {getAndroidProject, getPackageName} from '../../utils/getAndroidProject';
 
-function displayWarnings(config: Config, args: Flags) {
-  warnAboutManuallyLinkedLibs(config);
+function displayWarnings(args: Flags) {
   if (args.appFolder) {
     logger.warn(
       'Using deprecated "--appFolder" flag. Use "project.android.appName" in react-native.config.js instead.',
@@ -59,7 +57,7 @@ type AndroidProject = NonNullable<Config['project']['android']>;
  * Starts the app on a connected Android emulator or device.
  */
 async function runAndroid(_argv: Array<string>, config: Config, args: Flags) {
-  displayWarnings(config, args);
+  displayWarnings(args);
   const androidProject = getAndroidProject(config);
 
   if (args.jetifier) {

diff --git a/packages/platform-android/src/config/readManifest.ts b/packages/platform-android/src/config/readManifest.ts
@@ -5,10 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-
 import fs from 'fs';
 import xml from 'xmldoc';
+import {CLIError} from '@react-native-community/cli-tools';
 
 export default function readManifest(manifestPath: string) {
-  return new xml.XmlDocument(fs.readFileSync(manifestPath, 'utf8'));
+  try {
+    return new xml.XmlDocument(fs.readFileSync(manifestPath, 'utf8'));
+  } catch (error) {
+    throw new CLIError(
+      `Failed to parse Android Manifest file at ${manifestPath}`,
+      error,
+    );
+  }
 }
diff --git a/packages/platform-android/src/link/warnAboutManuallyLinkedLibs.ts b/packages/platform-android/src/link/warnAboutManuallyLinkedLibs.ts
diff --git a/packages/platform-ios/src/commands/runIOS/index.ts b/packages/platform-ios/src/commands/runIOS/index.ts
@@ -18,7 +18,6 @@ import {Config} from '@react-native-community/cli-types';
 import findXcodeProject, {ProjectInfo} from './findXcodeProject';
 import parseIOSDevicesList from './parseIOSDevicesList';
 import findMatchingSimulator from './findMatchingSimulator';
-import warnAboutManuallyLinkedLibs from '../../link/warnAboutManuallyLinkedLibs';
 import warnAboutPodInstall from '../../link/warnAboutPodInstall';
 import {
   logger,
@@ -48,7 +47,6 @@ function runIOS(_: Array<string>, ctx: Config, args: FlagsT) {
     );
   }
 
-  warnAboutManuallyLinkedLibs(ctx);
   warnAboutPodInstall(ctx);
 
   process.chdir(args.projectPath);

diff --git a/packages/platform-ios/src/link/warnAboutManuallyLinkedLibs.ts b/packages/platform-ios/src/link/warnAboutManuallyLinkedLibs.ts