chore: Bump versions

* graphviz - v5.0.1
* emsdk - v3.1.19

Signed-off-by: Gordon Smith <[email protected]>

.dockerignore

@@ -1,15 +1,13 @@
-.vscode/ipch
+.vscode/
+.nyc_output/
 build/
+coverage/
 dist/
+docker/
 emsdk/
-src-expat/
-src-graphviz/
 lib-*/
 node_modules/
+src-graphviz/
 types/
+vcpkg/
 *.tsbuildinfo
-.nyc_output/
-coverage/
-.vscode/c_cpp_properties.json
-.vscode/settings.json
-test/ubuntu-dev.dockerfile

.github/workflows/testPullRequest.yml

@@ -21,8 +21,8 @@ jobs:
       - run: npm run lint
       - run: sudo apt-get update
       - run: sudo apt-get install -y build-essential
-      - run: sudo apt-get install -y git cmake wget
-      - run: sudo apt-get install -y gcc-multilib g++-multilib pkg-config autoconf bison libtool flex zlib1g-dev
+      - run: sudo apt-get install -y git cmake wget zip
+      - run: sudo apt-get install -y gcc-multilib g++-multilib pkg-config autoconf bison libtool flex
       - run: sudo apt-get install -y python3 python3-pip
       - run: npm run install-build-deps
       - run: npm run build;

CMakeLists.txt

@@ -14,13 +14,13 @@ SET(EM_FLAGS
     "-s MODULARIZE"
     "-s ENVIRONMENT=web,worker,node"
     "-s FILESYSTEM=0"
-    "-s MINIMAL_RUNTIME=2"
+    # "-s MINIMAL_RUNTIME=1"
     "-s MODULARIZE=1" 
     "-s EXPORT_ES6=1"
     "-s IGNORE_CLOSURE_COMPILER_ERRORS=0"
     "-s USE_ES6_IMPORT_META=0"
-    "--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/pre.js"
-    "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/post.js"
+    # "--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/pre.js"
+    # "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/post.js"
 )
 
 IF (CMAKE_BUILD_TYPE STREQUAL "Debug")

README.md

@@ -3,11 +3,11 @@
 ![Test PR](https://github.com/hpcc-systems/hpcc-js-wasm/workflows/Test%20PR/badge.svg)
 
 This repository contains a collection of useful c++ libraries compiled to WASM for (re)use in Node JS, Web Browsers and JavaScript Libraries:
-* [graphviz](https://www.graphviz.org/) - v5.0.0
+* [graphviz](https://www.graphviz.org/) - v5.0.1
 * [expat](https://libexpat.github.io/) - v2.4.8
 
 Built with:
-* [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.15
+* [emsdk](https://github.com/emscripten-core/emsdk) - v3.1.19
 
 ## Quick GraphViz Demos
 * https://raw.githack.com/hpcc-systems/hpcc-js-wasm/trunk/index.html

cpp/expat/expatlib/CMakeLists.txt

@@ -5,7 +5,6 @@ find_package(expat CONFIG REQUIRED)
 # See:  https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
 SET(EM_FLAGS 
     ${EM_FLAGS}
-    "-s FILESYSTEM=1"
     "-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
     "-s EXPORTED_FUNCTIONS=\"['_malloc']\""
     "-s EXPORTED_RUNTIME_METHODS=\"[]\""

cpp/graphviz/CMakeLists.txt

@@ -23,7 +23,7 @@ option(use_sanitizers  "enables using address and undefined behavior sanitizer"
 option(use_coverage    "enables analyzing code coverage" OFF)
 option(with_cxx_api    "enables building the C++ API" ON)
 option(with_cxx_tests  "enables building the C++ tests" OFF)
-option(use_win_pre_inst_libs "enables building using pre-installed Windows libraries" ON)
+option(use_win_pre_inst_libs "enables building using pre-installed Windows libraries" OFF)
 
 if(with_digcola)
   add_definitions(-DDIGCOLA)

cpp/graphviz/graphvizlib/CMakeLists.txt

@@ -3,6 +3,7 @@ PROJECT(graphvizlib)
 # See:  https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
 SET(EM_FLAGS 
     ${EM_FLAGS}
+    "-s FILESYSTEM=1"
     "-s EXPORT_NAME='${CMAKE_PROJECT_NAME}'"
     "-s EXPORTED_FUNCTIONS=\"[_free]\""
     "-s EXPORTED_RUNTIME_METHODS=\"[]\""

cpp/graphviz/lib/common/CMakeLists.txt

@@ -15,7 +15,6 @@ add_library(common_obj OBJECT
   ${GRAPHVIZ_LIB_DIR}/common/intset.h
   ${GRAPHVIZ_LIB_DIR}/common/htmllex.h
   ${GRAPHVIZ_LIB_DIR}/common/htmltable.h
-  ${GRAPHVIZ_LIB_DIR}/common/logic.h
   ${GRAPHVIZ_LIB_DIR}/common/macros.h
   ${GRAPHVIZ_LIB_DIR}/common/memory.h
   ${GRAPHVIZ_LIB_DIR}/common/pointset.h

docker/ubuntu-dev.dockerfile

@@ -8,22 +8,25 @@ RUN apt-get upgrade -y
 # Install pre-requisites (keep synced with README.md)
 ## NodeJS
 RUN apt-get install -y curl
-RUN curl --silent --location https://deb.nodesource.com/setup_14.x | bash -
+RUN curl --silent --location https://deb.nodesource.com/setup_16.x | bash -
+RUN apt-get update
 RUN apt-get install -y nodejs
-RUN apt-get install -y build-essential
 
 ## Other
-RUN apt-get install -y git cmake wget
-RUN apt-get install -y gcc-multilib g++-multilib pkg-config autoconf bison libtool flex zlib1g-dev 
+RUN apt-get install -y build-essential
+RUN apt-get install -y git cmake wget zip
+RUN apt-get install -y gcc-multilib g++-multilib pkg-config autoconf bison libtool flex
 RUN apt-get install -y python3 python3-pip
 
 # Set the working directory
 WORKDIR /usr/src/app
 
-COPY ./scripts/* ./scripts/
+COPY ./scripts ./scripts
+
 RUN ./scripts/cpp-install-emsdk.sh
 RUN ./scripts/cpp-install-graphviz.sh
-RUN ./scripts/cpp-install-expat.sh
+RUN ./scripts/cpp-install-vcpkg.sh
+RUN ./vcpkg/bootstrap-vcpkg.sh
 
 COPY . .
 

index.html

@@ -27,15 +27,17 @@
 <body>
     <h3>Async DOT</h3>
     <div id="placeholder"></div>
-    <br>
+    <hr>
     <h3>Two</h3>
     <div id="placeholder2"></div>
-    <br>
+    <div id="placeholder2b"></div>
+    <hr>
     <h3>Sync DOT</h3>
     <div id="placeholder3"></div>
+    <hr>
     <h3>Cached wasmBinary</h3>
     <div id="placeholder4"></div>
-    <h3>End</h3>
+    <hr>
     <script>
         hpccWasm.expatVersion().then(v => alert(v));
         const dot = `
@@ -95,6 +97,11 @@ <h3>End</h3>
             div.innerHTML = svg;
         }).catch(err => console.error(err.message));
 
+        hpccWasm.graphviz.layout('digraph { a[image="./resources/hpcc-logo.png"]; }', "svg", "dot", { images: [{ path: "./resources/hpcc-logo.png", width: "272px", height: "92px" }] }).then(svg => {
+            const div = document.getElementById("placeholder2b");
+            div.innerHTML = svg;
+        }).catch(err => console.error(err.message));
+
         hpccWasm.graphvizSync().then(graphviz => {
             const div = document.getElementById("placeholder3");
             try {