chore: bump all version and update code

package.json

@@ -13,13 +13,12 @@
     "url": "https://github.com/pcottle/learnGitBranching"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.8",
+    "@babel/core": "^7.17.5",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/preset-react": "^7.16.7",
     "babelify": "^10.0.0",
-    "browserify": "^16.5.0",
+    "browserify": "^17.0.0",
-    "contributor-faces": "^1.0.2",
     "fancy-log": "^1.3.3",
-    "glob": "^7.1.6",
+    "glob": "^7.2.0",
     "gulp": "^4.0.2",
     "gulp-clean": "^0.4.0",
     "gulp-clean-css": "^4.3.0",
@@ -27,26 +26,26 @@
     "gulp-hash": "^4.2.2",
     "gulp-jasmine": "^4.0.0",
     "gulp-jshint": "^2.1.0",
-    "gulp-terser": "^1.2.0",
+    "gulp-terser": "^2.1.0",
     "gulp-uglify": "^3.0.2",
     "html-minifier": "^4.0.0",
-    "jasmine-spec-reporter": "^4.2.1",
+    "jasmine-spec-reporter": "^7.0.0",
-    "jshint": "^2.11.0",
+    "jshint": "^2.13.4",
-    "prompt": "^1.0.0",
+    "prompt": "^1.2.2",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
   },
   "dependencies": {
     "backbone": "^1.4.0",
-    "flux": "^3.1.3",
+    "flux": "^4.0.3",
     "jquery": "^3.4.0",
-    "jquery-ui": "^1.13.0",
+    "jquery-ui": "^1.13.1",
-    "marked": "^1.0.0",
+    "marked": "^4.0.12",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.8.1",
     "q": "^1.5.1",
     "raphael": "^2.1.0",
-    "react": "^16.13.0",
+    "react": "^17.0.2",
-    "react-dom": "^16.13.0",
+    "react-dom": "^17.0.2",
-    "underscore": "~1.4.3"
+    "underscore": "^1.13.2"
   }
 }

src/js/intl/index.js

@@ -16,7 +16,7 @@ var fallbackMap = {
 var templateSettings = Object.assign({}, _.templateSettings);
 templateSettings.interpolate = /\{(.+?)\}/g;
 var template = exports.template = function(str, params) {
-  return _.template(str, params, templateSettings);
+  return _.template(str, templateSettings)(params);
 };
 
 var str = exports.str = function(key, params) {

src/js/util/debug.js

@@ -31,7 +31,7 @@ var toGlobalize = {
   Sandbox: require('../sandbox/'),
   SandboxCommands: require('../sandbox/commands'),
   GitDemonstrationView: require('../views/gitDemonstrationView'),
-  Markdown: require('marked'),
+  Markdown: require('marked').marked,
   LevelDropdownView: require('../views/levelDropdownView'),
   BuilderViews: require('../views/builderViews'),
   Util: require('../util/index'),

src/js/views/builderViews.js

@@ -1,6 +1,6 @@
 var _ = require('underscore');
 var Q = require('q');
-var marked = require('marked');
+var { marked } = require('marked');
 
 var Views = require('../views');
 var throttle = require('../util/throttle');

src/js/views/gitDemonstrationView.js

@@ -1,7 +1,7 @@
 var _ = require('underscore');
 var Q = require('q');
 var Backbone = require('backbone');
-var marked = require('marked');
+var { marked } = require('marked');
 
 var util = require('../util');
 var intl = require('../intl');

src/js/views/index.js

@@ -1,7 +1,7 @@
 var _ = require('underscore');
 var Q = require('q');
 var Backbone = require('backbone');
-var marked = require('marked');
+var { marked } = require('marked');
 
 var Main = require('../app');
 var intl = require('../intl');