From 0fd62ed1f9d34e6a4aef44b59bb8db5ae076e254 Mon Sep 17 00:00:00 2001
From: Kevin Partington <kevin.partington@kernelpanicstudios.com>
Date: Mon, 19 Mar 2018 13:53:57 -0400
Subject: [PATCH 1/2] Chore: Adding debug logs on successful plugin loads

---
 lib/config/plugins.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/config/plugins.js b/lib/config/plugins.js
index c509c48fe25..f9ee13c8576 100644
--- a/lib/config/plugins.js
+++ b/lib/config/plugins.js
@@ -120,6 +120,17 @@ class Plugins {
                 throw pluginLoadErr;
             }
 
+            // This step is costly, so skip if debug is disabled
+            if (debug.enabled) {
+                try {
+                    const version = require(`${longName}/package.json`).version;
+
+                    debug(`Loaded plugin ${pluginName} (${longName}@${version})`);
+                } catch (e) {
+                    debug(`Loaded plugin ${pluginName} (${longName}, version unknown)`);
+                }
+            }
+
             this.define(pluginName, plugin);
         }
     }

From abe10284e7c263538750cdc761fcd76eb4f512f1 Mon Sep 17 00:00:00 2001
From: Kevin Partington <kevin.partington@kernelpanicstudios.com>
Date: Mon, 19 Mar 2018 17:36:16 -0400
Subject: [PATCH 2/2] Chore: Adding resolved plugin path to debug logging

---
 lib/config/plugins.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/config/plugins.js b/lib/config/plugins.js
index f9ee13c8576..756f9ff21b8 100644
--- a/lib/config/plugins.js
+++ b/lib/config/plugins.js
@@ -122,13 +122,22 @@ class Plugins {
 
             // This step is costly, so skip if debug is disabled
             if (debug.enabled) {
-                try {
-                    const version = require(`${longName}/package.json`).version;
+                const resolvedPath = require.resolve(longName);
+
+                let version = null;
 
-                    debug(`Loaded plugin ${pluginName} (${longName}@${version})`);
+                try {
+                    version = require(`${longName}/package.json`).version;
                 } catch (e) {
-                    debug(`Loaded plugin ${pluginName} (${longName}, version unknown)`);
+
+                    // Do nothing
                 }
+
+                const loadedPluginAndVersion = version
+                    ? `${longName}@${version}`
+                    : `${longName}, version unknown`;
+
+                debug(`Loaded plugin ${pluginName} (${loadedPluginAndVersion}) (from ${resolvedPath})`);
             }
 
             this.define(pluginName, plugin);