From 4b6b706680753b8837bf056deacbb55feb12de89 Mon Sep 17 00:00:00 2001
From: Ruslan Lesiutin <hoxy@meta.com>
Date: Mon, 20 Mar 2023 07:05:52 -0700
Subject: [PATCH] Update paths in a new setup to fix nightlies (#36535)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/36535

Changelog: [Internal]

- We should be copying `/packages/react-native/package.json`, not root `package.json`
- Updating CircleCI config's target directory where hermes artifacts should be copied

Reviewed By: cortinico

Differential Revision: D44214309

fbshipit-source-id: af84897df3931c6a2d6a902b33c71b665c3fcefc
---
 .circleci/config.yml      | 6 +++---
 scripts/set-rn-version.js | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef817fbbd2..34bb15d9ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1510,9 +1510,9 @@ jobs:
 
             cp -r $HERMES_WS_DIR/win64-bin/* ./packages/react-native/sdks/hermesc/win64-bin/.
             cp -r $HERMES_WS_DIR/linux64-bin/* ./packages/react-native/sdks/hermesc/linux64-bin/.
-            mkdir -p ./ReactAndroid/external-artifacts/artifacts/
-            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
-            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
+            mkdir -p ./packages/react-native/ReactAndroid/external-artifacts/artifacts/
+            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./packages/react-native/ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
+            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./packages/react-native/ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
 
       - run_yarn
       - download_gradle_dependencies
diff --git a/scripts/set-rn-version.js b/scripts/set-rn-version.js
index 7bafee1125..afa63887e4 100755
--- a/scripts/set-rn-version.js
+++ b/scripts/set-rn-version.js
@@ -61,7 +61,10 @@ const tmpVersioningFolder = fs.mkdtempSync(
 echo(`The temp versioning folder is ${tmpVersioningFolder}`);
 
 saveFiles(
-  ['package.json', 'packages/react-native/template/package.json'],
+  [
+    'packages/react-native/package.json',
+    'packages/react-native/template/package.json',
+  ],
   tmpVersioningFolder,
 );