feat: build-target options

docs: update readme with new usage
fix: don't call next twice
2017-09-01 00:28:10 -05:00 · 2017-08-31 13:59:01 -05:00 · 2017-08-31 10:02:12 -05:00 · 2017-08-31 08:46:50 -05:00 · 2017-08-31 01:15:51 -05:00 · 2017-08-30 15:32:26 -05:00
66 changed files with 3979 additions and 4940 deletions
@@ -4,5 +4,6 @@ end_of_line = lf
 charset = utf-8
 indent_style = space
 indent_size = 2
-trim_trailing_whitespace = true
+#https://github.com/Microsoft/vscode/issues/23983#event-1087502108
+#trim_trailing_whitespace = true
 insert_final_newline = true
@@ -1,12 +1,9 @@
 .DS_Store
 temp/
 coverage
-nexe
 node_modules
 *.log
 *.exe
-*.bin
-!winsw.exe
 .idea
 .nexe
 lib
@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+- '6'
+script: npm run nexe-build
+env:
+  global:
+    secure: LyC6djYqPfPKz5gHILES9JmSRxQ+ntKOcoaZNM5WID0+gogUoXZBhcmmtvq9RnMpFZN3pYujY6LB5iy7QS2seGjg+feyewNKI30yIK6N9ulJyZZKmrJVDdRx4wvl8YVTkttjcJFkanDGa6zRvFfFDKx/iIdcWLEpnqR/WO1ppf8=
@@ -1,3 +1,5 @@
 {
-    "recommendations": [ "ms-vscode.vscode-typescript-tslint-plugin" ]
+    "recommendations": [
+      "esbenp.prettier-vscode"
+    ]
 }
@@ -1,7 +1,8 @@
 {
-  "tslint.enable": true,
-  "tslint.run": "onType",
-  "tslint.autoFixOnSave": true,
+  "typescript.tsdk": "./node_modules/typescript/lib",
+  "prettier.semi": false,
+  "prettier.singleQuote": true,
+  "prettier.typescriptEnable": ["typescript"],
  "files.exclude": {
    "**/.git": true,
    "**/.svn": true,
@@ -13,6 +14,5 @@
    "lib/**/*": true,
    "**/node_modules": true,
    "**/bower_components": true
-  },
-  "typescript.tsdk": "node_modules\\typescript\\lib"
+  }
 }
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018 Nexe Contributors
+Copyright (c) 2013-2017 Nexe Contributors

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -1,21 +1,22 @@
 <p align="center"><img src="https://cloud.githubusercontent.com/assets/2391349/23598327/a17bb68a-01ee-11e7-8f55-88a5fc96e997.png" /></p>

 <p align="center">
-  <a href="https://dev.azure.com/nexe-ci/Nexe/_build?definitionId=1"><img src="https://img.shields.io/azure-devops/build/nexe-ci/nexe/1/master.svg" alt="Build Status"></a>
+  <a href="https://circleci.com/gh/nexe/nexe"><img src="https://img.shields.io/circleci/project/nexe/nexe.svg" alt="Build Status"></a>
  <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>
 </p>

-<p align="center"><code>npm i nexe -g</code></p>
+<p align="center"><code>npm i nexe@beta -g</code></p>
 <p align="center">Nexe is a command-line utility that compiles your Node.js application into a single executable file.</p>

 <p align="center">
-  <img src="https://user-images.githubusercontent.com/5818726/30999006-df7e0ae0-a497-11e7-96db-9ce87ae67b34.gif"/>
+  <img src="https://cloud.githubusercontent.com/assets/5818726/26533446/ce19ee5a-43de-11e7-9540-caf7ebd93370.gif"/>
 </p>

 ## Motivation and Features

+- Supports production ready builds
 - Self contained applications
 - Ability to run multiple applications with *different* node.js runtimes.
 - Distribute binaries without needing node / npm.
@@ -27,41 +28,40 @@

 ## Usage

- Application entrypoint:
+- Existing application bundle:

-  `nexe my-app.js`
+  `nexe my-app-bundle.js -o my-app`

 - stdin interface

-  `rollup -c | nexe --resource "./public/**/*" -o my-app.exe`
+  `rollup -c | nexe --resource ./public/**/* -o my-app.exe`

 For more CLI options see: `nexe --help`

-### Examples
+## Including Additional Resources

- `nexe server.js -r "public/**/*.html"`
- `nexe --build`
- `nexe -t x86-8.0.0`
-
-## Resources
-
-Additional files or resources can be added to the binary by passing `-r "glob/pattern/**/*"`. These included files can be read in the application by using `fs.readFile` or `fs.readFileSync`.
+Additional resources can be added to the binary by passing `-r glob/pattern/**/*`. These included files can be read in the application by using `fs.readFile` or `fs.readFileSync`

 ## 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 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).
+By default `nexe` will attempt to download a pre-built executable. However, some users may want to customize the way node is built, either by changing the flags, providing a different icon, or different executable details. To build node, use the `build` option/flag
+
+Nexe also exposes its patching pipeline to the user. This allows the application of simple patching of node sources prior to compilation.

 ## Node.js API

+Using Nexe Programatically
+
 #### Example

+
 ```javascript
 const { compile } = require('nexe')

 compile({
  input: './my-app.js',
-  build: true, //required to use patches
+  output: './my-app.exe',
+  build: true, //builds node
  patches: [
    async (compiler, next) => {
      await compiler.setFileContentsAsync(
@@ -75,125 +75,92 @@ compile({
  console.log('success')
 })
 ```
-## NexeOptions

-### `options: object`
+### `options`

+ - #### `build: boolean`
+    - Build node from source (required in beta)
 - #### `input: string`
    - Input bundle file path
    - default: stdin or the current directory's main file (package.json)
 - #### `output: string`
    - Output executable file path
    - default: same as `name` with an OS specific extension.
- - #### `target: string | object`
-    - An object or string describing platform-arch-version. e.g. `'windows-ia32-10.13.0'`
-      - each segment is optional, and will be merged with the current environment
-      - Examples: ([full list](https://github.com/nexe/nexe/releases))
-        - `'win32-x86-10.13.0`
-        - `{ platform: 'alpine' }`
-        - `darwin-10.13.0`
-        - `linux-x64`
-        - `macos-10.13.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`
+ - #### `target: string`
+    - Dash seperated platform-architecture-version. e.g. `'win32-ia32-6.10.3'`
+    - default: `[process.platform, process.arch, process.version.slice(1)].join('-')`
 - #### `bundle: string | boolean`
    - If a string is provided it must be a valid relative module path
    and should provide an export with the following signature:
    ```typescript
-    export function createBundle (options: NexeOptions): Promise<string>
+    export function createBundle (
+      filename: string,
+      options: { name: string, minify: any, cwd: string }
+    ): Promise<string>`
    ```
-    - default: true
+    - default: true, uses the internal fuse-box configuration
 - #### `name: string`
    - Module friendly name of the application
    - default: basename of the input file, or `nexe_${Date.now()}`
 - #### `cwd: string`
    - Directory nexe will operate on as though it is the cwd
    - default: process.cwd()
- - #### `mangle: boolean`
-    - If set to false, nexe will not include the virtual filesystem (your application and resources) on the output.
-    - This will cause the output to error as an "Invalid Binary" unless a userland patch alters the contents of lib/_third_party_main.js in the nodejs source.
-    - default: true
- - #### `build: boolean`
-    - Build node from source, passing this flag tells nexe to download and build from source. Subsequently using this flag will cause nexe to use the previously built binary. To rebuild, first add [`--clean`](#clean-boolean)
- - #### `asset: string`
-    - Provide a pre-built nexe binary asset, this can either be an http or https URL or a file path.
-    - default: `null`
+ - #### `version: string`
+    - The Node version you're building for
+    - default: `process.version.slice(1)`
 - #### `python: string`
    - On Linux this is the path pointing to your python2 executable
    - On Windows this is the directory where `python` can be accessed
    - default: `null`
- - #### `flags: string[]`
+ - #### `flags: Array<string>`
    - Array of node runtime flags to build node with.
    - Example: `['--expose-gc']`
    - default: `[]`
- - #### `configure: string[]`
+ - #### `configure: Array<string>`
    - Array of arguments for the node build configure step
    - Example: `['--with-dtrace', '--dest-cpu=x64']`
    - default: `[]`
- - #### `make: string[]`
-    - Array of arguments for the node build make step
-    - default: `[]`
- - #### `vcBuild: string[]`
-    - Options for windows build
-    - default: `['nosign', 'release']`
+ - #### `make: Array<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: Array<string>`
+    - Alias for `make` option
 - #### `snapshot: string`
    - path to a file to be used as the warmup snapshot for the build
    - default: `null`
- - #### `resources: string[]`
+ - #### `resources: Array<string>`
    - Array of globs with files to include in the build
    - Example: `['./public/**/*']`
    - default: `[]`
 - #### `temp: string`
    - Path to use for storing nexe's build files
    - Override in the env with `NEXE_TEMP`
-    - default: `~/.nexe`
+    - default: `./.nexe` in the cwd
 - #### `ico: string`
-    - Path to a user provided icon to be used (Windows only). Requires `--build` to be set.
+    - Path to a user provided icon to be used (Windows only).
 - #### `rc: object`
    - Settings for patching the [node.rc](https://github.com/nodejs/node/blob/master/src/res/node.rc) configuration file (Windows only).
-    - Example (keys may vary depending on the version. Reference the file linked above):
-      ```javascript
-        {
-          CompanyName: "ACME Corp",
-          PRODUCTVERSION: "17,3,0,0",
-          FILEVERSION: "1,2,3,4"
-          ...
-        }
-      ```
+    - Example: `{ CompanyName: "ACME Corp" }`
    - default: `{}`
 - #### `clean: boolean`
-    - If included, nexe will remove temporary files for the accompanying configuration and exit
+    - If included, nexe will remove temporary files for accompanying configuration and exit
 - #### `enableNodeCli: boolean`
-    - 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.
+    - Enable the original Node CLI (will prevent application cli from working)
    - 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
+    - Provide an alternate url for the node source. Should be a `.tar.gz`
 - #### `loglevel: string`
    - Set the loglevel, info, silent, or verbose
    - default: `'info'`
- - #### `patches: NexePatch[]`
+ - #### `patches: Array<NexePatch>`
    - Userland patches for patching or modifying node source
    - default: `[]`
- - #### `plugins: NexePatch[]`
-    - Userland plugins for modifying nexe executable behavior
-    - default: `[]`

 ### `NexePatch: (compiler: NexeCompiler, next: () => Promise<void>) => Promise<void>`

-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.
+A patch is just a middleware function that takes 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.

-For examples, see the built in patches: [src/patches](src/patches).
+For examples, see the built in patches: [src/patches](src/patches)

 ### `NexeCompiler`

@@ -203,9 +170,7 @@ For examples, see the built in patches: [src/patches](src/patches).
    - Quickly perform a replace in a file within the downloaded Node.js source. The rest arguments are passed along to `String.prototype.replace`
 - `readFileAsync(filename: string): Promise<NexeFile>`
    - Access (or create) a file within the downloaded Node.js source.
- - `addResource(filename: string, contents: Buffer): void`
-    - Add a resource to the nexe bundle
- - `files: NexeFile[]`
+ - `files: Array<NexeFile>`
    - The cache of the currently read, modified, or created files within the downloaded Node.js source.

 #### `NexeFile`
@@ -215,31 +180,18 @@ For examples, see the built in patches: [src/patches](src/patches).

 Any modifications made to `NexeFile#contents` will be maintained in the cache _without_ the need to explicitly write them back out, e.g. using `NexeCompiler#setFileContentsAsync`.

-## Native Modules
+### Native Modules

-TODO
+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 [example](examples/native-build/build.js)

- [ ] Implement support for `node-pre-gyp#find`.
-
-## Contributing
-
-Building
-```
-$ git clone git@github.com:nexe/nexe.git
-$ cd nexe
-$ yarn
-```
-
-Testing
-```
-$ npm test
-```
+- [ ] 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) | [![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) |
+[![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) |

 ### Former

@@ -0,0 +1,21 @@
+environment:
+  CIRCLE_TOKEN:
+    secure: TQKcepXmTzCNt4+tUBtYpwEQkdSPwFr9A8ugtoMhNbKu/SW1WM1EpjEu6kYXxpQ4
+  TRAVIS_TOKEN:
+    secure: tR7HXYv3x97q90uvPrjUxKZh7R1+uqKct0HdEcqTbsg=
+  GITHUB_TOKEN:
+    secure: 3wuEGJsppSKFvdwhp3jprUA9Zkc3WINlc/9oFXjhAR6J05lYMXP7Fl7lXTKpkGZx
+branches:
+  except:
+    - master
+install:
+  - ps: Install-Product node 6
+  - npm i
+build: off
+test: off
+build_script:
+  - npm run nexe-build
+artifacts:
+  - path: .nexe\**\node.exe
+cache:
+  - node_modules
@@ -1,60 +0,0 @@
-schedules:
- cron: "0 8 * * *"
-  displayName: "Daily Build 1"
-  always: true
-  branches:
-    include:
-      - master
- cron: "0 13 * * *"
-  displayName: "Daily Build 2"
-  always: true
-  branches:
-    include:
-      - master
- cron: "0 19 * * *"
-  displayName: "Daily Build 3"
-  always: true
-  branches:
-    include:
-      - master
-jobs:
- job: BaseBuild
-  timeoutInMinutes: 180
-  strategy:
-    matrix:
-      linux:
-        imageName: 'ubuntu-16.04'
-      mac:
-        imageName: 'macos-10.13'
-      windows_2017:
-        imageName: 'vs2017-win2016'
-      windows_2015:
-        imageName: 'vs2017-win2016'
-      alpine:
-        imageName: 'ubuntu-16.04'
-  pool:
-    vmImage: $(imageName)
-  steps:
-  - task: UsePythonVersion@0
-    displayName: Setup Python
-    inputs:
-      versionSpec: '2.7'
-      architecture: 'x64'
-  - task: NodeTool@0
-    displayName: Install Node
-    inputs:
-      versionSpec: '10.x'
-  - script: sudo apt-get update && sudo apt-get install -y libc6-dev-i386 gcc-multilib g++-multilib
-    condition: contains(variables['Agent.JobName'], 'linux')
-    displayName: Install Linux build dependencies
-  - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015
-    condition: contains(variables['Agent.JobName'], 'windows_2015')
-    displayName: Install Windows build dependencies
-  - script: choco install nasm -fy
-    displayName: Install Windows Assembler (NASM)
-    condition: contains(variables['Agent.JobName'], 'windows')
-  - script: npm install && npm run ci:build
-    displayName: Build Nexe
-    env:
-      GITHUB_TOKEN: $(PersonalGithubToken)
-      NEXE_VERBOSE: $(NEXE_VERBOSE)
@@ -0,0 +1,3 @@
+test:
+  override:
+    - npm run nexe-build
@@ -1,8 +0,0 @@
-const express = require('express')
-const path = require('path')
-const app = express()
-app.use('/', express.static(path.join(__dirname, 'public')))
-
-
-app.listen(8888)
-
@@ -1,373 +0,0 @@
-{
-  "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="
-    }
-  }
-}
@@ -1,15 +0,0 @@
-{
-  "name": "express-app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "express": "^4.16.3"
-  }
-}
@@ -1 +0,0 @@
-<h1>Hello World!</h1>
@@ -0,0 +1,22 @@
+const { FuseBox } = require('fuse-box')
+const { NativeModulePlugin } = require('../../lib/bundling')
+const fuse = FuseBox.init({
+  homeDir: './',
+  cache: false,
+  log: true,
+  debug: true,
+  output: '$name.js',
+  plugins: [
+    new NativeModulePlugin({
+      zmq: {
+        additionalFiles: [
+          '../../windows/lib/x64/libzmq-v100-mt-4_0_4.dll'
+        ]
+      }
+    })
+  ]
+})
+fuse.bundle('app')
+    .target('server')
+    .instructions(`> index.js`)
+fuse.run()
@@ -0,0 +1,19 @@
+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)
+console.log('global', global.require.main)
+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())
+})
@@ -0,0 +1,18 @@
+{
+  "name": "native-build",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "bundle": "node build",
+    "build-windows": "nexe -i app.js -o app.exe"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "zmq": "^2.15.3"
+  },
+  "devDependencies": {
+    "fuse-box": "^2.2.1-beta.7"
+  }
+}
@@ -1,32 +1,10 @@
 #!/usr/bin/env node
-const options = require('./lib/options')
-if (require.main === module) {
-  //fast path for help/version
-  const argv = options.argv
-  const eol = require('os').EOL
-  const showHelp = argv.help || argv._.some(x => x === 'help')
-  const showVersion = argv.version || argv._.some(x => x === 'version')
-  if (showHelp || showVersion) {    
-    process.stderr.write(showHelp ? options.help : options.version + eol)
-  } else {
-    const nexe = require('./lib/nexe')
-    nexe.compile(argv).catch((error) => {
-      const NexeError = require('./lib/compiler').NexeError
-      const chalk = require('chalk')
-      const isSilent = Boolean(argv.silent === true || argv.loglevel === 'silent')
-      if (!isSilent) {
-        if (error instanceof NexeError) {
-          process.stderr.write(eol + chalk.red('Error: ') + error.message + eol
-            + eol + 'See nexe -h for usage..' + eol + eol
-          )
-        } else {
-          process.stderr.write(error.stack + eol)
-        }
-      }
+const nexe = require('./lib/nexe')

-      process.exit(1)
-    })
-  }
-} else {
-  module.exports = require('./lib/nexe')
+module.exports = nexe
+
+if (require.main === module) {
+  nexe.compile(nexe.argv).catch((e) => {
+    process.stderr.write(e.stack, () => process.exit(1))
+  })
 }
@@ -1,19 +1,21 @@
-<!-- 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): -->
+This is a
+ - [ ] Bug Report
+ - [ ] Feature Request
+ - [ ] Other

-**Is this a BUG or a FEATURE REQUEST?:** 
+<br/>
+If this is a bug report, What are the steps to reproduce?

-**What happened:**
+```
+//provide configuration here
+```

-**What you expected to happen:**
-
-**How to reproduce it (as minimally and precisely as possible):**
-
-**Anything else we need to know?:**
-
-**Environment**
+<br/><br/>
+Please also provide:

 - Platform(OS/Version):
 - Host Node Version:
 - Target Node Version:
 - Nexe version:
 - Python Version:
+
@@ -2,29 +2,27 @@
  "name": "nexe",
  "description": "Create a single executable out of your Node.js application",
  "license": "MIT",
-  "version": "3.3.2",
+  "version": "2.0.0-rc.1",
  "contributors": [
    "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
    "Jared Allard <jaredallard@outlook.com>",
    "Caleb Boyd <caleb.boyd@hotmail.com>"
  ],
  "scripts": {
-    "ci:build": "ts-node tasks/build",
-    "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"
+    "nexe-build": "ts-node tasks/build",
+    "prebuild": "rimraf lib && npm run lint",
+    "prepublish": "npm run build",
+    "lint": "prettier --parser typescript --no-semi --print-width 100 --single-quote --write \"src/**/*.ts\"",
+    "build": "tsc --declaration"
  },
  "repository": {
    "type": "git",
    "url": "git://github.com/nexe/nexe.git"
  },
  "files": [
-    "lib"
+    "lib",
+    "source-map-support.js"
  ],
-  "typings": "lib/nexe.d.ts",
  "main": "index.js",
  "bin": {
    "nexe": "index.js"
@@ -33,44 +31,33 @@
    "node": ">=6"
  },
  "dependencies": {
-    "@calebboyd/semaphore": "^1.3.1",
-    "app-builder": "^5.2.0",
-    "caw": "^2.0.1",
-    "chalk": "^2.4.2",
-    "cherow": "1.6.9",
-    "download": "^7.1.0",
-    "globby": "^9.2.0",
-    "got": "^9.6.0",
+    "app-builder": "^5.1.0",
+    "chalk": "^1.1.3",
+    "download": "^6.2.0",
+    "fuse-box": "^2.2.1",
+    "globby": "^6.1.0",
    "minimist": "^1.2.0",
    "mkdirp": "^0.5.1",
-    "multistream": "^2.1.1",
-    "ora": "^3.4.0",
-    "pify": "^4.0.1",
-    "resolve-dependencies": "^2.2.3",
-    "rimraf": "^2.6.3"
+    "ora": "^1.2.0",
+    "pifi": "1.0.0",
+    "rimraf": "^2.6.1",
+    "uglify-js": "3.0.28"
  },
  "devDependencies": {
-    "@types/chai": "^4.1.7",
-    "@types/download": "^6.2.4",
-    "@types/execa": "^0.9.0",
-    "@types/globby": "^9.1.0",
-    "@types/got": "^9.6.0",
+    "@types/bluebird": "^3.5.8",
+    "@types/chalk": "^0.4.31",
+    "@types/execa": "0.7.0",
+    "@types/globby": "^0.6.0",
    "@types/minimist": "^1.2.0",
-    "@types/mkdirp": "^0.5.2",
-    "@types/mocha": "^5.2.7",
-    "@types/multistream": "^2.1.1",
-    "@types/ora": "^3.2.0",
-    "@types/pify": "3.0.2",
-    "@types/rimraf": "2.0.2",
-    "@types/semver": "^6.0.0",
-    "chai": "^4.2.0",
-    "execa": "^1.0.0",
-    "mocha": "^6.1.4",
-    "prettier": "^1.18.2",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.17.0",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-plugin-prettier": "^2.0.1",
-    "typescript": "^3.5.2"
+    "@types/mkdirp": "^0.3.29",
+    "@types/ora": "^0.3.31",
+    "@types/pify": "0.0.28",
+    "@types/rimraf": "0.0.28",
+    "execa": "0.8.0",
+    "got": "^7.1.0",
+    "mocha": "^3.2.0",
+    "prettier": "^1.6.1",
+    "ts-node": "3.3.0",
+    "typescript": "^2.4.1"
  }
 }
@@ -0,0 +1,162 @@
+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 module = Object.keys(options).find(x =>
+    Boolean(~file.absPath.indexOf(path.join('node_modules', x)))
+  )!
+  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 === 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
+
+  isRequireBindings(node: any) {
+    return node.callee.name === 'require' && node.arguments[0].value === 'bindings'
+  }
+
+  onNode(absolutePath: string, node: any, parent: any) {
+    if (node.type === 'CallExpression') {
+      if (this.isRequireBindings(node) && 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.isRequireBindings(node) && 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
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,70 @@
+import { BindingsRewrite, embedDotNode, ExtractNodeModuleOptions } from './bindings-rewrite'
+
+export interface FuseBoxFile {
+  info: { absPath: string }
+  absPath: string
+  contents: string
+  analysis: {
+    dependencies: string[]
+    requiresRegeneration: boolean
+  }
+  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: RegExp
+  public limit2Project = false
+  private modules: (keyof ExtractNodeModuleOptions)[]
+
+  constructor(public options: ExtractNodeModuleOptions) {
+    this.options = options
+    this.test = new RegExp(`node_modules\/(${Object.keys(options).join('|')}).*\.js|\.node$`)
+  }
+
+  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
+            }
+          }
+        }
+      ]
+    })
+  }
+}
@@ -0,0 +1,57 @@
+import { NexeCompiler } from '../compiler'
+import { FuseBox, JSONPlugin, CSSPlugin, HTMLPlugin, QuantumPlugin } from 'fuse-box'
+import { readFileAsync } from '../util'
+//import NativeModulePlugin from './fuse-native-module-plugin'
+
+function createBundle(filename: string, options: { name: string; minify: any; cwd: string }) {
+  const plugins: any = [JSONPlugin(), CSSPlugin(), HTMLPlugin()]
+  if (options.minify) {
+    plugins.push(
+      QuantumPlugin({
+        target: 'server',
+        uglify: true,
+        bakeApiIntoBundle: options.name
+      })
+    )
+  }
+  const fuse = FuseBox.init({
+    cache: false,
+    log: Boolean(process.env.NEXE_BUNDLE_DEBUG) || false,
+    homeDir: options.cwd,
+    sourceMaps: false,
+    writeBundles: false,
+    output: '$name.js',
+    target: 'server',
+    plugins
+  })
+  fuse.bundle(options.name).instructions(`> ${filename}`)
+  return fuse.run().then(x => {
+    let output = ''
+    x.bundles.forEach(y => (output = y.context.output.lastPrimaryOutput.content!.toString()))
+    return output
+  })
+}
+
+export default async function bundle(compiler: NexeCompiler, next: any) {
+  if (!compiler.options.bundle) {
+    compiler.input = await readFileAsync(compiler.options.input, 'utf-8')
+    return next()
+  }
+
+  if (compiler.options.empty || !compiler.options.input) {
+    compiler.input = ''
+    return next()
+  }
+
+  let producer = createBundle
+  if (typeof compiler.options.bundle === 'string') {
+    producer = require(compiler.options.bundle).createBundle
+  }
+
+  compiler.input = await producer(compiler.options.input, {
+    cwd: compiler.options.cwd,
+    name: compiler.options.name,
+    minify: compiler.options.compress
+  })
+  return next()
+}
@@ -0,0 +1 @@
+export * from './fuse-native-module-plugin'
@@ -1,206 +1,99 @@
-import { delimiter, resolve, normalize, join } from 'path'
+import { dirname, normalize, join } from 'path'
 import { Buffer } from 'buffer'
-import { createReadStream, ReadStream } from 'fs'
+import { createHash } from 'crypto'
+import { createReadStream } from 'fs'
+import { Readable } from 'stream'
 import { spawn } from 'child_process'
-import { Logger, LogStep } from './logger'
-import {
-  readFileAsync,
-  writeFileAsync,
-  pathExistsAsync,
-  statAsync,
-  dequote,
-  isWindows,
-  bound,
-  semverGt
-} from './util'
-import { NexeOptions, version } from './options'
+import { Logger } from './logger'
+import { readFileAsync, writeFileAsync, pathExistsAsync, dequote, isWindows } from './util'
+import { NexeOptions, nexeVersion } from './options'
 import { NexeTarget } from './target'
-import combineStreams = require('multistream')
-import { Bundle, toStream } from './fs/bundle'
+import { getLatestGitRelease, storeAsset } from './releases'

 const isBsd = Boolean(~process.platform.indexOf('bsd'))
 const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
 const configure = isWindows ? 'configure' : './configure'

-type StringReplacer = (match: string) => string
-
 export interface NexeFile {
  filename: string
  absPath: string
  contents: string
 }

-export { NexeOptions }
-
-export class NexeError extends Error {
-  constructor(m: string) {
-    super(m)
-    Object.setPrototypeOf(this, NexeError.prototype)
-  }
+interface NexeHeader {
+  resources: { [key: string]: number[] }
+  version: string
 }

 export class NexeCompiler {
-  /**
-   * Epoch of when compilation started
-   */
  private start = Date.now()
-  private compileStep: LogStep | undefined
+  private env = { ...process.env }
+  private compileStep: { modify: Function; log: Function }
  public log = new Logger(this.options.loglevel)
-  /**
-   * Copy of process.env
-   */
-  public env = { ...process.env }
-  /**
-   * Virtual FileSystem
-   */
-  public bundle: Bundle
-  /**
-   * Root directory for the source of the current build
-   */
-  public src: string
-  /**
-   * In memory files that are being manipulated by the compiler
-   */
+  public src = join(this.options.temp, this.options.version)
  public files: NexeFile[] = []
-  /**
-   * Standalone pieces of code run before the application entrypoint
-   */
-  public shims: string[] = []
-  /**
-   * The last shim (defaults to "require('module').runMain()")
-   */
-  public startup: string = ''
-  /**
-   * The main entrypoint filename for your application - eg. node mainFile.js
-   */
-  public entrypoint: string | undefined
-  /**
-   * Not used
-   */
-  public targets: NexeTarget[]
-  /**
-   * Current target of the compiler
-   */
-  public target: NexeTarget
-  /**
-   * Output filename (-o myapp.exe)
-   */
-  public output = this.options.output
-  /**
-   * Flag to indicate whether or notstdin was used for input
-   */
-  public stdinUsed = false
-  /**
-   * Path to the configure script
-   */
-  public configureScript: string
-  /**
-   * The file path of node binary
-   */
-  public nodeSrcBinPath: string
-  /**
-   * Remote asset path if available
-   */
-  public remoteAsset: string
+  public input: string
+  public bundledInput?: string
+  public output: string | null
+
+  public resources: { bundle: string; index: { [key: string]: number[] } } = {
+    index: {},
+    bundle: ''
+  }
+  public readFileAsync: (file: string) => Promise<NexeFile>
+  public writeFileAsync: (file: string, contents: Buffer | string) => Promise<void>
+  public replaceInFileAsync: (file: string, replacer: any, replaceValue: string) => Promise<void>
+  public setFileContentsAsync: (file: string, contents: string | Buffer) => Promise<void>
+
+  private nodeSrcBinPath = isWindows
+    ? join(this.src, 'Release', 'node.exe')
+    : join(this.src, 'out', 'Release', 'node')

  constructor(public options: NexeOptions) {
    const { python } = (this.options = options)
-    //SOMEDAY iterate over multiple targets with `--outDir`
-    this.targets = options.targets as NexeTarget[]
-    this.target = this.targets[0]
-    if (options.asset && options.asset.startsWith('http')) {
-      this.remoteAsset = options.asset
-    } else {
-      this.remoteAsset =
-        'https://github.com/nexe/nexe/releases/download/v3.0.0/' + this.target.toString()
-    }
-    this.src = join(this.options.temp, this.target.version)
-    this.configureScript = configure + (semverGt(this.target.version, '10.10.0') ? '.py' : '')
-    this.nodeSrcBinPath = isWindows
-      ? join(this.src, 'Release', 'node.exe')
-      : join(this.src, 'out', 'Release', 'node')
-    this.log.step('nexe ' + version, 'info')
-    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, content?: Buffer | string) {
-    return this.bundle.addResource(file, content)
-  }
-
-  get binaryConfiguration() {
-    return { resources: this.bundle.index }
-  }
-
-  get resourceSize() {
-    return this.bundle.blobSize
-  }
-
-  @bound
-  async readFileAsync(file: string) {
-    this.assertBuild()
-    let cachedFile = this.files.find(x => normalize(x.filename) === normalize(file))
-    if (!cachedFile) {
-      const absPath = join(this.src, file)
-      cachedFile = {
-        absPath,
-        filename: file,
-        contents: await readFileAsync(absPath, 'utf-8').catch(x => {
-          if (x.code === 'ENOENT') return ''
-          throw x
-        })
+    this.log.step('nexe ' + nexeVersion, 'info')
+    if (python) {
+      if (isWindows) {
+        this.env.PATH = '"' + dequote(normalize(python)) + '";' + this.env.PATH
+      } else {
+        this.env.PYTHON = python
      }
-      this.files.push(cachedFile)
    }
-    return cachedFile
+
+    this.readFileAsync = async (file: string) => {
+      let cachedFile = this.files.find(x => normalize(x.filename) === normalize(file))
+      if (!cachedFile) {
+        const absPath = join(this.src, file)
+        cachedFile = {
+          absPath,
+          filename: file,
+          contents: await readFileAsync(absPath, 'utf-8').catch(x => {
+            if (x.code === 'ENOENT') return ''
+            throw x
+          })
+        }
+        this.files.push(cachedFile)
+      }
+      return cachedFile
+    }
+    this.writeFileAsync = (file, contents) => writeFileAsync(join(this.src, file), contents)
+    this.replaceInFileAsync = async (file, replace: string | RegExp, value: string) => {
+      const entry = await this.readFileAsync(file)
+      entry.contents = entry.contents.replace(replace, value)
+    }
+    this.setFileContentsAsync = async (file: string, contents: string) => {
+      const entry = await this.readFileAsync(file)
+      entry.contents = contents
+    }
  }

-  @bound
-  writeFileAsync(file: string, contents: string | Buffer) {
-    this.assertBuild()
-    return writeFileAsync(join(this.src, file), contents)
-  }
-
-  @bound
-  async replaceInFileAsync(file: string, replace: string | RegExp, value: string | StringReplacer) {
-    const entry = await this.readFileAsync(file)
-    entry.contents = entry.contents.replace(replace, value as any)
-  }
-
-  @bound
-  async setFileContentsAsync(file: string, contents: string) {
-    const entry = await this.readFileAsync(file)
-    entry.contents = contents
-  }
-
-  quit(error?: any) {
+  quit() {
    const time = Date.now() - this.start
-    this.log.write(`Finished in ${time / 1000}s`, error ? 'red' : 'green')
+    this.log.write(`Finsihed in ${time / 1000}s`)
    return this.log.flush()
  }

-  assertBuild() {
-    if (!this.options.build) {
-      throw new NexeError('This feature is only available with `--build`')
-    }
-  }
-
-  public getNodeExecutableLocation(target?: NexeTarget) {
-    if (this.options.asset && !this.options.asset.startsWith('http')) {
-      return resolve(this.options.cwd, this.options.asset)
-    }
+  private _getNodeExecutableLocation(target?: NexeTarget) {
    if (target) {
      return join(this.options.temp, target.toString())
    }
@@ -208,112 +101,110 @@ export class NexeCompiler {
  }

  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: this.log.verbose ? 'inherit' : 'ignore'
+        stdio: 'ignore'
      })
-        .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 NexeError(error))
-          }
-          resolve()
-        })
+        .once('error', reject)
+        .once('close', resolve)
    })
  }

  private _configureAsync() {
-    if (isWindows && semverGt(this.target.version, '10.15.99')) {
-      return Promise.resolve()
-    }
    return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
-      this.configureScript,
+      configure,
      ...this.options.configure
    ])
  }

-  public async build(): Promise<ReadStream> {
-    this.compileStep!.log(
-      `Configuring node build${
-        this.options.configure.length ? ': ' + this.options.configure : '...'
-      }`
+  private async _buildAsync() {
+    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)
-    return createReadStream(this.getNodeExecutableLocation())
+    return createReadStream(this._getNodeExecutableLocation())
  }

-  private async _shouldCompileBinaryAsync(
-    binary: NodeJS.ReadableStream | null,
-    location: string | undefined
-  ) {
-    //SOMEDAY combine make/configure/vcBuild/and modified times of included files
-    const { snapshot, build } = this.options
+  private async _fetchPrebuiltBinaryAsync(target: NexeTarget) {
+    const githubRelease = await getLatestGitRelease()
+    const assetName = target.toString()
+    const asset = githubRelease.assets.find(x => x.name === assetName)

-    if (!binary) {
-      return true
+    if (!asset) {
+      throw new Error(`${assetName} not available, create one using --build`)
    }
+    const filename = this._getNodeExecutableLocation(target)
+    await storeAsset(asset, dirname(filename))
+    return createReadStream(filename)
+  }

-    if (build && snapshot != null && (await pathExistsAsync(snapshot))) {
-      const snapshotLastModified = (await statAsync(snapshot)).mtimeMs
-      const binaryLastModified = (await statAsync(location)).mtimeMs
-      return snapshotLastModified > binaryLastModified
+  private _generateHeader() {
+    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')
    }
+    const serializedHeader = this._serializeHeader(header)
+    return header
+  }

-    return false
+  private _serializeHeader(header: NexeHeader) {
+    return `process.__nexe=${JSON.stringify(header)};`
  }

  async compileAsync(target: NexeTarget) {
    const step = (this.compileStep = this.log.step('Compiling result'))
    const build = this.options.build
-    const location = this.getNodeExecutableLocation(build ? undefined : target)
+    const location = this._getNodeExecutableLocation(target)
    let binary = (await pathExistsAsync(location)) ? createReadStream(location) : null
+    const header = this._generateHeader()

-    if (await this._shouldCompileBinaryAsync(binary, location)) {
-      binary = await this.build()
+    if (target && !build) {
+      binary = await this._fetchPrebuiltBinaryAsync(target)
+    }
+
+    if (!binary) {
+      binary = await this._buildAsync()
      step.log('Node binary compiled')
    }
-    return this._assembleDeliverable(binary!)
+    return this._assembleDeliverable(header, binary)
  }

-  code() {
-    return [this.shims.join(''), this.startup].join(';')
-  }
-
-  private _assembleDeliverable(binary: NodeJS.ReadableStream) {
-    if (!this.options.mangle) {
+  private _assembleDeliverable(header: NexeHeader, binary: NodeJS.ReadableStream) {
+    if (this.options.empty) {
      return binary
    }
-
-    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]))
-    ])
+    const artifact = new Readable({ read() {} })
+    binary.on('data', (chunk: Buffer) => {
+      artifact.push(chunk)
+    })
+    binary.on('close', () => {
+      const content = this._serializeHeader(header) + this.input
+      artifact.push(content)
+      artifact.push(this.resources.bundle)
+      const lengths = Buffer.from(Array(16))
+      lengths.writeDoubleLE(Buffer.byteLength(content), 0)
+      lengths.writeDoubleLE(Buffer.byteLength(this.resources.bundle), 8)
+      artifact.push(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
+      artifact.push(null)
+    })
+    return artifact
  }
 }
@@ -1,40 +0,0 @@
-# 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`
@@ -1,20 +0,0 @@
-if (true) {
-  const __nexe_patches = (process.nexe = { patches: {} }).patches
-  const slice = [].slice
-  const __nexe_noop_patch = function (original) {
-    const args = slice.call(arguments, 1)
-    return original.apply(this, args)
-  }
-  const __nexe_patch = function (obj, method, patch) {
-    const original = obj[method]
-    if (!original) return
-    __nexe_patches[method] = patch
-    obj[method] = function() {
-      const args = [original].concat(slice.call(arguments))
-      return __nexe_patches[method].apply(this, 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)
-}
@@ -1,70 +0,0 @@
-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 !== undefined) {
-      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
-  }
-}
@@ -1,15 +0,0 @@
-{
-  "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"
-}
@@ -1,374 +0,0 @@
-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 lazyRestoreFs = () => {}
-
-function shimFs(binary: NexeBinary, fs: any = require('fs')) {
-  if (originalFsMethods !== null) {
-    return
-  }
-  originalFsMethods = Object.assign({}, fs)
-  const { blobPath, resources: manifest } = binary,
-    { resourceStart, stat } = binary.layout,
-    directories: { [key: string]: { [key: string]: boolean } } = {},
-    notAFile = '!@#$%^&*',
-    isWin = process.platform.startsWith('win'),
-    isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
-    noop = () => {},
-    path = require('path'),
-    baseDir = path.dirname(process.execPath)
-
-  let log = (_: string) => true
-  if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) {
-    log = (text: string) => process.stderr.write('[nexe] - ' + text + '\n')
-  }
-
-  const winPath = (key: string) => {
-    if (isWin && key.substr(1, 2) === ':\\') {
-      key = key[0].toUpperCase() + key.substr(1)
-    }
-    return key
-  }
-
-  const getKey = function getKey(filepath: string | Buffer | null): string {
-    if (Buffer.isBuffer(filepath)) {
-      filepath = filepath.toString()
-    }
-    if (!isString(filepath)) {
-      return notAFile
-    }
-    let key = path.resolve(baseDir, filepath)
-
-    return winPath(key)
-  }
-
-  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(extensions: any) {
-    return Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
-  }
-
-  const ownStat = function(filepath: any) {
-    setupManifest()
-    const key = getKey(filepath)
-    if (directories[key]) {
-      let mode = binary.layout.stat.mode
-      mode |= fs.constants.S_IFDIR
-      mode &= ~fs.constants.S_IFREG
-      return createStat({ mode, size: 0 })
-    }
-    if (manifest[key]) {
-      return createStat({ size: manifest[key][1] })
-    }
-  }
-
-  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 = winPath(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)
-      }
-    })
-    ;(manifest[notAFile] as any) = false
-    ;(directories[notAFile] as any) = false
-    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 (manifest[key]) {
-        return filepath
-      }
-      return originalFsMethods.realpathSync.call(fs, filepath, options)
-    },
-    readdir: function readdir(filepath: string | Buffer, options: any, callback: any) {
-      setupManifest()
-      const dir = directories[getKey(filepath)]
-      if (dir) {
-        if ('function' === typeof options) {
-          callback = options
-          options = { encoding: 'utf8' }
-        }
-        process.nextTick(() => callback(null, Object.keys(dir)))
-      } else {
-        return originalFsMethods.readdir.apply(fs, arguments)
-      }
-    },
-    readdirSync: function readdirSync(filepath: string | Buffer, options: any) {
-      setupManifest()
-      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[getKey(filepath)]
-      if (!entry) {
-        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
-
-      originalFsMethods.open(blobPath, 'r', function(err: Error, fd: number) {
-        if (err) return callback(err, null)
-        originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
-          error: Error,
-          bytesRead: number,
-          result: Buffer
-        ) {
-          if (error) {
-            return originalFsMethods.close(fd, function() {
-              callback(error, null)
-            })
-          }
-          originalFsMethods.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[getKey(filepath)]
-      if (!entry) {
-        return originalFsMethods.createReadStream.apply(fs, arguments)
-      }
-      const [offset, length] = entry
-      const resourceOffset = resourceStart + offset
-      const opts = fileOpts(options)
-
-      return originalFsMethods.createReadStream(
-        blobPath,
-        Object.assign({}, opts, {
-          start: resourceOffset,
-          end: resourceOffset + length - 1
-        })
-      )
-    },
-    readFileSync: function readFileSync(filepath: any, options: any) {
-      setupManifest()
-      const entry = manifest[getKey(filepath)]
-      if (!entry) {
-        return originalFsMethods.readFileSync.apply(fs, arguments)
-      }
-      const [offset, length] = entry
-      const resourceOffset = resourceStart + offset
-      const encoding = fileOpts(options).encoding
-      const fd = originalFsMethods.openSync(process.execPath, 'r')
-      const result = Buffer.alloc(length)
-      originalFsMethods.readSync(fd, result, 0, length, resourceOffset)
-      originalFsMethods.closeSync(fd)
-      return encoding ? result.toString(encoding) : result
-    },
-    statSync: function statSync(filepath: string | Buffer) {
-      const stat = ownStat(filepath)
-      if (stat) {
-        return stat
-      }
-      return originalFsMethods.statSync.apply(fs, arguments)
-    },
-    stat: function stat(filepath: string | Buffer, callback: any) {
-      const stat = 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.internalModuleReadJSON = patches.internalModuleReadFile
-  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))
-    }
-  }
-
-  if (typeof fs.copyFile === 'function') {
-    nfs.copyFile = function(filepath: string, dest: string, flags: number, callback: Function) {
-      setupManifest()
-      const entry = manifest[getKey(filepath)]
-      if (!entry) {
-        return originalFsMethods.copyFile.apply(fs, arguments)
-      }
-      if (typeof flags === 'function') {
-        callback = flags
-        flags = 0
-      }
-      nfs.readFile(filepath, (err: any, buffer: any) => {
-        if (err) {
-          return callback(err)
-        }
-        originalFsMethods.writeFile(dest, buffer, (err: any) => {
-          if (err) {
-            return callback(err)
-          }
-          callback(null)
-        })
-      })
-    }
-    nfs.copyFileSync = function(filepath: string, dest: string) {
-      setupManifest()
-      const entry = manifest[getKey(filepath)]
-      if (!entry) {
-        return originalFsMethods.copyFileSync.apply(fs, arguments)
-      }
-      return originalFsMethods.writeFileSync(dest, nfs.readFileSync(filepath))
-    }
-  }
-
-  Object.assign(fs, nfs)
-
-  lazyRestoreFs = () => {
-    Object.keys(nfs).forEach(key => {
-      fs[key] = originalFsMethods[key]
-    })
-    lazyRestoreFs = () => {}
-  }
-  return true
-}
-
-function restoreFs() {
-  lazyRestoreFs()
-}
-
-export { shimFs, restoreFs }
@@ -1,17 +1,15 @@
-import colors from 'chalk'
-import ora from 'ora'
+import colors = require('chalk')
+import ora = require('ora')

 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 {
-  public verbose: boolean
+  private verbose: boolean
  private silent: boolean
  private ora: any
  private modify: Function
@@ -50,7 +48,7 @@ export class Logger {

  step(text: string, method: string = 'succeed'): LogStep {
    if (this.silent) {
-      return { modify() {}, log() {}, pause() {}, resume() {} }
+      return { modify() {}, log() {} }
    }
    if (!this.ora.id) {
      this.ora.start().text = text
@@ -64,9 +62,7 @@ export class Logger {

    return {
      modify: this.modify,
-      log: this.verbose ? this.write : this.modify,
-      pause: () => this.ora.stopAndPersist(),
-      resume: () => this.ora.start()
+      log: this.verbose ? this.write : this.modify
    } as LogStep
  }
 }
@@ -1,49 +1,49 @@
-import { EOL } from 'os'
-import { compose } from 'app-builder'
-import { NexeCompiler, NexeError } from './compiler'
-import { normalizeOptions, NexeOptions, NexePatch } from './options'
+import { compose, PromiseConfig, Middleware } from 'app-builder'
 import resource from './steps/resource'
-import clean from './steps/clean'
+import { NexeCompiler } from './compiler'
+import {
+  argv,
+  nexeVersion as version,
+  normalizeOptionsAsync,
+  NexeOptions,
+  NexePatch
+} from './options'
 import cli from './steps/cli'
-import bundle from './steps/bundle'
+import bundle from './bundling/fuse'
 import download from './steps/download'
-import shim from './steps/shim'
 import artifacts from './steps/artifacts'
 import patches from './patches'
+import { rimrafAsync } from './util'

 async function compile(
  compilerOptions?: Partial<NexeOptions>,
  callback?: (err: Error | null) => void
 ) {
-  let error = null,
-    options: NexeOptions | null = null,
-    compiler: NexeCompiler | null = null
+  const options = await normalizeOptionsAsync(compilerOptions)
+  const compiler = new NexeCompiler(options)
+  const build = compiler.options.build

-  try {
-    options = normalizeOptions(compilerOptions)
-    compiler = new NexeCompiler(options)
-    await compose(
-      clean,
-      resource,
-      cli,
-      bundle,
-      shim,
-      download,
-      options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
-      options.plugins as NexePatch[]
-    )(compiler)
-  } catch (e) {
-    error = e
+  if (options.clean) {
+    const step = compiler.log.step('Cleaning up nexe build artifacts...')
+    step.log(`Deleting directory and contents at: ${compiler.src}`)
+    await rimrafAsync(compiler.src)
+    step.log(`Deleted directory and contents at: ${compiler.src}`)
+    return compiler.quit()
  }

-  if (error) {
-    compiler && compiler.quit(error)
-    if (callback) return callback(error)
-    return Promise.reject(error)
-  }
-
-  if (callback) callback(null)
+  const buildSteps = build
+    ? [download, artifacts, ...patches, ...(options.patches as NexePatch[])]
+    : []
+  const nexe = compose(resource, bundle, cli, buildSteps)
+  return callback
+    ? void nexe(compiler).then(
+        () => callback && callback(null),
+        (e: Error) => {
+          if (callback) callback(e)
+          else throw e
+        }
+      )
+    : nexe(compiler)
 }

-export { compile, NexeCompiler }
-export { argv, version, NexeOptions, help } from './options'
+export { argv, compile, version }
@@ -1,15 +1,11 @@
 import * as parseArgv from 'minimist'
-import { NexeCompiler, NexeError } from './compiler'
-import { isWindows, STDIN_FLAG } from './util'
-import { basename, extname, join, isAbsolute, resolve } from 'path'
+import { NexeCompiler } from './compiler'
+import { isWindows } from './util'
+import { basename, extname, join, isAbsolute, relative } from 'path'
 import { getTarget, NexeTarget } from './target'
-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
+import { EOL } from 'os'

-export const version = '{{replace:0}}'
+export const nexeVersion = '2.0.0-rc.1'

 export interface NexePatch {
  (compiler: NexeCompiler, next: () => Promise<void>): Promise<void>
@@ -21,9 +17,8 @@ export interface NexeOptions {
  output: string
  targets: (string | NexeTarget)[]
  name: string
-  asset: string
  cwd: string
-  fs: boolean | string[]
+  version: string
  flags: string[]
  configure: string[]
  vcBuild: string[]
@@ -35,21 +30,16 @@ export interface NexeOptions {
  enableNodeCli: boolean
  bundle: boolean | string
  patches: (string | NexePatch)[]
-  plugins: (string | NexePatch)[]
-  native: any
-  mangle: boolean
-  ghToken: string
+  empty: boolean
  sourceUrl?: string
-  enableStdIn?: boolean
  python?: string
  loglevel: 'info' | 'silent' | 'verbose'
  silent?: boolean
-  fakeArgv?: boolean
  verbose?: boolean
  info?: boolean
  ico?: string
-  debugBundle?: boolean
  warmup?: string
+  compress?: boolean
  clean?: boolean
  /**
   * Api Only
@@ -57,82 +47,72 @@ export interface NexeOptions {
  downloadOptions: any
 }

+function padRight(str: string, l: number) {
+  return (str + ' '.repeat(l)).substr(0, l)
+}
+
 const defaults = {
+  version: process.version.slice(1),
  flags: [],
  cwd: process.cwd(),
-  fs: true,
  configure: [],
-  mangle: true,
  make: [],
  targets: [],
  vcBuild: isWindows ? ['nosign', 'release'] : [],
  enableNodeCli: false,
+  compress: false,
  build: false,
  bundle: true,
-  patches: [],
-  plugins: []
+  patches: []
 }
 const alias = {
  i: 'input',
  o: 'output',
-  v: 'version',
  t: 'target',
-  b: 'build',
  n: 'name',
+  v: 'version',
  r: 'resource',
-  a: 'asset',
+  a: 'resource',
  p: 'python',
  f: 'flag',
  c: 'configure',
  m: 'make',
+  s: 'snapshot',
  h: 'help',
-  l: 'loglevel',
-  'fake-argv': 'fakeArgv',
-  'gh-token': 'ghToken'
+  l: 'loglevel'
 }
-const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
-let help = `
-${c.bold('nexe <entry-file> [options]')}
+const argv = parseArgv(process.argv, { alias, default: defaults })
+const help =
+  `
+nexe --help              CLI OPTIONS

-   ${c.underline.bold('Options:')}
+  -b   --build                              -- build from source
+  -i   --input      =index.js               -- application entry point
+  -o   --output     =my-app.exe             -- path to output file
+  -t   --target     =win32-x64-6.10.3       -- *target a prebuilt binary
+  -n   --name       =my-app                 -- main app module name
+  -v   --version    =${padRight(process.version.slice(1), 23)}-- node version
+  -p   --python     =/path/to/python2       -- python executable
+  -f   --flag       ="--expose-gc"          -- *v8 flags to include during compilation
+  -c   --configure  ="--with-dtrace"        -- *pass arguments to the configure step
+  -m   --make       ="--loglevel"           -- *pass arguments to the make/build step
+  -s   --snapshot   =/path/to/snapshot      -- build with warmup snapshot
+  -r   --resource   =./paths/**/*           -- *embed file bytes within the binary
+       --bundle     =./path/to/config       -- pass a module path that exports nexeBundle
+       --temp       =./path/to/temp         -- nexe temp files (for downloads and source builds)
+       --no-bundle                          -- set when input is already bundled
+       --cwd                                -- set the current working directory for the command
+       --ico                                -- file name for alternate icon file (windows)
+       --rc-*                               -- populate rc file options (windows)
+       --clean                              -- force download of sources
+       --enableNodeCli                      -- enable node cli enforcement (blocks app cli)
+       --sourceUrl                          -- pass an alternate source (node.tar.gz) url
+       --silent                             -- disable logging
+       --verbose                            -- set logging to verbose

-  -i   --input                      -- application entry point
-  -o   --output                     -- path to output file
-  -t   --target                     -- node version description
-  -n   --name                       -- main app module name
-  -r   --resource                   -- *embed files (glob) within the binary
-  -a   --asset                      -- alternate asset path, file or url pointing to a base (nexe) binary
-       --plugin                     -- extend nexe runtime behavior
+       -* variable key name                 * option can be used more than once`.trim() + EOL

-   ${c.underline.bold('Building from source:')}
-
-  -b   --build                      -- build from source
-  -p   --python                     -- python2 (as python) executable path
-  -f   --flag                       -- *v8 flags to include during compilation
-  -c   --configure                  -- *arguments to the configure step
-  -m   --make                       -- *arguments to the make/build step
-       --patch                      -- module with middleware default export for adding a build patch
-       --no-mangle                  -- used when generating base binaries, or when patching _third_party_main manually.
-       --snapshot                   -- path to a warmup snapshot
-       --ico                        -- file name for alternate icon file (windows)
-       --rc-*                       -- populate rc file options (windows)
-       --sourceUrl                  -- pass an alternate source (node.tar.gz) url
-       --enableNodeCli              -- enable node cli enforcement (blocks app cli)
-
-   ${c.underline.bold('Other options:')}
-
-       --bundle                     -- custom bundling module with 'createBundle' export
-       --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
-       --silent                     -- disable logging
-       --verbose                    -- set logging to verbose
-
-       -* variable key name         * option can be used more than once`.trim()
-help = EOL + help + EOL
-
-function flatten(...args: any[]): string[] {
+function flattenFilter(...args: any[]): string[] {
  return ([] as string[]).concat(...args).filter(x => x)
 }

@@ -145,15 +125,22 @@ function flatten(...args: any[]): string[] {
 function extractCliMap(match: RegExp, options: any) {
  return Object.keys(options)
    .filter(x => match.test(x))
-    .reduce(
-      (map: any, option: any) => {
-        const key = option.split('-')[1]
-        map[key] = options[option]
-        delete options[option]
-        return map
-      },
-      {} as any
-    )
+    .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 === 'index' ? 'nexe_' + Date.now() : filename
 }

 function extractLogLevel(options: NexeOptions) {
@@ -163,139 +150,84 @@ function extractLogLevel(options: NexeOptions) {
  return 'info'
 }

-function isName(name: string) {
-  return name && name !== 'index' && name !== STDIN_FLAG
-}
-
 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') {
+  if (!name && typeof options.input === 'string') {
    name = basename(options.input).replace(extname(options.input), '')
  }
-  //try and use the directory as the filename
-  if (!isName(name) && basename(options.cwd)) {
-    name = basename(options.cwd)
-  }
-
+  name = name || tryResolveMainFileName(options.cwd)
  return name.replace(/\.exe$/, '')
 }

-function padRelative(input: string) {
-  let prefix = ''
-  if (!input.startsWith('.')) {
-    prefix = './'
-  }
-  return prefix + input
+function isEntryFile(filename: string) {
+  return filename && !isAbsolute(filename) && filename !== 'node' && /\.(tsx?|jsx?)$/.test(filename)
 }

-function isEntryFile(filename?: string): filename is string {
-  return Boolean(filename && !isAbsolute(filename))
-}
-
-export function resolveEntry(
-  input: string,
-  cwd: string,
-  maybeEntry: string | undefined,
-  bundle: boolean | string
-) {
-  let result = null
-  if (input === '-' || maybeEntry === '-') {
-    return STDIN_FLAG
-  }
-  if (input && isAbsolute(input)) {
+function findInput(input: string, cwd: string) {
+  const maybeInput = argv._.slice().pop() || ''
+  if (input) {
    return input
  }
-  if (input) {
-    const inputPath = padRelative(input)
-    result = resolveFileNameSync(cwd, inputPath)
+  if (isEntryFile(maybeInput)) {
+    return maybeInput
  }
-  if (isEntryFile(maybeEntry) && (!result || !result.absPath)) {
-    const inputPath = padRelative(maybeEntry)
-    result = resolveFileNameSync(cwd, inputPath)
+  try {
+    const main = require.resolve(cwd)
+    return './' + relative(cwd, main)
+  } catch (e) {
+    void e
  }
-  if (!process.stdin.isTTY && (!result || !result.absPath) && bundle === defaults.bundle) {
-    return STDIN_FLAG
-  }
-  if (!result || !result.absPath) {
-    result = resolveFileNameSync(cwd, '.')
-  }
-  if (!result.absPath) {
-    throw new NexeError(`Entry file "${input || ''}" not found!`)
-  }
-  return result.absPath
+
+  return ''
 }

-function isCli(options?: Partial<NexeOptions>) {
-  return argv === options
-}
-
-function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
+function normalizeOptionsAsync(input?: Partial<NexeOptions>): Promise<NexeOptions | never> {
+  if (argv.help || argv._.some((x: string) => x === 'version') || argv.version === true) {
+    return new Promise(() => {
+      process.stderr.write(argv.help ? help : nexeVersion + EOL, () => process.exit(0))
+    })
+  }
  const options = Object.assign({}, defaults, input) as NexeOptions
  const opts = options as any
-  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.bundle)
-  options.enableStdIn = isCli(input) && options.input === STDIN_FLAG
+
+  options.temp = process.env.NEXE_TEMP || join(options.cwd, '.nexe')
  options.name = extractName(options)
+  options.input = findInput(options.input, options.cwd)
  options.loglevel = extractLogLevel(options)
-  options.flags = flatten(opts.flag, options.flags)
-  options.targets = flatten(opts.target, options.targets).map(getTarget)
-  if (!options.targets.length) {
-    options.targets.push(getTarget())
-  }
-  options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || ''
-  options.make = flatten(isWindows ? 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.flags = flattenFilter(opts.flag, options.flags)
+  options.targets = flattenFilter(opts.target, options.targets)
+  options.make = flattenFilter(options.vcBuild, options.make)
+  options.configure = flattenFilter(options.configure)
+  options.resources = flattenFilter(opts.resource, options.resources)
  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)

-  const requireDefault = (x: string) => {
-    if (typeof x === 'string') {
-      return require(x).default
-    }
-    return x
-  }
+  options.targets = options.targets.map(getTarget)

-  options.mangle = 'mangle' in opts ? opts.mangle : true
-  options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault)
-  options.patches = flatten(opts.patch, options.patches).map(requireDefault)
-
-  if ((!options.mangle && !options.bundle) || options.patches.length) {
-    options.build = true
-  }
-
-  if (options.build) {
+  if (options.build && options.targets.length) {
    const { arch } = options.targets[0] as NexeTarget
    if (isWindows) {
-      options.make = Array.from(new Set(options.make.concat(arch)))
+      options.make = Array.from(new Set(options.make.concat([arch])))
    } else {
      options.configure = Array.from(new Set(options.configure.concat([`--dest-cpu=${arch}`])))
    }
  }

+  if (!options.targets.length) {
+    options.targets = [getTarget(options.version)]
+  }
+
+  options.patches = options.patches.map(x => {
+    if (typeof x === 'string') {
+      return require(x).default
+    }
+    return x
+  })
+
  Object.keys(alias)
    .filter(k => k !== 'rc')
    .forEach(x => delete opts[x])

-  return options
+  return Promise.resolve(options)
 }

-export { argv, normalizeOptions, help }
+export { argv, normalizeOptionsAsync }
@@ -1,57 +0,0 @@
-const fs = require('fs'),
-  fd = fs.openSync(process.execPath, 'r'),
-  stat = fs.statSync(process.execPath),
-  tailSize = Math.min(stat.size, 16000),
-  tailWindow = Buffer.from(Array(tailSize))
-
-fs.readSync(fd, tailWindow, 0, tailSize, stat.size - tailSize)
-
-const footerPosition = tailWindow.indexOf('<nexe~~sentinel>')
-if (footerPosition == -1) {
-  throw 'Invalid Nexe binary'
-}
-
-const footer = tailWindow.slice(footerPosition, footerPosition + 32),
-  contentSize = footer.readDoubleLE(16),
-  resourceSize = footer.readDoubleLE(24),
-  contentStart = stat.size - tailSize + footerPosition - resourceSize - contentSize,
-  resourceStart = contentStart + contentSize
-
-Object.defineProperty(
-  process,
-  '__nexe',
-  (function() {
-    let nexeHeader: any = null
-    return {
-      get: function() {
-        return nexeHeader
-      },
-      set: function(value: any) {
-        if (nexeHeader) {
-          throw new Error('This property is readonly')
-        }
-        nexeHeader = Object.assign({}, value, {
-          blobPath: process.execPath,
-          layout: {
-            stat,
-            contentSize,
-            contentStart,
-            resourceSize,
-            resourceStart
-          }
-        })
-        Object.freeze(nexeHeader)
-      },
-      enumerable: false,
-      configurable: false
-    }
-  })()
-)
-
-const contentBuffer = Buffer.from(Array(contentSize)),
-  Module = require('module')
-
-fs.readSync(fd, contentBuffer, 0, contentSize, contentStart)
-fs.closeSync(fd)
-
-new Module(process.execPath, null)._compile(contentBuffer.toString(), process.execPath)
@@ -1,7 +1,7 @@
 import { NexeCompiler } from '../compiler'

 export default async function buildFixes(compiler: NexeCompiler, next: () => Promise<void>) {
-  if (!compiler.target.version.startsWith('8.2')) {
+  if (!compiler.options.version.startsWith('8.2')) {
    return next()
  }

@@ -1,44 +1,12 @@
 import { NexeCompiler } from '../compiler'
-import { semverGt } from '../util'

 export default async function disableNodeCli(compiler: NexeCompiler, next: () => Promise<void>) {
  if (compiler.options.enableNodeCli) {
    return next()
  }

-  if (semverGt(compiler.target.version, '11.6.0')) {
-    await compiler.replaceInFileAsync(
-      'src/node.cc',
-      /(?<!int )ProcessGlobalArgs\(/g,
-      '0;//ProcessGlobalArgs('
-    )
-  } else if (semverGt(compiler.target.version, '10.9')) {
-    await compiler.replaceInFileAsync('src/node.cc', /(?<!void )ProcessArgv\(/g, '//ProcessArgv(')
-  } else if (semverGt(compiler.target.version, '9.999')) {
-    await compiler.replaceInFileAsync(
-      'src/node.cc',
-      'int i = 1; i < v8_argc; i++',
-      'int i = v8_argc; i < v8_argc; i++'
-    )
-    let matches = 0
-    await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, match => {
-      if (matches++) {
-        return 'false'
-      }
-      return match
-    })
-  } else {
-    const nodeccMarker = 'argv[index][0] =='
-
-    await compiler.replaceInFileAsync(
-      'src/node.cc',
-      `${nodeccMarker} '-'`,
-      // allow NODE_OPTIONS, introduced in 8.0
-      semverGt(compiler.target.version, '7.99')
-        ? `(${nodeccMarker} (is_env ? '-' : ']'))`
-        : `(${nodeccMarker} ']')`
-    )
-  }
+  const nodeccMarker = "argv[index][0] == '-'"

+  await compiler.replaceInFileAsync('src/node.cc', nodeccMarker, nodeccMarker.replace('-', ']'))
  return next()
 }
@@ -1,12 +1,12 @@
 import gyp from './gyp'
-import bootNexe from './third-party-main'
+import nexePatches 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 snapshot from './snapshot'
+import { NexeCompiler } from '../compiler'

-const patches = [gyp, bootNexe, buildFixes, cli, flags, ico, rc, snapshot]
+const patches = [gyp, nexePatches, buildFixes, cli, flags, ico, rc]

 export default patches
@@ -12,15 +12,7 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise
    let value = options[key]
    const isVar = /^[A-Z_]+$/.test(value)
    value = isVar ? value : `"${value}"`
-    file.contents = file.contents.replace(
-      new RegExp(`VALUE "${key}",.*`),
-      `VALUE "${key}", ${value}`
-    )
-  })
-  ;['PRODUCTVERSION', 'FILEVERSION'].forEach(x => {
-    if (options[x]) {
-      file.contents = file.contents.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
-    }
+    file.contents.replace(new RegExp(`VALUE "${key}",*`), `VALUE "${key}", ${value}`)
  })

  return next()
@@ -1,26 +1,18 @@
-import { resolve } from 'path'
 import { NexeCompiler } from '../compiler'
-import { semverGt } from '../util'

-export default async function(compiler: NexeCompiler, next: () => Promise<void>) {
-  const { snapshot, warmup, cwd } = compiler.options
+export default async function snapshot(compiler: NexeCompiler, next: () => Promise<void>) {
+  const snapshotFile = compiler.options.snapshot
+  const warmupScript = compiler.options.warmup

-  if (!snapshot) {
+  if (!snapshotFile) {
    return next()
  }

-  const variablePrefix = semverGt(compiler.target.version, '11.0.0') ? 'v8_' : ''
-
  await compiler.replaceInFileAsync(
-    compiler.configureScript,
+    'configure',
    'def configure_v8(o):',
-    `def configure_v8(o):\n  o['variables']['${variablePrefix}embed_script'] = r'${resolve(
-      cwd,
-      snapshot
-    )}'\n  o['variables']['${variablePrefix}warmup_script'] = r'${resolve(
-      cwd,
-      warmup || snapshot
-    )}'`
+    `def configure_v8(o):\n  o['variables']['embed_script'] = '${snapshotFile}'\n  o['variables']['warmup_script'] = '${warmupScript ||
+      snapshotFile}'`
  )

  return next()
@@ -1,86 +1,126 @@
 import { NexeCompiler } from '../compiler'
-import { parse } from 'cherow'
-import { wrap, semverGt } from '../util'
-
-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
-}
+import { readFileSync } from 'fs'
+import { join } from 'path'

 export default async function main(compiler: NexeCompiler, next: () => Promise<void>) {
-  let bootFile = 'lib/internal/bootstrap_node.js'
-  const { version } = compiler.target
+  await compiler.setFileContentsAsync(
+    'lib/_third_party_main.js',
+    `
+const fs = require('fs')
+const path = require('path')
+const Buffer = require('buffer').Buffer
+const isString = x => typeof x === 'string' || x instanceof String

-  if (version.startsWith('4.')) {
-    bootFile = 'src/node.js'
-  } else if (semverGt(version, '11.99')) {
-    bootFile = 'lib/internal/bootstrap/pre_execution.js'
-  } else if (semverGt(version, '9.10.1')) {
-    bootFile = 'lib/internal/bootstrap/node.js'
+const fd = fs.openSync(process.execPath, 'r')
+const size = fs.statSync(process.execPath).size
+const footer = Buffer.from(Array(32))
+fs.readSync(fd, footer, 0, 32, size - 32)
+
+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 = size - 32 - resourceSize - contentSize
+const resourceStart = contentStart + contentSize
+
+Object.defineProperty(process, '__nexe', (function () {
+  let nexeHeader = null
+  return {
+    get: function () {
+      return nexeHeader
+    },
+    set: function (value) {
+      if (nexeHeader) {
+        throw new Error('__nexe cannot be reconfigured')
+      }
+      nexeHeader = value
+      Object.freeze(nexeHeader)
+    },
+    enumerable: false,
+    configurable: false
  }
+})());

-  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
+if (resourceSize) {
+  const originalReadFile = fs.readFile
+  const originalReadFileSync = fs.readFileSync
+  let setupManifest = () => {
+    const manifest = process.__nexe && process.__nexe.resources
+    if (!manifest) {
+      return
    }
-  })
+    Object.keys(manifest).forEach((key) => {
+      const absolutePath = path.resolve(key)
+      if (!manifest[absolutePath]) {
+        manifest[absolutePath] = manifest[key]
+      }
+      const normalizedPath = path.normalize(key)
+      if (!manifest[normalizedPath]) {
+        manifest[normalizedPath] = manifest[key]
+      }
+    })
+    normalizeManifest = () => {}
+  };
+  fs.readFile = function readFile (file, options, callback) {
+    setupManifest()
+    const manifest = process.__nexe
+    const entry = manifest && manifest.resources[file]
+    if (!manifest || !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

-  const fileLines = file.contents.split('\n')
-  fileLines.splice(
-    location.start.line,
-    0,
-    '{{replace:lib/fs/bootstrap.js}}' +
-      '\n' +
-      (semverGt(version, '11.99') ? 'expandArgv1 = false;\n' : '')
-  )
-  file.contents = fileLines.join('\n')
-
-  if (semverGt(version, '11.99')) {
-    await compiler.replaceInFileAsync(
-      bootFile,
-      'initializePolicy();',
-      'initializePolicy();\n' + wrap('{{replace:lib/patches/boot-nexe.js}}')
-    )
-    await compiler.replaceInFileAsync(
-      'src/node.cc',
-      'MaybeLocal<Value> StartMainThreadExecution(Environment* env) {',
-      'MaybeLocal<Value> StartMainThreadExecution(Environment* env) {\n' +
-        '  return StartExecution(env, "internal/main/run_main_module");\n'
-    )
-  } else {
-    await compiler.setFileContentsAsync(
-      'lib/_third_party_main.js',
-      '{{replace:lib/patches/boot-nexe.js}}'
-    )
+    fs.open(process.execPath, 'r', function (err, fd) {
+      if (err) return callback(err, null)
+      fs.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function (error, bytesRead, buffer) {
+        if (error) {
+          return fs.close(fd, function () {
+            callback(error, null)
+          })
+        }
+        fs.close(fd, function (err) {
+          if (err) {
+            return callback(err, buffer)
+          }
+          const result = Buffer.from(buffer.toString(), 'base64')
+          callback(err, encoding ? result.toString(encoding) : result)
+        })
+      })
+    })
  }
+
+  fs.readFileSync = function readFileSync (file, options) {
+    setupManifest()
+    const manifest = process.__nexe
+    const entry = manifest && manifest.resources[file]
+    if (!manifest || !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)
+    const contents = Buffer.from(result.toString(), 'base64')
+    return encoding ? contents.toString(encoding) : contents
+  }
+}
+
+const contentBuffer = Buffer.from(Array(contentSize));
+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._compile(contentBuffer.toString(), process.execPath);
+`.trim()
+  )
  return next()
 }
@@ -1,8 +1,16 @@
 import got = require('got')
-import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
+import download = require('download')
+import {
+  NodePlatform,
+  NodeArch,
+  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
@@ -24,15 +32,21 @@ 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 = Number(version.split('.')[0])
-  return !versionsToSkip.includes(major) || version === '4.8.4'
+  const major = +version.split('.')[0]
+  return !~[0, 1, 2, 3, 4, 5, 7].indexOf(major) || version === '4.8.4'
 }

 export function getLatestGitRelease(options?: any) {
  return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/latest', options)
 }

+export async function storeAsset(asset: GitAsset, dest: string, headers?: any) {
+  const options = headers ? { headers } : undefined
+  await download(asset.browser_download_url, dest, options as any)
+}
+
 export async function getUnBuiltReleases(options?: any) {
  const nodeReleases = await getJson<NodeRelease[]>(
    'https://nodejs.org/download/release/index.json'
@@ -50,7 +64,6 @@ export async function getUnBuiltReleases(options?: any) {
      platforms.forEach(platform => {
        architectures.forEach(arch => {
          if (arch === 'x86' && platform === 'mac') return
-          if (arch.includes('arm')) return
          versions.push(getTarget({ platform, arch, version }))
        })
      })
@@ -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,6 +39,7 @@ 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
@@ -1,81 +0,0 @@
-import { NexeCompiler, NexeError } from '../compiler'
-import { resolve, relative } from 'path'
-import { each } from '@calebboyd/semaphore'
-import resolveFiles, { resolveFileNameSync } from 'resolve-dependencies'
-import { dequote, STDIN_FLAG, semverGt } from '../util'
-import { Readable } from 'stream'
-
-function getStdIn(stdin: Readable): Promise<string> {
-  let out = ''
-  return new Promise(resolve => {
-    stdin
-      .setEncoding('utf8')
-      .on('readable', () => {
-        let current
-        while ((current = stdin.read())) {
-          out += current
-        }
-      })
-      .on('end', () => resolve(out.trim()))
-    setTimeout(() => {
-      if (!out.trim()) {
-        resolve(out.trim())
-      }
-    }, 1000)
-  })
-}
-
-export default async function bundle(compiler: NexeCompiler, next: any) {
-  const { bundle, cwd, input: inputPath } = compiler.options
-  let input = inputPath
-  compiler.entrypoint = './' + relative(cwd, input)
-
-  if (semverGt(compiler.target.version, '11.99')) {
-    compiler.startup = ''
-  } else {
-    compiler.startup = ';require("module").runMain();'
-  }
-
-  if (!bundle) {
-    await compiler.addResource(resolve(cwd, input))
-    return next()
-  }
-
-  let code = ''
-  if (typeof bundle === 'string') {
-    code = await require(bundle).createBundle(compiler.options)
-  }
-
-  if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) {
-    compiler.stdinUsed = true
-    compiler.entrypoint = './__nexe_stdin.js'
-    await compiler.addResource(resolve(cwd, compiler.entrypoint), code)
-    return next()
-  }
-
-  if (input === STDIN_FLAG) {
-    const maybeInput = resolveFileNameSync(cwd, '.')
-    if (!maybeInput || !maybeInput.absPath) {
-      throw new NexeError('No valid input detected')
-    }
-    input = maybeInput.absPath
-    compiler.entrypoint = './' + relative(cwd, input)
-  }
-
-  const { files, warnings } = await resolveFiles(
-    input,
-    ...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
-    { cwd, expand: true, loadContent: false }
-  )
-
-  if (
-    warnings.filter(x => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
-  ) {
-    throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
-  }
-
-  await each(Object.keys(files), (filename: string) => compiler.addResource(filename), {
-    concurrency: 10
-  })
-  return next()
-}
@@ -1,19 +0,0 @@
-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()
-}
@@ -1,9 +1,21 @@
-import { dirname, normalize, relative, resolve } from 'path'
-import { createWriteStream, chmodSync, statSync } from 'fs'
+import { normalize } from 'path'
+import { Readable } from 'stream'
+import { createWriteStream, chmodSync } from 'fs'
+import { readFileAsync, dequote, isWindows } from '../util'
 import { NexeCompiler } from '../compiler'
 import { NexeTarget } from '../target'
-import { STDIN_FLAG } from '../util'
-import mkdirp = require('mkdirp')
+
+function readStreamAsync(stream: NodeJS.ReadableStream): PromiseLike<string> {
+  return new Promise(resolve => {
+    let input = ''
+    stream.setEncoding('utf-8')
+    stream.on('data', (x: string) => {
+      input += x
+    })
+    stream.once('end', () => resolve(dequote(input)))
+    stream.resume && stream.resume()
+  })
+}

 /**
 * The "cli" step detects the appropriate input. If no input options are passed,
@@ -11,48 +23,44 @@ import mkdirp = require('mkdirp')
 * After all the build steps have run, the output (the executable) is written to a file or piped to stdout.
 *
 * Configuration:
+ *   - compiler.options.input - file path to the input bundle.
+ *     - fallbacks: stdin, package.json#main
+ *   - compiler.options.output - file path to the output executable.
+ *     - fallbacks: stdout, nexe_ + epoch + ext
 *
 * @param {*} compiler
 * @param {*} next
 */
 export default async function cli(compiler: NexeCompiler, next: () => Promise<void>) {
+  const { output } = compiler.options
+  const { log, input: bundledInput } = compiler
+
+  if (!process.stdin.isTTY) {
+    log.step('Using stdin as input')
+    compiler.input = await readStreamAsync(process.stdin)
+  }
+
  await next()
-  const { log } = compiler,
-    target = compiler.options.targets.shift() as NexeTarget,
-    deliverable = await compiler.compileAsync(target),
-    output = normalize(compiler.output!)

-  mkdirp.sync(dirname(output))
+  compiler.output = isWindows
+    ? `${(output || compiler.options.name).replace(/\.exe$/, '')}.exe`
+    : `${output || compiler.options.name}`

-  return new Promise((res, rej) => {
+  const target = compiler.options.targets.shift() as NexeTarget
+  const deliverable = await compiler.compileAsync(target)
+
+  return new Promise((resolve, reject) => {
    const step = log.step('Writing result to file')
    deliverable
-      .pipe(createWriteStream(output))
-      .on('error', rej)
+      .pipe(createWriteStream(normalize(compiler.output!)))
+      .on('error', reject)
      .once('close', (e: Error) => {
        if (e) {
-          rej(e)
+          reject(e)
        } else if (compiler.output) {
-          const output = compiler.output,
-            mode = statSync(output).mode | 0o111,
-            inputFileLogOutput = relative(
-              process.cwd(),
-              resolve(compiler.options.cwd, compiler.entrypoint || compiler.options.input)
-            ),
-            outputFileLogOutput = relative(process.cwd(), output)
-
-          chmodSync(output, mode.toString(8).slice(-3))
-          step.log(
-            `Entry: '${
-              compiler.stdinUsed
-                ? compiler.options.mangle
-                  ? STDIN_FLAG
-                  : '[none]'
-                : inputFileLogOutput
-            }' written to: ${outputFileLogOutput}`
-          )
-          compiler.quit()
-          res(output)
+          chmodSync(compiler.output, '755')
+          step.log(`Executable written to: ${compiler.output}`)
+          resolve(compiler.quit())
        }
      })
  })
@@ -2,8 +2,7 @@ import download = require('download')
 import { pathExistsAsync } from '../util'
 import { LogStep } from '../logger'
 import { IncomingMessage } from 'http'
-import { NexeCompiler, NexeError } from '../compiler'
-import { dirname } from 'path'
+import { NexeCompiler } from '../compiler'

 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...')
        }
@@ -22,56 +21,23 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
    .then(() => step.log(`Node source extracted to: ${dest}`))
 }

-async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) {
-  const { target, remoteAsset } = compiler,
-    filename = compiler.getNodeExecutableLocation(target)
-
-  try {
-    await download(remoteAsset, dirname(filename), compiler.options.downloadOptions).on(
-      'response',
-      (res: IncomingMessage) => {
-        const total = +res.headers['content-length']!
-        let current = 0
-        res.on('data', data => {
-          current += data.length
-          step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
-        })
-      }
-    )
-  } catch (e) {
-    if (e.statusCode === 404) {
-      throw new NexeError(`${remoteAsset} is not available, create it using the --build flag`)
-    } else {
-      throw new NexeError('Error downloading prebuilt binary: ' + e)
-    }
-  }
-}
-
 /**
 * Downloads the node source to the configured temporary directory
 * @param {*} compiler
 * @param {*} next
 */
 export default async function downloadNode(compiler: NexeCompiler, next: () => Promise<void>) {
-  const { src, log, target } = compiler,
-    { version } = target,
-    { sourceUrl, downloadOptions, build } = compiler.options,
-    url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`,
-    step = log.step(
-      `Downloading ${build ? '' : 'pre-built '}Node.js${build ? `source from: ${url}` : ''}`
-    ),
-    exeLocation = compiler.getNodeExecutableLocation(build ? undefined : target),
-    downloadExists = await pathExistsAsync(build ? src : exeLocation)
-
-  if (downloadExists) {
-    step.log('Already downloaded...')
+  const { src, log } = compiler
+  const { version, 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}`)
+  if (await pathExistsAsync(src)) {
+    step.log('Source already downloaded')
    return next()
  }

-  if (build) {
+  if (compiler.options.build) {
    await fetchNodeSourceAsync(src, url, step, downloadOptions)
-  } else {
-    await fetchPrebuiltBinary(compiler, step)
  }

  return next()
@@ -1,22 +1,32 @@
-import { isDirectoryAsync, each } from '../util'
-import globs from 'globby'
+import { readFileAsync, isDirectoryAsync, each } from '../util'
+import { Buffer } from 'buffer'
+import * as globs from 'globby'
 import { NexeCompiler } from '../compiler'

-export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
-  const { cwd } = compiler.options
+export default async function resource(compiler: NexeCompiler, next: () => Promise<void>) {
+  const resources = compiler.resources
+
  if (!compiler.options.resources.length) {
    return next()
  }
  const step = compiler.log.step('Bundling Resources...')
  let count = 0
-  await each(globs(compiler.options.resources, { cwd }), async file => {
+  await each(globs(compiler.options.resources), async file => {
    if (await isDirectoryAsync(file)) {
      return
    }
    count++
    step.log(`Including file: ${file}`)
-    await compiler.addResource(file)
+    const contents = await readFileAsync(file)
+    const commentSafeContents = contents.toString('base64')
+    resources.index[file] = [
+      Buffer.byteLength(resources.bundle),
+      Buffer.byteLength(commentSafeContents)
+    ]
+    resources.bundle += commentSafeContents
  })
-  step.log(`Included ${count} file(s). ${(compiler.resourceSize / 1e6).toFixed(3)} MB`)
+  step.log(
+    `Included ${count} file(s). ${(Buffer.byteLength(resources.bundle) / 1e6).toFixed(3)} MB`
+  )
  return next()
 }
@@ -1,37 +0,0 @@
-import { NexeCompiler } from '../compiler'
-import { wrap } from '../util'
-
-export default function(compiler: NexeCompiler, next: () => Promise<void>) {
-  compiler.shims.push(
-    wrap(
-      `process.__nexe = ${JSON.stringify(compiler.binaryConfiguration)};\n` +
-        '{{replace:lib/fs/patch.js}}' +
-        '\nshimFs(process.__nexe)' +
-        `\n${compiler.options.fs ? '' : 'restoreFs()'}`
-      //TODO support only restoring specific methods
-    )
-  )
-  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) {
-        const path = require('path')
-        const entry = path.resolve(path.dirname(process.execPath),${JSON.stringify(
-          compiler.entrypoint
-        )})
-        process.argv.splice(1,0, entry)
-      }
-    `)
-  )
-
-  return next()
-}
@@ -1,21 +1,21 @@
 export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux'
-export type NodeArch = 'x86' | 'x64' | 'arm7l' | 'arm6l' | 'arm64'
+export type NodeArch = 'x86' | 'x64'

 const platforms: NodePlatform[] = ['windows', 'mac', 'alpine', 'linux'],
-  architectures: NodeArch[] = ['x86', 'x64', 'arm7l', 'arm6l', 'arm64']
+  architectures: NodeArch[] = ['x86', 'x64']

 export { platforms, architectures }

 export interface NexeTarget {
  version: string
-  platform: NodePlatform | string
-  arch: NodeArch | string
+  platform: NodePlatform
+  arch: NodeArch
 }

+//TODO bsd
 const prettyPlatform: { [key: string]: NodePlatform } = {
  win32: 'windows',
  windows: 'windows',
-  win: 'windows',
  darwin: 'mac',
  macos: 'mac',
  mac: 'mac',
@@ -24,15 +24,9 @@ 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'
@@ -42,7 +36,7 @@ function isVersion(x: string) {
  if (!x) {
    return false
  }
-  return /^[\d]+$/.test(x.replace(/v|\.|\s+/g, ''))
+  return /\d/.test(x.replace(/v|\./g, ''))
 }

 function isPlatform(x: string): x is NodePlatform {
@@ -67,9 +61,8 @@ export function targetsEqual(a: NexeTarget, b: NexeTarget) {
  return a.arch === b.arch && a.platform === b.platform && a.version === b.version
 }

-export function getTarget(target: string | Partial<NexeTarget> = ''): NexeTarget {
-  const currentArch = process.arch
-  let arch = currentArch in prettyArch ? prettyArch[process.arch] : (process.arch as NodeArch),
+export function getTarget(target: string | NexeTarget = ''): NexeTarget {
+  let arch = process.arch as NodeArch,
    platform = prettyPlatform[process.platform],
    version = process.version.slice(1)

@@ -82,7 +75,7 @@ export function getTarget(target: string | Partial<NexeTarget> = ''): NexeTarget
    .split('-')
    .forEach(x => {
      if (isVersion(x)) {
-        version = x.replace(/v/g, '')
+        version = x
      }
      if (isPlatform(x)) {
        platform = prettyPlatform[x]
@@ -3,8 +3,8 @@ declare module 'got' {
    (url: string, options?: any): Promise<{ body: string }>
    stream(url: string, optoins?: any): any
  }
-  const got: GotFn
-  export = got
+  function got(url: string, options?: any): Promise<{ body: string }>
+  export = got as GotFn
 }
 declare module 'download' {
  import { Duplex } from 'stream'
@@ -4,18 +4,15 @@ import pify = require('pify')
 import rimraf = require('rimraf')

 const rimrafAsync = pify(rimraf)
-export const STDIN_FLAG = '[stdin]'

 export async function each<T>(
  list: T[] | Promise<T[]>,
  action: (item: T, index: number, list: T[]) => Promise<any>
 ) {
  const l = await list
-  return Promise.all(l.map(action))
-}
-
-export function wrap(code: string) {
-  return '!(function () {' + code + '})();'
+  for (let i = 0; i < l.length; i++) {
+    await action(l[i], i, l)
+  }
 }

 function falseOnEnoent(e: any) {
@@ -25,30 +22,6 @@ function falseOnEnoent(e: any) {
  throw e
 }

-function padRight(str: string, l: number) {
-  return (str + ' '.repeat(l)).substr(0, l)
-}
-
-const bound: MethodDecorator = function bound<T>(
-  target: Object,
-  propertyKey: string | Symbol,
-  descriptor: TypedPropertyDescriptor<T>
-) {
-  const configurable = true
-  return {
-    configurable,
-    get(this: T) {
-      const value = (descriptor.value as any).bind(this)
-      Object.defineProperty(this, propertyKey as string, {
-        configurable,
-        value,
-        writable: true
-      })
-      return value
-    }
-  }
-}
-
 function dequote(input: string) {
  input = input.trim()
  const singleQuote = input.startsWith("'") && input.endsWith("'")
@@ -81,27 +54,9 @@ function isDirectoryAsync(path: string) {
    .then(x => x.isDirectory())
    .catch(falseOnEnoent)
 }
-/**
- * @param version See if this version is greather than the second one
- * @param operand Version to compare against
- */
-function semverGt(version: string, operand: string) {
-  const [cMajor, cMinor, cPatch] = version.split('.').map(Number)
-  let [major, minor, patch] = operand.split('.').map(Number)
-  if (!minor) minor = 0
-  if (!patch) patch = 0
-  return (
-    cMajor > major ||
-    (cMajor === major && cMinor > minor) ||
-    (cMajor === major && cMinor === minor && cPatch > patch)
-  )
-}

 export {
  dequote,
-  padRight,
-  semverGt,
-  bound,
  isWindows,
  rimrafAsync,
  statAsync,
@@ -1,21 +1,24 @@
-import * as nexe from '../lib/nexe'
-import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
-import { runDockerBuild } from './docker'
-import { getTarget, targetsEqual, NexeTarget } from '../lib/target'
-import { pathExistsAsync, readFileAsync, execFileAsync, semverGt } from '../lib/util'
+import * as nexe from '../src/nexe'
+import {
+  getUnBuiltReleases,
+  getLatestGitRelease
+} from '../src/releases'
+import * as ci from './ci'
+import { runAlpineBuild } from './docker'
+import { getTarget } from '../src/target'
+import { pathExistsAsync, statAsync, readFileAsync, execFileAsync } from '../src/util'
 import got = require('got')
-import { cpus } from 'os'

 const env = process.env,
-  isPullRequest = env.BUILD_REASON === 'PullRequest',
-  isWindows = process.platform === 'win32',
-  isLinux = process.platform === 'linux',
-  buildHost = env.AGENT_JOBNAME || (isWindows && 'windows_2017_2015') || '',
-  isMac = process.platform === 'darwin',
-  headers = {
-    Authorization: 'token ' + env.GITHUB_TOKEN,
-    'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
-  }
+  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 }

 if (require.main === module) {
  if (!isPullRequest) {
@@ -26,87 +29,69 @@ if (require.main === module) {
  }
 }

-async function build() {
-  const releases = await getUnBuiltReleases({ headers })
-  if (!releases.length) {
-    return
-  }
-  const windowsBuild = releases.find(x => x.platform === 'windows'),
-    macBuild = releases.find(x => x.platform === 'mac'),
-    linux = releases.find(x => x.platform === 'linux'),
-    alpine = releases.find(x => x.platform === 'alpine')
-
-  let target: NexeTarget | undefined
-
-  if (env.NEXE_VERSION) target = getTarget(env.NEXE_VERSION)
-  else if (isWindows) target = windowsBuild
-  else if (isMac) target = macBuild
-  else if (isLinux) target = linux
-  if (buildHost.includes('alpine')) target = alpine
-
-  if (!target) {
-    return console.log('Nothing to build...')
-  }
-
-  if (isWindows && buildHost.includes('2017') && !semverGt(target.version, '9.99.99')) {
-    return console.log(`Not building ${target} on this host...`)
-  }
-  if (isWindows && buildHost.includes('2015') && semverGt(target.version, '9.99.99')) {
-    return console.log(`Not building ${target} on this host...`)
-  }
-
-  const output = isWindows ? './out.exe' : './out',
-    options = {
-      mangle: false,
-      build: true,
-      verbose: Boolean(env.NEXE_VERBOSE!),
-      target,
-      make: ['-j' + cpus().length],
-      output
-    }
-  console.log('Building: ' + target + ' on ' + buildHost)
-  const stop = keepalive()
-
-  if (
-    [/*'arm7l', 'arm6l', 'arm64', */ 'alpine'].includes(target.platform) &&
-    buildHost.includes('alpine')
-  ) {
-    await runDockerBuild(target)
-  } else {
-    await nexe.compile(options)
-  }
-  stop()
-  if (await pathExistsAsync(output)) {
-    await assertNexeBinary(output)
-    const gitRelease = await getLatestGitRelease({ headers }),
-      unbuiltReleases = await getUnBuiltReleases({ headers })
-    if (!unbuiltReleases.some(x => targetsEqual(x, target!))) {
-      console.log(`${target} already uploaded.`)
-      process.exit(0)
+async function build () {
+  if (isScheduled) {
+    const releases = await getUnBuiltReleases({ headers })
+    if (!releases.length) {
      return
    }
-    await got(gitRelease.upload_url.split('{')[0], {
-      query: { name: target.toString() },
-      body: await readFileAsync(output),
-      headers: {
-        ...headers,
-        'Content-Type': 'application/octet-stream'
+    const windowsBuild = releases.find(x => x.platform === 'windows')
+    const macBuild = releases.find(x => x.platform === 'mac')
+    const linuxOrAlpine = releases.find(x => x.platform === 'linux' || x.platform === 'alpine')
+
+    if (linuxOrAlpine) {
+      await ci.triggerDockerBuild(linuxOrAlpine, branchName)
+    }
+    if (macBuild) {
+      await ci.triggerMacBuild(macBuild, branchName)
+    }
+    if (windowsBuild) {
+      await ci.triggerWindowsBuild(windowsBuild)
+    }
+  }
+
+  if (env.NEXE_VERSION) {
+    const
+      target = getTarget(env.NEXE_VERSION),
+      output = isWindows ? './out.exe' : './out',
+      options = {
+        empty: true,
+        build: true,
+        target, //FIXME
+        output
      }
-    }).catch(reason => {
-      console.log(reason && reason.response && reason.response.body)
-      throw reason
-    })
-    console.log(target + ' uploaded.')
-    process.exit(0)
+    
+    const stop = keepalive()
+    if (target.platform === 'alpine') {
+      await runAlpineBuild(target, nexe.version.split('.')[0])
+    } else {
+      await nexe.compile(options)      
+    }
+    stop()
+    
+    
+    if (await pathExistsAsync(output)) {
+      await assertNexeBinary(output)
+      const gitRelease = await getLatestGitRelease({ headers })
+      await got(gitRelease.upload_url.split('{')[0], {
+        query: { name: target.toString() },
+        body: await readFileAsync(output),
+        headers: {
+          'Authorization': 'token ' + env.GITHUB_TOKEN,
+          'Content-Type': 'application/octet-stream'
+        }
+      })
+      console.log(target + ' uploaded.')
+    }
  }
 }

-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
@@ -0,0 +1,48 @@
+import { NexeTarget } from '../src/releases'
+import got = require('got')
+import * as assert from 'assert'
+const { env } = process
+
+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, {
+    json: true,
+    body: {
+      request: {
+        branch: branch,
+        config: {
+          merge_mode: 'deep_merge',
+          env: {
+            NEXE_VERSION: release
+          }
+        }
+      }
+    },
+    headers: {
+      'Travis-API-Version': '3',
+      'Authorization': `token ${env.TRAVIS_TOKEN}`
+    }
+  })
+}
+
+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}`
+  return got(circle, {
+    json: true,
+    body: {
+      build_parameters: {
+        NEXE_VERSION: release.toString()
+      }
+    }
+  })
+}
+
+export function triggerWindowsBuild (release: NexeTarget) {
+  const hasVersion = 'NEXE_VERSION' in env
+  env.NEXE_VERSION = hasVersion 
+    ? env.NEXE_VERSION!.trim() 
+    : release.toString() 
+  return Promise.resolve()
+}
@@ -1,73 +1,32 @@
-import { NexeTarget, architectures } from '../lib/target'
-import { writeFileAsync, readFileAsync } from '../lib/util'
-import got = require('got')
-import execa = require('execa')
-import { appendFileSync } from 'fs'
+import { NexeTarget } from '../src/target'
+import { writeFileAsync } from '../src/util'
+import exec = require('execa')

-function alpine(target: NexeTarget) {
+function alpine (target: NexeTarget, nexeVersion: string) {
+  const version = target.version
  return `
-FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.4
+FROM i386/alpine:3.6
 RUN apk add --no-cache curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ git vim tar gzip wget
-ENV NODE_VERSION=${target.version}
-ENV NEXE_VERSION=latest
 WORKDIR /
-
-RUN curl -sSL https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}.tar.gz | tar -xz && \
-  mkdir /nexe_temp && mv /node-v\${NODE_VERSION} /nexe_temp/\${NODE_VERSION} && \
-  cd /nexe_temp/\${NODE_VERSION} && \
+RUN curl -sSL https://nodejs.org/dist/v${version}/node-v${version}.tar.gz | tar -xz && \
+  cd /node-v${version} && \
  ./configure --prefix=/usr --fully-static && \
-  make && make install && \
+  make -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
+  make install && \
  paxctl -cm /usr/bin/node

-RUN rm /nexe_temp/\${NODE_VERSION}/out/Release/node && \
-  npm install -g nexe@\${NEXE_VERSION}
-RUN echo "console.log('hello world')" >> index.js && \
-  nexe --build --no-mangle --temp /nexe_temp -c="--fully-static" -o out
-`.trim()
+RUN mkdir nexe_temp && mv node-v${version} nexe_temp/${version}
+RUN npm i nexe@beta -g
+ENV NEXE_TEMP=/nexe_temp
+
+RUN nexe --empty -c="--fully-static" -o /nexe-out`.trim()
 }

-function arm(target: NexeTarget) {
-  return `
-FROM hypriot/rpi-node
-ENV NEXE_VERSION=latest
-WORKDIR /
-
-RUN yarn global add nexe@\${NEXE_VERSION} && \
-  nexe --build --no-mangle -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-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) {
-    console.log('Error running docker')
-    appendFileSync(outFilename, e.message)
-  } 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))
-  }
+export async function runAlpineBuild (target: NexeTarget, nexeVersion: string) {
+  await writeFileAsync('Dockerfile', alpine(target, nexeVersion))
+  const option = { stido: 'inherit' } as any
+  await exec('docker', ['build', '-t', 'nexe-alpine', '.'], option)
+  await exec('docker', ['run', '--name', 'nexe', 'nexe-alpine'], option)
+  await exec('docker', ['cp', 'nexe:/nexe-out', 'out'], option)
+  await exec('docker', ['rm', 'nexe'], option)
 }
@@ -1,38 +0,0 @@
-import { writeFileSync, readFileSync } from 'fs'
-
-/**
- * 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[]) {
-  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'))
-  })
-  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)
-}
@@ -1 +0,0 @@
-module.exports = 'abc'
@@ -1 +0,0 @@
-console.log('hello world', require('./dependency'))
@@ -1,3 +0,0 @@
-{
-  "main": "entry.js"
-}
@@ -1,4 +0,0 @@
-./test/**/*.spec.ts
--check-leaks
--require ts-node/register
--recursive
@@ -1,60 +0,0 @@
-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 (if not in a TTY)', () => {
-      const options = normalizeOptions()
-      if (!process.stdin.isTTY) {
-        expect(options.input).to.equal('[stdin]')
-      } else {
-        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}`))
-    })
-  })
-})
@@ -1,29 +0,0 @@
-import { padRight, isWindows } from '../src/util'
-import { expect } from 'chai'
-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`],
-    ['not-a-thing', getTarget(process).toString()]
-  ].forEach(([input, expected]) => {
-    it(`should accept: ${padRight(JSON.stringify(input), 53)} ${b('->')}   ${expected}`, () => {
-      expect(getTarget(input).toString()).to.equal(expected)
-    })
-  })
-
-  it('should stringify and toString', () => {
-    expect(JSON.stringify(getTarget(process))).to.equal(`"${getTarget(process)}"`)
-  })
-})
@@ -1,9 +1,7 @@
 {
  "compilerOptions": {
    "target":"es5",
-    "skipLibCheck": true,
-    "experimentalDecorators": true,
-    "lib": ["es2018"],
+    "lib": ["es2017"],
    "module": "commonjs",
    "outDir": "./lib",
    "strict": true
@@ -1,9 +0,0 @@
-{
-  "rulesDirectory": ["tslint-plugin-prettier", "tslint-config-prettier"],
-  "linterOptions": {
-    "exclude": ["**/node_modules/**/*"]
-  },  
-  "rules": {
-    "prettier": [true, { "semi": false, "printWidth": 100, "singleQuote": true }]
-  }
-}
Author	SHA1	Message	Date
calebboyd	34c51064f4	feat: build-target options	2017-09-01 00:28:10 -05:00
calebboyd	be48e5a2f3	docs: update readme with new usage	2017-08-31 13:59:01 -05:00
calebboyd	0340c01b36	fix: don't call next twice	2017-08-31 10:02:12 -05:00
calebboyd	e62cd19b42	feat: targets	2017-08-31 08:46:50 -05:00
calebboyd	fc99386199	chore: options, and resource normalization	2017-08-31 01:15:51 -05:00
calebboyd	f949bf3040	feat: initial build	2017-08-30 15:32:26 -05:00
calebboyd	0a1e747ca3	chore: inject source-map-support	2017-08-26 23:34:03 -05:00
calebboyd	91aa014b7d	feat: initial fuse-box bundling support	2017-08-25 23:23:57 -05:00
				`@@ -0,0 +1 @@`
				`export * from './fuse-native-module-plugin'`
				`@@ -1 +0,0 @@`
				`console.log('hello world', require('./dependency'))`