Update JS impls: use ffi-napi and Ubuntu 18.04

diff --git a/.gitignore b/.gitignore
index a7558f6..f3eac16 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -71,6 +71,8 @@ haxe/*.js
 java/mal.jar
 java/target/
 java/dependency-reduced-pom.xml
+.npm/
+.node-gyp/
 js/mal.js
 js/web/mal.js
 kotlin/*.jar
@@ -103,6 +105,7 @@ ps/mal.ps
 python/mal.pyz
 r/mal.r
 ruby/mal.rb
+.cargo/
 rust/target/
 rust/Cargo.lock
 rust/.cargo

diff --git a/clojure/Dockerfile b/clojure/Dockerfile
index 5060a80..2d1dea4 100644 (file)
--- a/clojure/Dockerfile
+++ b/clojure/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -40,12 +40,15 @@ ENV LEIN_JVM_OPTS -Duser.home=/mal
 # For building node modules
 RUN apt-get -y install g++
 
-# Add nodesource apt repo config for 8.X
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
-# Install nodejs.
+# Install nodejs
 RUN apt-get -y install nodejs
 
+ENV NPM_CONFIG_CACHE /mal/.npm
+
 ## Install ffi and lumo-cljs modules globally
 #RUN npm install -g ffi lumo-cljs
 

diff --git a/clojure/package.json b/clojure/package.json
index e224825..904cd36 100644 (file)
--- a/clojure/package.json
+++ b/clojure/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in ClojureScript",
     "dependencies": {
-        "ffi": "2.2.x",
-        "lumo-cljs": "1.7.x"
+        "ffi-napi": "2.4.x",
+        "lumo-cljs": "1.9.x"
     }
 }

diff --git a/clojure/project.clj b/clojure/project.clj
index f2eea93..5bb5f96 100644 (file)
--- a/clojure/project.clj
+++ b/clojure/project.clj
@@ -1,7 +1,7 @@
 (defproject mal "0.0.1-SNAPSHOT"
   :description "Make-A-Lisp"
 
-  :dependencies [[org.clojure/clojure "1.8.0-RC4"]
+  :dependencies [[org.clojure/clojure "1.9.0"]
                  [org.clojure/tools.reader "0.8.3"]
                  [net.n01se/clojure-jna "1.0.0"]]
 

diff --git a/clojure/src/mal/node_readline.js b/clojure/src/mal/node_readline.js
index dc64e3f..6042eaa 100644 (file)
--- a/clojure/src/mal/node_readline.js
+++ b/clojure/src/mal/node_readline.js
@@ -6,7 +6,7 @@ var HISTORY_FILE = require('path').join(process.env.HOME, '.mal-history');
 
 var rlwrap = {}; // namespace for this module in web context
 
-var ffi = require('ffi'),
+var ffi = require('ffi-napi'),
     fs = require('fs');
 
 var rllib = ffi.Library(RL_LIB, {

diff --git a/clojure/src/mal/readline.cljs b/clojure/src/mal/readline.cljs
index 88f3117..ea21874 100644 (file)
--- a/clojure/src/mal/readline.cljs
+++ b/clojure/src/mal/readline.cljs
@@ -1,3 +1,3 @@
 (ns mal.readline)
 
-(def readline (.-readline (js/require "./src/mal/node_readline.js")))
+(def readline (.-readline (js/require "../src/mal/node_readline.js")))

diff --git a/coffee/Dockerfile b/coffee/Dockerfile
index 895a563..075c304 100644 (file)
--- a/coffee/Dockerfile
+++ b/coffee/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:vivid
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -24,18 +24,16 @@ WORKDIR /mal
 # For building node modules
 RUN apt-get -y install g++
 
-# Add nodesource apt repo config for 0.12 stable
-RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
 # Install nodejs
 RUN apt-get -y install nodejs
 
-# Link common name
-RUN ln -sf nodejs /usr/bin/node
-
 ENV NPM_CONFIG_CACHE /mal/.npm
 
 # CoffeeScript specific
-RUN npm install -g coffee-script
+RUN npm install -g coffeescript
 RUN touch /.coffee_history && chmod go+w /.coffee_history
 

diff --git a/coffee/node_readline.coffee b/coffee/node_readline.coffee
index 87c8d37..fecddc8 100644 (file)
--- a/coffee/node_readline.coffee
+++ b/coffee/node_readline.coffee
@@ -6,7 +6,7 @@ HISTORY_FILE = require('path').join(process.env.HOME, '.mal-history')
 
 rlwrap = {} # namespace for this module in web context
 
-ffi = require('ffi')
+ffi = require('ffi-napi')
 fs = require('fs')
 
 rllib = ffi.Library(RL_LIB, {

diff --git a/coffee/package.json b/coffee/package.json
index d28b74b..9850858 100644 (file)
--- a/coffee/package.json
+++ b/coffee/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in CoffeeScript",
     "dependencies": {
-        "ffi": "1.3.x",
-        "coffee-script": "~1.8"
+        "ffi-napi": "2.4.x",
+        "coffeescript": "~1.8"
     }
 }

diff --git a/crystal/Dockerfile b/crystal/Dockerfile
index 1c24bbd..0d02375 100644 (file)
--- a/crystal/Dockerfile
+++ b/crystal/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:vivid
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -25,6 +25,6 @@ WORKDIR /mal
 RUN apt-get -y install g++
 
 # Crystal
-RUN apt-get -y install apt-transport-https
+RUN apt-get -y install apt-transport-https gnupg
 RUN curl http://dist.crystal-lang.org/apt/setup.sh | bash
 RUN apt-get -y install crystal

diff --git a/elm/Dockerfile b/elm/Dockerfile
index 5b3bc3e..b0553bd 100644 (file)
--- a/elm/Dockerfile
+++ b/elm/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -21,14 +21,18 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# For building node modules and pulling elm packages
-RUN apt-get -y install g++ netbase
+# For building node modules
+RUN apt-get -y install g++
 
-# Add nodesource apt repo config for 7.X
-RUN curl -sL https://deb.nodesource.com/setup_7.x | bash -
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
 # Install nodejs
 RUN apt-get -y install nodejs
 
+# For pulling elm packages
+RUN apt-get -y install netbase
+
 ENV HOME /mal
 ENV NPM_CONFIG_CACHE /mal/.npm

diff --git a/elm/node_readline.js b/elm/node_readline.js
index e59a62b..0a50f91 100644 (file)
--- a/elm/node_readline.js
+++ b/elm/node_readline.js
@@ -6,7 +6,7 @@ var HISTORY_FILE = require('path').join(process.env.HOME, '.mal-history');
 
 var rlwrap = {}; // namespace for this module in web context
 
-var ffi = require('ffi'),
+var ffi = require('ffi-napi'),
     fs = require('fs');
 
 var rllib = ffi.Library(RL_LIB, {

diff --git a/elm/package.json b/elm/package.json
index dfbc2c7..67d4127 100644 (file)
--- a/elm/package.json
+++ b/elm/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "bootstrap.js",
   "dependencies": {
-    "ffi": "2.0.x"
+    "ffi-napi": "2.4.x"
   },
   "devDependencies": {
     "elm": "^0.18.0"

diff --git a/es6/Dockerfile b/es6/Dockerfile
index ddcadb5..f7677e9 100644 (file)
--- a/es6/Dockerfile
+++ b/es6/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -24,11 +24,11 @@ WORKDIR /mal
 # For building node modules
 RUN apt-get -y install g++
 
-# Add nodesource apt repo config for 7.X
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
 # Install nodejs
 RUN apt-get -y install nodejs
 
-# Link common name
 ENV NPM_CONFIG_CACHE /mal/.npm

diff --git a/es6/core.mjs b/es6/core.mjs
index 64a7436..d99c3c5 100644 (file)
--- a/es6/core.mjs
+++ b/es6/core.mjs
@@ -1,15 +1,17 @@
 import { _equal_Q, _clone, _keyword, _keyword_Q } from './types'
 import { _list_Q, Vector, _assoc_BANG, Atom } from './types'
 import { pr_str } from './printer'
-import { readline } from './node_readline'
+import rl from './node_readline'
+const readline = rl.readline
 import { read_str } from './reader'
+import { readFileSync } from 'fs'
 
 function _error(e) { throw new Error(e) }
 
 // String functions
 function slurp(f) {
-    if (typeof require !== 'undefined') {
-        return require('fs').readFileSync(f, 'utf-8')
+    if (typeof process !== 'undefined') {
+        return readFileSync(f, 'utf-8')
     } else {
         var req = new XMLHttpRequest()
         req.open('GET', f, false)

diff --git a/es6/node_readline.js b/es6/node_readline.js
index 9e2fb86..500f892 100644 (file)
--- a/es6/node_readline.js
+++ b/es6/node_readline.js
@@ -4,7 +4,7 @@ var RL_LIB = "libreadline";  // NOTE: libreadline is GPL
 
 var HISTORY_FILE = require('path').join(process.env.HOME, '.mal-history');
 
-var ffi = require('ffi'),
+var ffi = require('ffi-napi'),
     fs = require('fs');
 
 var rllib = ffi.Library(RL_LIB, {

diff --git a/es6/package.json b/es6/package.json
index 627da97..850dff0 100644 (file)
--- a/es6/package.json
+++ b/es6/package.json
@@ -3,10 +3,10 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in ES6 (ECMAScript 6 / ECMAScript 2015)",
     "dependencies": {
-        "@std/esm": "^0.11.0",
-        "ffi": "2.0.x"
+        "esm": "3.0.x",
+        "ffi-napi": "2.4.x"
     },
-    "@std/esm": {
+    "esm": {
         "cjs": true
     }
 }

diff --git a/es6/run b/es6/run
index a6c8bf8..ad5a837 100755 (executable)
--- a/es6/run
+++ b/es6/run
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec node -r @std/esm $(dirname $0)/${STEP:-stepA_mal}.mjs "${@}"
+exec node -r esm $(dirname $0)/${STEP:-stepA_mal}.mjs "${@}"

diff --git a/es6/step0_repl.mjs b/es6/step0_repl.mjs
index 6679a09..6eaca05 100644 (file)
--- a/es6/step0_repl.mjs
+++ b/es6/step0_repl.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 
 // read
 const READ = str => str

diff --git a/es6/step1_read_print.mjs b/es6/step1_read_print.mjs
index 6ff1cee..8af709f 100644 (file)
--- a/es6/step1_read_print.mjs
+++ b/es6/step1_read_print.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'
 

diff --git a/es6/step2_eval.mjs b/es6/step2_eval.mjs
index 40abe09..f49b78a 100644 (file)
--- a/es6/step2_eval.mjs
+++ b/es6/step2_eval.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/es6/step3_env.mjs b/es6/step3_env.mjs
index 0026b34..034315a 100644 (file)
--- a/es6/step3_env.mjs
+++ b/es6/step3_env.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/es6/step4_if_fn_do.mjs b/es6/step4_if_fn_do.mjs
index 4fe1f90..e3c7073 100644 (file)
--- a/es6/step4_if_fn_do.mjs
+++ b/es6/step4_if_fn_do.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/es6/step5_tco.mjs b/es6/step5_tco.mjs
index 7bcb778..bf83f4a 100644 (file)
--- a/es6/step5_tco.mjs
+++ b/es6/step5_tco.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q, _malfunc, _malfunc_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/es6/step6_file.mjs b/es6/step6_file.mjs
index 7396197..1053976 100644 (file)
--- a/es6/step6_file.mjs
+++ b/es6/step6_file.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q, _malfunc, _malfunc_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/es6/step7_quote.mjs b/es6/step7_quote.mjs
index 947c3a2..31642da 100644 (file)
--- a/es6/step7_quote.mjs
+++ b/es6/step7_quote.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q, _malfunc, _malfunc_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/es6/step8_macros.mjs b/es6/step8_macros.mjs
index 9aa6e1c..e106975 100644 (file)
--- a/es6/step8_macros.mjs
+++ b/es6/step8_macros.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q, _malfunc, _malfunc_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/es6/step9_try.mjs b/es6/step9_try.mjs
index ede914d..389c1c8 100644 (file)
--- a/es6/step9_try.mjs
+++ b/es6/step9_try.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q, _malfunc, _malfunc_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/es6/stepA_mal.mjs b/es6/stepA_mal.mjs
index c883980..a861993 100644 (file)
--- a/es6/stepA_mal.mjs
+++ b/es6/stepA_mal.mjs
@@ -1,4 +1,5 @@
-import { readline } from './node_readline'
+import rl from './node_readline.js'
+const readline = rl.readline
 import { _list_Q, _malfunc, _malfunc_Q } from './types'
 import { BlankException, read_str } from './reader'
 import { pr_str } from './printer'

diff --git a/haxe/Dockerfile b/haxe/Dockerfile
index 545c7a6..a0b5572 100644 (file)
--- a/haxe/Dockerfile
+++ b/haxe/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:vivid
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -27,15 +27,13 @@ WORKDIR /mal
 # For building node modules
 RUN apt-get -y install g++
 
-# Add nodesource apt repo config for 0.12 stable
-RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
 # Install nodejs
 RUN apt-get -y install nodejs
 
-# Link common name
-RUN ln -sf nodejs /usr/bin/node
-
 ENV NPM_CONFIG_CACHE /mal/.npm
 
 

diff --git a/haxe/node_readline.js b/haxe/node_readline.js
index 2045d66..80885cf 100644 (file)
--- a/haxe/node_readline.js
+++ b/haxe/node_readline.js
@@ -6,7 +6,7 @@ var HISTORY_FILE = require('path').join(process.env.HOME, '.mal-history');
 
 var rlwrap = {}; // namespace for this module in web context
 
-var ffi = require('ffi'),
+var ffi = require('ffi-napi'),
     fs = require('fs');
 
 var rllib = ffi.Library(RL_LIB, {

diff --git a/haxe/package.json b/haxe/package.json
index 34fc239..e84e49a 100644 (file)
--- a/haxe/package.json
+++ b/haxe/package.json
@@ -3,6 +3,6 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in Haxe/Javascript",
     "dependencies": {
-        "ffi": "1.3.x"
+        "ffi-napi": "2.4.x"
     }
 }

diff --git a/js/Dockerfile b/js/Dockerfile
index 0559f7a..f7677e9 100644 (file)
--- a/js/Dockerfile
+++ b/js/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:vivid
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -24,14 +24,11 @@ WORKDIR /mal
 # For building node modules
 RUN apt-get -y install g++
 
-# Add nodesource apt repo config for 0.12 stable
-RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
 # Install nodejs
 RUN apt-get -y install nodejs
 
-# Link common name
-RUN ln -sf nodejs /usr/bin/node
-
 ENV NPM_CONFIG_CACHE /mal/.npm
-

diff --git a/js/node_readline.js b/js/node_readline.js
index dc64e3f..6042eaa 100644 (file)
--- a/js/node_readline.js
+++ b/js/node_readline.js
@@ -6,7 +6,7 @@ var HISTORY_FILE = require('path').join(process.env.HOME, '.mal-history');
 
 var rlwrap = {}; // namespace for this module in web context
 
-var ffi = require('ffi'),
+var ffi = require('ffi-napi'),
     fs = require('fs');
 
 var rllib = ffi.Library(RL_LIB, {

diff --git a/js/package.json b/js/package.json
index 4eec270..e6246a8 100644 (file)
--- a/js/package.json
+++ b/js/package.json
@@ -3,6 +3,6 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in Javascript",
     "dependencies": {
-        "ffi": "2.0.x"
+        "ffi-napi": "2.4.x"
     }
 }

diff --git a/livescript/Dockerfile b/livescript/Dockerfile
index edfa694..f7677e9 100644 (file)
--- a/livescript/Dockerfile
+++ b/livescript/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -24,11 +24,11 @@ WORKDIR /mal
 # For building node modules
 RUN apt-get -y install g++
 
-# Add nodesource apt repo config for 7.X
-RUN curl -sL https://deb.nodesource.com/setup_7.x | bash -
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
 # Install nodejs
 RUN apt-get -y install nodejs
 
 ENV NPM_CONFIG_CACHE /mal/.npm
-

diff --git a/livescript/node_readline.js b/livescript/node_readline.js
index e59a62b..0a50f91 100644 (file)
--- a/livescript/node_readline.js
+++ b/livescript/node_readline.js
@@ -6,7 +6,7 @@ var HISTORY_FILE = require('path').join(process.env.HOME, '.mal-history');
 
 var rlwrap = {}; // namespace for this module in web context
 
-var ffi = require('ffi'),
+var ffi = require('ffi-napi'),
     fs = require('fs');
 
 var rllib = ffi.Library(RL_LIB, {

diff --git a/livescript/package.json b/livescript/package.json
index af94704..fe5b589 100644 (file)
--- a/livescript/package.json
+++ b/livescript/package.json
@@ -4,11 +4,11 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "ffi": "2.0.x",
+    "ffi-napi": "2.4.x",
     "prelude-ls": "^1.1.2"
   },
   "devDependencies": {
-    "livescript": "^1.5.0"
+    "livescript": "^1.6.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/miniMAL/Dockerfile b/miniMAL/Dockerfile
index 152c82a..fa54933 100644 (file)
--- a/miniMAL/Dockerfile
+++ b/miniMAL/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -24,15 +24,13 @@ WORKDIR /mal
 # For building node modules
 RUN apt-get -y install g++
 
-# Add nodesource apt repo config for 7.X
-RUN curl -sL https://deb.nodesource.com/setup_7.x | bash -
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 
 # Install nodejs
 RUN apt-get -y install nodejs
 
-# Link common name
-RUN ln -sf nodejs /usr/bin/node
-
 ENV NPM_CONFIG_CACHE /mal/.npm
 
 # install miniMAL

diff --git a/miniMAL/node_readline.js b/miniMAL/node_readline.js
index dc64e3f..6042eaa 100644 (file)
--- a/miniMAL/node_readline.js
+++ b/miniMAL/node_readline.js
@@ -6,7 +6,7 @@ var HISTORY_FILE = require('path').join(process.env.HOME, '.mal-history');
 
 var rlwrap = {}; // namespace for this module in web context
 
-var ffi = require('ffi'),
+var ffi = require('ffi-napi'),
     fs = require('fs');
 
 var rllib = ffi.Library(RL_LIB, {

diff --git a/miniMAL/package.json b/miniMAL/package.json
index 0c87452..bd9e2cf 100644 (file)
--- a/miniMAL/package.json
+++ b/miniMAL/package.json
@@ -4,6 +4,6 @@
     "description": "Make a Lisp (mal) language implemented in miniMAL",
     "dependencies": {
         "minimal-lisp": "1.0.2",
-        "ffi": "2.0.x"
+        "ffi-napi": "2.4.x"
     }
 }

diff --git a/ts/Dockerfile b/ts/Dockerfile
index 1bb0452..f7677e9 100644 (file)
--- a/ts/Dockerfile
+++ b/ts/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:18.04
 MAINTAINER Joel Martin <github@martintribe.org>
 
 ##########################################################
@@ -21,8 +21,14 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-RUN apt-get -y install build-essential
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
+# For building node modules
+RUN apt-get -y install g++
+
+# Add nodesource apt repo config for 10.x stable
+RUN apt-get -y install gnupg
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+
+# Install nodejs
 RUN apt-get -y install nodejs
 
 ENV NPM_CONFIG_CACHE /mal/.npm

diff --git a/ts/node_readline.ts b/ts/node_readline.ts
index cc0af94..6018c92 100644 (file)
--- a/ts/node_readline.ts
+++ b/ts/node_readline.ts
@@ -1,5 +1,5 @@
 import * as path from "path";
-import * as ffi from "ffi";
+import * as ffi from "ffi-napi";
 import * as fs from "fs";
 
 // IMPORTANT: choose one

diff --git a/ts/package.json b/ts/package.json
index 162c752..6a5bd97 100644 (file)
--- a/ts/package.json
+++ b/ts/package.json
@@ -19,10 +19,10 @@
     "test:stepA": "cd .. && make 'test^ts^stepA'"
   },
   "dependencies": {
-    "ffi": "^2.2.0"
+    "ffi-napi": "^2.4.0"
   },
   "devDependencies": {
-    "@types/ffi": "0.0.19",
+    "@types/ffi-napi": "2.4.0",
     "@types/node": "^7.0.5",
     "typescript": "^2.2.1",
     "typescript-formatter": "^4.1.2"