fix: nerf property access to better support Editor test harness

This reverts commit 5ea2150ae7.

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) {

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-bundle-size-analyzer": "^2.5.0"
-    "webpack-strip-block": "^0.2.0"
   },
   "config": {
     "deps_check_dir": ".deps_check"

src/core/index.js

@@ -131,6 +131,9 @@ module.exports = function SwaggerUI(opts) {
   var system = store.getSystem()
 
   const downloadSpec = (fetchedConfig) => {
+      if(typeof constructorConfig !== "object") {
+        return system
+      }
     let localConfig = system.specSelectors.getLocalConfig ? system.specSelectors.getLocalConfig() : {}
     let mergedConfig = deepExtend({}, localConfig, constructorConfig, fetchedConfig || {}, queryConfig)
 
@@ -140,7 +143,10 @@ module.exports = function SwaggerUI(opts) {
     }
 
     store.setConfigs(mergedConfig)
+
+    if(system.configsActions) {
       system.configsActions.loaded()
+    }
 
     if (fetchedConfig !== null) {
       if (!queryConfig.url && typeof mergedConfig.spec === "object" && Object.keys(mergedConfig.spec).length) {

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)
     })
 }

src/core/plugins/spec/reducers.js

@@ -42,15 +42,7 @@ export default {
   },
 
   [UPDATE_RESOLVED]: (state, action) => {
-    /* develblock:start */
+    return state.setIn(["resolved"], fromJSOrdered(action.payload))
-    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)
   },
 
   [UPDATE_RESOLVED_SUBTREE]: (state, action) => {

src/core/plugins/spec/wrap-actions.js

@@ -12,7 +12,7 @@ export const updateJsonSpec = (ori, {specActions}) => (...args) => {
 
   // Trigger resolution of any path-level $refs.
   const [json] = args
-  const pathItems = get(json, ["paths"])
+  const pathItems = get(json, ["paths"]) || {}
   const pathItemKeys = Object.keys(pathItems)
 
   pathItemKeys.forEach(k => {

src/core/system.js

@@ -15,15 +15,9 @@ const idFn = a => a
 function createStoreWithMiddleware(rootReducer, initialState, getSystem) {
 
   let middlwares = [
-    /* develblock:start */
+    // createLogger( {
-    // Measure actions
+    //   stateTransformer: state => state && state.toJS()
-    () => 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 */
     systemThunkMiddleware( getSystem )
   ]
 

src/perf.js

@@ -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 */
-  }
-}

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)
 

webpack-hot-dev-server.config.js

@@ -35,7 +35,7 @@ const rules = [
         }
       }
     ]
-  },
+  }
 ]
 
 module.exports = require("./make-webpack-config")(rules, {

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