From d012b5223c3e309c6949dc3250346d5e6939e798 Mon Sep 17 00:00:00 2001
From: Daniel Bayley <daniel.bayley@me.com>
Date: Fri, 13 Oct 2017 20:16:47 +0100
Subject: [PATCH] Update to CoffeeScript 2 Also uses the --transpile option
 with babel-preset-env.

---
 AUTHORS                 |  1 +
 docs/lib_kernel.js.html |  4 ++--
 lib/kernel.js           | 13 ++++++++++---
 package.json            |  6 +++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2f3baaa..0a3df41 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,3 +12,4 @@ Min RK <benjaminrk@gmail.com>
 Nicolas Riesco <enquiries@nicolasriesco.net>
 Will Whitney <wfwhitney@gmail.com>
 Slava Ganzin <slava.ganzin@gmail.com>
+Daniel Bayley <daniel.bayley@me.com>
diff --git a/docs/lib_kernel.js.html b/docs/lib_kernel.js.html
index 77828d2..7aa6384 100644
--- a/docs/lib_kernel.js.html
+++ b/docs/lib_kernel.js.html
@@ -66,7 +66,7 @@ <h1 class="page-title">Source: lib/kernel.js</h1>
 var fs = require("fs");
 var path = require("path");
 
-var cs = require("coffee-script");
+var cs = require("coffeescript");
 var csOptions = {bare: true};
 
 var Kernel = require("jp-kernel");
@@ -97,7 +97,7 @@ <h1 class="page-title">Source: lib/kernel.js</h1>
 
 // Setup session initialisation
 config.startupCallback = function startupCallback() {
-    var requirePath = require.resolve("coffee-script/register");
+    var requirePath = require.resolve("coffeescript/register");
     var code = 'require("' + requirePath + '");';
     this.session.execute(code, {
         onSuccess: function() {
diff --git a/lib/kernel.js b/lib/kernel.js
index c9fd16f..a987e90 100755
--- a/lib/kernel.js
+++ b/lib/kernel.js
@@ -38,8 +38,15 @@ var console = require("console");
 var fs = require("fs");
 var path = require("path");
 
-var cs = require("coffee-script");
-var csOptions = {bare: true};
+var cs = require("coffeescript");
+var csOptions = {
+    bare: true,
+    inlineMap: true,
+    transpile: {
+        filename: __filename,
+        presets: [["env", {targets: [{node: "current"}]}]]
+    }
+};
 
 var Kernel = require("jp-kernel");
 
@@ -69,7 +76,7 @@ log = global.DEBUG ? doLog : dontLog;
 
 // Setup session initialisation
 config.startupCallback = function startupCallback() {
-    var requirePath = require.resolve("coffee-script/register");
+    var requirePath = require.resolve("coffeescript/register");
     var code = 'require("' + requirePath + '");';
     this.session.execute(code, {
         onSuccess: function() {
diff --git a/package.json b/package.json
index e949238..d95a673 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
         "jp-coffee-kernel": "lib/kernel.js"
     },
     "dependencies": {
-        "coffee-script": "^1.7.0",
+        "coffeescript": "^2.0.1",
         "jp-kernel": "^0.1.4"
     },
     "devDependencies": {
@@ -37,6 +37,10 @@
         "jsdoc": "latest",
         "jshint": "latest"
     },
+    "optionalDependencies": {
+        "babel-core": "^6.26.0",
+        "babel-preset-env": "^1.6.0"
+    },
     "scripts": {
         "doc": "jsdoc -R README.md -d docs bin lib",
         "lint": "jshint bin/ lib/ test/",