From 25796896757e48669eba501a0c42be6cc4580239 Mon Sep 17 00:00:00 2001
From: Daniel Lu <dl1644@gmail.com>
Date: Tue, 19 Dec 2023 11:25:07 -0800
Subject: [PATCH 1/4] Tentative fix for nextJS test app

---
 packages/@react-spectrum/menu/src/Menu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/menu/src/Menu.tsx b/packages/@react-spectrum/menu/src/Menu.tsx
index 0a6a78b570d..c63208e0277 100644
--- a/packages/@react-spectrum/menu/src/Menu.tsx
+++ b/packages/@react-spectrum/menu/src/Menu.tsx
@@ -114,7 +114,7 @@ function Menu<T extends object>(props: SpectrumMenuProps<T>, ref: DOMRef<HTMLDiv
 
 export function TrayHeaderWrapper(props) {
   let {children, isSubmenu, hasOpenSubmenu, parentMenuTreeState, rootMenuTriggerState, onBackButtonPress, wrapperKeyDown} = props;
-  let stringFormatter = useLocalizedStringFormatter(intlMessages);
+  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/menu');
   let backButtonText = parentMenuTreeState?.collection.getItem(rootMenuTriggerState?.UNSTABLE_expandedKeysStack.slice(-1)[0])?.textValue;
   let backButtonLabel = stringFormatter.format('backButton', {
     prevMenuButton: backButtonText

From 81ca70a2db7be99c8fb0b2c62141dec3be62a346 Mon Sep 17 00:00:00 2001
From: Daniel Lu <dl1644@gmail.com>
Date: Tue, 19 Dec 2023 11:37:56 -0800
Subject: [PATCH 2/4] test build on PR

---
 .circleci/comment.js | 6 +++---
 .circleci/config.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/comment.js b/.circleci/comment.js
index 768e304a0c9..2382a44477b 100644
--- a/.circleci/comment.js
+++ b/.circleci/comment.js
@@ -11,7 +11,7 @@ async function run() {
   let pr;
   // If we aren't running on a PR commit, double check if this is a branch created for a fork. If so, we'll need to
   // comment the build link on the fork.
-  if (!process.env.CIRCLE_PULL_REQUEST) {
+  if (true) {
     try {
       const commit = await octokit.git.getCommit({
         owner: 'adobe',
@@ -20,7 +20,7 @@ async function run() {
       });
 
       // Check if it is a merge commit from the github "Branch from fork action"
-      if (commit && commit.data?.parents?.length === 2 && commit.data.message.indexOf('Merge') > -1) {
+      if (false) {
         // Unfortunately listPullRequestsAssociatedWithCommit doesn't return fork prs so have to use search api
         // to find the fork PR the original commit lives in
         const forkHeadCommit = commit.data.parents[1].sha;
@@ -41,7 +41,7 @@ async function run() {
             break;
           }
         }
-      } else if (process.env.CIRCLE_BRANCH === 'main') {
+      } else if (true) {
         //If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
         await octokit.repos.createCommitComment({
           owner: 'adobe',
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e763c91ad3..e82f11bc2a7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -599,8 +599,8 @@ workflows:
             - install
       - docs-verdaccio:
           filters:
-            branches:
-              only: main
+            # branches:
+            #   only: main
           requires:
             - install
       - deploy:

From eaddd672cee35c899952ebfca4b3f641f2ee0059 Mon Sep 17 00:00:00 2001
From: Daniel Lu <dl1644@gmail.com>
Date: Tue, 19 Dec 2023 11:46:55 -0800
Subject: [PATCH 3/4] fix build

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e82f11bc2a7..ccad4d5b053 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -598,7 +598,7 @@ workflows:
           requires:
             - install
       - docs-verdaccio:
-          filters:
+          # filters:
             # branches:
             #   only: main
           requires:

From f679d45c985c966d56737f3c5f3ea5b64c8e4a96 Mon Sep 17 00:00:00 2001
From: Daniel Lu <dl1644@gmail.com>
Date: Tue, 19 Dec 2023 12:02:52 -0800
Subject: [PATCH 4/4] revert circle changes

---
 .circleci/comment.js | 6 +++---
 .circleci/config.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/comment.js b/.circleci/comment.js
index 2382a44477b..768e304a0c9 100644
--- a/.circleci/comment.js
+++ b/.circleci/comment.js
@@ -11,7 +11,7 @@ async function run() {
   let pr;
   // If we aren't running on a PR commit, double check if this is a branch created for a fork. If so, we'll need to
   // comment the build link on the fork.
-  if (true) {
+  if (!process.env.CIRCLE_PULL_REQUEST) {
     try {
       const commit = await octokit.git.getCommit({
         owner: 'adobe',
@@ -20,7 +20,7 @@ async function run() {
       });
 
       // Check if it is a merge commit from the github "Branch from fork action"
-      if (false) {
+      if (commit && commit.data?.parents?.length === 2 && commit.data.message.indexOf('Merge') > -1) {
         // Unfortunately listPullRequestsAssociatedWithCommit doesn't return fork prs so have to use search api
         // to find the fork PR the original commit lives in
         const forkHeadCommit = commit.data.parents[1].sha;
@@ -41,7 +41,7 @@ async function run() {
             break;
           }
         }
-      } else if (true) {
+      } else if (process.env.CIRCLE_BRANCH === 'main') {
         //If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
         await octokit.repos.createCommitComment({
           owner: 'adobe',
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ccad4d5b053..8e763c91ad3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -598,9 +598,9 @@ workflows:
           requires:
             - install
       - docs-verdaccio:
-          # filters:
-            # branches:
-            #   only: main
+          filters:
+            branches:
+              only: main
           requires:
             - install
       - deploy: