From 22c0eaa5cd546ca4b3115b2bc9bbd6fea36cff6a Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@meta.com>
Date: Mon, 21 Aug 2023 03:03:30 -0700
Subject: [PATCH] Clean up update server

Reviewed By: lblasa

Differential Revision: D48433744

fbshipit-source-id: 749868e00e17af02040a8e2c164631e295deae65
---
 desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx   | 5 ++---
 ...ion+cache+11.5.0.patch => @emotion+cache+11.7.1.patch} | 8 ++++----
 .../patches/{metro+0.69.0.patch => metro+0.70.2.patch}    | 0
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename desktop/patches/{@emotion+cache+11.5.0.patch => @emotion+cache+11.7.1.patch} (91%)
 rename desktop/patches/{metro+0.69.0.patch => metro+0.70.2.patch} (100%)

diff --git a/desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx b/desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx
index 9d3381bdc..48f2b7007 100644
--- a/desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx
+++ b/desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx
@@ -9,8 +9,7 @@
 
 import {VersionCheckResult} from '../chrome/UpdateIndicator';
 import {getRenderHostInstance} from 'flipper-frontend-core';
-
-const updateServer = 'https://www.facebook.com/fbflipper/public/latest.json';
+import config from './config';
 
 const getPlatformSpecifier = (): string => {
   switch (getRenderHostInstance().serverConfig.environmentInfo.os.platform) {
@@ -52,7 +51,7 @@ const parseResponse = (resp: any): VersionCheckResult => {
 export async function checkForUpdate(
   currentVersion: string,
 ): Promise<VersionCheckResult> {
-  return fetch(`${updateServer}?version=${currentVersion}`).then(
+  return fetch(`${config.updateServer}?version=${currentVersion}`).then(
     (res: Response) => {
       switch (res.status) {
         case 204:
diff --git a/desktop/patches/@emotion+cache+11.5.0.patch b/desktop/patches/@emotion+cache+11.7.1.patch
similarity index 91%
rename from desktop/patches/@emotion+cache+11.5.0.patch
rename to desktop/patches/@emotion+cache+11.7.1.patch
index c77129dd9..1d28e46b2 100644
--- a/desktop/patches/@emotion+cache+11.5.0.patch
+++ b/desktop/patches/@emotion+cache+11.7.1.patch
@@ -1,8 +1,8 @@
 diff --git a/node_modules/@emotion/cache/dist/emotion-cache.cjs.dev.js b/node_modules/@emotion/cache/dist/emotion-cache.cjs.dev.js
-index 9a906b4..57f9d9d 100644
+index af9ac5a..195c3ff 100644
 --- a/node_modules/@emotion/cache/dist/emotion-cache.cjs.dev.js
 +++ b/node_modules/@emotion/cache/dist/emotion-cache.cjs.dev.js
-@@ -158,9 +158,10 @@ var createUnsafeSelectorsAlarm = function createUnsafeSelectorsAlarm(cache) {
+@@ -159,9 +159,10 @@ var createUnsafeSelectorsAlarm = function createUnsafeSelectorsAlarm(cache) {
          return;
        }
  
@@ -17,10 +17,10 @@ index 9a906b4..57f9d9d 100644
    };
  };
 diff --git a/node_modules/@emotion/cache/dist/emotion-cache.esm.js b/node_modules/@emotion/cache/dist/emotion-cache.esm.js
-index 5e5fa89..781c69a 100644
+index fd65cd3..40899c2 100644
 --- a/node_modules/@emotion/cache/dist/emotion-cache.esm.js
 +++ b/node_modules/@emotion/cache/dist/emotion-cache.esm.js
-@@ -149,9 +149,10 @@ var createUnsafeSelectorsAlarm = function createUnsafeSelectorsAlarm(cache) {
+@@ -150,9 +150,10 @@ var createUnsafeSelectorsAlarm = function createUnsafeSelectorsAlarm(cache) {
          return;
        }
  
diff --git a/desktop/patches/metro+0.69.0.patch b/desktop/patches/metro+0.70.2.patch
similarity index 100%
rename from desktop/patches/metro+0.69.0.patch
rename to desktop/patches/metro+0.70.2.patch