Merge pull request redfin#927 from SoprisApps/patch-fix-clientcsshelper-key-issue

Another flash of unstyled content

Author: drewpc

packages/react-server/core/util/ClientCssHelper.js

@@ -96,14 +96,16 @@ module.exports = {
 }
 
 function normalizeLocalUrl(url) {
-	const urlBase = location.protocol + "//" + location.host;
-
-	// The browser will give us a full URL even if we only put a
+	// Step 1: make the url protocol less first.  This helps recognizing http://0.0.0.0:3001/common.css
+	// and //0.0.0.0:3001/common.css as the same file.
+	// Step 2: The browser will give us a full URL even if we only put a
 	// path in on the server.  So, if we're comparing against just
 	// a path here we need to strip the base off to avoid a flash
 	// of unstyled content.
-	if (url && url.indexOf(urlBase) === 0) {
-		url = url.substr(urlBase.length);
+	if (typeof url === 'string') {
+		url = url
+			.replace(/^http[s]?:/, '')
+			.replace(new RegExp("^\/\/" + location.host), '');
 	}
 
 	return url;