Merge pull request #3370 from Automattic/update/server-lru-lib

Server Side Rendering: Use lru-cache instead of LruMap

package.json

@@ -59,7 +59,6 @@
     "localforage": "1.3.3",
     "lodash": "3.10.1",
     "lru-cache": "4.0.0",
-    "lru-map": "1.2.0",
     "lunr": "0.5.7",
     "marked": "0.3.5",
     "moment": "2.10.6",

server/render/index.js

@@ -5,15 +5,15 @@ import ReactDomServer from 'react-dom/server';
 import Helmet from 'react-helmet';
 import memoize from 'lodash/function/memoize';
 import superagent from 'superagent';
-import LruMap from 'lru-map';
+import Lru from 'lru-cache';
 
 /**
  * Internal dependencies
  */
 import config from 'config';
 
+const markupCache = new Lru( { max: 1000 } );
 const memoizedRenderToString = memoize( ReactDomServer.renderToString, element => JSON.stringify( element ) );
-memoizedRenderToString.cache = new LruMap( { maxSize: 1000 } );
 
 function bumpStat( group, name ) {
 	const url = `http://pixel.wp.com/g.gif?v=wpcom-no-pv&x_${ group }=${ name }&t=${ Math.random() }`;
@@ -24,7 +24,9 @@ function bumpStat( group, name ) {
 }
 
 export function render( element ) {
-	if ( ! memoizedRenderToString.cache.has( element ) ) {
+	memoizedRenderToString.cache = markupCache;
+
+	if ( ! memoizedRenderToString.cache.has( JSON.stringify( element ) ) ) {
 		bumpStat( 'calypso-ssr', 'loggedout-design-cache-miss' );
 	}