From 36314829b2f13d53d905896cf8741eef1b92c5f5 Mon Sep 17 00:00:00 2001 From: "Andrew Coates (REDMOND)" Date: Thu, 7 May 2020 14:17:58 -0700 Subject: [PATCH 1/2] Align local metro config with future CLI changes --- packages/react-native-win32/metro-react-native-platform.js | 4 ++-- vnext/metro-react-native-platform.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-native-win32/metro-react-native-platform.js b/packages/react-native-win32/metro-react-native-platform.js index daf9a550e04..bce9b4f4a36 100644 --- a/packages/react-native-win32/metro-react-native-platform.js +++ b/packages/react-native-win32/metro-react-native-platform.js @@ -29,11 +29,11 @@ function reactNativePlatformResolver(platformImplementations) { } } let result = resolve(context, modifiedModuleName, platform); - context.resolveRequest = backupResolveRequest; return result; } catch (e) { - context.resolveRequest = backupResolveRequest; throw e; + } finally { + context.resolveRequest = backupResolveRequest; } }; } diff --git a/vnext/metro-react-native-platform.js b/vnext/metro-react-native-platform.js index e9acdf525a7..5ee8ff3d65a 100644 --- a/vnext/metro-react-native-platform.js +++ b/vnext/metro-react-native-platform.js @@ -29,11 +29,11 @@ function reactNativePlatformResolver(platformImplementations) { } } let result = resolve(context, modifiedModuleName, platform); - context.resolveRequest = backupResolveRequest; return result; } catch (e) { - context.resolveRequest = backupResolveRequest; throw e; + } finally { + context.resolveRequest = backupResolveRequest; } }; } From d54f12607bd72bc2523d11f3fa8f4403b3eab84a Mon Sep 17 00:00:00 2001 From: "Andrew Coates (REDMOND)" Date: Thu, 7 May 2020 14:18:14 -0700 Subject: [PATCH 2/2] Change files --- ...eact-native-win32-2020-05-07-14-18-13-clifeedback.json | 8 ++++++++ ...ct-native-windows-2020-05-07-14-18-13-clifeedback.json | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 change/@office-iss-react-native-win32-2020-05-07-14-18-13-clifeedback.json create mode 100644 change/react-native-windows-2020-05-07-14-18-13-clifeedback.json diff --git a/change/@office-iss-react-native-win32-2020-05-07-14-18-13-clifeedback.json b/change/@office-iss-react-native-win32-2020-05-07-14-18-13-clifeedback.json new file mode 100644 index 00000000000..fd332b25345 --- /dev/null +++ b/change/@office-iss-react-native-win32-2020-05-07-14-18-13-clifeedback.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Align local metro config with future CLI changes", + "packageName": "@office-iss/react-native-win32", + "email": "acoates@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-07T21:18:12.974Z" +} diff --git a/change/react-native-windows-2020-05-07-14-18-13-clifeedback.json b/change/react-native-windows-2020-05-07-14-18-13-clifeedback.json new file mode 100644 index 00000000000..0a15e1dc31e --- /dev/null +++ b/change/react-native-windows-2020-05-07-14-18-13-clifeedback.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Align local metro config with future CLI changes", + "packageName": "react-native-windows", + "email": "acoates@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-07T21:18:13.813Z" +}