From 632ffdfa8f5c0a13d411967d045ff1f46a5df454 Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Wed, 2 Nov 2016 22:55:14 -0700
Subject: [PATCH] deps: upgrade yamljs

Old version of `yamljs` was bringing in deprecated dependencies causing
`npm install` warnings.  Newer version is still buggy and doesn't
fully support the YAML spec, but it seems to work at least as well as
the old version, as far as I can tell.
---
 NEWS.md              | 20 ++++++++++++++++++++
 config.template.yaml |  2 +-
 package.json         |  4 ++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index c18ef21d..c81f2850 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,23 @@
+2016-11-02
+==========
+
+After upgrading the dependency on `yamljs`, you may see this error if you didn't
+notice and correct a typo in the config.yaml template:
+
+    Error loading config file config.yaml:
+    { [Error: Unexpected characters near ",".]
+      message: 'Unexpected characters near ",".',
+      parsedLine: 88,
+      snippet: 'title: \'CyTube\',' }
+
+The fix is to edit config.yaml and remove the trailing comma for the `title:`
+property under `html-template`.  If there are other syntax errors that the old
+version didn't detect, you will need to correct those as well.
+
+Longer term, I am looking to move away from using `yamljs` to parse
+configuration because it's a little buggy and the current configuration system
+is confusing.
+
 2016-10-20
 ==========
 
diff --git a/config.template.yaml b/config.template.yaml
index 53a7482c..25ff7a09 100644
--- a/config.template.yaml
+++ b/config.template.yaml
@@ -91,7 +91,7 @@ https:
 # Page template values
 # title goes in the upper left corner, description goes in a <meta> tag
 html-template:
-  title: 'Sync',
+  title: 'Sync'
   description: 'Free, open source synchtube'
 
 # Socket.IO server details
diff --git a/package.json b/package.json
index 1af591c1..66a4bbcf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "Calvin Montgomery",
   "name": "CyTube",
   "description": "Online media synchronizer and chat",
-  "version": "3.23.6",
+  "version": "3.24.0",
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },
@@ -46,7 +46,7 @@
     "status-message-polyfill": "git://github.com/calzoneman/status-message-polyfill",
     "toml": "^2.3.0",
     "uuid": "^2.0.1",
-    "yamljs": "^0.1.6"
+    "yamljs": "^0.2.8"
   },
   "scripts": {
     "build-player": "$npm_node_execpath build-player.js",