fix the ci builds

.circleci/config.yml

@@ -33,17 +33,17 @@ build-shared: &build-shared
     <<: *defaults
     machine: true
     macos:
-      xcode: '8.3.3'
+      xcode: '11.1.0'
     steps:
     - run:
         # https://discuss.circleci.com/t/how-to-change-node-version-in-circleci-2-0/17455/4
         name: Install node
         command: |
-          curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
+          curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
           export NVM_DIR="$HOME/.nvm"
           [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-          nvm install 12.2.0
-          nvm alias default 12.2.0
+          nvm install 13.8.0
+          nvm alias default 13.8.0
           # Adding to $BASH_ENV
           echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
           echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
@@ -114,9 +114,9 @@ jobs:
   test-js-current:
     <<: *node-test-shared
     docker:
-      - image: circleci/node:12.2.0
+      - image: circleci/node:13.8.0
     environment:
-      BUILD_NODE_VERSION: 12.2.0
+      BUILD_NODE_VERSION: 13.8.0
 
   build-current:
     <<: *build-shared

.eslintrc

@@ -1,7 +1,7 @@
 {
   "parser": "babel-eslint",
   "extends": [
-    "airbnb"
+    "eslint-config-airbnb-base"
   ],
   "env": {
     "jest": true
@@ -12,7 +12,6 @@
   },
   "plugins": [
     "flowtype",
-    "import",
     "babel"
   ],
   "rules": {
@@ -39,7 +38,7 @@
       }
     ],
     "object-curly-newline": 0,
-    "babel/array-bracket-spacing": 2,
+    "array-bracket-spacing": 2,
     "implicit-arrow-linebreak": 0,
     "operator-linebreak": 0,
     "import/no-cycle": 0,

.flowconfig

@@ -1,5 +1,5 @@
 [ignore]
-# <PROJECT_ROOT>/node_modules/.*
+<PROJECT_ROOT>/node_modules/module-deps
 <PROJECT_ROOT>/target/.*
 <PROJECT_ROOT>/LUMO__INTERNAL__CLASSPATH/.*
 <PROJECT_ROOT>/tmp/.*
@@ -15,4 +15,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.98.0
+^0.117.0

.gitignore

@@ -49,6 +49,7 @@ target/
 /build/
 lumo-cache/
 test-lumo-cache/
+resources_bak/
 .vagrant
 
 third_party/*

.travis.yml

@@ -1,14 +1,16 @@
 sudo: required
-dist: trusty
+dist: bionic
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - g++-6
+      - g++-7
+    env:
+      - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
 language: node_js
 node_js:
-- 12
+- 13
 # safelist
 branches:
   only:
@@ -17,11 +19,8 @@ cache:
   directories:
   - node_modules
   - "~/.m2"
-  - tmp
-  - "~/.boot/cache/lib"
-  - "~/.boot/cache/bin"
-  - yarn
 before_install:
+- eval "${MATRIX_EVAL}"
 - sudo fallocate -l 4G /swapfile
 - sudo chmod 600 /swapfile
 - sudo mkswap /swapfile
@@ -69,9 +68,9 @@ env:
       -XX:+CMSClassUnloadingEnabled
       -Xverify:none'
       BUILD_ARCH=linux
-    - CC=gcc-6 && CXX=g++-6
+    - eval "${MATRIX_EVAL}"
 matrix:
   fast_finish: true
   include:
     - env:
-      - BUILD_NODE_VERSION=12.2.0
+      - BUILD_NODE_VERSION=13.8.0

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Changes
 
-- Upgrade Node.js to version 12.2.0.
+- Upgrade Node.js to version 13.8.0.
 
 ### Bug fixes
 

appveyor.yml

@@ -1,11 +1,11 @@
 image:
 - Visual Studio 2017
 environment:
-  nodejs_version: "11"
+  nodejs_version: "13"
   appveyor_build_worker_cloud: gce
   BUILD_ARCH: win
   matrix:
-    - BUILD_NODE_VERSION: 12.2.0
+    - BUILD_NODE_VERSION: 13.8.0
 platform:
   - x64
 

build.boot

@@ -2,7 +2,7 @@
                                  "1.10.520"))
 
 (def +node-version+ (or (System/getenv "BUILD_NODE_VERSION")
-                        "12.2.0"))
+                        "13.8.0"))
 
 (def +build-static-binary+ (-> (System/getenv "BUILD_STATIC_BINARY") boolean str))
 

package.json

@@ -37,50 +37,47 @@
     "postinstall": "node download/install.js || nodejs download/install.js"
   },
   "devDependencies": {
-    "@babel/core": "^7.1.5",
-    "@babel/plugin-external-helpers": "^7.0.0",
-    "@babel/plugin-proposal-class-properties": "^7.1.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.1.0",
-    "@babel/preset-env": "^7.1.5",
-    "@babel/preset-stage-2": "^7.0.0",
-    "@babel/runtime": "^7.1.5",
-    "async-retry": "^1.2.3",
+    "@babel/core": "^7.8.4",
+    "@babel/plugin-external-helpers": "^7.8.3",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.8.3",
+    "@babel/preset-env": "^7.8.4",
+    "@babel/preset-stage-2": "^7.8.3",
+    "@babel/runtime": "^7.8.4",
+    "async-retry": "^1.3.1",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.8.0",
-    "babel-loader": "^8.0.4",
+    "babel-eslint": "^10.0.3",
+    "babel-jest": "^25.1.0",
+    "babel-loader": "^8.0.6",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
-    "chalk": "^2.4.1",
-    "cross-env": "^5.2.0",
+    "chalk": "^3.0.0",
+    "cross-env": "^7.0.0",
     "death": "^1.1.0",
-    "eslint": "^5.8.0",
-    "eslint-config-airbnb": "17.1.0",
-    "eslint-config-airbnb-base": "13.1.0",
-    "eslint-plugin-babel": "^5.2.1",
-    "eslint-plugin-flowtype": "^3.2.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jsx-a11y": "^6.1.2",
-    "eslint-plugin-react": "^7.11.1",
-    "flow-bin": "0.98.1",
-    "google-closure-compiler-js": "20170910.0.1",
-    "jest-cli": "^24.7.0",
+    "eslint": "^6.8.0",
+    "eslint-config-airbnb-base": "14.0.0",
+    "eslint-plugin-babel": "^5.3.0",
+    "eslint-plugin-flowtype": "^4.6.0",
+    "eslint-plugin-import": "^2.20.1",
+    "flow-bin": "0.117.0",
+    "google-closure-compiler": "^20200204.0.0",
+    "jest-cli": "^25.1.0",
     "jszip": "github:anmonteiro/jszip#patch-1",
-    "nexe": "github:anmonteiro/nexe#anmonteiro-patch-1",
-    "node-fetch": "^2.2.1",
-    "paredit.js": "^0.3.4",
+    "nexe": "./vendor/nexe",
+    "node-fetch": "^2.6.0",
+    "paredit.js": "^0.3.6",
     "posix-getopt": "github:anmonteiro/node-getopt#master",
-    "prettier": "^1.15.1",
-    "progress": "^2.0.0",
-    "read-pkg": "^5.1.1",
-    "rollup": "^1.9.0",
-    "rollup-plugin-babel": "^4.3.2",
-    "rollup-plugin-babel-minify": "^8.0.0",
-    "rollup-plugin-commonjs": "^10.0.0",
-    "rollup-plugin-node-resolve": "^5.0.0",
-    "rollup-plugin-replace": "^2.1.1",
-    "webpack": "^4.25.1",
-    "webpack-cli": "^3.1.2",
+    "prettier": "^1.19.1",
+    "progress": "^2.0.3",
+    "read-pkg": "^5.2.0",
+    "rollup": "^1.31.1",
+    "rollup-plugin-babel": "^4.3.3",
+    "rollup-plugin-babel-minify": "^9.1.1",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-replace": "^2.2.0",
+    "webpack": "^4.41.6",
+    "webpack-cli": "^3.3.11",
     "which-promise": "^1.0.0"
   },
   "jest": {

scripts/bundle.js

@@ -76,6 +76,8 @@ if (!isDevBuild) {
       comments: false,
       removeConsole: true,
       removeDebugger: true,
+      evaluate: false,
+      mangle: false,
     }),
   );
 }

scripts/bundleForeign.js

@@ -4,7 +4,7 @@ const replace = require('rollup-plugin-replace');
 const commonjs = require('rollup-plugin-commonjs');
 
 rollup({
-  input: 'node_modules/google-closure-compiler-js/compile.js',
+  input: 'node_modules/google-closure-compiler/lib/node/closure-compiler-js.js',
   plugins: [
     replace({
       'process.env.NODE_ENV': JSON.stringify('production'),

scripts/package.js

@@ -1,4 +1,3 @@
-const async = require('async');
 const nexe = require('../vendor/nexe');
 const monkeyPatch = require('../vendor/nexe/monkeypatch');
 const fs = require('fs');
@@ -65,11 +64,7 @@ Promise.all(resources.map(deflate)).then(() => {
       '--without-etw',
       '--with-snapshot',
     ].concat(
-      isWindows
-        ? ['--openssl-no-asm']
-        : staticBinary
-        ? ['--fully-static']
-        : [],
+      isWindows ? ['--openssl-no-asm'] : staticBinary ? ['--fully-static'] : [],
     ),
     nodeMakeArgs: ['-j', '8'],
     nodeVCBuildArgs: ['nosign', 'x64', 'noetw'],
@@ -82,15 +77,10 @@ Promise.all(resources.map(deflate)).then(() => {
 
   console.dir(options);
 
-  nexe.compile(
-    options,
-    err => {
-      if (err) {
-        throw err;
-      }
-      console.log(
-        `Finished bundling. Nexe binary can be found in ${outputPath}`,
-      );
-    },
-  );
+  nexe.compile(options, err => {
+    if (err) {
+      throw err;
+    }
+    console.log(`Finished bundling. Nexe binary can be found in ${outputPath}`);
+  });
 });

src/js/cljs.js

@@ -51,6 +51,7 @@ function lumoEval(
   if (execPath != null) {
     const filename = path.resolve(execPath);
     const dirname = path.dirname(filename);
+    // $FlowFixMe: strangely, module 'module' isn't built-in
     const module = new Module(filename);
 
     module.filename = filename;
@@ -490,9 +491,7 @@ async function initSocketRepl(
     // versions and jest does not allow yet to specify the snapshot name at runtime.
     // It's been worked on though, see:
     //   https://github.com/facebook/jest/pull/5838#issuecomment-382476612
-    const errorMsg = `Port should be > 0 and < 65536. Received ${
-      parsedOpts.port
-    }.`;
+    const errorMsg = `Port should be > 0 and < 65536. Received ${parsedOpts.port}.`;
     if (Number.isNaN(replOpts.port)) {
       throw new Error(errorMsg);
     } else if (replOpts.port < 1 || replOpts.port > 65536) {

vendor/nexe/.gitignore

@@ -0,0 +1 @@
+node_modules