From db2fdbe102871e28eba146feebd542005d07820a Mon Sep 17 00:00:00 2001
From: Jeremy Hermelin <jerem@pukka.io>
Date: Wed, 12 Feb 2020 13:37:30 -0500
Subject: [PATCH 1/2] admin watcher improvement

Signed-off-by: Jeremy Hermelin <jerem@pukka.io>
---
 packages/strapi-admin/index.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/strapi-admin/index.js b/packages/strapi-admin/index.js
index 5399726e38..37660c76bb 100644
--- a/packages/strapi-admin/index.js
+++ b/packages/strapi-admin/index.js
@@ -249,6 +249,7 @@ async function watchFiles(dir, ignoreFiles = []) {
   const cacheDir = path.join(dir, '.cache');
   const pkgJSON = require(path.join(dir, 'package.json'));
   const admin = path.join(dir, 'admin');
+  const extensionsPath = path.join(dir, 'extensions');
 
   const appPlugins = Object.keys(pkgJSON.dependencies).filter(
     dep =>
@@ -256,12 +257,7 @@ async function watchFiles(dir, ignoreFiles = []) {
       fs.existsSync(path.resolve(getPkgPath(dep), 'admin', 'src', 'index.js'))
   );
   const pluginsToWatch = appPlugins.map(plugin =>
-    path.join(
-      dir,
-      'extensions',
-      plugin.replace(/^strapi-plugin-/i, ''),
-      'admin'
-    )
+    path.join(extensionsPath, plugin.replace(/^strapi-plugin-/i, ''), 'admin')
   );
   const filesToWatch = [admin, ...pluginsToWatch];
 
@@ -272,20 +268,20 @@ async function watchFiles(dir, ignoreFiles = []) {
   });
 
   watcher.on('all', async (event, filePath) => {
-    const re = /\/extensions\/([^\/]*)\/.*$/gm;
-    const matched = re.exec(filePath);
-    const isExtension = matched !== null;
-    const pluginName = isExtension ? matched[1] : '';
+    const isExtension = filePath.includes(extensionsPath);
+    const pluginName = isExtension
+      ? filePath.replace(extensionsPath, '').split(path.sep)[1]
+      : '';
 
     const packageName = isExtension
       ? `strapi-plugin-${pluginName}`
       : 'strapi-admin';
 
     const targetPath = isExtension
-      ? filePath
-          .split(`${path.sep}extensions${path.sep}`)[1]
-          .replace(pluginName, '')
-      : filePath.split(`${path.sep}admin`)[1];
+      ? path.normalize(
+          filePath.split(extensionsPath)[1].replace(pluginName, '')
+        )
+      : path.normalize(filePath.split(admin)[1]);
 
     const destFolder = isExtension
       ? path.join(cacheDir, 'plugins', packageName)

From 6c0568909ba5a27237a62831bdf32928224ee908 Mon Sep 17 00:00:00 2001
From: okandas <okandasjr@gmail.com>
Date: Tue, 11 Feb 2020 23:12:39 +0200
Subject: [PATCH 2/2] enhancement(Row\Content.js): align plugin icons to the
 center

Signed-off-by: okandas <okandasjr@gmail.com>
---
 packages/strapi-admin/admin/src/components/Row/Content.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/strapi-admin/admin/src/components/Row/Content.js b/packages/strapi-admin/admin/src/components/Row/Content.js
index c8a49ba723..151d2d5091 100644
--- a/packages/strapi-admin/admin/src/components/Row/Content.js
+++ b/packages/strapi-admin/admin/src/components/Row/Content.js
@@ -29,6 +29,7 @@ const Content = styled.div`
 
     .icoWrapper {
       display: flex;
+      align-items: center;
       height: 100%;
       flex-direction: column;
       justify-content: space-around;