feat(fs): add option to restore all but internal filesystem methods

2019-04-08 22:14:27 -05:00
31 changed files with 1878 additions and 940 deletions
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+export NVS_HOME="$HOME/.nvs"
+. "$NVS_HOME/nvs.sh" install && nvs link lts && nvs use default
+
+set -e -x
+
+npm run asset-compile
@@ -0,0 +1,28 @@
+version: 2
+
+jobs:
+  build:
+    macos:
+      xcode: "9.0"
+    steps:
+    - checkout
+    - restore_cache:
+        keys:
+        - package-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
+        - package- # Fallback for the latest package.json cache
+    - run:
+        name: setup
+        command: .circleci/setup.sh
+    - save_cache:
+        key: package-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }} 
+        paths:
+        - node_modules
+    - run:
+        name: build
+        command: .circleci/build.sh
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - build
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+export NVS_HOME="$HOME/.nvs"
+git clone --depth=1 https://github.com/jasongin/nvs "$NVS_HOME"
+. "$NVS_HOME/nvs.sh" install
+nvs add lts && nvs link lts nvs use default
+node -v
+npm -v
+npm i
@@ -1,23 +0,0 @@
---
-name: Bug Report
-about: Report a bug encountered while running Nexe
-labels: bug
-
---
-<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
-->
-
-**What happened**:
-
-**What you expected to happen**:
-
-**How to reproduce it (as minimally and precisely as possible)**:
-
-**Anything else we need to know?**:
-
-**Environment**:
- Platform(OS/Version):
- Host Node Version:
- Target Node Version:
- Nexe version:
- Python Version:
@@ -1,11 +0,0 @@
---
-name: Feature Request
-about: Suggest an feature request
-labels: feature
-
---
-<!-- Please only use this template for submitting feature requests -->
-
-**What would you like to be added**:
-
-**Why is this needed**:
@@ -1,11 +0,0 @@
-**What this PR does / why we need it**:
-
-**Which issue(s) this PR fixes**:
-<!--
-*Automatically closes linked issue when PR is merged.
-Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
-->
-Fixes #
-
-**Special notes for your reviewer**:
@@ -0,0 +1,15 @@
+dist: xenial
+language: node_js
+node_js:
+- '6'
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y g++-multilib
+node_js:
+- '8'
+script: npm run asset-compile
+env:
+  global:
+    - secure: LyC6djYqPfPKz5gHILES9JmSRxQ+ntKOcoaZNM5WID0+gogUoXZBhcmmtvq9RnMpFZN3pYujY6LB5iy7QS2seGjg+feyewNKI30yIK6N9ulJyZZKmrJVDdRx4wvl8YVTkttjcJFkanDGa6zRvFfFDKx/iIdcWLEpnqR/WO1ppf8=
+notifications:
+  email: false
@@ -1,7 +1,9 @@
 <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/github/nexe/nexe/master.svg" alt="Mac Build Status"></a>
+  <a href="https://travis-ci.org/nexe/nexe/builds"><img src="https://img.shields.io/travis/nexe/nexe/master.svg" alt="Linux Build Status"></a>
+  <a href="https://ci.appveyor.com/project/calebboyd/nexe/history"><img src="https://img.shields.io/appveyor/ci/calebboyd/nexe/master.svg" alt="Windows 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>
@@ -153,7 +155,7 @@ compile({
    - Path to a user provided icon to be used (Windows only). Requires `--build` to be set.
 - #### `rc: object`
    - Settings for patching the [node.rc](https://github.com/nodejs/node/blob/master/src/res/node.rc) configuration file (Windows only).
-    - Example (keys may vary depending on the version. Reference the file linked above):
+    - Example (keys may vary depending ont the version. Reference the file linked above):
      ```javascript
        {
          CompanyName: "ACME Corp",
@@ -0,0 +1,25 @@
+image:
+  - Visual Studio 2017
+  - Visual Studio 2015
+environment:
+  CIRCLE_TOKEN:
+    secure: TQKcepXmTzCNt4+tUBtYpwEQkdSPwFr9A8ugtoMhNbKu/SW1WM1EpjEu6kYXxpQ4
+  TRAVIS_TOKEN:
+    secure: 6ni/E6Rbmv6cFWW7QNLkpQY2fVpT7wr7y12GEtektN0=
+  GITHUB_TOKEN:
+    secure: 3wuEGJsppSKFvdwhp3jprUA9Zkc3WINlc/9oFXjhAR6J05lYMXP7Fl7lXTKpkGZx
+install:
+  - rmdir C:\cygwin /s /q
+  - rmdir C:\QT /s /q
+  - ps: Install-Product node 8
+  - curl -L -o nasm.exe https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-2.13.03-installer-x64.exe
+  - start /wait nasm.exe /S
+  - ps: $env:path="C:\Program Files\nasm;$($env:path)"
+  - npm i
+build: off
+test: off
+build_script:
+  - npm run asset-compile
+artifacts:
+  - path: $(HOMEPATH)\.nexe\**\node.exe
+
@@ -1,68 +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: npm install && npm run ci:build
-    displayName: Build Nexe
-    env:
-      GITHUB_TOKEN: $(PersonalGithubToken)
-      NEXE_VERBOSE: $(NEXE_VERBOSE)
-    condition: not(contains(variables['Agent.JobName'], 'windows'))
-  - powershell: |
-      iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
-      scoop install nasm
-      npm install
-      npm run ci:build
-    displayName: Build Nexe (Windows)
-    condition: contains(variables['Agent.JobName'], 'windows')
-    env:
-      GITHUB_TOKEN: $(PersonalGithubToken)
-      NEXE_VERBOSE: $(NEXE_VERBOSE)
@@ -0,0 +1,19 @@
+<!-- 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): -->
+
+**Is this a BUG or a FEATURE REQUEST?:** 
+
+**What happened:**
+
+**What you expected to happen:**
+
+**How to reproduce it (as minimally and precisely as possible):**
+
+**Anything else we need to know?:**
+
+**Environment**
+
+- Platform(OS/Version):
+- Host Node Version:
+- Target Node Version:
+- Nexe version:
+- Python Version:
@@ -2,14 +2,14 @@
  "name": "nexe",
  "description": "Create a single executable out of your Node.js application",
  "license": "MIT",
-  "version": "4.0.0-beta.3",
+  "version": "3.1.0",
  "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",
+    "asset-compile": "ts-node tasks/asset-compile",
    "test": "mocha",
    "lint": "tslint \"{src,plugins,tasks}/**/*.ts\" --fix",
    "prepare": "npm run lint && npm run build && npm test",
@@ -39,38 +39,38 @@
    "chalk": "^2.4.2",
    "cherow": "1.6.9",
    "download": "^7.1.0",
-    "globby": "^10.0.1",
+    "globby": "^9.2.0",
    "got": "^9.6.0",
    "minimist": "^1.2.0",
    "mkdirp": "^0.5.1",
-    "multistream": "^4.0.0",
+    "multistream": "^2.1.1",
    "ora": "^3.4.0",
    "pify": "^4.0.1",
-    "resolve-dependencies": "^3.0.2",
-    "rimraf": "^3.0.0"
+    "resolve-dependencies": "^2.2.2",
+    "rimraf": "^2.6.3"
  },
  "devDependencies": {
-    "@types/chai": "^4.2.3",
+    "@types/chai": "^4.1.7",
    "@types/download": "^6.2.4",
-    "@types/execa": "^2.0.0",
+    "@types/execa": "^0.9.0",
    "@types/globby": "^9.1.0",
-    "@types/got": "^9.6.7",
+    "@types/got": "^9.4.1",
    "@types/minimist": "^1.2.0",
    "@types/mkdirp": "^0.5.2",
-    "@types/mocha": "^5.2.7",
+    "@types/mocha": "^5.2.6",
    "@types/multistream": "^2.1.1",
    "@types/ora": "^3.2.0",
    "@types/pify": "3.0.2",
    "@types/rimraf": "2.0.2",
-    "@types/semver": "^6.0.2",
+    "@types/semver": "^6.0.0",
    "chai": "^4.2.0",
-    "execa": "^2.1.0",
-    "mocha": "^6.2.1",
-    "prettier": "^1.18.2",
-    "ts-node": "^8.4.1",
-    "tslint": "^5.20.0",
+    "execa": "^1.0.0",
+    "mocha": "^6.0.2",
+    "prettier": "^1.16.4",
+    "ts-node": "^8.0.3",
+    "tslint": "^5.15.0",
    "tslint-config-prettier": "^1.18.0",
    "tslint-plugin-prettier": "^2.0.1",
-    "typescript": "^3.6.3"
+    "typescript": "^3.4.1"
  }
 }
@@ -15,7 +15,7 @@ import {
 } from './util'
 import { NexeOptions, version } from './options'
 import { NexeTarget } from './target'
-import MultiStream = require('multistream')
+import combineStreams = require('multistream')
 import { Bundle, toStream } from './fs/bundle'

 const isBsd = Boolean(~process.platform.indexOf('bsd'))
@@ -136,8 +136,8 @@ export class NexeCompiler {
  }

  @bound
-  addResource(absoluteFileName: string, content?: Buffer | string) {
-    return this.bundle.addResource(absoluteFileName, content)
+  addResource(file: string, content?: Buffer | string) {
+    return this.bundle.addResource(file, content)
  }

  get binaryConfiguration() {
@@ -237,9 +237,6 @@ export class NexeCompiler {
  }

  private _configureAsync() {
-    if (isWindows && semverGt(this.target.version, '10.15.99')) {
-      return Promise.resolve()
-    }
    return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
      this.configureScript,
      ...this.options.configure
@@ -309,7 +306,7 @@ export class NexeCompiler {
    const lengths = Buffer.from(Array(16))
    lengths.writeDoubleLE(codeSize, 0)
    lengths.writeDoubleLE(this.bundle.blobSize, 8)
-    return new (MultiStream as any)([
+    return combineStreams([
      binary,
      toStream(startup),
      this.bundle.toStream(),
@@ -1,7 +1,7 @@
 import { stat as getStat, Stats, createReadStream } from 'fs'
 import { relative } from 'path'
 import { Readable } from 'stream'
-import MultiStream = require('multistream')
+import combineStreams = require('multistream')

 const stat = (file: string): Promise<Stats> => {
  return new Promise((resolve, reject) => {
@@ -14,12 +14,9 @@ function makeRelative(cwd: string, path: string) {
 }

 export function toStream(content: Buffer | string) {
-  const readable = new Readable({
-    read() {
-      this.push(content)
-      this.push(null)
-    }
-  })
+  const readable = new Readable({ read() {} })
+  readable.push(content)
+  readable.push(null)
  return readable
 }

@@ -64,7 +61,7 @@ export class Bundle {
  }

  toStream() {
-    return new (MultiStream as any)(this.streams)
+    return combineStreams(this.streams)
  }

  toJSON() {
@@ -35,13 +35,6 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
    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()
@@ -51,7 +44,10 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
    }
    let key = path.resolve(baseDir, filepath)

-    return winPath(key)
+    if (isWin && key.substr(1, 2) === ':\\') {
+      key = key[0].toUpperCase() + key.substr(1)
+    }
+    return key
  }

  const statTime = function() {
@@ -75,34 +71,21 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
    }
  }

-  let BigInt: Function
-  try {
-    BigInt = eval('BigInt')
-  } catch (ignored) {}
-
-  const createStat = function(extensions: any, options: any) {
-    const stat = Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
-    if (options && options.bigint && BigInt) {
-      for (const k in stat) {
-        if (Object.prototype.hasOwnProperty.call(stat, k) && typeof stat[k] === 'number') {
-          stat[k] = BigInt(stat[k])
-        }
-      }
-    }
-    return stat
+  const createStat = function(extensions: any) {
+    return Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
  }

-  const ownStat = function(filepath: any, options: any) {
+  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 }, options)
+      return createStat({ mode, size: 0 })
    }
    if (manifest[key]) {
-      return createStat({ size: manifest[key][1] }, options)
+      return createStat({ size: manifest[key][1] })
    }
  }

@@ -119,7 +102,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
      const entry = manifest[filepath]
      const absolutePath = getKey(filepath)
      const longPath = makeLong(absolutePath)
-      const normalizedPath = winPath(path.normalize(filepath))
+      const normalizedPath = path.normalize(filepath)

      if (!manifest[absolutePath]) {
        manifest[absolutePath] = entry
@@ -209,19 +192,19 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
      const encoding = fileOpts(options).encoding
      callback = typeof options === 'function' ? options : callback

-      originalFsMethods.open(blobPath, 'r', function(err: Error, fd: number) {
+      fs.open(blobPath, 'r', function(err: Error, fd: number) {
        if (err) return callback(err, null)
-        originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
+        fs.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
          error: Error,
          bytesRead: number,
          result: Buffer
        ) {
          if (error) {
-            return originalFsMethods.close(fd, function() {
+            return fs.close(fd, function() {
              callback(error, null)
            })
          }
-          originalFsMethods.close(fd, function(err: Error) {
+          fs.close(fd, function(err: Error) {
            if (err) {
              return callback(err, result)
            }
@@ -240,7 +223,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
      const resourceOffset = resourceStart + offset
      const opts = fileOpts(options)

-      return originalFsMethods.createReadStream(
+      return fs.createReadStream(
        blobPath,
        Object.assign({}, opts, {
          start: resourceOffset,
@@ -257,27 +240,21 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
      const [offset, length] = entry
      const resourceOffset = resourceStart + offset
      const encoding = fileOpts(options).encoding
-      const fd = originalFsMethods.openSync(process.execPath, 'r')
+      const fd = fs.openSync(process.execPath, 'r')
      const result = Buffer.alloc(length)
-      originalFsMethods.readSync(fd, result, 0, length, resourceOffset)
-      originalFsMethods.closeSync(fd)
+      fs.readSync(fd, result, 0, length, resourceOffset)
+      fs.closeSync(fd)
      return encoding ? result.toString(encoding) : result
    },
-    statSync: function statSync(filepath: string | Buffer, options: any) {
-      const stat = ownStat(filepath, options)
+    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, options: any, callback: any) {
-      let stat: any
-      if (typeof options === 'function') {
-        callback = options
-        stat = ownStat(filepath, null)
-      } else {
-        stat = ownStat(filepath, options)
-      }
+    stat: function stat(filepath: string | Buffer, callback: any) {
+      const stat = ownStat(filepath)
      if (stat) {
        process.nextTick(() => {
          callback(null, stat)
@@ -341,40 +318,6 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
      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 = () => {
@@ -5,7 +5,7 @@ import { basename, extname, join, isAbsolute, resolve } from 'path'
 import { getTarget, NexeTarget } from './target'
 import { EOL, homedir } from 'os'
 import chalk from 'chalk'
-import { resolveSync } from 'resolve-dependencies'
+import { resolveFileNameSync } from 'resolve-dependencies'
 const caw = require('caw')
 const c = process.platform === 'win32' ? chalk.constructor({ enabled: false }) : chalk

@@ -80,7 +80,7 @@ const alias = {
  b: 'build',
  n: 'name',
  r: 'resource',
-  a: 'asset',
+  a: 'resource',
  p: 'python',
  f: 'flag',
  c: 'configure',
@@ -111,7 +111,7 @@ ${c.bold('nexe <entry-file> [options]')}
  -f   --flag                       -- *v8 flags to include during compilation
  -c   --configure                  -- *arguments to the configure step
  -m   --make                       -- *arguments to the make/build step
-       --patch                      -- module with middleware default export for adding a build patch
+       --patch                      -- module with middelware 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)
@@ -208,17 +208,17 @@ export function resolveEntry(
  }
  if (input) {
    const inputPath = padRelative(input)
-    result = resolveSync(cwd, inputPath)
+    result = resolveFileNameSync(cwd, inputPath)
  }
  if (isEntryFile(maybeEntry) && (!result || !result.absPath)) {
    const inputPath = padRelative(maybeEntry)
-    result = resolveSync(cwd, inputPath)
+    result = resolveFileNameSync(cwd, inputPath)
  }
  if (!process.stdin.isTTY && (!result || !result.absPath) && bundle === defaults.bundle) {
    return STDIN_FLAG
  }
  if (!result || !result.absPath) {
-    result = resolveSync(cwd, '.')
+    result = resolveFileNameSync(cwd, '.')
  }
  if (!result.absPath) {
    throw new NexeError(`Entry file "${input || ''}" not found!`)
@@ -7,9 +7,13 @@ export default async function disableNodeCli(compiler: NexeCompiler, next: () =>
  }

  if (semverGt(compiler.target.version, '11.6.0')) {
-    await compiler.replaceInFileAsync('src/node.cc', /(?<!int )ProcessGlobalArgs\(argv/g, '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\(argv/g, '//$&')
+    await compiler.replaceInFileAsync('src/node.cc', /(?<!void )ProcessArgv\(/g, '//ProcessArgv(')
  } else if (semverGt(compiler.target.version, '9.999')) {
    await compiler.replaceInFileAsync(
      'src/node.cc',
@@ -1,6 +1,5 @@
 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
@@ -9,18 +8,13 @@ export default async function(compiler: NexeCompiler, next: () => Promise<void>)
    return next()
  }

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

  return next()
@@ -1,6 +1,6 @@
 import { NexeCompiler } from '../compiler'
 import { parse } from 'cherow'
-import { wrap, semverGt } from '../util'
+import { semverGt } from '../util'

 function walkSome(node: any, visit: Function) {
  if (!node || typeof node.type !== 'string' || node._visited) {
@@ -29,8 +29,6 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v

  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'
  }
@@ -55,32 +53,12 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
  })

  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' : '')
-  )
+  fileLines.splice(location.start.line, 0, '{{replace:lib/fs/bootstrap.js}}' + '\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}}'
-    )
-  }
+  await compiler.setFileContentsAsync(
+    'lib/_third_party_main.js',
+    '{{replace:lib/patches/boot-nexe.js}}'
+  )
  return next()
 }
@@ -2,7 +2,7 @@ import got = require('got')
 import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
 export { NexeTarget }

-const versionsToSkip = [0, 1, 2, 3, 4, 5, 7, 9, 11, 13, 15, 17, 19, 21, 22]
+const versionsToSkip = [0, 1, 2, 3, 4, 5, 7, 9, 11]
 export interface GitAsset {
  name: string
  url: string
@@ -25,13 +25,8 @@ async function getJson<T>(url: string, options?: any) {
 }

 function isBuildableVersion(version: string) {
-  if (version === '12.11.0') {
-    return false
-  }
-  if (version === '4.9.1') {
-    return true
-  }
-  return !versionsToSkip.includes(Number(version.split('.')[0]))
+  const major = Number(version.split('.')[0])
+  return !versionsToSkip.includes(major) || version === '4.8.4'
 }

 export function getLatestGitRelease(options?: any) {
@@ -1,13 +1,13 @@
 import { NexeCompiler, NexeError } from '../compiler'
 import { resolve, relative } from 'path'
 import { each } from '@calebboyd/semaphore'
-import resolveFiles, { resolveSync } from 'resolve-dependencies'
-import { dequote, STDIN_FLAG, semverGt } from '../util'
+import resolveFiles, { resolveFileNameSync } from 'resolve-dependencies'
+import { dequote, STDIN_FLAG } from '../util'
 import { Readable } from 'stream'

 function getStdIn(stdin: Readable): Promise<string> {
-  let out = ''
  return new Promise(resolve => {
+    let out = ''
    stdin
      .setEncoding('utf8')
      .on('readable', () => {
@@ -17,11 +17,6 @@ function getStdIn(stdin: Readable): Promise<string> {
        }
      })
      .on('end', () => resolve(out.trim()))
-    setTimeout(() => {
-      if (!out.trim()) {
-        resolve(out.trim())
-      }
-    }, 1000)
  })
 }

@@ -29,12 +24,7 @@ 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();'
-  }
+  compiler.startup = ';require("module").runMain();'

  if (!bundle) {
    await compiler.addResource(resolve(cwd, input))
@@ -54,7 +44,7 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
  }

  if (input === STDIN_FLAG) {
-    const maybeInput = resolveSync(cwd, '.')
+    const maybeInput = resolveFileNameSync(cwd, '.')
    if (!maybeInput || !maybeInput.absPath) {
      throw new NexeError('No valid input detected')
    }
@@ -65,7 +55,7 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
  const { files, warnings } = await resolveFiles(
    input,
    ...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
-    { cwd, expand: 'variable', loadContent: false }
+    { cwd, expand: true, loadContent: false }
  )

  if (
@@ -51,8 +51,7 @@ export default async function cli(compiler: NexeCompiler, next: () => Promise<vo
                : inputFileLogOutput
            }' written to: ${outputFileLogOutput}`
          )
-          compiler.quit()
-          res(output)
+          res(compiler.quit())
        }
      })
  })
@@ -1,5 +1,5 @@
 import { isDirectoryAsync, each } from '../util'
-import * as globs from 'globby'
+import globs from 'globby'
 import { NexeCompiler } from '../compiler'

 export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
@@ -1,9 +1,7 @@
 import { NexeCompiler } from '../compiler'
 import { wrap } from '../util'

-export default async function(compiler: NexeCompiler, next: () => Promise<void>) {
-  await next()
-
+export default function(compiler: NexeCompiler, next: () => Promise<void>) {
  compiler.shims.push(
    wrap(
      `process.__nexe = ${JSON.stringify(compiler.binaryConfiguration)};\n` +
@@ -34,4 +32,6 @@ export default async function(compiler: NexeCompiler, next: () => Promise<void>)
      }
    `)
  )
+
+  return next()
 }
@@ -1,8 +1,8 @@
 export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux'
-export type NodeArch = 'x86' | 'x64' | 'arm' | 'arm64'
+export type NodeArch = 'x86' | 'x64' | 'arm7l' | 'arm6l' | 'arm64'

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

 export { platforms, architectures }

@@ -26,12 +26,12 @@ const prettyPlatform: { [key: string]: NodePlatform } = {

 const prettyArch: { [key: string]: NodeArch } = {
  x86: 'x86',
-  arm6: 'arm',
+  arm6: 'arm6l',
  arm64: 'arm64',
-  arm6l: 'arm',
-  arm: 'arm',
-  arm7: 'arm',
-  arm7l: 'arm',
+  arm6l: 'arm6l',
+  arm: 'arm7l',
+  arm7: 'arm7l',
+  arm7l: 'arm7l',
  amd64: 'x64',
  ia32: 'x86',
  x32: 'x86',
@@ -0,0 +1,106 @@
+import * as nexe from '../lib/nexe'
+import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
+import * as ci from './ci'
+import { runDockerBuild } from './docker'
+import { getTarget, targetsEqual } from '../lib/target'
+import { pathExistsAsync, readFileAsync, execFileAsync } from '../lib/util'
+import got = require('got')
+
+const env = process.env,
+  branchName = env.CIRCLE_BRANCH || env.APPVEYOR_REPO_BRANCH || env.TRAVIS_BRANCH || '',
+  isScheduled = Boolean(env.APPVEYOR_SCHEDULED_BUILD || env.NEXE_TRIGGERED),
+  isWindows = Boolean(env.APPVEYOR),
+  isPullRequest =
+    Boolean(env.CIRCLE_PR_NUMBER) ||
+    Boolean(env.APPVEYOR_PULL_REQUEST_NUMBER) ||
+    Boolean(env.TRAVIS_PULL_REQUEST_BRANCH),
+  headers = {
+    Authorization: 'token ' + env.GITHUB_TOKEN,
+    'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
+  }
+
+if (require.main === module) {
+  if (!isPullRequest) {
+    build().catch(x => {
+      console.error(x)
+      process.exit(1)
+    })
+  }
+}
+
+async function build() {
+  if (isScheduled) {
+    const releases = await getUnBuiltReleases({ headers })
+    if (!releases.length) {
+      return
+    }
+    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,
+        output
+      }
+    console.log('Building: ', target)
+    const stop = keepalive()
+    if (['arm7l', 'arm6l', 'arm64', 'alpine'].includes(target.platform)) {
+      await runDockerBuild(target)
+    } else {
+      await nexe.compile(options)
+    }
+    stop()
+
+    if (await pathExistsAsync(output)) {
+      await assertNexeBinary(output)
+      const gitRelease = await getLatestGitRelease({ headers })
+      const unbuiltReleases = await getUnBuiltReleases({ headers })
+      if (!unbuiltReleases.some(x => targetsEqual(x, target))) {
+        console.log(`${target} already uploaded.`)
+        return
+      }
+      await got(gitRelease.upload_url.split('{')[0], {
+        query: { name: target.toString() },
+        body: await readFileAsync(output),
+        headers: {
+          ...headers,
+          'Content-Type': 'application/octet-stream'
+        }
+      }).catch(reason => {
+        console.log(reason && reason.response && reason.response.body)
+        throw reason
+      })
+      console.log(target + ' uploaded.')
+    }
+  }
+}
+
+function keepalive() {
+  const keepalive = setInterval(() => console.log('Building...'), 300 * 1000)
+  return () => clearInterval(keepalive)
+}
+
+function assertNexeBinary(file: string) {
+  return execFileAsync(file).catch(e => {
+    if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
+      return
+    }
+    throw e
+  })
+}
@@ -1,116 +0,0 @@
-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 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)'
-  }
-
-if (require.main === module) {
-  if (!isPullRequest) {
-    build().catch(x => {
-      console.error(x)
-      process.exit(1)
-    })
-  }
-}
-
-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)
-      return
-    }
-    await got(gitRelease.upload_url.split('{')[0], {
-      query: { name: target.toString() },
-      body: await readFileAsync(output),
-      headers: {
-        ...headers,
-        'Content-Type': 'application/octet-stream'
-      }
-    }).catch(reason => {
-      console.log(reason && reason.response && reason.response.body)
-      throw reason
-    })
-    console.log(target + ' uploaded.')
-    process.exit(0)
-  }
-}
-
-function keepalive() {
-  const keepalive = setInterval(() => console.log('Building...'), 300 * 1000)
-  return () => clearInterval(keepalive)
-}
-
-function assertNexeBinary(file: string) {
-  return execFileAsync(file).catch(e => {
-    if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
-      return
-    }
-    throw e
-  })
-}
@@ -0,0 +1,58 @@
+import { NexeTarget } from '../lib/releases'
+import got = require('got')
+import * as assert from 'assert'
+import { getTarget } from '../lib/target'
+const { env } = process
+
+export function triggerMacBuild(release: NexeTarget, branch: string) {
+  assert.ok(env.CIRCLE_TOKEN)
+  const circle = `https://circleci.com/api/v1.1/project/github/nexe/nexe/tree/${branch}?circle-token=${
+    env.CIRCLE_TOKEN
+  }`
+  return got(circle, {
+    json: true,
+    body: {
+      build_parameters: {
+        NEXE_VERSION: release.toString()
+      }
+    }
+  })
+}
+
+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: {
+            //use matrix so that secure global variable is merged
+            matrix: {
+              NEXE_VERSION: release.toString()
+            }
+          }
+        }
+      }
+    },
+    headers: {
+      'Travis-API-Version': '3',
+      Authorization: `token ${env.TRAVIS_TOKEN}`
+    }
+  })
+}
+
+export function triggerWindowsBuild(release: NexeTarget) {
+  const version = 'NEXE_VERSION' in env ? env.NEXE_VERSION!.trim() : release.toString()
+  if (getTarget(version).version.startsWith('10.')) {
+    if ((env.APPVEYOR_BUILD_WORKER_IMAGE || '').includes('2017')) {
+      env.NEXE_VERSION = version
+    }
+  } else {
+    env.NEXE_VERSION = version
+  }
+  return Promise.resolve()
+}
@@ -20,9 +20,8 @@ RUN curl -sSL https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}.t
  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
+  npm install -g nexe@\${NEXE_VERSION} && \
+  nexe --build --no-mangle --temp /nexe_temp -c="--fully-static" -o out --enableStdIn=false
 `.trim()
 }

@@ -46,10 +45,10 @@ export async function runDockerBuild(target: NexeTarget) {
  let output: any = []

  try {
-    output.push(await execa(`docker build -t nexe-docker .`, { shell: true }))
-    output.push(await execa(`docker run -d --name nexe nexe-docker sh`, { shell: true }))
-    output.push(await execa(`docker cp nexe:/out out`, { shell: true }))
-    output.push(await execa(`docker rm nexe`, { shell: true }))
+    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)
@@ -10,13 +10,9 @@ describe('options', () => {
      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)', () => {
+    it('should use the main module in a package directory', () => {
      const options = normalizeOptions()
-      if (!process.stdin.isTTY) {
-        expect(options.input).to.equal('[stdin]')
-      } else {
-        expect(options.input).to.equal(path.resolve('./index.js'))
-      }
+      expect(options.input).to.equal(path.resolve('./index.js'))
    })
    it('should resolve relative paths for input', () => {
      const options = normalizeOptions({ input: 'test/fixture/entry.js' })