Revert "Make client-config optional"

This reverts commit 8af36cd.

client-config-defaults.js

@@ -33,13 +33,9 @@ var defaults = {
 };
 
 module.exports = (function() {
-	var changes;
+	var changes = require("./client-config.js");
 
-	try {
-		changes = require("./client-config.js");
-	} catch (e) {
-		changes = {};
-	}
+	if (!changes) changes = {};
 
 	return merge(defaults, changes);
 }());

gulpfile.js

@@ -5,7 +5,6 @@ var gulp = require("gulp"),
 	del = require("del"),
 	bower = require("bower"),
 	browserify = require("browserify"),
-	optional = require("browserify-optional"),
 	reactify = require("reactify"),
 	babelify = require("babelify").configure({ extensions: [ ".es6", ".jsx" ] }),
 	source = require("vinyl-source-stream"),
@@ -162,7 +161,7 @@ gulp.task("polyfills", [ "bower" ], function() {
 gulp.task("bundle", function() {
 	return bundle([ "ui/app.es6" ], {
 		debug: true,
-		transform: [ babelify, reactify, optional ]
+		transform: [ babelify, reactify ]
 	})
 	.pipe(sourcemaps.init({ loadMaps: true }))
 	.pipe(buildscripts())
@@ -178,7 +177,7 @@ gulp.task("bundle", function() {
 gulp.task("embed-legacy", function() {
 	return bundle("embed/embed-parent.js", {
 		debug: true,
-		transform: [ babelify, optional ]
+		transform: [ babelify ]
 	})
 	.pipe(sourcemaps.init({ loadMaps: true }))
 	.pipe(buildscripts())
@@ -190,7 +189,7 @@ gulp.task("embed-legacy", function() {
 gulp.task("embed-apis", function() {
 	return bundle("widget/index.js", {
 		debug: true,
-		transform: [ babelify, optional ]
+		transform: [ babelify ]
 	})
 	.pipe(sourcemaps.init({ loadMaps: true }))
 	.pipe(buildscripts())

package.json

@@ -79,7 +79,6 @@
     "blanket": "latest",
     "bower": "latest",
     "browserify": "latest",
-    "browserify-optional": "latest",
     "browserstack-webdriver": "latest",
     "chai": "latest",
     "del": "latest",

widget/index.js

@@ -1,7 +1,7 @@
 /* eslint-env browser */
 
 "use strict";
-var config = require("../client-config-defaults.js");
+var config = require("../client-config.js");
 var host = config.server.protocol + "//" + config.server.host;
 var iframeCount = 0,
 	widgets = {};