Merge remote-tracking branch 'CLI/main' into feat/android-applicationId

react-native-community · Jun 15, 2023 · 485f79f · 485f79f
2 parents 34e98f4 + 4650a8d
commit 485f79f
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 57 deletions.
diff --git a/__e2e__/__snapshots__/default.test.ts.snap b/__e2e__/__snapshots__/default.test.ts.snap
@@ -5,7 +5,6 @@ exports[`shows up help information without passing in any args 1`] = `
 
 Options:
   -v                            Output the current version
-  --verbose                     Increase logging verbosity
   -h, --help                    display help for command
 
 Commands:

diff --git a/__e2e__/init.test.ts b/__e2e__/init.test.ts
@@ -6,6 +6,7 @@ import {
   cleanupSync,
   writeFiles,
 } from '../jest/helpers';
+import slash from 'slash';
 
 const DIR = getTempDirectory('command-init');
 
@@ -41,7 +42,7 @@ afterEach(() => {
 
 let templatePath = path.resolve(DIR, 'custom', 'template');
 if (process.platform === 'win32') {
-  templatePath = templatePath.split('\\').join('/');
+  templatePath = slash(templatePath);
 } else {
   templatePath = `file://${templatePath}`;
 }

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "exact": true

diff --git a/packages/cli-clean/package.json b/packages/cli-clean/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@react-native-community/cli-clean",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "types": "build/index.d.ts",
   "dependencies": {
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
     "chalk": "^4.1.2",
     "execa": "^5.0.0",
     "prompts": "^2.4.0"
@@ -19,7 +19,7 @@
     "!*.map"
   ],
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.3",
+    "@react-native-community/cli-types": "12.0.0-alpha.4",
     "@types/prompts": "^2.0.9"
   },
   "homepage": "https://github.com/react-native-community/cli/tree/master/packages/cli-clean",

diff --git a/packages/cli-config/package.json b/packages/cli-config/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@react-native-community/cli-config",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "types": "build/index.d.ts",
   "dependencies": {
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
     "chalk": "^4.1.2",
     "cosmiconfig": "^5.1.0",
     "deepmerge": "^4.3.0",
@@ -21,7 +21,7 @@
     "!*.map"
   ],
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.3",
+    "@react-native-community/cli-types": "12.0.0-alpha.4",
     "@types/cosmiconfig": "^5.0.3",
     "@types/glob": "^7.1.1"
   },

diff --git a/packages/cli-debugger-ui/package.json b/packages/cli-debugger-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/cli-debugger-ui",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "./build/middleware",
   "scripts": {

diff --git a/packages/cli-doctor/package.json b/packages/cli-doctor/package.json
@@ -1,18 +1,18 @@
 {
   "name": "@react-native-community/cli-doctor",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "types": "build/index.d.ts",
   "dependencies": {
-    "@react-native-community/cli-config": "12.0.0-alpha.3",
-    "@react-native-community/cli-platform-android": "12.0.0-alpha.3",
-    "@react-native-community/cli-platform-ios": "12.0.0-alpha.3",
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
-    "@react-native-community/cli-plugin-metro": "12.0.0-alpha.3",
+    "@react-native-community/cli-config": "12.0.0-alpha.4",
+    "@react-native-community/cli-platform-android": "12.0.0-alpha.4",
+    "@react-native-community/cli-platform-ios": "12.0.0-alpha.4",
+    "@react-native-community/cli-plugin-metro": "12.0.0-alpha.4",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
     "chalk": "^4.1.2",
     "command-exists": "^1.2.8",
     "envinfo": "^7.7.2",
@@ -34,7 +34,7 @@
     "!*.map"
   ],
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.3",
+    "@react-native-community/cli-types": "12.0.0-alpha.4",
     "@types/command-exists": "^1.2.0",
     "@types/envinfo": "^7.8.1",
     "@types/ip": "^1.1.0",

diff --git a/packages/cli-doctor/src/commands/doctor.ts b/packages/cli-doctor/src/commands/doctor.ts
@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import {logger, getLoader} from '@react-native-community/cli-tools';
+import {logger, getLoader, CLIError} from '@react-native-community/cli-tools';
 import {getHealthchecks, HEALTHCHECK_TYPES} from '../tools/healthchecks';
 import printFixOptions, {KEYS} from '../tools/printFixOptions';
 import runAutomaticFix, {AUTOMATIC_FIX_LEVELS} from '../tools/runAutomaticFix';
@@ -255,8 +255,8 @@ const doctorCommand = (async (_, options, config) => {
 
         process.exit(0);
       } catch (err) {
-        // TODO: log error
-        process.exit(1);
+        logger.log((err as any).stderr || (err as any).stdout);
+        throw new CLIError('Failed to run automatic fixes.', err as Error);
       }
     }
   };

diff --git a/packages/cli-doctor/src/tools/runAutomaticFix.ts b/packages/cli-doctor/src/tools/runAutomaticFix.ts
@@ -92,7 +92,7 @@ export default async function ({
           config,
         });
       } catch (error) {
-        // TODO: log the error in a meaningful way
+        logger.error((error as any).stderr || (error as any).stdout);
       }
     }
   }

diff --git a/packages/cli-hermes/package.json b/packages/cli-hermes/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@react-native-community/cli-hermes",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "types": "build/index.d.ts",
   "dependencies": {
-    "@react-native-community/cli-platform-android": "12.0.0-alpha.3",
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
+    "@react-native-community/cli-platform-android": "12.0.0-alpha.4",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
     "chalk": "^4.1.2",
     "hermes-profile-transformer": "^0.0.6",
     "ip": "^1.1.5"
@@ -20,7 +20,7 @@
     "!*.map"
   ],
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.3",
+    "@react-native-community/cli-types": "12.0.0-alpha.4",
     "@types/ip": "^1.1.0"
   },
   "homepage": "https://github.com/react-native-community/cli/tree/master/packages/cli-hermes",

diff --git a/packages/cli-platform-android/package.json b/packages/cli-platform-android/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@react-native-community/cli-platform-android",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
     "chalk": "^4.1.2",
     "execa": "^5.0.0",
     "glob": "^7.1.3",
@@ -20,8 +20,8 @@
     "native_modules.gradle"
   ],
   "devDependencies": {
-    "@react-native-community/cli-plugin-metro": "12.0.0-alpha.3",
-    "@react-native-community/cli-types": "12.0.0-alpha.3",
+    "@react-native-community/cli-plugin-metro": "12.0.0-alpha.4",
+    "@react-native-community/cli-types": "12.0.0-alpha.4",
     "@types/fs-extra": "^8.1.0",
     "@types/glob": "^7.1.1"
   },

diff --git a/packages/cli-platform-ios/package.json b/packages/cli-platform-ios/package.json
@@ -1,21 +1,21 @@
 {
   "name": "@react-native-community/cli-platform-ios",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
     "chalk": "^4.1.2",
     "execa": "^5.0.0",
     "fast-xml-parser": "^4.0.12",
     "glob": "^7.1.3",
     "ora": "^5.4.1"
   },
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.3",
+    "@react-native-community/cli-types": "12.0.0-alpha.4",
     "@types/glob": "^7.1.1",
     "@types/lodash": "^4.14.149",
     "hasbin": "^1.2.3"

diff --git a/packages/cli-platform-ios/src/tools/getConfigurationScheme.ts b/packages/cli-platform-ios/src/tools/getConfigurationScheme.ts
@@ -11,9 +11,12 @@ export function getConfigurationScheme(
 ) {
   if (scheme && mode) {
     return mode;
-  } else if (scheme) {
-    return getBuildConfigurationFromXcScheme(scheme, mode, sourceDir);
   }
 
-  return mode || 'Debug';
+  const configuration = mode || 'Debug';
+  if (scheme) {
+    return getBuildConfigurationFromXcScheme(scheme, configuration, sourceDir);
+  }
+
+  return configuration;
 }
diff --git a/packages/cli-plugin-metro/package.json b/packages/cli-plugin-metro/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@react-native-community/cli-plugin-metro",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@react-native-community/cli-server-api": "12.0.0-alpha.3",
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
+    "@react-native-community/cli-server-api": "12.0.0-alpha.4",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
     "chalk": "^4.1.2",
     "execa": "^5.0.0",
     "metro": "0.76.5",
@@ -20,7 +20,7 @@
     "readline": "^1.3.0"
   },
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.3"
+    "@react-native-community/cli-types": "12.0.0-alpha.4"
   },
   "files": [
     "build",

diff --git a/packages/cli-server-api/package.json b/packages/cli-server-api/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@react-native-community/cli-server-api",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@react-native-community/cli-debugger-ui": "12.0.0-alpha.3",
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
+    "@react-native-community/cli-debugger-ui": "12.0.0-alpha.4",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
     "compression": "^1.7.1",
     "connect": "^3.6.5",
     "errorhandler": "^1.5.1",

diff --git a/packages/cli-tools/package.json b/packages/cli-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/cli-tools",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "license": "MIT",
   "main": "build/index.js",
   "publishConfig": {
@@ -18,7 +18,7 @@
     "shell-quote": "^1.7.3"
   },
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.3",
+    "@react-native-community/cli-types": "12.0.0-alpha.4",
     "@types/lodash": "^4.14.149",
     "@types/mime": "^2.0.1",
     "@types/node": "^16.0.0",

diff --git a/packages/cli-types/package.json b/packages/cli-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/cli-types",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "main": "build",
   "publishConfig": {
     "access": "public"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/cli",
-  "version": "12.0.0-alpha.3",
+  "version": "12.0.0-alpha.4",
   "description": "React Native CLI",
   "license": "MIT",
   "main": "build/index.js",
@@ -24,15 +24,15 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@react-native-community/cli-clean": "12.0.0-alpha.3",
-    "@react-native-community/cli-config": "12.0.0-alpha.3",
-    "@react-native-community/cli-debugger-ui": "12.0.0-alpha.3",
-    "@react-native-community/cli-doctor": "12.0.0-alpha.3",
-    "@react-native-community/cli-hermes": "12.0.0-alpha.3",
-    "@react-native-community/cli-plugin-metro": "12.0.0-alpha.3",
-    "@react-native-community/cli-server-api": "12.0.0-alpha.3",
-    "@react-native-community/cli-tools": "12.0.0-alpha.3",
-    "@react-native-community/cli-types": "12.0.0-alpha.3",
+    "@react-native-community/cli-clean": "12.0.0-alpha.4",
+    "@react-native-community/cli-config": "12.0.0-alpha.4",
+    "@react-native-community/cli-debugger-ui": "12.0.0-alpha.4",
+    "@react-native-community/cli-doctor": "12.0.0-alpha.4",
+    "@react-native-community/cli-hermes": "12.0.0-alpha.4",
+    "@react-native-community/cli-plugin-metro": "12.0.0-alpha.4",
+    "@react-native-community/cli-server-api": "12.0.0-alpha.4",
+    "@react-native-community/cli-tools": "12.0.0-alpha.4",
+    "@react-native-community/cli-types": "12.0.0-alpha.4",
     "chalk": "^4.1.2",
     "commander": "^9.4.1",
     "execa": "^5.0.0",

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -16,8 +16,7 @@ const pkgJson = require('../package.json');
 const program = new CommanderCommand()
   .usage('[command] [options]')
   .version(pkgJson.version, '-v', 'Output the current version')
-  .option('--verbose', 'Increase logging verbosity');
-// .enablePositionalOptions();
+  .enablePositionalOptions();
 
 const handleError = (err: Error) => {
   logger.enable();
@@ -85,6 +84,7 @@ function attachCommand<C extends Command<boolean>>(
 ): void {
   const cmd = program
     .command(command.name)
+    .option('--verbose', 'Increase logging verbosity')
     .action(async function handleAction(
       this: CommanderCommand,
       ...args: string[]
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ export default async function ({ @@
               config,
             });
           } catch (error) {
-            // TODO: log the error in a meaningful way
+            logger.error((error as any).stderr || (error as any).stdout);
           }
         }
       }
@@ Expand Down @@