From dc1fccdaa94601ae4689da6dfe336c75644934db Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Tue, 25 Jan 2022 09:18:32 +0100
Subject: [PATCH] Always display Settings -> Developer on dev chains (#6877)

---
 packages/apps/webpack.serve.cjs                | 3 +++
 packages/page-settings/src/index.tsx           | 6 +++---
 packages/react-components/src/Status/index.tsx | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/apps/webpack.serve.cjs b/packages/apps/webpack.serve.cjs
index 93ad58dfad..72704bc279 100644
--- a/packages/apps/webpack.serve.cjs
+++ b/packages/apps/webpack.serve.cjs
@@ -24,6 +24,9 @@ module.exports = merge(
       })
     ],
     watchOptions: {
+      // 5.66.0 work-around (was reduced to 20, then started failing)
+      // https://github.com/webpack/webpack/commit/96da7660021e8aa31e163bacd3515960eb253422#diff-13cf5374edb5eced5f3770d5f346c59252f87a90de91bc57306077693c8b95e2R52
+      aggregateTimeout: 200,
       ignored: ['.yarn', 'build', 'node_modules']
     }
   }
diff --git a/packages/page-settings/src/index.tsx b/packages/page-settings/src/index.tsx
index 8462e230a2..20534f7b29 100644
--- a/packages/page-settings/src/index.tsx
+++ b/packages/page-settings/src/index.tsx
@@ -21,7 +21,7 @@ export { useCounter };
 
 function SettingsApp ({ basePath, onStatusChange }: Props): React.ReactElement<Props> {
   const { t } = useTranslation();
-  const { api, isApiConnected, isApiReady } = useApi();
+  const { api, isApiConnected, isApiReady, isDevelopment } = useApi();
   const numExtensions = useCounter();
 
   const items = useMemo(() => [
@@ -47,11 +47,11 @@ function SettingsApp ({ basePath, onStatusChange }: Props): React.ReactElement<P
 
   const hidden = useMemo(
     () => (isApiConnected && isApiReady)
-      ? api.runtimeMetadata.version <= 13
+      ? isDevelopment || (api.runtimeMetadata.version <= 13)
         ? []
         : ['developer']
       : ['metadata', 'i18n'],
-    [api, isApiConnected, isApiReady]
+    [api, isApiConnected, isApiReady, isDevelopment]
   );
 
   return (
diff --git a/packages/react-components/src/Status/index.tsx b/packages/react-components/src/Status/index.tsx
index b3b4541c8d..ff58e2c61f 100644
--- a/packages/react-components/src/Status/index.tsx
+++ b/packages/react-components/src/Status/index.tsx
@@ -179,7 +179,7 @@ function Status ({ className = '' }: Props): React.ReactElement<Props> | null {
 }
 
 export default React.memo(styled(Status)`
-  bottom: 0;
+  /* bottom: 0; */
   display: inline-block;
   overflow: hidden;
   position: fixed;