From fea2a7ddab386758d450af6fb41f76f0f8e7b7b4 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Sun, 11 Apr 2021 14:59:52 -0400
Subject: [PATCH] Fixed broken feature flag import for DT inline package
 (#21237)

---
 packages/react-devtools-inline/package.json      | 2 +-
 packages/react-devtools-inline/webpack.config.js | 6 +++++-
 packages/react-devtools/CHANGELOG.md             | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/react-devtools-inline/package.json b/packages/react-devtools-inline/package.json
index 6ad9bf82976d8a..a7a4525ccbca21 100644
--- a/packages/react-devtools-inline/package.json
+++ b/packages/react-devtools-inline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-devtools-inline",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "description": "Embed react-devtools within a website",
   "license": "MIT",
   "main": "./dist/backend.js",
diff --git a/packages/react-devtools-inline/webpack.config.js b/packages/react-devtools-inline/webpack.config.js
index 98920b3508c104..6be627a6262b2b 100644
--- a/packages/react-devtools-inline/webpack.config.js
+++ b/packages/react-devtools-inline/webpack.config.js
@@ -33,11 +33,15 @@ module.exports = {
     react: 'react',
     // TODO: Once this package is published, remove the external
     // 'react-debug-tools': 'react-debug-tools',
-    'react-devtools-feature-flags': resolveFeatureFlags('inline'),
     'react-dom': 'react-dom',
     'react-is': 'react-is',
     scheduler: 'scheduler',
   },
+  resolve: {
+    alias: {
+      'react-devtools-feature-flags': resolveFeatureFlags('inline'),
+    },
+  },
   optimization: {
     minimize: false,
   },
diff --git a/packages/react-devtools/CHANGELOG.md b/packages/react-devtools/CHANGELOG.md
index d32bff0dec21a3..1e9df0db7c0dc5 100644
--- a/packages/react-devtools/CHANGELOG.md
+++ b/packages/react-devtools/CHANGELOG.md
@@ -9,6 +9,10 @@
   <!-- Upcoming changes go here -->
 </details>
 
+## 4.11.1 (April 11, 2021)
+#### Bugfix
+* Fixed broken import in `react-devtools-inline` for feature flags file ([bvaughn](https://github.com/bvaughn) in [#21235](https://github.com/facebook/react/issues/21235))
+
 ## 4.11.0 (April 9, 2021)
 #### Bugfix
 * `$r` should contain hooks property when it is `forwardRef` or `memo` component  ([meowtec](https://github.com/meowtec) in [#20626](https://github.com/facebook/react/pull/20626))