From a2015ee08be084aa1d472652078adfe468d21bbf Mon Sep 17 00:00:00 2001
From: kyle <shockey@users.noreply.github.com>
Date: Fri, 8 Jun 2018 23:18:55 -0700
Subject: [PATCH] Revert "initial perf, which gets stripped out in production
 (#4131)" (#4636)

This reverts commit 5ea2150ae7d05e56191f79ab5f9bda1a69930a1e.
---
 make-webpack-config.js            |  2 +-
 package.json                      |  3 +--
 src/core/plugins/spec/actions.js  |  7 -------
 src/core/plugins/spec/reducers.js | 10 +---------
 src/core/system.js                | 12 +++---------
 src/perf.js                       | 16 ----------------
 webpack-dist.config.js            | 12 +-----------
 webpack-hot-dev-server.config.js  |  2 +-
 webpack-watch.config.js           |  5 -----
 9 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 src/perf.js

diff --git a/make-webpack-config.js b/make-webpack-config.js
index 6e2c786a..74eae669 100644
--- a/make-webpack-config.js
+++ b/make-webpack-config.js
@@ -41,7 +41,7 @@ var commonRules = [
   { test: /\.(woff|woff2)(\?.*)?$/,
     loader: "url-loader?limit=100000" },
   { test: /\.(ttf|eot)(\?.*)?$/,
-    loader: "file-loader" },
+    loader: "file-loader" }
 ]
 
 module.exports = function(rules, options) {
diff --git a/package.json b/package.json
index 264a44ff..9f833a20 100644
--- a/package.json
+++ b/package.json
@@ -154,8 +154,7 @@
     "uglifyjs-webpack-plugin": "^1.2.5",
     "url-loader": "0.5.9",
     "webpack": "^2.6.1",
-    "webpack-bundle-size-analyzer": "^2.5.0",
-    "webpack-strip-block": "^0.2.0"
+    "webpack-bundle-size-analyzer": "^2.5.0"
   },
   "config": {
     "deps_check_dir": ".deps_check"
diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js
index 000458ef..d35e09e5 100644
--- a/src/core/plugins/spec/actions.js
+++ b/src/core/plugins/spec/actions.js
@@ -104,10 +104,6 @@ export const resolveSpec = (json, url) => ({specActions, specSelectors, errActio
 
   let specStr = specSelectors.specStr()
 
-  /* develblock:start */
-  require("root/src/perf").start("resolve")
-  /* develblock:end */
-
   return resolve({
     fetch,
     spec: json,
@@ -135,9 +131,6 @@ export const resolveSpec = (json, url) => ({specActions, specSelectors, errActio
         errActions.newThrownErrBatch(preparedErrors)
       }
 
-    /* develblock:start */
-    require("root/src/perf").stop("resolve")
-    /* develblock:end */
       return specActions.updateResolved(spec)
     })
 }
diff --git a/src/core/plugins/spec/reducers.js b/src/core/plugins/spec/reducers.js
index b21ab174..c95c7ce9 100644
--- a/src/core/plugins/spec/reducers.js
+++ b/src/core/plugins/spec/reducers.js
@@ -42,15 +42,7 @@ export default {
   },
 
   [UPDATE_RESOLVED]: (state, action) => {
-    /* develblock:start */
-    require("root/src/perf").start("UPDATE_RESOLVED")
-    /* develblock:end */
-    const resolved = fromJSOrdered(action.payload)
-
-    /* develblock:start */
-    require("root/src/perf").stop("UPDATE_RESOLVED")
-    /* develblock:end */
-    return state.setIn(["resolved"], resolved)
+    return state.setIn(["resolved"], fromJSOrdered(action.payload))
   },
 
   [UPDATE_RESOLVED_SUBTREE]: (state, action) => {
diff --git a/src/core/system.js b/src/core/system.js
index 61cb6e6b..824bc558 100644
--- a/src/core/system.js
+++ b/src/core/system.js
@@ -15,15 +15,9 @@ const idFn = a => a
 function createStoreWithMiddleware(rootReducer, initialState, getSystem) {
 
   let middlwares = [
-    /* develblock:start */
-    // Measure actions
-    () => next => action => {
-      require("root/src/perf").start("action:"+action.type)
-      const res = next(action)
-      require("root/src/perf").stop("action:"+action.type)
-      return res
-    },
-    /* develblock:end */
+    // createLogger( {
+    //   stateTransformer: state => state && state.toJS()
+    // } ),
     systemThunkMiddleware( getSystem )
   ]
 
diff --git a/src/perf.js b/src/perf.js
deleted file mode 100644
index 484ace63..00000000
--- a/src/perf.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// This uses experimental console methods, to track performance
-
-module.exports = {
-  start(str) {
-    /* develblock:start */
-    // eslint-disable-next-line no-console
-    console.time(str)
-    /* develblock:end */
-  },
-  stop(str) {
-    /* develblock:start */
-    // eslint-disable-next-line no-console
-    console.timeEnd(str)
-    /* develblock:end */
-  }
-}
diff --git a/webpack-dist.config.js b/webpack-dist.config.js
index a08ed03d..391c4a96 100644
--- a/webpack-dist.config.js
+++ b/webpack-dist.config.js
@@ -15,17 +15,7 @@ let rules = [
       },
       { loader: "babel-loader?retainLines=true" }
     ]
-  },
-  // This will strip out blocks of code that start with:
-  /* develblock:start */
-  // And end with
-  /* develblock:end */
-  {
-    test: /\.jsx?$/,
-    enforce: "pre",
-    exclude: /(node_modules|\.spec\.js)/,
-    loader: "webpack-strip-block"
-  },
+  }
 ]
 rules = rules.concat(styleRules)
 
diff --git a/webpack-hot-dev-server.config.js b/webpack-hot-dev-server.config.js
index 621a5796..5ca1b041 100644
--- a/webpack-hot-dev-server.config.js
+++ b/webpack-hot-dev-server.config.js
@@ -35,7 +35,7 @@ const rules = [
         }
       }
     ]
-  },
+  }
 ]
 
 module.exports = require("./make-webpack-config")(rules, {
diff --git a/webpack-watch.config.js b/webpack-watch.config.js
index f9d29b37..2c4bbc94 100644
--- a/webpack-watch.config.js
+++ b/webpack-watch.config.js
@@ -5,9 +5,4 @@ config.plugins = config.plugins.filter(plugin => {
   return plugin.constructor.name !== "UglifyJsPlugin"
 })
 
-config.module.rules = config.module.rules.filter(rule => {
-  // Disable minification
-  return rule.loader != "webpack-strip-block"
-})
-
 module.exports = config