Upgrade dependencies

marijnh · marijnh · commit 19ae586d9a88 · 2017-09-26T17:27:23.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 /book_mobile.pdf
 /html/[012]*.html
 /html/js/chapter_info.js
+/html/js/[012]*.js
 /html/js/acorn_codemirror.js
 /code/chapter/*
 /code/file_server.js
diff --git a/15_game.txt b/15_game.txt
@@ -219,7 +219,8 @@ Level.prototype.isFinished = function() {
 
 == Actors ==
 
-[[vector]] (((Vector type)))(((coordinates)))To store the position and
+[[vector]]
+(((Vector type)))(((coordinates)))To store the position and
 size of an actor, we will return to our trusty `Vector` type, which
 groups an x-coordinate and a y-coordinate into an object.
 
diff --git a/Makefile b/Makefile
@@ -21,8 +21,8 @@ html/js/acorn_codemirror.js: node_modules/codemirror/lib/codemirror.js \
 	                     node_modules/codemirror/mode/xml/xml.js \
 	                     node_modules/codemirror/mode/htmlmixed/htmlmixed.js \
 	                     node_modules/codemirror/addon/edit/matchbrackets.js \
-	                     node_modules/acorn/acorn.js \
-	                     node_modules/acorn/util/walk.js
+	                     node_modules/acorn/dist/acorn.js \
+	                     node_modules/acorn/dist/walk.js
 	node_modules/.bin/uglifyjs $? -m -o $@
 
 img/generated/%.png: img/%.svg
diff --git a/bin/run_tests.js b/bin/run_tests.js
@@ -241,7 +241,8 @@ function nextSandbox() {
       report(e);
     }
   } else {
-    require("jsdom").env({
+    let {JSDOM} = require("jsdom")
+    new JSDOM({
       url: "http://eloquentjavascript.net/" + file + "#" + i,
       html: sandbox.html || "<!doctype html><body></body>",
       src: [baseCode],
diff --git a/package.json b/package.json
@@ -9,16 +9,14 @@
     "url": "git://github.com/marijnh/Eloquent-JavaScript.git"
   },
   "dependencies": {
-    "acorn": "0.3",
-    "codemirror": "4",
+    "acorn": "^5.1.0",
+    "codemirror": "^5.25.0",
     "jszip": "^2.5.0",
-    "uglify-js": "2"
+    "uglify-js": "^2.0.0"
   },
   "devDependencies": {
-    "contextify": "kkoopa/contextify",
-    "jsdom": "0.10",
-    "canvas": "git://github.com/learnboost/node-canvas",
-    "promise": "6",
-    "jszip": "2"
+    "canvas": "^1.6.7",
+    "jsdom": "^11.2.0",
+    "promise": "^8.0.1"
   }
 }
