resolve merge conflicts. rge branch 'master' of https://github.com/el…

…ectrode-io/electrode-webpack-reporter
electrode-io · Dec 1, 2016 · 6e1cbbc · 6e1cbbc
2 parents a568a9d + 706cf98
commit 6e1cbbc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/packages/electrode-webpack-reporter/lib/module-processor.js b/packages/electrode-webpack-reporter/lib/module-processor.js
@@ -86,6 +86,11 @@ class ModuleProcessor {
     const byPkg = this.modulesByPackage = {};
     this.totalSize = 0;
     Object.keys(this.modulesByName).forEach((name) => {
+      // Ignore "ignored" modules i.e. node shims etc.
+      if (name.indexOf('(ignored)') > -1) {
+        return;
+      }
+
       const split = this._splitPathName(name);
       const pkg = byPkg[split.name] || (byPkg[split.name] = {size: 0});
       const getVersion = (parents) => {

diff --git a/packages/electrode-webpack-reporter/lib/webpack-reporter.js b/packages/electrode-webpack-reporter/lib/webpack-reporter.js
@@ -56,6 +56,10 @@ class WebpackReporter extends EventEmitter {
   }
 
   _stats(req, res) {
+    const jsonData = () => {
+      return this._reporterOptions.stats.toJson({}, true);
+    };
+
     res.format({
       json: () => {
         res.json(jsonData());