Merge pull request #2464 from Automattic/add/ssr-enabled-flag

SSR: Enable server side rendering based on feature flag
Automattic · Jan 15, 2016 · c67aa87 · c67aa87
2 parents 3721bd8 + 9a681b2
commit c67aa87
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/config/development.json b/config/development.json
@@ -27,6 +27,7 @@
 	"discover_blog_id": 53424024,
 	"features": {
 		"code-splitting": true,
+		"server-side-rendering": true,
 
 		"reader": true,
 		"reader/teams": true,

diff --git a/config/horizon.json b/config/horizon.json
@@ -13,6 +13,7 @@
 	"discover_blog_id": 53424024,
 	"features": {
 		"code-splitting": true,
+		"server-side-rendering": true,
 
 		"post-editor": true,
 		"post-editor/iframe-preview": true,

diff --git a/config/production.json b/config/production.json
@@ -11,6 +11,7 @@
 	"discover_blog_id": 53424024,
 	"features": {
 		"code-splitting": true,
+		"server-side-rendering": false,
 		"manage/ads": true,
 		"manage/ads/jetpack": true,
 		"manage/customize": true,

diff --git a/config/stage.json b/config/stage.json
@@ -13,6 +13,7 @@
 	"discover_blog_id": 53424024,
 	"features": {
 		"code-splitting": true,
+		"server-side-rendering": false,
 		"post-editor": true,
 		"post-editor/iframe-preview": true,
 		"post-editor/live-image-updates": true,

diff --git a/config/wpcalypso.json b/config/wpcalypso.json
@@ -13,6 +13,7 @@
 	"discover_blog_id": 53424024,
 	"features": {
 		"code-splitting": true,
+		"server-side-rendering": true,
 
 		"post-editor": true,
 		"post-editor/iframe-preview": true,

diff --git a/server/pages/index.js b/server/pages/index.js
@@ -375,11 +375,13 @@ module.exports = function() {
 		} else {
 			const context = getDefaultContext( req );
 
-			try {
-				context.layout = ReactDomServer.renderToString( LayoutLoggedOutDesignFactory() );
-			} catch ( ex ) {
-				if ( config( 'env' ) === 'development' ) {
-					throw ex;
+			if ( config.isEnabled( 'server-side-rendering' ) ) {
+				try {
+					context.layout = ReactDomServer.renderToString( LayoutLoggedOutDesignFactory() );
+				} catch ( ex ) {
+					if ( config( 'env' ) === 'development' ) {
+						throw ex;
+					}
 				}
 			}