Es4x update dependencies (#4266)

* Replaced custom docker image with official graalvm image

* Upgrade dependencies

frameworks/JavaScript/es4x/es4x.dockerfile

@@ -1,4 +1,4 @@
-FROM oracle/graalvm-ce:1.0.0-rc9
+FROM oracle/graalvm-ce:1.0.0-rc10
 # Set working dir
 RUN mkdir /app
 WORKDIR /app
@@ -22,7 +22,5 @@ CMD java \
     -Dvertx.threadChecks=false                        \
     -Dvertx.disableContextTimings=true                \
     -Dvertx.disableTCCL=true                          \
-    -jar                                              \
-    target/es4x-0.0.1-bin.jar                         \
-    --instances                                       \
-    `grep --count ^processor /proc/cpuinfo`
+    -jar target/dist/es4x-0.0.1.jar                   \
+    --instances `grep --count ^processor /proc/cpuinfo`

frameworks/JavaScript/es4x/index.js

@@ -5,14 +5,14 @@ import {Router} from '@vertx/web';
 
 import {PgClient, Tuple} from '@reactiverse/reactive-pg-client';
 import {PgPoolOptions} from '@reactiverse/reactive-pg-client/options';
+import {HandlebarsTemplateEngine} from '@vertx/web-templ-handlebars'
 
 const util = require('./util');
-const HandlebarsTemplateEngine = Java.type('io.vertx.ext.web.templ.HandlebarsTemplateEngine');
 
 const SERVER = 'vertx.js';
 
 const app = Router.router(vertx);
-const template = HandlebarsTemplateEngine.create();
+const template = HandlebarsTemplateEngine.create(vertx);
 let date = new Date().toString();
 
 vertx.setPeriodic(1000, t => date = new Date().toUTCString());
@@ -80,7 +80,7 @@ app.get("/queries").handler(ctx => {
   let worlds = [];
 
   const queries = util.getQueries(ctx.request());
-  
+
   for (let i = 0; i < queries; i++) {
     client.preparedQuery(SELECT_WORLD, Tuple.of(util.randomWorld()), ar => {
       if (!failed) {
@@ -146,10 +146,8 @@ app.get("/fortunes").handler(ctx => {
       return 0;
     });
 
-    ctx.put("fortunes", fortunes);
-
     // and now delegate to the engine to render it.
-    template.render(ctx, "templates", "/fortunes.hbs", res => {
+    template.render({fortunes: fortunes}, "templates/fortunes.hbs", res => {
       if (res.succeeded()) {
         ctx.response()
           .putHeader("Server", SERVER)
@@ -240,7 +238,7 @@ app.get("/plaintext").handler(ctx => {
 
 vertx
   .createHttpServer()
-  .requestHandler(req => app.accept(req))
+  .requestHandler(app)
   .listen(8080);
 
 console.log('Server listening at: http://localhost:8080/');

frameworks/JavaScript/es4x/package.json

@@ -4,26 +4,23 @@
   "private": true,
   "main": "index.js",
   "devDependencies": {
-    "@vertx/unit": "3.5.4",
-    "es4x-cli": "0.0.3"
+    "@vertx/unit": "^3.6.2",
+    "es4x-cli": "^0.1.1"
   },
   "dependencies": {
-    "@vertx/core": "3.5.4",
-    "@vertx/web": "3.5.4",
-    "@reactiverse/reactive-pg-client": "0.10.5"
-  },
-  "scripts": {
-    "postinstall": "es4x postinstall",
-    "start": "es4x launcher run",
-    "test": "es4x launcher test",
-    "shell": "es4x shell",
-    "package": "es4x package"
-  },
-  "mvnDependencies": {
-    "io.vertx:vertx-web-templ-handlebars": "3.5.4"
+    "@vertx/core": "^3.6.2",
+    "@vertx/web": "^3.6.2",
+    "@vertx/web-templ-handlebars": "^3.6.2",
+    "@reactiverse/reactive-pg-client": "^0.11.0"
   },
   "files": [
     "util.js",
     "templates/fortunes.hbs"
-  ]
+  ],
+  "scripts": {
+    "postinstall": "es4x postinstall",
+    "start": "es4x exec run",
+    "test": "es4x exec test",
+    "package": "es4x package"
+  }
 }