chore: 3.0 beta

closes #468

.circleci/build.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+export NVS_HOME="$HOME/.nvs"
+. "$NVS_HOME/nvs.sh" install && nvs link lts && nvs use default
+
+set -e -x
+
+yarn run asset-compile

.circleci/config.yml

@@ -0,0 +1,28 @@
+version: 2
+
+jobs:
+  build:
+    macos:
+      xcode: "9.0"
+    steps:
+    - checkout
+    - restore_cache:
+        keys:
+        - package-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
+        - package- # Fallback for the latest package.json cache
+    - run:
+        name: setup
+        command: .circleci/setup.sh
+    - save_cache:
+        key: package-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }} 
+        paths:
+        - node_modules
+    - run:
+        name: build
+        command: .circleci/build.sh
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - build

.circleci/setup.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+
+echo "setting up node to use latest lts"
+
+export NVS_HOME="$HOME/.nvs"
+git clone --depth=1 https://github.com/jasongin/nvs "$NVS_HOME"
+. "$NVS_HOME/nvs.sh" install
+nvs add lts && nvs link lts nvs use default
+npm install -g yarn 
+yarn

.travis.yml

@@ -1,9 +1,11 @@
 language: node_js
+node_js:
+- '6'
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y g++-multilib
 node_js:
-- '6'
+- '8'
 script: npm run asset-compile
 env:
   global:

.vscode/extensions.json

@@ -1,5 +1,3 @@
 {
-    "recommendations": [
-      "esbenp.prettier-vscode"
-    ]
+    "recommendations": [ "eg2.tslint" ]
 }

.vscode/settings.json

@@ -1,9 +1,7 @@
 {
-  "typescript.tsdk": "./node_modules/typescript/lib",
-  "prettier.semi": false,
-  "prettier.singleQuote": true,
-  "prettier.typescriptEnable": ["typescript"],
-  "editor.trimAutoWhitespace": true,
+  "tslint.enable": true,
+  "tslint.run": "onType",
+  "tslint.autoFixOnSave": true,
   "files.exclude": {
     "**/.git": true,
     "**/.svn": true,
@@ -15,5 +13,6 @@
     "lib/**/*": true,
     "**/node_modules": true,
     "**/bower_components": true
-  }
+  },
+  "typescript.tsdk": "node_modules\\typescript\\lib"
 }

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017 Nexe Contributors
+Copyright (c) 2013-2018 Nexe Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -5,6 +5,7 @@
   <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/dt/nexe.svg" alt="Downloads"></a>
   <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/v/nexe.svg" alt="Version"></a>
   <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/l/nexe.svg" alt="License"></a>
+  <a href="https://gitter.im/nexe/nexe?utm_source=badge&utm_medium=badge"><img src="https://badges.gitter.im/nexe/nexe.svg"></a>
 </p>
 
 <p align="center"><code>npm i nexe -g</code></p>
@@ -51,7 +52,7 @@ Additional files or resources can be added to the binary by passing `-r "glob/pa
 ## Compiling Node
 
 By default `nexe` will attempt to download a pre-built executable. However, It may be unavailable ([github releases](https://github.com/nexe/nexe/releases))
-or you may want to customize what is built. See `nexe --help` for a list of options available when passing the [`--build`](#build-boolean) option. You will also need to ensure your environment is setup to [build node](https://github.com/nodejs/node/blob/master/BUILDING.md). Note: the `python` binary in your path should be an acceptbale version of python 2. eg. Systems that have python2 will need to create a [symlink](https://github.com/nexe/nexe/issues/354#issuecomment-319874486)
+or you may want to customize what is built. See `nexe --help` for a list of options available when passing the [`--build`](#build-boolean) option. You will also need to ensure your environment is setup to [build node](https://github.com/nodejs/node/blob/master/BUILDING.md). Note: the `python` binary in your path should be an acceptable version of python 2. eg. Systems that have python2 will need to create a [symlink](https://github.com/nexe/nexe/issues/354#issuecomment-319874486).
 
 ## Node.js API
 
@@ -87,8 +88,17 @@ compile({
     - Output executable file path
     - default: same as `name` with an OS specific extension.
  - #### `target: string | object`
-    - Combination of platform-arch-version. e.g. `'win32-ia32-6.10.3'`
+    - An object or string describing platform-arch-version. e.g. `'windows-ia32-6.10.3'`
       - each segment is optional, and will be merged with the current environment
+      - Examples: ([full list](https://github.com/nexe/nexe/releases))
+        - `'win32-x86-8.6.0`
+        - `{ platform: 'alpine' }`
+        - `darwin-8.6.0`
+        - `linux-x64`
+        - `macos-8.4.0`
+
+        See [test/target.spec.ts](test/target.spec.ts)
+    - If the [`build`](#build-boolean) flag is set, the platform portion of the target is ignored.
     - default: `process`
 - #### `bundle: string | boolean`
     - If a string is provided it must be a valid relative module path
@@ -120,7 +130,7 @@ compile({
  - #### `make: string[]`
     - Array of arguments for the node build make step, on windows this step recieves options for vcBuild.bat
     - default: `[]` or `['nosign', 'release']` for non windows systems
- - #### `make: string[]`
+ - #### `vcBuild: string[]`
     - Alias for `make` option
  - #### `snapshot: string`
     - path to a file to be used as the warmup snapshot for the build
@@ -134,7 +144,7 @@ compile({
     - Override in the env with `NEXE_TEMP`
     - default: `./.nexe` in the cwd
  - #### `ico: string`
-    - Path to a user provided icon to be used (Windows only).
+    - Path to a user provided icon to be used (Windows only). Requires `--build` to be set.
  - #### `rc: object`
     - Settings for patching the [node.rc](https://github.com/nodejs/node/blob/master/src/res/node.rc) configuration file (Windows only).
     - Example:
@@ -150,10 +160,16 @@ compile({
  - #### `clean: boolean`
     - If included, nexe will remove temporary files for the accompanying configuration and exit
  - #### `enableNodeCli: boolean`
-    - Enable the original Node CLI (will prevent application cli from working)
+    - Enable the original Node CLI (will prevent application cli from working).
+    - Node CLI arguments passed via the [NODE_OPTIONS](https://nodejs.org/api/cli.html#cli_node_options_options) environment
+      variable will still be processed. NODE_OPTIONS support can be disabled with the `--without-node-options` configure flag.
     - default: `false`
   - #### `fakeArgv: boolean`
     - fake the entry point file name (`process.argv[1]`). If nexe was used with stdin this will be `'[stdin]'`. 
+ - #### `ghToken: string`
+    - Provide a Github Token for accessing nexe releases
+    - This is usually needed in CI environments
+    - default: `process.env.GITHUB_TOKEN`
  - #### `sourceUrl: string`
     - Provide an alternate url for the node source code
     - Note: temporary files will still be created for this under the specified version
@@ -171,8 +187,7 @@ compile({
 
 Patches and Plugins are just a middleware functions that take two arguments, the `compiler`, and `next`. The compiler is described below, and `next` ensures that the pipeline continues. Its invocation should always be awaited or returned to ensure correct behavior. Patches also require that [`--build`](#build-boolean) be set, while plugins do not.
 
-For examples, see the built in patches: [src/patches](src/patches)
-A plugin
+For examples, see the built in patches: [src/patches](src/patches).
 
 ### `NexeCompiler`
 
@@ -196,16 +211,9 @@ Any modifications made to `NexeFile#contents` will be maintained in the cache _w
 
 ## Native Modules
 
-Nexe has a plugin built for use with [fuse-box](http://fuse-box.org) > 2.2.1. This plugin currently supports modules that require `.node` files and those that use the `bindings` module.
-Take a look at the (windows) [example](examples/native-build/build.js)
+TODO
 
-- [ ] Implement support `node-pre-gyp#find`.
-
-## Maintainers
-
-[![Jared Allard](https://avatars.githubusercontent.com/u/2391349?s=130)](https://jaredallard.me/) | [![Caleb Boyd](https://avatars.githubusercontent.com/u/5818726?s=130)](https://github.com/calebboyd) | [![Christopher Karper](https://avatars.githubusercontent.com/u/653156?s=130)](https://github.com/ckarper) | [![Dustin Greif](https://avatars.githubusercontent.com/u/3026298?s=130)](https://github.com/dgreif) |
----|---|---|---
-[Jared Allard](https://github.com/jaredallard) | [Caleb Boyd](http://github.com/calebboyd) | [Christopher Karper](https://github.com/ckarper) | [Dustin Greif](https://github.com/dgreif) |
+- [ ] Implement support for `node-pre-gyp#find`.
 
 ## Contributing
 
@@ -221,6 +229,11 @@ Testing
 $ npm test
 ```
 
+## Maintainers
+
+[![Jared Allard](https://avatars.githubusercontent.com/u/2391349?s=130)](https://jaredallard.me/) | [![Caleb Boyd](https://avatars.githubusercontent.com/u/5818726?s=130)](https://github.com/calebboyd) | [![Dustin Greif](https://avatars.githubusercontent.com/u/3026298?s=130)](https://github.com/dgreif) |
+---|---|---|
+[Jared Allard](https://github.com/jaredallard) | [Caleb Boyd](http://github.com/calebboyd) |  [Dustin Greif](https://github.com/dgreif) |
 
 ### Former
 

appveyor.yml

@@ -1,3 +1,6 @@
+image:
+  - Visual Studio 2017
+  - Visual Studio 2015
 environment:
   CIRCLE_TOKEN:
     secure: TQKcepXmTzCNt4+tUBtYpwEQkdSPwFr9A8ugtoMhNbKu/SW1WM1EpjEu6kYXxpQ4
@@ -6,13 +9,14 @@ environment:
   GITHUB_TOKEN:
     secure: 3wuEGJsppSKFvdwhp3jprUA9Zkc3WINlc/9oFXjhAR6J05lYMXP7Fl7lXTKpkGZx
 install:
-  - ps: Install-Product node 6
-  - yarn
+  - ps: Install-Product node 8
+  - curl -L -o nasm.exe https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-2.13.03-installer-x64.exe
+  - start /wait nasm.exe /S
+  - ps: $env:path="C:\Program Files\nasm;$($env:path)"
+  - npm i
 build: off
 test: off
 build_script:
-  - yarn run asset-compile
+  - npm run asset-compile
 artifacts:
-  - path: .nexe\**\node.exe
-cache:
-  - node_modules
+  - path: $(HOMEPATH)\.nexe\**\node.exe

circle.yml

@@ -1,3 +0,0 @@
-test:
-  override:
-    - npm run asset-compile

examples/express-app/index.js

@@ -0,0 +1,8 @@
+const express = require('express')
+const path = require('path')
+const app = express()
+app.use('/', express.static(path.join(__dirname, 'public')))
+
+
+app.listen(8888)
+

examples/express-app/package-lock.json

@@ -0,0 +1,373 @@
+{
+  "name": "express-app",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "requires": {
+        "mime-types": "~2.1.18",
+        "negotiator": "0.6.1"
+      }
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "body-parser": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.1",
+        "http-errors": "~1.6.2",
+        "iconv-lite": "0.4.19",
+        "on-finished": "~2.3.0",
+        "qs": "6.5.1",
+        "raw-body": "2.3.2",
+        "type-is": "~1.6.15"
+      }
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "express": {
+      "version": "4.16.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
+      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
+      "requires": {
+        "accepts": "~1.3.5",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.18.2",
+        "content-disposition": "0.5.2",
+        "content-type": "~1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.1.1",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.3",
+        "qs": "6.5.1",
+        "range-parser": "~1.2.0",
+        "safe-buffer": "5.1.1",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "statuses": "~1.4.0",
+        "type-is": "~1.6.16",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.4.0",
+        "unpipe": "~1.0.0"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ipaddr.js": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
+      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+    },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
+    },
+    "mime-types": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+      "requires": {
+        "mime-db": "~1.35.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "proxy-addr": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
+      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.8.0"
+      }
+    },
+    "qs": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
+    },
+    "raw-body": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.19",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
+        },
+        "http-errors": {
+          "version": "1.6.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+          "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+          "requires": {
+            "depd": "1.1.1",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.0.3",
+            "statuses": ">= 1.3.1 < 2"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+        }
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      }
+    },
+    "serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
+      }
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+    },
+    "statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.18"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    }
+  }
+}

examples/express-app/package.json

@@ -1,16 +1,15 @@
 {
-  "name": "native-build",
+  "name": "express-app",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "node build"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
+  "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "sqlite3": "^3.1.10",
-    "zmq": "^2.15.3"
-  },
-  "devDependencies": {}
+    "express": "^4.16.3"
+  }
 }

examples/express-app/public/index.html

@@ -0,0 +1 @@
+<h1>Hello World!</h1>

examples/native-build/build.js

@@ -1,13 +0,0 @@
-const nexe = require('../..')
-nexe.compile({
-  output: 'native-build',
-  silent: true,
-  native: {
-    zmq: {
-      additionalFiles: [
-        '../../windows/lib/x64/libzmq-v100-mt-4_0_4.dll'
-      ]
-    }
-  }
-})
-

examples/native-build/index.js

@@ -1,18 +0,0 @@
-var zmq = require('zmq')
-var pub = zmq.socket('pub')
-
-pub.bindSync('tcp://127.0.0.1:3000')
-console.log('Publisher bound to port 3000')
-
-setInterval(function(){
-  console.log('sending a multipart message envelope')
-  pub.send(['kitty cats', 'meow!'])
-}, 2500)
-var sub = zmq.socket('sub')
-sub.connect('tcp://127.0.0.1:3000')
-sub.subscribe('kitty cats')
-console.log('Subscriber connected to port 3000')
-
-sub.on('message', function(topic, message) {
-  console.log('received a message related to:', topic.toString(), 'containing message:', message.toString())
-})

index.js

@@ -10,8 +10,8 @@ if (require.main === module) {
     process.stderr.write(showHelp ? options.help : options.version + eol)
   } else {
     const nexe = require('./lib/nexe')
-    nexe.compile(argv).catch((e) => {
-      process.stderr.write(eol + e.stack)
+    nexe.compile(argv).catch(() => {
+      process.exit(1)
     })
   }
 } else {

issue_template.md

@@ -1,21 +1,19 @@
-This is a
- - [ ] Bug Report
- - [ ] Feature Request
- - [ ] Other
+<!-- If you need help or think you have found a bug, please help us with your issue by entering the following information (otherwise you can delete this text): -->
 
-<br/>
-If this is a bug report, What are the steps to reproduce?
+**Is this a BUG or a FEATURE REQUEST?:** 
 
-```
-//provide configuration here
-```
+**What happened:**
 
-<br/><br/>
-Please also provide:
+**What you expected to happen:**
+
+**How to reproduce it (as minimally and precisely as possible):**
+
+**Anything else we need to know?:**
+
+**Environment**
 
 - Platform(OS/Version):
 - Host Node Version:
 - Target Node Version:
 - Nexe version:
 - Python Version:
-

package.json

@@ -2,7 +2,7 @@
   "name": "nexe",
   "description": "Create a single executable out of your Node.js application",
   "license": "MIT",
-  "version": "2.0.0-rc.11",
+  "version": "3.0.0-beta.0",
   "contributors": [
     "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
     "Jared Allard <jaredallard@outlook.com>",
@@ -10,10 +10,10 @@
   ],
   "scripts": {
     "asset-compile": "ts-node tasks/asset-compile",
-    "prebuild": "rimraf lib && npm run lint",
-    "prepublish": "npm test && npm run build",
-    "test": "mocha test/**/*.spec.ts",
-    "lint": "prettier --parser typescript --no-semi --print-width 100 --single-quote --write \"src/**/*.ts\"",
+    "test": "mocha",
+    "lint": "tslint \"{src,plugins,tasks}/**/*.ts\" --fix",
+    "prepare": "npm run lint && npm run build && npm test",
+    "prebuild": "rimraf lib",
     "build": "tsc --declaration",
     "postbuild": "ts-node tasks/post-build"
   },
@@ -22,8 +22,7 @@
     "url": "git://github.com/nexe/nexe.git"
   },
   "files": [
-    "lib",
-    "source-map-support.js"
+    "lib"
   ],
   "typings": "lib/nexe.d.ts",
   "main": "index.js",
@@ -34,35 +33,43 @@
     "node": ">=6"
   },
   "dependencies": {
-    "app-builder": "^5.1.0",
-    "chalk": "^1.1.3",
-    "download": "^6.2.0",
-    "fuse-box": "2.2.31",
-    "globby": "^6.1.0",
+    "@calebboyd/semaphore": "^1.3.1",
+    "app-builder": "^5.2.0",
+    "caw": "^2.0.1",
+    "chalk": "^2.4.1",
+    "cherow": "^1.6.8",
+    "download": "^7.1.0",
+    "globby": "^8.0.1",
+    "got": "^9.2.2",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
-    "ora": "^1.2.0",
-    "pifi": "1.0.0",
-    "rimraf": "^2.6.1",
-    "uglify-js": "3.0.28"
+    "multistream": "^2.1.1",
+    "ora": "^3.0.0",
+    "pify": "^4.0.0",
+    "resolve-dependencies": "^2.1.1",
+    "rimraf": "^2.6.2"
   },
   "devDependencies": {
-    "@types/chai": "^4.0.4",
-    "@types/chalk": "^0.4.31",
-    "@types/execa": "^0.7.0",
-    "@types/globby": "^0.6.0",
+    "@types/chai": "^4.1.5",
+    "@types/execa": "^0.9.0",
+    "@types/globby": "^8.0.0",
+    "@types/got": "^8.3.4",
     "@types/minimist": "^1.2.0",
-    "@types/mkdirp": "^0.3.29",
-    "@types/mocha": "^2.2.42",
-    "@types/ora": "^0.3.31",
-    "@types/pify": "0.0.28",
-    "@types/rimraf": "0.0.28",
+    "@types/mkdirp": "^0.5.2",
+    "@types/mocha": "^5.2.5",
+    "@types/multistream": "^2.1.1",
+    "@types/ora": "^1.3.4",
+    "@types/pify": "3.0.2",
+    "@types/rimraf": "2.0.2",
+    "@types/semver": "^5.5.0",
     "chai": "^4.1.2",
-    "execa": "^0.8.0",
-    "got": "^7.1.0",
-    "mocha": "^3.5.0",
-    "prettier": "^1.6.1",
-    "ts-node": "3.3.0",
-    "typescript": "^2.4.1"
+    "execa": "^1.0.0",
+    "mocha": "^5.2.0",
+    "prettier": "^1.14.3",
+    "ts-node": "^7.0.1",
+    "tslint": "^5.11.0",
+    "tslint-config-prettier": "^1.15.0",
+    "tslint-plugin-prettier": "^2.0.0",
+    "typescript": "^3.0.3"
   }
 }

plugins/nexe-daemon/package.json

@@ -1,22 +0,0 @@
-{
-  "name": "nexe-daemon",
-  "version": "1.0.0",
-  "description": "Plugin for nexe to create installable services",
-  "main": "index.js",
-  "scripts": {
-    "clean": "rimraf *.js",
-    "build": "tsc",
-    "postpublish": "npm run clean"
-  },
-  "files": [
-    "*.js",
-    "winsw.exe"
-  ],
-  "author": "Caleb Boyd",
-  "license": "MIT",
-  "devDependencies": {
-    "nexe": "^2.0.0-rc.6",
-    "rimraf": "^2.6.2",
-    "typescript": "^2.5.2"
-  }
-}

plugins/nexe-daemon/src/index.ts

@@ -1,50 +0,0 @@
-import { NexeCompiler, NexeOptions } from 'nexe'
-import { readFileSync } from 'fs'
-import { join } from 'path'
-
-interface NexeDaemonOptions {
-  id: string
-  name: string
-  description: string
-  executable: string
-}
-
-type DaemonOptions = NexeOptions & { daemon: { windows: NexeDaemonOptions } }
-
-function renderWinswConfig(options: any) {
-  return '<configuration>\r\n' +
-    `${Object.keys(options).reduce((config: string, element: string) => {
-      return config += `<${element}>${options[element]}</${element}>\r\n`
-    }, '')}</configuration>\r\n`
-}
-
-export default function daemon (compiler: NexeCompiler<DaemonOptions>, next: () => Promise<void>) {
-  if (compiler.target.platform !== 'windows') {
-    return next()
-  }
-  
-  compiler.addResource(
-    './nexe/plugin/daemon/winsw.exe',
-    readFileSync(require.resolve('./winsw.exe'))
-  )  
-  const name = compiler.options.name,
-    options = compiler.options.daemon.windows,
-    defaults: NexeDaemonOptions = {
-      id: name,
-      name,
-      description: name,
-      executable: '%BASE%\\' + compiler.output
-    } 
-
-  compiler.addResource(
-    './nexe/plugin/daemon/winsw-config.xml',
-    Buffer.from(renderWinswConfig(Object.assign(defaults, options)))
-  )
-  compiler.addResource(
-    './nexe/plugin/daemon/app.js',
-    Buffer.from(compiler.input)
-  )
-  compiler.input = '{{replace:plugins/nexe-daemon/lib/nexe-daemon.js}}'
-
-  return next()
-}

plugins/nexe-daemon/src/nexe-daemon.ts

@@ -1,4 +0,0 @@
-console.log('hello world')
-if (true) {
-  console.log('wat')
-}

plugins/nexe-daemon/tsconfig.json

@@ -1,13 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "module": "commonjs",
-    "lib": [ "es2016" ],
-    "outDir": "lib",
-    "strict": true
-  },
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": []
-}

src/bundling/bindings-rewrite.ts

@@ -1,161 +0,0 @@
-import * as fs from 'fs'
-import * as path from 'path'
-import * as child from 'child_process'
-import { createHash } from 'crypto'
-
-export interface ExtractNodeModuleOptions {
-  [key: string]: { additionalFiles: string[] } | true
-}
-
-function hashName(name: string | Buffer) {
-  return createHash('md5')
-    .update(name)
-    .digest('hex')
-    .toString()
-    .slice(0, 8)
-}
-
-export function embedDotNode(
-  options: ExtractNodeModuleOptions,
-  file: { contents: string; absPath: string }
-) {
-  const contents = fs.readFileSync(file.absPath)
-  const modulePathParts = file.absPath.split(path.sep).reverse()
-  const module = modulePathParts[modulePathParts.findIndex(x => x === 'node_modules') - 1]
-  const bindingName = path.basename(file.absPath)
-  const settings = options[module]
-  const moduleDir = hashName(contents)
-  file.contents = `
-  var fs=require('fs');var path=require('path');var binding='${contents.toString(
-    'base64'
-  )}';function mkdirp(r,t){t=t||null,r=path.resolve(r);try{fs.mkdirSync(r),t=t||r}catch(c){if("ENOENT"===c.code)t=mkdirp(path.dirname(r),t),mkdirp(r,t);else{var i;try{i=fs.statSync(r)}catch(r){throw c}if(!i.isDirectory())throw c}}return t};`
-
-  if (!settings || settings === true) {
-    file.contents += `
-      mkdirp('${moduleDir}');
-      var bindingPath = path.join(process.cwd(), '${moduleDir}', '${bindingName}')
-      require('fs').writeFileSync(bindingPath, Buffer.from(binding, 'base64'))
-      process.dlopen(module, bindingPath)
-    `.trim()
-    return
-  }
-
-  let depth = 0
-  settings.additionalFiles.forEach(file => {
-    let ownDepth = 0
-    file.split('/').forEach(x => x === '..' && ownDepth++)
-    depth = ownDepth > depth ? ownDepth : depth
-  })
-  let segments = [moduleDir]
-  while (depth--) {
-    segments.push(hashName(moduleDir + depth))
-  }
-  segments.push(bindingName)
-
-  file.contents += `
-    var cwd = process.cwd()
-    var bindingFileParts = ${JSON.stringify(segments)};
-    var bindingFile = path.join.apply(path, [cwd].concat(bindingFileParts));
-    mkdirp(path.dirname(bindingFile));
-    fs.writeFileSync(bindingFile, Buffer.from(binding, 'base64'));
-    ${settings.additionalFiles.reduce((code, filename, i) => {
-      const contents = fs.readFileSync(path.join(path.dirname(file.absPath), filename))
-      return (code += `
-        var file${i} = '${contents.toString('base64')}';
-        var filePath${i} = path.join(cwd, bindingFileParts[0], '${filename.split('../').join('')}');
-        mkdirp(path.dirname(filePath${i}));
-        fs.writeFileSync(filePath${i}, Buffer.from(file${i}, 'base64'));
-      `)
-    }, '')};
-    process.dlopen(module, bindingFile)
-  `
-}
-
-function findNativeModulePath(filePath: string, bindingsArg: string) {
-  const dirname = path.dirname(filePath)
-  const tempFile = Math.random() * 100 + '.js'
-  const tempFilePath = path.join(dirname, tempFile)
-  fs.writeFileSync(
-    tempFilePath,
-    `
-    var bindings = require('bindings');
-    var Module = require('module');
-    var originalRequire = Module.prototype.require;
-    Module.prototype.require = function(path) {
-      const mod = originalRequire.apply(this, arguments);
-      process.stdout.write(path)
-      return mod
-    };
-    bindings('${bindingsArg}')
-  `
-  )
-  //using exec because it can be done sync
-  const nativeFileName = child.execSync('node ' + tempFile, { cwd: dirname }).toString()
-  fs.unlinkSync(tempFilePath)
-  const relativePath = './' + path.relative(dirname, nativeFileName).replace(/\\/g, '/')
-  return relativePath
-}
-/**
- * Traverse all nodes in a file and evaluate usages of the bindings module
- * handles two common cases
- */
-export class BindingsRewrite {
-  private bindingsIdNodes: any[] = []
-  public nativeModulePaths: string[] = []
-  public rewrite = false
-
-  isRequire(node: any, moduleName: string) {
-    return node.callee.name === 'require' && node.arguments[0].value === moduleName
-  }
-
-  onNode(absolutePath: string, node: any, parent: any) {
-    if (node.type === 'CallExpression') {
-      if (this.isRequire(node, 'bindings') && parent.type === 'VariableDeclarator') {
-        /**
-         * const loadBindings = require('bindings');
-         *   -> const loadBindings = String('');
-         */
-        this.bindingsIdNodes.push(parent.id)
-        node.callee.name = 'String'
-        node.arguments[0].value = ''
-        this.rewrite = true
-        return
-      }
-
-      if (this.isRequire(node, 'bindings') && parent.type === 'CallExpression') {
-        /**
-         *const bindings = require('bindings')('native-module')....
-         *  -> const bindings = require('./path/to/native/module.node').....
-         */
-        const bindingsArgNode = parent.arguments[0]
-        if (bindingsArgNode.type === 'Literal') {
-          parent.callee = { type: 'Identifier', name: 'require' }
-          bindingsArgNode.value = findNativeModulePath(absolutePath, bindingsArgNode.value)
-          this.nativeModulePaths.push(bindingsArgNode.value)
-          this.rewrite = true
-          return
-        }
-      }
-
-      const bindingsInvocationIdx = this.bindingsIdNodes.findIndex(x => node.callee.name === x.name)
-
-      if (this.bindingsIdNodes[bindingsInvocationIdx]) {
-        /**
-         * const bindings = loadBindings('native-module')
-         *   -> const bindings = require('./path/to/native/module.node')
-         */
-        const bindingsIdNode = this.bindingsIdNodes[bindingsInvocationIdx]
-        const bindingsArgNode = node.arguments[0]
-        this.bindingsIdNodes.splice(bindingsInvocationIdx, 1)
-
-        if (bindingsArgNode.type === 'Literal') {
-          node.callee.name = 'require'
-          bindingsArgNode.value = findNativeModulePath(absolutePath, bindingsArgNode.value)
-          this.nativeModulePaths.push(bindingsArgNode.value)
-          this.rewrite = true
-          return
-        }
-      }
-    }
-  }
-}

src/bundling/fuse-native-module-plugin.ts

@@ -1,69 +0,0 @@
-import { BindingsRewrite, embedDotNode, ExtractNodeModuleOptions } from './bindings-rewrite'
-
-export interface FuseBoxFile {
-  info: { absPath: string }
-  absPath: string
-  contents: string
-  analysis: {
-    dependencies: string[]
-    requiresRegeneration: boolean
-  }
-  consume(): void
-  loadContents(): void
-  makeAnalysis(
-    parsingOptions?: any,
-    traversalPlugin?: {
-      plugins: Array<{
-        onNode(file: FuseBoxFile, node: any, parent: any): void
-        onEnd(file: FuseBoxFile): void
-      }>
-    }
-  ): void
-}
-
-export default function(options: ExtractNodeModuleOptions = {}) {
-  return new NativeModulePlugin(options)
-}
-
-export class NativeModulePlugin {
-  public test = /node_modules.*(\.js|\.node)$|\.node$/
-  public limit2Project = false
-  private modules: (keyof ExtractNodeModuleOptions)[]
-
-  constructor(public options = {}) {}
-
-  init(context: any) {
-    context.allowExtension('.node')
-  }
-
-  transform(file: FuseBoxFile) {
-    file.loadContents()
-
-    if (file.absPath.endsWith('.node')) {
-      embedDotNode(this.options, file)
-      return
-    }
-
-    const bindingsRewrite = new BindingsRewrite()
-
-    file.makeAnalysis(null, {
-      plugins: [
-        {
-          onNode(file, node, parent) {
-            bindingsRewrite.onNode(file.absPath, node, parent)
-          },
-          onEnd(file) {
-            if (bindingsRewrite.rewrite) {
-              const index = file.analysis.dependencies.indexOf('bindings')
-              if (~index) {
-                file.analysis.dependencies.splice(index, 1)
-              }
-              file.analysis.dependencies.push(...bindingsRewrite.nativeModulePaths)
-              file.analysis.requiresRegeneration = true
-            }
-          }
-        }
-      ]
-    })
-  }
-}

src/bundling/index.ts

@@ -1 +0,0 @@
-export * from './fuse-native-module-plugin'

src/compiler.ts

@@ -1,16 +1,17 @@
-import { dirname, normalize, join } from 'path'
+import { delimiter, dirname, normalize, join } from 'path'
 import { Buffer } from 'buffer'
-import { createHash } from 'crypto'
 import { createReadStream } from 'fs'
-import { Readable } from 'stream'
+import { Readable, Stream } from 'stream'
 import { spawn } from 'child_process'
-import { Logger } from './logger'
+import { Logger, LogStep } from './logger'
 import { readFileAsync, writeFileAsync, pathExistsAsync, dequote, isWindows, bound } from './util'
 import { NexeOptions, version } from './options'
 import { NexeTarget } from './target'
 import download = require('download')
 import { getLatestGitRelease } from './releases'
 import { IncomingMessage } from 'http'
+import combineStreams = require('multistream')
+import { Bundle, toStream } from './fs/bundle'
 
 const isBsd = Boolean(~process.platform.indexOf('bsd'))
 const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
@@ -24,33 +25,24 @@ export interface NexeFile {
 
 export { NexeOptions }
 
-interface NexeHeader {
-  resources: { [key: string]: number[] }
-  version: string
-}
-
-export class NexeCompiler<T extends NexeOptions = NexeOptions> {
+export class NexeCompiler {
   private start = Date.now()
   private env = { ...process.env }
-  private compileStep: { modify: Function; log: Function }
+  private bundle: Bundle
+  private compileStep: LogStep | undefined
   public log = new Logger(this.options.loglevel)
   public src: string
   public files: NexeFile[] = []
   public shims: string[] = []
-  public input: string
+  public startup: string = ''
+  public entrypoint: string | undefined
   public bundledInput?: string
   public targets: NexeTarget[]
   public target: NexeTarget
-  public resources: { bundle: Buffer; index: { [key: string]: number[] } } = {
-    index: {},
-    bundle: Buffer.from('')
-  }
-  public output = isWindows
-    ? `${(this.options.output || this.options.name).replace(/\.exe$/, '')}.exe`
-    : `${this.options.output || this.options.name}`
-
+  public output = this.options.output
   private nodeSrcBinPath: string
-  constructor(public options: T) {
+
+  constructor(public options: NexeOptions) {
     const { python } = (this.options = options)
     this.targets = options.targets as NexeTarget[]
     this.target = this.targets[0]
@@ -59,20 +51,32 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
       ? join(this.src, 'Release', 'node.exe')
       : join(this.src, 'out', 'Release', 'node')
     this.log.step('nexe ' + version, 'info')
-    if (python) {
-      if (isWindows) {
-        this.env.PATH = '"' + dequote(normalize(python)) + '";' + this.env.PATH
-      } else {
-        this.env.PYTHON = python
-      }
+    this.bundle = new Bundle(options)
+    if (isWindows) {
+      const originalPath = process.env.PATH
+      delete process.env.PATH
+      this.env = { ...process.env }
+      this.env.PATH = python
+        ? (this.env.PATH = dequote(normalize(python)) + delimiter + originalPath)
+        : originalPath
+      process.env.PATH = originalPath
+    } else {
+      this.env = { ...process.env }
+      python && (this.env.PYTHON = python)
     }
   }
 
   @bound
-  addResource(file: string, contents: Buffer) {
-    const { resources } = this
-    resources.index[file] = [resources.bundle.byteLength, contents.byteLength]
-    resources.bundle = Buffer.concat([resources.bundle, contents])
+  addResource(file: string, content?: Buffer | string) {
+    return this.bundle.addResource(file, content)
+  }
+
+  get binaryConfiguration() {
+    return { resources: this.bundle.index }
+  }
+
+  get resourceSize() {
+    return this.bundle.blobSize
   }
 
   @bound
@@ -132,14 +136,25 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
   }
 
   private _runBuildCommandAsync(command: string, args: string[]) {
+    if (this.log.verbose) {
+      this.compileStep!.pause()
+    }
     return new Promise((resolve, reject) => {
       spawn(command, args, {
         cwd: this.src,
         env: this.env,
-        stdio: 'ignore'
+        stdio: this.log.verbose ? 'inherit' : 'ignore'
       })
-        .once('error', reject)
+        .once('error', (e: Error) => {
+          if (this.log.verbose) {
+            this.compileStep!.resume()
+          }
+          reject(e)
+        })
         .once('close', (code: number) => {
+          if (this.log.verbose) {
+            this.compileStep!.resume()
+          }
           if (code != 0) {
             const error = `${command} ${args.join(' ')} exited with code: ${code}`
             reject(new Error(error))
@@ -157,14 +172,14 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
   }
 
   private async _buildAsync() {
-    this.compileStep.log(
-      `Configuring node build${this.options.configure.length
-        ? ': ' + this.options.configure
-        : '...'}`
+    this.compileStep!.log(
+      `Configuring node build${
+        this.options.configure.length ? ': ' + this.options.configure : '...'
+      }`
     )
     await this._configureAsync()
     const buildOptions = this.options.make
-    this.compileStep.log(
+    this.compileStep!.log(
       `Compiling Node${buildOptions.length ? ' with arguments: ' + buildOptions : '...'}`
     )
     await this._runBuildCommandAsync(make, buildOptions)
@@ -172,11 +187,15 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
   }
 
   private async _fetchPrebuiltBinaryAsync(target: NexeTarget) {
-    const downloadOptions: any = {
-      headers: {
-        'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
-      }
+    let downloadOptions = this.options.downloadOptions
+
+    if (this.options.ghToken) {
+      downloadOptions = Object.assign({}, downloadOptions)
+      downloadOptions.headers = Object.assign({}, downloadOptions.headers, {
+        Authorization: 'token ' + this.options.ghToken
+      })
     }
+
     const githubRelease = await getLatestGitRelease(downloadOptions)
     const assetName = target.toString()
     const asset = githubRelease.assets.find(x => x.name === assetName)
@@ -185,36 +204,19 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
       throw new Error(`${assetName} not available, create it using the --build flag`)
     }
     const filename = this.getNodeExecutableLocation(target)
-    await download(
-      asset.browser_download_url,
-      dirname(filename),
-      downloadOptions
-    ).on('response', (res: IncomingMessage) => {
-      const total = +res.headers['content-length']!
-      let current = 0
-      res.on('data', data => {
-        current += data.length
-        this.compileStep.modify(`Downloading...${(current / total * 100).toFixed()}%`)
-      })
-    })
-    return createReadStream(filename)
-  }
 
-  getHeader() {
-    const version =
-      ['configure', 'vcBuild', 'make'].reduce((a, c) => {
-        return (a += (this.options as any)[c]
-          .slice()
-          .sort()
-          .join())
-      }, '') + this.options.enableNodeCli
-    const header = {
-      resources: this.resources.index,
-      version: createHash('md5')
-        .update(version)
-        .digest('hex')
-    }
-    return `process.__nexe=${JSON.stringify(header)};`
+    await download(asset.browser_download_url, dirname(filename), this.options.downloadOptions).on(
+      'response',
+      (res: IncomingMessage) => {
+        const total = +res.headers['content-length']!
+        let current = 0
+        res.on('data', data => {
+          current += data.length
+          this.compileStep!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
+        })
+      }
+    )
+    return createReadStream(filename)
   }
 
   async compileAsync(target: NexeTarget) {
@@ -233,24 +235,26 @@ export class NexeCompiler<T extends NexeOptions = NexeOptions> {
     return this._assembleDeliverable(binary)
   }
 
+  code() {
+    return [this.shims.join(''), this.startup].join(';')
+  }
+
   private _assembleDeliverable(binary: NodeJS.ReadableStream) {
-    if (this.options.empty) {
+    if (!this.options.mangle) {
       return binary
     }
-    const artifact = new Readable({ read() {} })
-    binary.on('data', (chunk: Buffer) => {
-      artifact.push(chunk)
-    })
-    binary.on('close', () => {
-      const content = [this.shims.join(''), this.input].join(';')
-      artifact.push(content)
-      artifact.push(this.resources.bundle)
-      const lengths = Buffer.from(Array(16))
-      lengths.writeDoubleLE(Buffer.byteLength(content), 0)
-      lengths.writeDoubleLE(this.resources.bundle.byteLength, 8)
-      artifact.push(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
-      artifact.push(null)
-    })
-    return artifact
+
+    const startup = this.code(),
+      codeSize = Buffer.byteLength(startup)
+
+    const lengths = Buffer.from(Array(16))
+    lengths.writeDoubleLE(codeSize, 0)
+    lengths.writeDoubleLE(this.bundle.blobSize, 8)
+    return combineStreams([
+      binary,
+      toStream(startup),
+      this.bundle.toStream(),
+      toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
+    ])
   }
 }

src/fs/README.md

@@ -0,0 +1,40 @@
+# nexe-fs
+
+### Getting Started:
+
+This module contains a set of patches used to create (and use) the Nexe Virtual FileSystem
+
+In order for NVFS to work with node's `require` method. A custom build of node must be used. If using the `nexe` cli this will be handled automatically
+
+The customization should be applied as early as possbile when node is starting up. 
+
+i.e. The contents of `nexe-fs/bootstrap` should be put [here](https://github.com/nodejs/node/blob/0827c80920311fa9d1e6989c8a73aaaeca962eb7/lib/internal/bootstrap/node.js#L27-L28).
+
+### Creating a NVFS:
+
+To create a virtual file system use the `Bundle` Object, in your build process:
+
+```javascript
+const { Bundle } = require('nexe-fs')
+
+const bundle = new Bundle()
+await bundle.addResource(absoluteFileName)
+
+bundle.toStream().pipe(fs.createWriteStream('./myFsBlob'))
+```
+
+In the entrypoint of your application, the fs patch needs to be applied (executed as early as possible)
+For example, In the build process, the application's entrypoint could be prepended with the following:
+
+```javascript
+const codeToPrependToEntrypoint = fs.readFileSync(require.resolve('nexe-fs/patch'), 'utf-8') + `
+shimFs({
+  blobPath: 'location/of/myFsBlob',
+  resources: ${JSON.stringify(bundle)},
+  layout: {
+    resourceStart: 0 // the offset within the blob that is referenced by the bundle index
+  }
+})`
+```
+
+Since a custom node build is being used. A great place for this code would be the node source file: `_third_party_main.js`

src/fs/bootstrap.js

@@ -0,0 +1,15 @@
+const __nexe_patches = (process.nexe = { patches: {} }).patches
+function __nexe_noop_patch(original, ...args) {
+  return original.call(this, ...args)
+}
+function __nexe_patch(obj, method, patch) {
+  const original = obj[method]
+  if (!original) return
+  __nexe_patches[method] = patch
+  obj[method] = function( ...args) {
+    return __nexe_patches[method].call(this, original, ...args)
+  }
+}
+__nexe_patch((process).binding('fs'), 'internalModuleReadFile', __nexe_noop_patch)
+__nexe_patch((process).binding('fs'), 'internalModuleReadJSON', __nexe_noop_patch)
+__nexe_patch((process).binding('fs'), 'internalModuleStat', __nexe_noop_patch)

src/fs/bundle.ts

@@ -0,0 +1,70 @@
+import { stat as getStat, Stats, createReadStream } from 'fs'
+import { relative } from 'path'
+import { Readable } from 'stream'
+import combineStreams = require('multistream')
+
+const stat = (file: string): Promise<Stats> => {
+  return new Promise((resolve, reject) => {
+    getStat(file, (err, stats) => (err ? reject(err) : resolve(stats)))
+  })
+}
+
+function makeRelative(cwd: string, path: string) {
+  return './' + relative(cwd, path)
+}
+
+export function toStream(content: Buffer | string) {
+  const readable = new Readable({ read() {} })
+  readable.push(content)
+  readable.push(null)
+  return readable
+}
+
+export type File = { absPath: string; contents: string; deps: FileMap }
+export type FileMap = { [absPath: string]: File | null }
+
+export interface BundleOptions {
+  entries: string[]
+  cwd: string
+  expand: boolean
+  loadContent: boolean
+  files: FileMap
+}
+
+export class Bundle {
+  constructor({ cwd }: { cwd: string } = { cwd: process.cwd() }) {
+    this.cwd = cwd
+  }
+  cwd: string
+  blobSize: number = 0
+  index: { [relativeFilePath: string]: [number, number] } = {}
+  streams: (Readable | (() => Readable))[] = []
+
+  async addResource(absoluteFileName: string, content?: Buffer | string) {
+    let length = 0
+    if (content) {
+      length = Buffer.byteLength(content)
+    } else {
+      const stats = await stat(absoluteFileName)
+      length = stats.size
+    }
+
+    const start = this.blobSize
+
+    this.blobSize += length
+    this.index[makeRelative(this.cwd, absoluteFileName)] = [start, length]
+    this.streams.push(() => (content ? toStream(content) : createReadStream(absoluteFileName)))
+  }
+
+  concat() {
+    throw new Error('Not Implemented')
+  }
+
+  toStream() {
+    return combineStreams(this.streams)
+  }
+
+  toJSON() {
+    return this.index
+  }
+}

src/fs/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "nexe-fs",
+  "version": "1.0.1",
+  "description": "Virtual File System used by nexe",
+  "main": "bundle.js",
+  "files": [
+    "*.d.ts",
+    "*.js"
+  ],
+  "author": "Caleb Boyd",
+  "dependencies": {
+    "multistream": "^2.1.1"
+  },
+  "license": "MIT"
+}

src/fs/patch.ts

@@ -0,0 +1,340 @@
+import { Stats } from 'fs'
+
+export interface NexeBinary {
+  blobPath: string
+  resources: { [key: string]: number[] }
+  layout: {
+    stat: Stats
+    resourceStart: number
+    contentSize?: number
+    contentStart?: number
+    resourceSize?: number
+  }
+}
+
+let originalFsMethods: any = null
+let nexeBinary: NexeBinary | null = null
+
+function restoreFs(fs: any = require('fs')): NexeBinary | false {
+  if (!nexeBinary) {
+    return false
+  }
+  const source = nexeBinary
+  Object.assign(fs, originalFsMethods)
+  nexeBinary = originalFsMethods = null
+  return source
+}
+
+function shimFs(binary: NexeBinary, fs: any = require('fs')) {
+  if (originalFsMethods !== null) {
+    return
+  }
+  originalFsMethods = Object.assign({}, fs)
+  nexeBinary = binary
+  const { blobPath, resources: manifest } = binary
+  const { resourceStart, stat } = binary.layout
+  const directories: { [key: string]: { [key: string]: boolean } } = {},
+    isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
+    isNotFile = () => false,
+    isNotDirectory = isNotFile,
+    isFile = () => true,
+    noop = () => {},
+    isDirectory = isFile,
+    path = require('path')
+
+  let log = (text: string) => {
+    if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) {
+      process.stderr.write('[nexe] - ' + text + '\n')
+    } else {
+      log = noop
+    }
+  }
+
+  const getKey = process.platform.startsWith('win')
+    ? function getKey(filepath: string): string {
+        let key = path.resolve(filepath)
+        if (key.substr(1, 2) === ':\\') {
+          key = key[0].toUpperCase() + key.substr(1)
+        }
+        return key
+      }
+    : path.resolve
+
+  const statTime = function() {
+    return {
+      dev: 0,
+      ino: 0,
+      nlink: 0,
+      rdev: 0,
+      uid: 123,
+      gid: 500,
+      blksize: 4096,
+      blocks: 0,
+      atime: new Date(stat.atime),
+      atimeMs: stat.atime.getTime(),
+      mtime: new Date(stat.mtime),
+      mtimeMs: stat.mtime.getTime(),
+      ctime: new Date(stat.ctime),
+      ctimMs: stat.ctime.getTime(),
+      birthtime: new Date(stat.birthtime),
+      birthtimeMs: stat.birthtime.getTime()
+    }
+  }
+
+  const createStat = function(directoryExtensions: any, fileExtensions?: any) {
+    if (!fileExtensions) {
+      return Object.assign({}, binary.layout.stat, directoryExtensions, { size: 0 }, statTime())
+    }
+    const size = directoryExtensions[1]
+    return Object.assign({}, binary.layout.stat, fileExtensions, { size }, statTime())
+  }
+
+  const ownStat = function(filepath: string) {
+    setupManifest()
+    const key = getKey(filepath)
+    if (directories[key]) {
+      return createStat({ isDirectory, isFile: isNotFile })
+    }
+    if (manifest[key]) {
+      return createStat(manifest[key], { isFile, isDirectory: isNotDirectory })
+    }
+  }
+
+  function makeLong(filepath: string) {
+    return (path as any)._makeLong && (path as any)._makeLong(filepath)
+  }
+
+  function fileOpts(options: any) {
+    return !options ? {} : isString(options) ? { encoding: options } : options
+  }
+
+  let setupManifest = () => {
+    Object.keys(manifest).forEach(filepath => {
+      const entry = manifest[filepath]
+      const absolutePath = getKey(filepath)
+      const longPath = makeLong(absolutePath)
+      const normalizedPath = path.normalize(filepath)
+
+      if (!manifest[absolutePath]) {
+        manifest[absolutePath] = entry
+      }
+      if (longPath && !manifest[longPath]) {
+        manifest[longPath] = entry
+      }
+      if (!manifest[normalizedPath]) {
+        manifest[normalizedPath] = manifest[filepath]
+      }
+
+      let currentDir = path.dirname(absolutePath)
+      let prevDir = absolutePath
+
+      while (currentDir !== prevDir) {
+        directories[currentDir] = directories[currentDir] || {}
+        directories[currentDir][path.basename(prevDir)] = true
+        const longDir = makeLong(currentDir)
+        if (longDir && !directories[longDir]) {
+          directories[longDir] = directories[currentDir]
+        }
+        prevDir = currentDir
+        currentDir = path.dirname(currentDir)
+      }
+    })
+    setupManifest = noop
+  }
+
+  //naive patches intended to work for most use cases
+  const nfs: any = {
+    existsSync: function existsSync(filepath: string) {
+      setupManifest()
+      const key = getKey(filepath)
+      if (manifest[key] || directories[key]) {
+        return true
+      }
+      return originalFsMethods.existsSync.apply(fs, arguments)
+    },
+    realpath: function realpath(filepath: any, options: any, cb: any): void {
+      setupManifest()
+      const key = getKey(filepath)
+      if (isString(filepath) && (manifest[filepath] || manifest[key])) {
+        return process.nextTick(() => cb(null, filepath))
+      }
+      return originalFsMethods.realpath.call(fs, filepath, options, cb)
+    },
+    realpathSync: function realpathSync(filepath: any, options: any) {
+      setupManifest()
+      const key = getKey(filepath)
+      if (isString(filepath) && (manifest[filepath] || manifest[key])) {
+        return filepath
+      }
+      return originalFsMethods.realpathSync.call(fs, filepath, options)
+    },
+    readdir: function readdir(filepath: string | Buffer, options: any, callback: any) {
+      setupManifest()
+      filepath = filepath.toString()
+      if ('function' === typeof options) {
+        callback = options
+        options = { encoding: 'utf8' }
+      }
+      const dir = directories[getKey(filepath)]
+      if (dir) {
+        process.nextTick(() => {
+          //todo merge with original?
+          callback(null, Object.keys(dir))
+        })
+      } else {
+        return originalFsMethods.readdir.apply(fs, arguments)
+      }
+    },
+
+    readdirSync: function readdirSync(filepath: string | Buffer, options: any) {
+      setupManifest()
+      filepath = filepath.toString()
+      const dir = directories[getKey(filepath)]
+      if (dir) {
+        return Object.keys(dir)
+      }
+      return originalFsMethods.readdirSync.apply(fs, arguments)
+    },
+
+    readFile: function readFile(filepath: any, options: any, callback: any) {
+      setupManifest()
+      const entry = manifest[filepath] || manifest[getKey(filepath)]
+      if (!entry || !isString(filepath)) {
+        return originalFsMethods.readFile.apply(fs, arguments)
+      }
+      const [offset, length] = entry
+      const resourceOffset = resourceStart + offset
+      const encoding = fileOpts(options).encoding
+      callback = typeof options === 'function' ? options : callback
+
+      fs.open(blobPath, 'r', function(err: Error, fd: number) {
+        if (err) return callback(err, null)
+        fs.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
+          error: Error,
+          bytesRead: number,
+          result: Buffer
+        ) {
+          if (error) {
+            return fs.close(fd, function() {
+              callback(error, null)
+            })
+          }
+          fs.close(fd, function(err: Error) {
+            if (err) {
+              return callback(err, result)
+            }
+            callback(err, encoding ? result.toString(encoding) : result)
+          })
+        })
+      })
+    },
+    createReadStream: function createReadStream(filepath: any, options: any) {
+      setupManifest()
+      const entry = manifest[filepath] || manifest[getKey(filepath)]
+      if (!entry || !isString(filepath)) {
+        return originalFsMethods.createReadStream.apply(fs, arguments)
+      }
+      const [offset, length] = entry
+      const resourceOffset = resourceStart + offset
+      const opts = fileOpts(options)
+
+      return fs.createReadStream(
+        blobPath,
+        Object.assign({}, opts, {
+          start: resourceOffset,
+          end: resourceOffset + length - 1
+        })
+      )
+    },
+    readFileSync: function readFileSync(filepath: any, options: any) {
+      setupManifest()
+
+      const entry = manifest[filepath] || manifest[getKey(filepath)]
+      if (!entry || !isString(filepath)) {
+        return originalFsMethods.readFileSync.apply(fs, arguments)
+      }
+      const [offset, length] = entry
+      const resourceOffset = resourceStart + offset
+      const encoding = fileOpts(options).encoding
+      const fd = fs.openSync(process.execPath, 'r')
+      const result = Buffer.alloc(length)
+      fs.readSync(fd, result, 0, length, resourceOffset)
+      fs.closeSync(fd)
+      return encoding ? result.toString(encoding) : result
+    },
+    statSync: function statSync(filepath: string | Buffer) {
+      const stat = isString(filepath) && ownStat(filepath)
+      if (stat) {
+        return stat
+      }
+      return originalFsMethods.statSync.apply(fs, arguments)
+    },
+    stat: function stat(filepath: string | Buffer, callback: any) {
+      const stat = isString(filepath) && ownStat(filepath)
+      if (stat) {
+        process.nextTick(() => {
+          callback(null, stat)
+        })
+      } else {
+        return originalFsMethods.stat.apply(fs, arguments)
+      }
+    }
+  }
+
+  if (typeof fs.exists === 'function') {
+    nfs.exists = function(filepath: string, cb: Function) {
+      cb = cb || noop
+      const exists = nfs.existsSync(filepath)
+      process.nextTick(() => cb(exists))
+    }
+  }
+
+  const patches = (process as any).nexe.patches || {}
+  delete (process as any).nexe
+  patches.internalModuleReadFile = function(this: any, original: any, ...args: any[]) {
+    const [filepath] = args
+    setupManifest()
+    if (manifest[filepath]) {
+      log('read     (hit)              ' + filepath)
+      return nfs.readFileSync(filepath, 'utf-8')
+    }
+    log('read          (miss)       ' + filepath)
+    return original.call(this, ...args)
+  }
+  patches.internalModuleStat = function(this: any, original: any, ...args: any[]) {
+    setupManifest()
+    const [filepath] = args
+    if (manifest[filepath]) {
+      log('stat     (hit)              ' + filepath + '   ' + 0)
+      return 0
+    }
+    if (directories[filepath]) {
+      log('stat dir (hit)              ' + filepath + '   ' + 1)
+      return 1
+    }
+    const res = original.call(this, ...args)
+    if (res === 0) {
+      log('stat          (miss)        ' + filepath + '   ' + res)
+    } else if (res === 1) {
+      log('stat dir      (miss)        ' + filepath + '   ' + res)
+    } else {
+      log('stat                 (fail) ' + filepath + '   ' + res)
+    }
+    return res
+  }
+
+  if (typeof fs.exists === 'function') {
+    nfs.exists = function(filepath: string, cb: Function) {
+      cb = cb || noop
+      const exists = nfs.existsSync(filepath)
+      if (!exists) {
+        return originalFsMethods.exists(filepath, cb)
+      }
+      process.nextTick(() => cb(exists))
+    }
+  }
+  Object.assign(fs, nfs)
+  return true
+}
+
+export { shimFs, restoreFs }

src/logger.ts

@@ -6,10 +6,12 @@ const frameLength = 120
 export interface LogStep {
   modify(text: string, color?: string): void
   log(text: string, color?: string): void
+  pause(): void
+  resume(): void
 }
 
 export class Logger {
-  private verbose: boolean
+  public verbose: boolean
   private silent: boolean
   private ora: any
   private modify: Function
@@ -48,7 +50,7 @@ export class Logger {
 
   step(text: string, method: string = 'succeed'): LogStep {
     if (this.silent) {
-      return { modify() {}, log() {} }
+      return { modify() {}, log() {}, pause() {}, resume() {} }
     }
     if (!this.ora.id) {
       this.ora.start().text = text
@@ -62,7 +64,9 @@ export class Logger {
 
     return {
       modify: this.modify,
-      log: this.verbose ? this.write : this.modify
+      log: this.verbose ? this.write : this.modify,
+      pause: () => this.ora.stopAndPersist(),
+      resume: () => this.ora.start()
     } as LogStep
   }
 }

src/nexe.ts

@@ -1,49 +1,51 @@
-import { compose, Middleware } from 'app-builder'
-import resource from './steps/resource'
+import { EOL } from 'os'
+import { compose } from 'app-builder'
 import { NexeCompiler } from './compiler'
-import { argv, version, help, normalizeOptionsAsync, NexeOptions, NexePatch } from './options'
+import { normalizeOptions, NexeOptions, NexePatch } from './options'
+import resource from './steps/resource'
+import clean from './steps/clean'
 import cli from './steps/cli'
 import bundle from './steps/bundle'
 import download from './steps/download'
 import shim from './steps/shim'
 import artifacts from './steps/artifacts'
 import patches from './patches'
-import { rimrafAsync } from './util'
-import { NexeTarget } from './target'
 
 async function compile(
   compilerOptions?: Partial<NexeOptions>,
   callback?: (err: Error | null) => void
 ) {
-  const options = await normalizeOptionsAsync(compilerOptions)
+  const options = normalizeOptions(compilerOptions)
   const compiler = new NexeCompiler(options)
-  const build = compiler.options.build
 
-  if (options.clean) {
-    let path = compiler.src
-    if (!options.build) {
-      path = compiler.getNodeExecutableLocation(compiler.options.targets[0] as NexeTarget)
-    }
-    const step = compiler.log.step('Cleaning up nexe build artifacts...')
-    step.log(`Deleting contents at: ${path}`)
-    await rimrafAsync(path)
-    step.log(`Deleted contents at: ${path}`)
-    return compiler.quit()
+  const nexe = compose(
+    clean,
+    resource,
+    cli,
+    bundle,
+    shim,
+    options.build ? [download, artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
+    options.plugins as NexePatch[]
+  )
+
+  let error = null
+  try {
+    await nexe(compiler)
+  } catch (e) {
+    error = e
   }
 
-  const buildSteps = build
-    ? [download, artifacts, ...patches, ...(options.patches as NexePatch[])]
-    : []
-  const nexe = compose(resource, bundle, cli, buildSteps, shim, options.plugins as NexePatch[])
-  return callback
-    ? void nexe(compiler).then(
-        () => callback && callback(null),
-        (e: Error) => {
-          if (callback) callback(e)
-          else throw e
-        }
-      )
-    : nexe(compiler)
+  if (error) {
+    if (compiler.options.loglevel !== 'silent' && error) {
+      process.stderr.write(EOL + error.message + EOL)
+    }
+    compiler.quit()
+    if (callback) return callback(error)
+    return Promise.reject(error)
+  }
+
+  if (callback) callback(null)
 }
 
-export { argv, compile, version, NexeCompiler, NexeOptions, help }
+export { compile, NexeCompiler }
+export { argv, version, NexeOptions, help } from './options'

src/options.ts

@@ -1,10 +1,13 @@
 import * as parseArgv from 'minimist'
 import { NexeCompiler } from './compiler'
-import { isWindows, padRight } from './util'
-import { basename, extname, join, isAbsolute, relative, dirname } from 'path'
+import { isWindows } from './util'
+import { basename, extname, join, isAbsolute, resolve } from 'path'
 import { getTarget, NexeTarget } from './target'
-import { EOL } from 'os'
-import * as c from 'chalk'
+import { EOL, homedir } from 'os'
+import chalk from 'chalk'
+import { resolveFileNameSync } from 'resolve-dependencies'
+const caw = require('caw')
+const c = process.platform === 'win32' ? chalk.constructor({ enabled: false }) : chalk
 
 export const version = '{{replace:0}}'
 
@@ -32,7 +35,13 @@ export interface NexeOptions {
   patches: (string | NexePatch)[]
   plugins: (string | NexePatch)[]
   native: any
+  /**
+   * @deprecated
+   * Use mangle: false instead
+   */
   empty: boolean
+  mangle: boolean
+  ghToken: string
   sourceUrl?: string
   enableStdIn?: boolean
   python?: string
@@ -81,10 +90,10 @@ const alias = {
   m: 'make',
   h: 'help',
   l: 'loglevel',
-  'fake-argv': 'fakeArgv'
+  'fake-argv': 'fakeArgv',
+  'gh-token': 'ghToken'
 }
-const argv = parseArgv(process.argv, { alias, default: { ...defaults, enableStdIn: true } })
-const g = c.gray
+const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
 let help = `
 ${c.bold('nexe <entry-file> [options]')}
 
@@ -104,6 +113,7 @@ ${c.bold('nexe <entry-file> [options]')}
   -f   --flag                       -- *v8 flags to include during compilation
   -c   --configure                  -- *arguments to the configure step
   -m   --make                       -- *arguments to the make/build step
+       --no-mangle                  -- used when generating base binaries, or when pathing _third_party_main manually.
        --snapshot                   -- path to a warmup snapshot
        --ico                        -- file name for alternate icon file (windows)
        --rc-*                       -- populate rc file options (windows)
@@ -113,7 +123,7 @@ ${c.bold('nexe <entry-file> [options]')}
    ${c.underline.bold('Other options:')}
 
        --bundle                     -- custom bundling module with 'createBundle' export
-       --temp                       -- temp file storage default './nexe'
+       --temp                       -- temp file storage default '~/.nexe'
        --cwd                        -- set the current working directory for the command
        --fake-argv                  -- fake argv[1] with entry file
        --clean                      -- force download of sources
@@ -136,22 +146,15 @@ function flatten(...args: any[]): string[] {
 function extractCliMap(match: RegExp, options: any) {
   return Object.keys(options)
     .filter(x => match.test(x))
-    .reduce((map: { [key: string]: string }, option: keyof NexeOptions) => {
-      const key = option.split('-')[1]
-      map[key] = options[option]
-      delete options[option]
-      return map
-    }, {})
-}
-
-function tryResolveMainFileName(cwd: string) {
-  let filename
-  try {
-    const file = require.resolve(cwd)
-    filename = basename(file).replace(extname(file), '')
-  } catch (_) {}
-
-  return filename ? filename : 'nexe_' + Date.now()
+    .reduce(
+      (map: any, option: any) => {
+        const key = option.split('-')[1]
+        map[key] = options[option]
+        delete options[option]
+        return map
+      },
+      {} as any
+    )
 }
 
 function extractLogLevel(options: NexeOptions) {
@@ -167,14 +170,11 @@ function isName(name: string) {
 
 function extractName(options: NexeOptions) {
   let name = options.name
+  //try and use the input filename as the output filename if its not index
   if (!isName(name) && typeof options.input === 'string') {
     name = basename(options.input).replace(extname(options.input), '')
   }
-
-  if (!isName(name)) {
-    name = tryResolveMainFileName(options.cwd)
-  }
-
+  //try and use the directory as the filename
   if (!isName(name) && basename(options.cwd)) {
     name = basename(options.cwd)
   }
@@ -182,48 +182,86 @@ function extractName(options: NexeOptions) {
   return name.replace(/\.exe$/, '')
 }
 
-function isEntryFile(filename: string) {
-  return filename && !isAbsolute(filename) && filename !== 'node' && /\.(tsx?|jsx?)$/.test(filename)
+function padRelative(input: string) {
+  let prefix = ''
+  if (!input.startsWith('.')) {
+    prefix = './'
+  }
+  return prefix + input
 }
 
-function findInput(input: string, cwd: string) {
-  const maybeInput = argv._.slice().pop() || ''
-  if (input) {
+function isEntryFile(filename?: string): filename is string {
+  return Boolean(filename && !isAbsolute(filename))
+}
+
+export function resolveEntry(input: string, cwd: string, maybeEntry?: string) {
+  if (input === '-' || maybeEntry === '-') {
+    return ''
+  }
+  let result = null
+  if (input && isAbsolute(input)) {
     return input
   }
-  if (isEntryFile(maybeInput)) {
-    return maybeInput
+  if (input) {
+    const inputPath = padRelative(input)
+    result = resolveFileNameSync(cwd, inputPath)
+  }
+
+  if (isEntryFile(maybeEntry) && (!result || !result.absPath)) {
+    const inputPath = padRelative(maybeEntry)
+    result = resolveFileNameSync(cwd, inputPath)
   }
   if (!process.stdin.isTTY) {
     return ''
   }
-  try {
-    const main = require.resolve(cwd)
-    return './' + relative(cwd, main)
-  } catch (e) {
-    void e
+  if (!result || !result.absPath) {
+    result = resolveFileNameSync(cwd, '.')
   }
-  return ''
+  if (!result.absPath) throw new Error(`Entry file "${input}" not found!`)
+
+  return result.absPath
 }
 
-function normalizeOptionsAsync(input?: Partial<NexeOptions>): Promise<NexeOptions> {
+function isCli(options?: Partial<NexeOptions>) {
+  return argv === options
+}
+
+function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
   const options = Object.assign({}, defaults, input) as NexeOptions
   const opts = options as any
-
-  options.temp = options.temp || process.env.NEXE_TEMP || join(options.cwd, '.nexe')
-  options.input = findInput(options.input, options.cwd)
+  const cwd = (options.cwd = resolve(options.cwd))
+  options.temp = options.temp
+    ? resolve(cwd, options.temp)
+    : process.env.NEXE_TEMP || join(homedir(), '.nexe')
+  const maybeEntry = isCli(input) ? argv._[argv._.length - 1] : undefined
+  options.input = resolveEntry(options.input, cwd, maybeEntry)
+  options.enableStdIn = isCli(input) && options.input === ''
   options.name = extractName(options)
   options.loglevel = extractLogLevel(options)
   options.flags = flatten(opts.flag, options.flags)
   options.targets = flatten(opts.target, options.targets).map(getTarget)
-  options.make = flatten(options.vcBuild, options.make)
-  options.configure = flatten(options.configure)
-  options.resources = flatten(opts.resource, options.resources)
-  options.rc = options.rc || extractCliMap(/^rc-.*/, options)
-
   if (!options.targets.length) {
     options.targets.push(getTarget())
   }
+  options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || ''
+  options.make = flatten(options.vcBuild, options.make)
+  options.configure = flatten(options.configure)
+  options.resources = flatten(opts.resource, options.resources)
+
+  options.downloadOptions = options.downloadOptions || {}
+  options.downloadOptions.headers = options.downloadOptions.headers || {}
+  options.downloadOptions.headers['User-Agent'] = 'nexe (https://www.npmjs.com/package/nexe)'
+  options.downloadOptions.agent = process.env.HTTPS_PROXY
+    ? caw(process.env.HTTPS_PROXY, { protocol: 'https' })
+    : options.downloadOptions.agent || require('https').globalAgent
+  options.downloadOptions.rejectUnauthorized = process.env.HTTPS_PROXY ? false : true
+
+  options.rc = options.rc || extractCliMap(/^rc-.*/, options)
+  options.output =
+    (options.targets[0] as NexeTarget).platform === 'windows'
+      ? `${(options.output || options.name).replace(/\.exe$/, '')}.exe`
+      : `${options.output || options.name}`
+  options.output = resolve(cwd, options.output)
 
   if (options.build) {
     const { arch } = options.targets[0] as NexeTarget
@@ -241,14 +279,15 @@ function normalizeOptionsAsync(input?: Partial<NexeOptions>): Promise<NexeOption
     return x
   }
 
-  options.plugins = options.plugins.map(requireDefault)
-  options.patches = options.patches.map(requireDefault)
+  options.mangle = 'mangle' in opts ? opts.mangle : !opts.empty
+  options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault)
+  options.patches = flatten(opts.patch, options.patches).map(requireDefault)
 
   Object.keys(alias)
     .filter(k => k !== 'rc')
     .forEach(x => delete opts[x])
 
-  return Promise.resolve(options)
+  return options
 }
 
-export { argv, normalizeOptionsAsync, help }
+export { argv, normalizeOptions, help }

src/patches/boot-nexe.ts

@@ -1,7 +1,7 @@
-const fs = require('fs')
-const fd = fs.openSync(process.execPath, 'r')
-const stat = fs.statSync(process.execPath)
-const footer = Buffer.from(Array(32))
+const fs = require('fs'),
+  fd = fs.openSync(process.execPath, 'r'),
+  stat = fs.statSync(process.execPath),
+  footer = Buffer.alloc(32, 0)
 
 fs.readSync(fd, footer, 0, 32, stat.size - 32)
 
@@ -9,10 +9,10 @@ if (!footer.slice(0, 16).equals(Buffer.from('<nexe~~sentinel>'))) {
   throw 'Invalid Nexe binary'
 }
 
-const contentSize = footer.readDoubleLE(16)
-const resourceSize = footer.readDoubleLE(24)
-const contentStart = stat.size - 32 - resourceSize - contentSize
-const resourceStart = contentStart + contentSize
+const contentSize = footer.readDoubleLE(16),
+  resourceSize = footer.readDoubleLE(24),
+  contentStart = stat.size - 32 - resourceSize - contentSize,
+  resourceStart = contentStart + contentSize
 
 Object.defineProperty(
   process,
@@ -25,9 +25,10 @@ Object.defineProperty(
       },
       set: function(value: any) {
         if (nexeHeader) {
-          throw new Error('__nexe cannot be reconfigured')
+          throw new Error('This property is readonly')
         }
         nexeHeader = Object.assign({}, value, {
+          blobPath: process.execPath,
           layout: {
             stat,
             contentSize,
@@ -44,10 +45,10 @@ Object.defineProperty(
   })()
 )
 
-const contentBuffer = Buffer.from(Array(contentSize))
+const contentBuffer = Buffer.from(Array(contentSize)),
+  Module = require('module')
+
 fs.readSync(fd, contentBuffer, 0, contentSize, contentStart)
 fs.closeSync(fd)
-const Module = require('module')
-process.mainModule = new Module(process.execPath, null)
-process.mainModule!.loaded = true
-;(process.mainModule as any)._compile(contentBuffer.toString(), process.execPath)
+
+new Module(process.execPath, null)._compile(contentBuffer.toString(), process.execPath)

src/patches/disable-node-cli.ts

@@ -5,8 +5,16 @@ export default async function disableNodeCli(compiler: NexeCompiler, next: () =>
     return next()
   }
 
-  const nodeccMarker = "argv[index][0] == '-'"
+  const nodeccMarker = 'argv[index][0] =='
+
+  await compiler.replaceInFileAsync(
+    'src/node.cc',
+    `${nodeccMarker} '-'`,
+    // allow NODE_OPTIONS, introduced in 8.0
+    parseInt(compiler.target.version.split('.')[0]) >= 8
+      ? `(${nodeccMarker} (is_env ? '-' : ']'))`
+      : `(${nodeccMarker} ']')`
+  )
 
-  await compiler.replaceInFileAsync('src/node.cc', nodeccMarker, nodeccMarker.replace('-', ']'))
   return next()
 }

src/patches/index.ts

@@ -1,12 +1,11 @@
 import gyp from './gyp'
-import nexePatches from './third-party-main'
+import bootNexe from './third-party-main'
 import buildFixes from './build-fixes'
 import cli from './disable-node-cli'
 import flags from './flags'
 import ico from './ico'
 import rc from './node-rc'
-import { NexeCompiler, NexeOptions } from '../compiler'
 
-const patches = [gyp, nexePatches, buildFixes, cli, flags, ico, rc]
+const patches = [gyp, bootNexe, buildFixes, cli, flags, ico, rc]
 
 export default patches

src/patches/node-rc.ts

@@ -13,7 +13,7 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise
     const isVar = /^[A-Z_]+$/.test(value)
     value = isVar ? value : `"${value}"`
     file.contents = file.contents.replace(
-      new RegExp(`VALUE "${key}",*`),
+      new RegExp(`VALUE "${key}",.*`),
       `VALUE "${key}", ${value}`
     )
   })

src/patches/third-party-main.ts

@@ -1,8 +1,71 @@
 import { NexeCompiler } from '../compiler'
-import { readFileSync } from 'fs'
-import { join } from 'path'
+import { parse } from 'cherow'
+
+function semverGt(version: string, operand: string) {
+  const [cMajor, cMinor, cPatch] = version.split('.').map(Number)
+  const [major, minor, patch] = operand.split('.').map(Number)
+
+  return (
+    cMajor > major ||
+    (cMajor === major && cMinor > minor) ||
+    (cMajor === major && cMinor === minor && cPatch > patch)
+  )
+}
+
+function walkSome(node: any, visit: Function) {
+  if (!node || typeof node.type !== 'string' || node._visited) {
+    return false
+  }
+  visit(node)
+  node._visited = true
+  for (let childNode in node) {
+    const child = node[childNode]
+    if (Array.isArray(child)) {
+      for (let i = 0; i < child.length; i++) {
+        if (walkSome(child[i], visit)) {
+          return true
+        }
+      }
+    } else if (walkSome(child, visit)) {
+      return true
+    }
+  }
+  return false
+}
 
 export default async function main(compiler: NexeCompiler, next: () => Promise<void>) {
+  let bootFile = 'lib/internal/bootstrap_node.js'
+  const { version } = compiler.target
+
+  if (version.startsWith('4.')) {
+    bootFile = 'src/node.js'
+  } else if (semverGt(version, '9.10.1')) {
+    bootFile = 'lib/internal/bootstrap/node.js'
+  }
+
+  const file = await compiler.readFileAsync(bootFile),
+    ast = parse(file.contents, {
+      loc: true,
+      tolerant: true,
+      next: true,
+      globalReturn: true,
+      node: true,
+      skipShebang: true
+    }),
+    location = { start: { line: 0 } }
+
+  walkSome(ast, (node: any) => {
+    if (!location.start.line && node.type === 'BlockStatement') {
+      //Find the first block statement and mark the location
+      Object.assign(location, node.loc)
+      return true
+    }
+  })
+
+  const fileLines = file.contents.split('\n')
+  fileLines.splice(location.start.line, 0, '{{replace:lib/fs/bootstrap.js}}' + '\n')
+  file.contents = fileLines.join('\n')
+
   await compiler.setFileContentsAsync(
     'lib/_third_party_main.js',
     '{{replace:lib/patches/boot-nexe.js}}'

src/releases.ts

@@ -1,16 +1,8 @@
 import got = require('got')
-import download = require('download')
-import {
-  NodePlatform,
-  NodeArch,
-  platforms,
-  architectures,
-  NexeTarget,
-  getTarget,
-  targetsEqual
-} from './target'
+import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
 export { NexeTarget }
 
+const versionsToSkip = [0, 1, 2, 3, 4, 5, 7, 9, 11]
 export interface GitAsset {
   name: string
   url: string
@@ -32,10 +24,9 @@ async function getJson<T>(url: string, options?: any) {
   return JSON.parse((await got(url, options)).body) as T
 }
 
-//TODO only build the latest of each major...?
 function isBuildableVersion(version: string) {
   const major = +version.split('.')[0]
-  return !~[0, 1, 2, 3, 4, 5, 7].indexOf(major) || version === '4.8.4'
+  return !~versionsToSkip.indexOf(major) || version === '4.8.4'
 }
 
 export function getLatestGitRelease(options?: any) {
@@ -59,6 +50,7 @@ export async function getUnBuiltReleases(options?: any) {
       platforms.forEach(platform => {
         architectures.forEach(arch => {
           if (arch === 'x86' && platform === 'mac') return
+          if (arch === 'arm7l' && platform !== 'linux') return
           versions.push(getTarget({ platform, arch, version }))
         })
       })

src/steps/artifacts.ts

@@ -14,7 +14,7 @@ function readDirAsync(dir: string): Promise<string[]> {
     return Promise.all(
       paths.map((file: string) => {
         const path = join(dir, file)
-        return isDirectoryAsync(path).then(x => (x ? readDirAsync(path) : path as any))
+        return isDirectoryAsync(path).then(x => (x ? readDirAsync(path) : (path as any)))
       })
     ).then(result => {
       return [].concat(...(result as any))
@@ -39,7 +39,6 @@ function maybeReadFileContentsAsync(file: string) {
  *  - After the patch functions have run, the temporary directory is emptied
  *  - Original versions of sources to be patched are written to the temporary directory
  *  - Finally, The patched files are written into source.
- *
  */
 export default async function artifacts(compiler: NexeCompiler, next: () => Promise<void>) {
   const { src } = compiler

src/steps/bundle.ts

@@ -1,61 +1,22 @@
 import { NexeCompiler } from '../compiler'
-import { readFileAsync, writeFileAsync } from '../util'
-import { resolve, relative } from 'path'
-import NativeModulePlugin from '../bundling/fuse-native-module-plugin'
-import { NexeOptions } from '../options'
-
-function createBundle(options: NexeOptions) {
-  const { FuseBox, JSONPlugin, CSSPlugin, HTMLPlugin, QuantumPlugin } = require('fuse-box')
-  const plugins: any = [JSONPlugin(), CSSPlugin(), HTMLPlugin(), NativeModulePlugin(options.native)]
-  if (options.compress) {
-    plugins.push(
-      QuantumPlugin({
-        target: 'server',
-        uglify: true,
-        bakeApiIntoBundle: options.name
-      })
-    )
-  }
-  const fuse = FuseBox.init({
-    cache: false,
-    log: Boolean(process.env.NEXE_BUNDLE_LOG) || false,
-    homeDir: options.cwd,
-    sourceMaps: false,
-    writeBundles: false,
-    output: '$name.js',
-    target: 'server',
-    plugins
-  })
-  const input = relative(options.cwd, options.input).replace(/\\/g, '/')
-  fuse.bundle(options.name).instructions(`> ${input}`)
-  return fuse.run().then((x: any) => {
-    let output = ''
-    x.bundles.forEach((y: any) => (output = y.context.output.lastPrimaryOutput.content.toString()))
-    return output
-  })
-}
+import { resolve } from 'path'
+import { each } from '@calebboyd/semaphore'
+import resolveFiles from 'resolve-dependencies'
 
 export default async function bundle(compiler: NexeCompiler, next: any) {
-  if (!compiler.options.bundle) {
-    compiler.input = await readFileAsync(compiler.options.input, 'utf-8')
+  const { bundle, cwd, input } = compiler.options
+  if (!bundle) {
+    await compiler.addResource(resolve(cwd, input))
     return next()
   }
 
-  if (compiler.options.empty || !compiler.options.input) {
-    compiler.input = ''
+  if (!input) {
     return next()
   }
 
-  let producer = createBundle
-  if (typeof compiler.options.bundle === 'string') {
-    producer = require(resolve(compiler.options.cwd, compiler.options.bundle)).createBundle
-  }
-
-  compiler.input = await producer(compiler.options)
-
-  if ('string' === typeof compiler.options.debugBundle) {
-    await writeFileAsync(compiler.options.debugBundle, compiler.input)
-  }
-
+  const { files } = await resolveFiles(input, { cwd, expand: true, loadContent: false })
+  await each(Object.keys(files), (filename: string) => compiler.addResource(filename), {
+    concurrency: 10
+  })
   return next()
 }

src/steps/clean.ts

@@ -0,0 +1,19 @@
+import { NexeCompiler } from '../compiler'
+import { rimrafAsync } from '../util'
+import { NexeTarget } from '../target'
+
+export default async function clean(compiler: NexeCompiler, next: () => Promise<any>) {
+  const { options } = compiler
+  if (options.clean) {
+    let path = compiler.src
+    if (!options.build) {
+      path = compiler.getNodeExecutableLocation(compiler.options.targets[0] as NexeTarget)
+    }
+    const step = compiler.log.step('Cleaning up nexe build artifacts...')
+    step.log(`Deleting contents at: ${path}`)
+    await rimrafAsync(path)
+    step.log(`Deleted contents at: ${path}`)
+    return compiler.quit()
+  }
+  return next()
+}

src/steps/cli.ts

@@ -1,11 +1,11 @@
-import { normalize } from 'path'
+import { normalize, relative, resolve } from 'path'
+import { createWriteStream, chmodSync, statSync } from 'fs'
+import { dequote } from '../util'
 import { Readable } from 'stream'
-import { createWriteStream, chmodSync } from 'fs'
-import { readFileAsync, dequote, isWindows } from '../util'
 import { NexeCompiler } from '../compiler'
 import { NexeTarget } from '../target'
 
-function getStdIn(stdin: NodeJS.ReadStream): Promise<string> {
+function getStdIn(stdin: Readable): Promise<string> {
   return new Promise(resolve => {
     let out = ''
     stdin
@@ -39,9 +39,13 @@ export default async function cli(compiler: NexeCompiler, next: () => Promise<vo
   let stdInUsed = false
   if (!process.stdin.isTTY && compiler.options.enableStdIn) {
     stdInUsed = true
-    compiler.input = dequote(await getStdIn(process.stdin))
+    compiler.entrypoint = './__nexe_stdin.js'
+    const code = dequote(await getStdIn(process.stdin))
+    await compiler.addResource(resolve(compiler.options.cwd, compiler.entrypoint), code)
+  } else {
+    compiler.entrypoint = './' + relative(compiler.options.cwd, compiler.options.input)
   }
-
+  compiler.startup = ';require("module").runMain();'
   await next()
 
   const target = compiler.options.targets.shift() as NexeTarget
@@ -56,11 +60,15 @@ export default async function cli(compiler: NexeCompiler, next: () => Promise<vo
         if (e) {
           reject(e)
         } else if (compiler.output) {
-          chmodSync(compiler.output, '755') //todo fix erroneous rw mode change
+          const output = compiler.output
+          const mode = statSync(output).mode | 0o111
+          chmodSync(output, mode.toString(8).slice(-3))
+          const inputFile = relative(process.cwd(), compiler.options.input)
+          const outputFile = relative(process.cwd(), output)
           step.log(
-            `Entry: '${stdInUsed
-              ? compiler.options.empty ? '[empty]' : '[stdin]'
-              : compiler.options.input}' written to: ${compiler.output}`
+            `Entry: '${
+              stdInUsed ? (compiler.options.mangle ? '[stdin]' : '[none]') : inputFile
+            }' written to: ${outputFile}`
           )
           resolve(compiler.quit())
         }

src/steps/download.ts

@@ -3,7 +3,6 @@ import { pathExistsAsync } from '../util'
 import { LogStep } from '../logger'
 import { IncomingMessage } from 'http'
 import { NexeCompiler } from '../compiler'
-import { NexeTarget } from '../target'
 
 function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options = {}) {
   const setText = (p: number) => step.modify(`Downloading Node: ${p.toFixed()}%...`)
@@ -13,7 +12,7 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
       let current = 0
       res.on('data', data => {
         current += data.length
-        setText(current / total * 100)
+        setText((current / total) * 100)
         if (current === total) {
           step.log('Extracting Node...')
         }
@@ -28,7 +27,11 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
  * @param {*} next
  */
 export default async function downloadNode(compiler: NexeCompiler, next: () => Promise<void>) {
-  const { src, log, targets: [{ version }] } = compiler
+  const {
+    src,
+    log,
+    targets: [{ version }]
+  } = compiler
   const { sourceUrl, downloadOptions } = compiler.options
   const url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`
   const step = log.step(`Downloading Node.js source from: ${url}`)

src/steps/resource.ts

@@ -1,25 +1,22 @@
-import { readFileAsync, isDirectoryAsync, each } from '../util'
-import { Buffer } from 'buffer'
+import { isDirectoryAsync, each } from '../util'
 import * as globs from 'globby'
 import { NexeCompiler } from '../compiler'
 
-export default async function resource(compiler: NexeCompiler, next: () => Promise<void>) {
-  const resources = compiler.resources
-
+export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
+  const { cwd } = compiler.options
   if (!compiler.options.resources.length) {
     return next()
   }
   const step = compiler.log.step('Bundling Resources...')
   let count = 0
-  await each(globs(compiler.options.resources), async file => {
+  await each(globs(compiler.options.resources, { cwd }), async file => {
     if (await isDirectoryAsync(file)) {
       return
     }
     count++
     step.log(`Including file: ${file}`)
-    const contents = await readFileAsync(file)
-    compiler.addResource(file, contents)
+    await compiler.addResource(file)
   })
-  step.log(`Included ${count} file(s). ${(resources.bundle.byteLength / 1e6).toFixed(3)} MB`)
+  step.log(`Included ${count} file(s). ${(compiler.resourceSize / 1e6).toFixed(3)} MB`)
   return next()
 }

src/steps/shim-fs.ts

@@ -1,93 +0,0 @@
-import { Stats } from 'fs'
-import { ok } from 'assert'
-import { resolve, normalize } from 'path'
-
-const binary = (process as any).__nexe as NexeBinary
-ok(binary)
-const manifest = binary.resources
-const isString = (x: any): x is string => typeof x === 'string' || x instanceof String
-
-if (Object.keys(manifest).length) {
-  const fs = require('fs')
-  const originalReadFile = fs.readFile
-  const originalReadFileSync = fs.readFileSync
-  const resourceStart = binary.layout.resourceStart
-
-  let setupManifest = () => {
-    const manifest = binary.resources
-    Object.keys(manifest).forEach(key => {
-      const absolutePath = resolve(key)
-      if (!manifest[absolutePath]) {
-        manifest[absolutePath] = manifest[key]
-      }
-      const normalizedPath = normalize(key)
-      if (!manifest[normalizedPath]) {
-        manifest[normalizedPath] = manifest[key]
-      }
-    })
-    setupManifest = () => {}
-  }
-  //TODO track inflight fs reqs??
-  var nfs = {
-    readFile: function readFile(file: any, options: any, callback: any) {
-      setupManifest()
-      const entry = manifest[file]
-      if (!entry || !isString(file)) {
-        return originalReadFile.apply(fs, arguments)
-      }
-      const [offset, length] = entry
-      const resourceOffset = resourceStart + offset
-      const encoding = isString(options) ? options : null
-      callback = typeof options === 'function' ? options : callback
-
-      fs.open(process.execPath, 'r', function(err: Error, fd: number) {
-        if (err) return callback(err, null)
-        fs.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
-          error: Error,
-          bytesRead: number,
-          result: Buffer
-        ) {
-          if (error) {
-            return fs.close(fd, function() {
-              callback(error, null)
-            })
-          }
-          fs.close(fd, function(err: Error) {
-            if (err) {
-              return callback(err, result)
-            }
-            callback(err, encoding ? result.toString(encoding) : result)
-          })
-        })
-      })
-    },
-    readFileSync: function readFileSync(file: any, options: any) {
-      setupManifest()
-      const entry = manifest[file]
-      if (!entry || !isString(file)) {
-        return originalReadFileSync.apply(fs, arguments)
-      }
-      const [offset, length] = entry
-      const resourceOffset = resourceStart + offset
-      const encoding = isString(options) ? options : null
-      const fd = fs.openSync(process.execPath, 'r')
-      const result = Buffer.alloc(length)
-      fs.readSync(fd, result, 0, length, resourceOffset)
-      fs.closeSync(fd)
-      return encoding ? result.toString(encoding) : result
-    }
-  }
-  Object.assign(fs, nfs)
-}
-
-interface NexeBinary {
-  resources: { [key: string]: number[] }
-  version: string
-  layout: {
-    stat: Stats
-    contentSize: number
-    contentStart: number
-    resourceSize: number
-    resourceStart: number
-  }
-}

src/steps/shim.ts

@@ -1,25 +1,31 @@
 import { NexeCompiler } from '../compiler'
-
-function wrap(code: string) {
-  return '!(function () {' + code + '})();'
-}
+import { wrap } from '../util'
 
 export default function(compiler: NexeCompiler, next: () => Promise<void>) {
-  compiler.shims.push(wrap(compiler.getHeader()))
-
-  if (compiler.options.resources.length) {
-    compiler.shims.push(wrap('{{replace:lib/steps/shim-fs.js}}'))
-  }
-
-  if (compiler.options.fakeArgv) {
-    const nty = !process.stdin.isTTY
-    const input = nty ? '[stdin]' : compiler.options.input
-    compiler.shims.push(
-      wrap(`
-      var r = require('path').resolve; 
-      process.argv.splice(1,0, ${nty ? `'${input}'` : `r("${input}")`});`)
+  compiler.shims.push(
+    wrap(
+      `process.__nexe = ${JSON.stringify(compiler.binaryConfiguration)};\n` +
+        '{{replace:lib/fs/patch.js}}' +
+        '\nshimFs(process.__nexe)'
     )
-  }
+  )
+  compiler.shims.push(
+    wrap(`
+    if (process.argv[1] && process.env.NODE_UNIQUE_ID) {
+      const cluster = require('cluster')
+      cluster._setupWorker()
+      delete process.env.NODE_UNIQUE_ID
+    }
+  `)
+  )
+
+  compiler.shims.push(
+    wrap(`
+      if (!process.send) {
+        process.argv.splice(1,0, require.resolve("${compiler.entrypoint}"))  
+      }
+    `)
+  )
 
   return next()
 }

src/target.ts

@@ -1,8 +1,8 @@
 export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux'
-export type NodeArch = 'x86' | 'x64'
+export type NodeArch = 'x86' | 'x64' | 'arm7l' | 'arm6l' | 'arm64'
 
 const platforms: NodePlatform[] = ['windows', 'mac', 'alpine', 'linux'],
-  architectures: NodeArch[] = ['x86', 'x64']
+  architectures: NodeArch[] = ['x86', 'x64', 'arm7l', 'arm6l', 'arm64']
 
 export { platforms, architectures }
 
@@ -12,7 +12,6 @@ export interface NexeTarget {
   arch: NodeArch | string
 }
 
-//TODO bsd
 const prettyPlatform: { [key: string]: NodePlatform } = {
   win32: 'windows',
   windows: 'windows',
@@ -25,9 +24,15 @@ const prettyPlatform: { [key: string]: NodePlatform } = {
   alpine: 'alpine'
 }
 
-//TODO arm
 const prettyArch: { [key: string]: NodeArch } = {
   x86: 'x86',
+  arm6: 'arm6l',
+  arm64: 'arm64',
+  arm6l: 'arm6l',
+  arm: 'arm7l',
+  arm7: 'arm7l',
+  arm7l: 'arm7l',
+  amd64: 'x64',
   ia32: 'x86',
   x32: 'x86',
   x64: 'x64'
@@ -64,7 +69,7 @@ export function targetsEqual(a: NexeTarget, b: NexeTarget) {
 
 export function getTarget(target: string | Partial<NexeTarget> = ''): NexeTarget {
   const currentArch = process.arch
-  let arch = currentArch in prettyArch ? prettyArch[process.arch] : process.arch as NodeArch,
+  let arch = currentArch in prettyArch ? prettyArch[process.arch] : (process.arch as NodeArch),
     platform = prettyPlatform[process.platform],
     version = process.version.slice(1)
 

src/types.d.ts

@@ -3,8 +3,8 @@ declare module 'got' {
     (url: string, options?: any): Promise<{ body: string }>
     stream(url: string, optoins?: any): any
   }
-  function got(url: string, options?: any): Promise<{ body: string }>
-  export = got as GotFn
+  const got: GotFn
+  export = got
 }
 declare module 'download' {
   import { Duplex } from 'stream'

src/util.ts

@@ -10,9 +10,11 @@ export async function each<T>(
   action: (item: T, index: number, list: T[]) => Promise<any>
 ) {
   const l = await list
-  for (let i = 0; i < l.length; i++) {
-    await action(l[i], i, l)
-  }
+  return Promise.all(l.map(action))
+}
+
+export function wrap(code: string) {
+  return '!(function () {' + code + '})();'
 }
 
 function falseOnEnoent(e: any) {
@@ -28,7 +30,7 @@ function padRight(str: string, l: number) {
 
 const bound: MethodDecorator = function bound<T>(
   target: Object,
-  propertyKey: string,
+  propertyKey: string | Symbol,
   descriptor: TypedPropertyDescriptor<T>
 ) {
   const configurable = true
@@ -36,7 +38,11 @@ const bound: MethodDecorator = function bound<T>(
     configurable,
     get(this: T) {
       const value = (descriptor.value as any).bind(this)
-      Object.defineProperty(this, propertyKey, { configurable, value, writable: true })
+      Object.defineProperty(this, propertyKey as string, {
+        configurable,
+        value,
+        writable: true
+      })
       return value
     }
   }

tasks/asset-compile.ts

@@ -1,25 +1,21 @@
 import * as nexe from '../lib/nexe'
-import {
-  getUnBuiltReleases,
-  getLatestGitRelease
-} from '../lib/releases'
+import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
 import * as ci from './ci'
-import { runAlpineBuild } from './docker'
+import { runDockerBuild } from './docker'
 import { getTarget } from '../lib/target'
-import { pathExistsAsync, statAsync, readFileAsync, execFileAsync } from '../lib/util'
+import { pathExistsAsync, readFileAsync, execFileAsync } from '../lib/util'
 import got = require('got')
 
 const env = process.env,
   branchName = env.CIRCLE_BRANCH || env.APPVEYOR_REPO_BRANCH || env.TRAVIS_BRANCH || '',
   isScheduled = Boolean(env.APPVEYOR_SCHEDULED_BUILD || env.NEXE_TRIGGERED),
-  isLinux = Boolean(env.TRAVIS),
   isWindows = Boolean(env.APPVEYOR),
-  isMac = Boolean(env.CIRCLECI),
-  isPullRequest = Boolean(env.CIRCLE_PR_NUMBER)
-    || Boolean(env.APPVEYOR_PULL_REQUEST_NUMBER) 
-    || Boolean(env.TRAVIS_PULL_REQUEST_BRANCH),
-  headers = { 
-    'Authorization': 'token ' + env.GITHUB_TOKEN,
+  isPullRequest =
+    Boolean(env.CIRCLE_PR_NUMBER) ||
+    Boolean(env.APPVEYOR_PULL_REQUEST_NUMBER) ||
+    Boolean(env.TRAVIS_PULL_REQUEST_BRANCH),
+  headers = {
+    Authorization: 'token ' + env.GITHUB_TOKEN,
     'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
   }
 
@@ -32,7 +28,7 @@ if (require.main === module) {
   }
 }
 
-async function build () {
+async function build() {
   if (isScheduled) {
     const releases = await getUnBuiltReleases({ headers })
     if (!releases.length) {
@@ -54,8 +50,7 @@ async function build () {
   }
 
   if (env.NEXE_VERSION) {
-    const
-      target = getTarget(env.NEXE_VERSION),
+    const target = getTarget(env.NEXE_VERSION),
       output = isWindows ? './out.exe' : './out',
       options = {
         empty: true,
@@ -63,15 +58,15 @@ async function build () {
         target,
         output
       }
-    
+    console.log('Building: ', target)
     const stop = keepalive()
-    if (target.platform === 'alpine') {
-      await runAlpineBuild(target)
+    if (['arm7l', 'arm6l', 'arm64', 'alpine'].indexOf(target.platform)) {
+      await runDockerBuild(target)
     } else {
-      await nexe.compile(options)      
+      await nexe.compile(options)
     }
     stop()
-    
+
     if (await pathExistsAsync(output)) {
       await assertNexeBinary(output)
       const gitRelease = await getLatestGitRelease({ headers })
@@ -79,7 +74,7 @@ async function build () {
         query: { name: target.toString() },
         body: await readFileAsync(output),
         headers: {
-          'Authorization': 'token ' + env.GITHUB_TOKEN,
+          Authorization: 'token ' + env.GITHUB_TOKEN,
           'Content-Type': 'application/octet-stream',
           'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
         }
@@ -89,12 +84,12 @@ async function build () {
   }
 }
 
-function keepalive () {
+function keepalive() {
   const keepalive = setInterval(() => console.log('Building...'), 300 * 1000)
   return () => clearInterval(keepalive)
 }
 
-function assertNexeBinary (file: string) {
+function assertNexeBinary(file: string) {
   return execFileAsync(file).catch(e => {
     if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
       return

tasks/ci.ts

@@ -1,12 +1,14 @@
 import { NexeTarget } from '../lib/releases'
 import got = require('got')
 import * as assert from 'assert'
+import { getTarget } from '../lib/target'
 const { env } = process
 
 export function triggerMacBuild(release: NexeTarget, branch: string) {
   assert.ok(env.CIRCLE_TOKEN)
-  const circle = `https://circleci.com/api/v1.1/project/github/nexe/nexe/tree/${
-    branch}?circle-token=${env.CIRCLE_TOKEN}`
+  const circle = `https://circleci.com/api/v1.1/project/github/nexe/nexe/tree/${branch}?circle-token=${
+    env.CIRCLE_TOKEN
+  }`
   return got(circle, {
     json: true,
     body: {
@@ -17,7 +19,7 @@ export function triggerMacBuild(release: NexeTarget, branch: string) {
   })
 }
 
-export function triggerDockerBuild (release: NexeTarget, branch: string) {
+export function triggerDockerBuild(release: NexeTarget, branch: string) {
   assert.ok(env.TRAVIS_TOKEN)
   const travis = `https://api.travis-ci.org/repo/nexe%2Fnexe/requests`
   return got(travis, {
@@ -38,15 +40,19 @@ export function triggerDockerBuild (release: NexeTarget, branch: string) {
     },
     headers: {
       'Travis-API-Version': '3',
-      'Authorization': `token ${env.TRAVIS_TOKEN}`
+      Authorization: `token ${env.TRAVIS_TOKEN}`
     }
   })
 }
 
-export function triggerWindowsBuild (release: NexeTarget) {
-  const hasVersion = 'NEXE_VERSION' in env
-  env.NEXE_VERSION = hasVersion 
-    ? env.NEXE_VERSION!.trim() 
-    : release.toString() 
+export function triggerWindowsBuild(release: NexeTarget) {
+  const version = 'NEXE_VERSION' in env ? env.NEXE_VERSION!.trim() : release.toString()
+  if (getTarget(version).version.startsWith('10.')) {
+    if ((env.APPVEYOR_BUILD_WORKER_IMAGE || '').includes('2017')) {
+      env.NEXE_VERSION = version
+    }
+  } else {
+    env.NEXE_VERSION = version
+  }
   return Promise.resolve()
 }

tasks/docker.ts

@@ -1,11 +1,11 @@
-import { NexeTarget } from '../lib/target'
+import { NexeTarget, architectures } from '../lib/target'
 import { writeFileAsync, readFileAsync } from '../lib/util'
 import { spawn } from 'child_process'
 import got = require('got')
 import execa = require('execa')
 import { appendFileSync } from 'fs'
 
-function alpine (target: NexeTarget) {  
+function alpine(target: NexeTarget) {
   return `
 FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.4
 RUN apk add --no-cache curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ git vim tar gzip wget
@@ -26,29 +26,47 @@ RUN rm /nexe_temp/\${NODE_VERSION}/out/Release/node && \
 `.trim()
 }
 
-export async function runAlpineBuild (target: NexeTarget) {
-  await writeFileAsync('Dockerfile', alpine(target))
-  const outFilename = 'nexe-alpine-build-log.txt'
+function arm(target: NexeTarget) {
+  return `
+FROM hypriot/rpi-node
+ENV NEXE_VERSION=beta
+WORKDIR /
+
+RUN yarn global add nexe@\${NEXE_VERSION} && \
+  nexe --build --empty -o out -t ${target.version}
+`.trim()
+}
+
+export async function runDockerBuild(target: NexeTarget) {
+  //todo switch on alpine and arm
+  const dockerfile = alpine(target)
+  await writeFileAsync('Dockerfile', dockerfile)
+  const outFilename = 'nexe-docker-build-log.txt'
   await writeFileAsync(outFilename, '')
   let output: any = []
 
   try {
-    output.push(await execa.shell(`docker build -t nexe-alpine .`))    
-    output.push(await execa.shell(`docker run -d --name nexe nexe-alpine sh`))    
-    output.push(await execa.shell(`docker cp nexe:/out out`))    
+    output.push(await execa.shell(`docker build -t nexe-docker .`))
+    output.push(await execa.shell(`docker run -d --name nexe nexe-docker sh`))
+    output.push(await execa.shell(`docker cp nexe:/out out`))
     output.push(await execa.shell(`docker rm nexe`))
-  } catch(e) {
+  } catch (e) {
     console.log('Error running docker', e)
   } finally {
     output.forEach((x: any) => {
       appendFileSync(outFilename, x.stderr)
       appendFileSync(outFilename, x.stdout)
     })
-    await got(`https://transfer.sh/${Math.random().toString(36).substring(2)}.txt`, {
-      body: await readFileAsync(outFilename),
-      method: 'PUT'
-    })
-    .then(x => console.log('Posted docker log: ', x.body))
-    .catch(e => console.log('Error posting log', e))
+    await got(
+      `https://transfer.sh/${Math.random()
+        .toString(36)
+        .substring(2)}.txt`,
+      {
+        body: await readFileAsync(outFilename),
+        method: 'PUT'
+      }
+    )
+      .then(x => console.log('Posted docker log: ', x.body))
+      .catch(e => console.log('Error posting log', e))
   }
 }

tasks/post-build.ts

@@ -1,30 +1,38 @@
 import { writeFileSync, readFileSync } from 'fs'
 
 /**
- * post build step to insert code files into code files. 
+ * post build step to insert code files into code files (naively).
  * '{{replace:path/to/file}}' => "file contents"
  * And the package.json version.
  */
 //inject('plugins/nexe-daemon/lib/index.js')
+cp('src/fs/package.json', 'lib/fs/package.json')
+cp('src/fs/bootstrap.js', 'lib/fs/bootstrap.js')
+cp('src/fs/README.md', 'lib/fs/README.md')
+
 inject('lib/patches/third-party-main.js')
 inject('lib/steps/shim.js')
 inject('lib/options.js', JSON.stringify(require('../package.json').version))
 
-function inject (filename: string, ...replacements: string[]) {
+function inject(filename: string, ...replacements: string[]) {
   let contents = readFileSync(filename, 'utf8')
   contents = contents.replace(/('{{(.*)}}')/g, (substring: string, ...matches: string[]) => {
     if (!matches || !matches[1]) {
       return substring
-    }    
+    }
     const [replace, file] = matches[1].split(':')
     if (replace !== 'replace') {
       return substring
     }
     console.log('Replacing: ', substring)
-    return replacements[+file] 
-      ? replacements[+file] 
-      : JSON.stringify(readFileSync(file, 'utf8'))
-  })  
+    return replacements[+file] ? replacements[+file] : JSON.stringify(readFileSync(file, 'utf8'))
+  })
   writeFileSync(filename, contents)
   console.log(`Wrote: ${filename}`)
 }
+
+function cp(from: string, to: string) {
+  const file = readFileSync(from)
+  writeFileSync(to, file)
+  console.log('Copied: ', from, 'To: ', to)
+}

test/fixture/dependency.js

@@ -0,0 +1 @@
+module.exports = 'abc'

test/fixture/entry.js

@@ -0,0 +1 @@
+console.log('hello world', require('./dependency'))

test/fixture/package.json

@@ -0,0 +1,3 @@
+{
+  "main": "entry.js"
+}

test/mocha.opts

@@ -1,3 +1,4 @@
+./test/**/*.spec.ts
 --check-leaks
 --require ts-node/register
 --recursive

test/options.spec.ts

@@ -0,0 +1,56 @@
+import { normalizeOptions } from '../src/options'
+import { expect } from 'chai'
+import * as path from 'path'
+
+const ext = process.platform === 'win32' ? '.exe' : ''
+
+describe('options', () => {
+  describe('cwd', () => {
+    it('should use process.cwd() if nothing is provided', () => {
+      const options = normalizeOptions()
+      expect(options.cwd).to.equal(process.cwd())
+    })
+    it('should use the main module in a package directory', () => {
+      const options = normalizeOptions()
+      expect(options.input).to.equal(path.resolve('./index.js'))
+    })
+    it('should resolve relative paths for input', () => {
+      const options = normalizeOptions({ input: 'test/fixture/entry.js' })
+      expect(options.input).to.equal(path.resolve('./test/fixture/entry.js'))
+    })
+    it('should accept a module entry as input', () => {
+      const options = normalizeOptions({ input: 'test/fixture' })
+      expect(options.input).to.equal(path.resolve('./test/fixture/entry.js'))
+    })
+    it('should resolve pathed options against cwd', () => {
+      const cwd = path.join(process.cwd(), 'test/fixture')
+      const options = normalizeOptions({
+        cwd,
+        input: 'entry',
+        output: 'abc',
+        temp: './d'
+      })
+      expect(options.temp).to.equal(path.resolve(cwd, './d'))
+      expect(options.input).to.equal(path.resolve(cwd, 'entry.js'))
+      expect(options.output).to.equal(path.resolve(cwd, `abc${ext}`))
+    })
+  })
+  describe('output', () => {
+    it('should work', () => {
+      const options = normalizeOptions({
+        output: './some-output'
+      })
+      expect(options.output).to.equal(path.resolve(`./some-output${ext}`))
+    })
+    it('should default to the input file name if not index', () => {
+      const options = normalizeOptions({
+        input: './test/fixture'
+      })
+      expect(options.output).to.equal(path.resolve(`./entry${ext}`))
+    })
+    it('should default to the folder/project name if filename is index', () => {
+      const options = normalizeOptions({ cwd: './test/fixture2' })
+      expect(options.output).to.equal(path.resolve(`./test/fixture2/fixture2${ext}`))
+    })
+  })
+})

test/target.spec.ts

@@ -1,16 +1,18 @@
 import { padRight, isWindows } from '../src/util'
 import { expect } from 'chai'
-import { blue as b } from 'chalk'
+import chalk from 'chalk'
 import { getTarget, NexeTarget } from '../src/target'
-
+const b = chalk.blue
 const arch = process.arch === 'ia32' ? 'x86' : process.arch
 
 describe('Targets', () => {
-  [
+  ;[
     ['win-ia32-6.11.2', 'windows-x86-6.11.2'],
     [{ version: '6.11.2', platform: 'win', arch: 'ia32' }, 'windows-x86-6.11.2'],
     ['win32-x64-6.11.2', 'windows-x64-6.11.2'],
+    ['win-amd64-6.11.2', 'windows-x64-6.11.2'],
     ['darwin-x64-v8.4.0', 'mac-x64-8.4.0'],
+    ['macos-x64-v8.4.0', 'mac-x64-8.4.0'],
     ['static-x86-6.10.3', 'alpine-x86-6.10.3'],
     ['linux-x32', `linux-x86-${process.version.slice(1)}`],
     ['alpine-notsupported-6.10.3', `alpine-${arch}-6.10.3`],
@@ -21,8 +23,7 @@ describe('Targets', () => {
     })
   })
 
-  it ('should stringify and toString', () => {
+  it('should stringify and toString', () => {
     expect(JSON.stringify(getTarget(process))).to.equal(`"${getTarget(process)}"`)
   })
 })
-

tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "target":"es5",
+    "skipLibCheck": true,
     "experimentalDecorators": true,
     "lib": ["es2017"],
     "module": "commonjs",

tslint.json

@@ -0,0 +1,9 @@
+{
+  "rulesDirectory": ["tslint-plugin-prettier", "tslint-config-prettier"],
+  "linterOptions": {
+    "exclude": ["**/node_modules/**/*"]
+  },  
+  "rules": {
+    "prettier": [true, { "semi": false, "printWidth": 100, "singleQuote": true }]
+  }
+}