Fix build errors with codegen discovery flag enabled (#1320) (#1376)

* Revert "Use execFileSync over execSync when messing with file paths in generate-artifacts.js"

This reverts commit d68d209.

* [RN][macos] Don't try and build Fabric example when USE_CODEGEN_DISCOVERY=1

* use `execFileSync` for secure argument passing

* Fix tag comments

* Don't use template literals as arguments

Co-authored-by: Shawn Dempsey <[email protected]>

Co-authored-by: Shawn Dempsey <[email protected]>
Co-authored-by: Shawn Dempsey <[email protected]>

Author: 3 people

packages/rn-tester/Podfile

@@ -41,10 +41,12 @@ def pods(options = {})
 
   prefix_path = "../.."
 
-  if ENV['USE_CODEGEN_DISCOVERY'] == '1'
-    # Custom fabric component is only supported when using codegen discovery.
-    pod 'MyNativeView', :path => "NativeComponentExample"
-  end
+  # [TODO(macOS GH#774) - don't enable Fabric on RNTester by default until it works on macOS
+  # if ENV['USE_CODEGEN_DISCOVERY'] == '1'
+  #   # Custom fabric component is only supported when using codegen discovery.
+  #   pod 'MyNativeView', :path => "NativeComponentExample"
+  # end
+  # ]TODO(macOS GH#774)
 
   use_react_native!(
     path: prefix_path,

scripts/generate-artifacts.js

@@ -16,7 +16,7 @@
  * in a CODEGEN_CONFIG_FILENAME file.
  */
 
-const {execSync, execFileSync} = require('child_process');
+const {execFileSync} = require('child_process');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
@@ -185,14 +185,16 @@ function main(appRootDir, outputPath) {
         console.log(
           '\n\n[Codegen] >>>>> Building react-native-codegen package',
         );
-        execSync('yarn install', {
+        // [TODO(macOS GH#774) - use execFileSync to help keep shell commands clean
+        execFileSync('yarn', ['install'], {
           cwd: codegenCliPath,
           stdio: 'inherit',
         });
-        execSync('yarn build', {
+        execFileSync('yarn', ['build'], {
           cwd: codegenCliPath,
           stdio: 'inherit',
         });
+        // ]TODO(macOS GH#774)
       }
     } else if (fs.existsSync(CODEGEN_NPM_PATH)) {
       codegenCliPath = CODEGEN_NPM_PATH;
@@ -235,8 +237,7 @@ function main(appRootDir, outputPath) {
       console.log(`\n\n[Codegen] >>>>> Processing ${library.config.name}`);
       // Generate one schema for the entire library...
       // [TODO(macOS GH#774) - use execFileSync to help keep shell commands clean
-      execFileSync(
-        'node',
+      execFileSync('node', [
         path.join(
           codegenCliPath,
           'lib',
@@ -246,17 +247,17 @@ function main(appRootDir, outputPath) {
         ),
         pathToSchema,
         pathToJavaScriptSources,
-      ); // ]TODO(macOS GH#774)
+      ]); // ]TODO(macOS GH#774)
       console.log(`[Codegen] Generated schema: ${pathToSchema}`);
 
       // ...then generate native code artifacts.
+      // [TODO(macOS GH#774) - use execFileSync to help keep shell commands clean
       const libraryTypeArg = library.config.type
-        ? `--libraryType ${library.config.type}`
-        : '';
+        ? ['--libraryType', library.config.type]
+        : null; // ]TODO(macOS GH#774)
       fs.mkdirSync(pathToTempOutputDir, {recursive: true});
       // [TODO(macOS GH#774) - use execFileSync to help keep shell commands clean
-      execFileSync(
-        'node',
+      execFileSync('node', [
         path.join(RN_ROOT, 'scripts', 'generate-specs-cli.js'),
         '--platform',
         'ios',
@@ -266,13 +267,17 @@ function main(appRootDir, outputPath) {
         pathToTempOutputDir,
         '--libraryName',
         library.config.name,
-        libraryTypeArg,
-      ); // ]TODO(macOS GH#774)
+        ...libraryTypeArg,
+      ]); // ]TODO(macOS GH#774)
 
       // Finally, copy artifacts to the final output directory.
       fs.mkdirSync(pathToOutputDirIOS, {recursive: true});
       // [TODO(macOS GH#774) - use execFileSync to help keep shell commands clean
-      execFileSync('cp', '-R', `${pathToTempOutputDir}/*`, pathToOutputDirIOS); // ]TODO(macOS GH#774)
+      execFileSync('cp', [
+        '-R',
+        path.join(pathToTempOutputDir, '/'),
+        pathToOutputDirIOS,
+      ]); // ]TODO(macOS GH#774)
       console.log(`[Codegen] Generated artifacts: ${pathToOutputDirIOS}`);
 
       // Filter the react native core library out.
@@ -295,16 +300,15 @@ function main(appRootDir, outputPath) {
       // Generate FabricComponentProvider.
       // Only for iOS at this moment.
       // [TODO(macOS GH#774) - use execFileSync to help keep shell commands clean
-      execFileSync(
-        'node',
+      execFileSync('node', [
         path.join(RN_ROOT, 'scripts', 'generate-provider-cli.js'),
         '--platform',
         'ios',
-        '--schemaListPast',
+        '--schemaListPath',
         schemaListTmpPath,
         '--outputDir',
         iosOutputDir,
-      ); // ]TODO(macOS GH#774)
+      ]); // ]TODO(macOS GH#774)
       console.log(`Generated provider in: ${iosOutputDir}`);
     }
   } catch (err) {