Update JS impls to ubuntu 24.04, ffi-napi to 4.0.3

kanaka · Aug 5, 2024 · 1dd394a · 1dd394a
1 parent dd2b64c
commit 1dd394a
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 17 deletions.
diff --git a/impls/coffee/Dockerfile b/impls/coffee/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -19,6 +19,7 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install coffeescript g++ libreadline-dev npm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ libreadline-dev nodejs npm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install coffeescript
 ENV NPM_CONFIG_CACHE /mal/.npm
 RUN touch /.coffee_history && chmod go+w /.coffee_history
diff --git a/impls/coffee/package.json b/impls/coffee/package.json
@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in CoffeeScript",
     "dependencies": {
-        "ffi-napi": "2.4.x",
+        "ffi-napi": "4.0.3",
         "coffeescript": "~1.8"
     }
 }
diff --git a/impls/elm/package.json b/impls/elm/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "bootstrap.js",
   "dependencies": {
-    "ffi-napi": "2.4.x"
+    "ffi-napi": "4.0.3"
   },
   "devDependencies": {
     "elm": "^0.18.0"

diff --git a/impls/es6/Dockerfile b/impls/es6/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -19,6 +19,6 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y g++ libreadline-dev npm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ libreadline-dev nodejs npm
 
 ENV NPM_CONFIG_CACHE /mal/.npm
diff --git a/impls/es6/package.json b/impls/es6/package.json
@@ -4,7 +4,7 @@
     "description": "Make a Lisp (mal) language implemented in ES6 (ECMAScript 6 / ECMAScript 2015)",
     "dependencies": {
         "esm": "3.1.x",
-        "ffi-napi": "2.4.x"
+        "ffi-napi": "4.0.3"
     },
     "esm": {
         "cjs": true

diff --git a/impls/es6/printer.mjs b/impls/es6/printer.mjs
@@ -29,6 +29,8 @@ export function pr_str(obj, print_readably) {
         return "nil"
     } else if (obj instanceof Atom) {
         return "(atom " + pr_str(obj.val,_r) + ")"
+    } else if (obj instanceof Function) {
+        return "#<function>"
     } else {
         return obj.toString()
     }

diff --git a/impls/haxe/Dockerfile b/impls/haxe/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -20,7 +20,8 @@ WORKDIR /mal
 ##########################################################
 
 # Haxe
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ haxe libreadline-dev npm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ libreadline-dev nodejs npm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install haxe
 
 ENV NPM_CONFIG_CACHE /mal/.npm
 ENV HOME /

diff --git a/impls/haxe/package.json b/impls/haxe/package.json
@@ -3,6 +3,6 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in Haxe/Javascript",
     "dependencies": {
-        "ffi-napi": "2.4.x"
+        "ffi-napi": "4.0.3"
     }
 }
diff --git a/impls/js/Dockerfile b/impls/js/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################

diff --git a/impls/js/package.json b/impls/js/package.json
@@ -3,6 +3,6 @@
     "version": "0.0.1",
     "description": "Make a Lisp (mal) language implemented in Javascript",
     "dependencies": {
-        "ffi-napi": "2.4.x"
+        "ffi-napi": "4.0.3"
     }
 }
diff --git a/impls/livescript/package.json b/impls/livescript/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "ffi-napi": "2.4.x",
+    "ffi-napi": "4.0.3",
     "prelude-ls": "^1.1.2"
   },
   "devDependencies": {

diff --git a/impls/ts/Dockerfile b/impls/ts/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -19,6 +19,6 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install libreadline-dev nodejs npm
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ libreadline-dev nodejs npm
 
 ENV NPM_CONFIG_CACHE /mal/.npm
diff --git a/impls/ts/package.json b/impls/ts/package.json
@@ -19,7 +19,7 @@
     "test:stepA": "cd .. && make 'test^ts^stepA'"
   },
   "dependencies": {
-    "ffi-napi": "^2.4.0"
+    "ffi-napi": "^4.0.3"
   },
   "devDependencies": {
     "@types/ffi-napi": "4.0.4",

diff --git a/impls/wasm/package.json b/impls/wasm/package.json
@@ -4,7 +4,7 @@
     "description": "Make a Lisp (mal) language implemented in WebAssembly",
     "dependencies": {
         "@kanaka/wamp": "1.0.9",
-        "ffi-napi": "^2.4.4",
+        "ffi-napi": "^4.0.3",
         "text-encoding": "0.6.4"
     }
 }