chore: bump resolve-dependencies node 10 compat

chore: bump resolve-dependencies
2020-06-26 12:07:39 -05:00 · 2020-06-26 11:42:23 -05:00 · 2020-06-26 10:26:53 -05:00 · 2020-06-21 20:16:45 -05:00 · 2019-06-24 15:57:54 -05:00
35 changed files with 2602 additions and 5688 deletions
@@ -1 +0,0 @@
-custom: https://www.paypal.me/calebsboyd
@@ -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**:
@@ -1,21 +0,0 @@
-name: No Response
-
-# Both `issue_comment` and `scheduled` event types are required for this Action
-# to work properly.
-on:
-  issue_comment:
-    types: [created]
-  schedule:
-    # 9AM Central
-    - cron: '0 14 * * *'
-
-jobs:
-  noResponse:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/no-response@v0.5.0
-        with:
-          token: ${{ github.token }}
-          closeComment: 'Closed awaiting response from OP, please open a new issue with the requested information and/or examples'
-          daysUntilClose: 21
-          responseRequiredLabel: more-information-needed
@@ -1,4 +1,3 @@
-
 <p align="center"><img src="https://cloud.githubusercontent.com/assets/2391349/23598327/a17bb68a-01ee-11e7-8f55-88a5fc96e997.png" /></p>

 <p align="center">
@@ -6,10 +5,9 @@
  <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/dt/nexe.svg" alt="Downloads"></a>
  <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/v/nexe.svg" alt="Version"></a>
  <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/l/nexe.svg" alt="License"></a>
-  <a href="https://discord.gg/2qTH52zNcZ"><img src="https://discordapp.com/api/guilds/814334925049561168/widget.png?style=shield"></a>
 </p>

-<p align="center">Install:&nbsp<code>npm i nexe -g</code></p>
+<p align="center"><code>npm i nexe -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">
@@ -49,39 +47,10 @@ For more CLI options see: `nexe --help`

 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`.

-## Compiling the nexe Executable
+## Compiling Node

-By default `nexe` will attempt to download a pre-built executable. These are listed on the [releases page](https://github.com/nexe/nexe/releases/tag/v3.3.3). The exact version you want may be unavailable 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 python 2 will need to create a [symlink](https://github.com/nexe/nexe/issues/354#issuecomment-319874486).
-
-### Linux and macOS
-[Prerequisites & details](https://github.com/nodejs/node/blob/master/BUILDING.md#unix-and-macos)
-
-### Windows
-
-The fastest and most reliable way to get started is simply to run the commands below. If you'd rather read the details or perform a manual install of the prerequisites, [you can find that here](https://github.com/nodejs/node/blob/master/BUILDING.md#windows).
-
-The instructions below are the fastest and most reliable method.
-Run the following sets of commands with PowerShell (running as Administrator).
-
-**Install all required build tools (and dependencies):**
-```
-Set-ExecutionPolicy Unrestricted -Force
-iex ((New-Object System.Net.WebClient).DownloadString('https://boxstarter.org/bootstrapper.ps1'))
-get-boxstarter -Force
-Install-BoxstarterPackage https://raw.githubusercontent.com/nodejs/node/master/tools/bootstrap/windows_boxstarter -DisableReboots
-```
-
-**Set config:**
-```
-npm config set msvs_version 2019
-npm config set python python2.7
-```
-Where `2019` is the version of Visual Studio you have (if you have it).
-
-**Notes:**
- The above works and has been tested with node.js `14.5.4` and `15.8.0`
- Python 3 and Python 2 can coexist and `nexe` will still work, considering the `set config` area above
- Don't use `npm install windows-build-tools` unless you're having some type of issue, because the above commands configures and installs the latest/preferred too.
+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).

 ## Node.js API

@@ -148,11 +117,9 @@ compile({
    - 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)
- - #### `remote: string`
-    - Provide a custom remote location for fetching pre-built nexe binaries from. This can either be an HTTP or HTTPS URL.
-    - default: `null`
 - #### `asset: string`
-    - Provide a pre-built nexe binary asset, this is a file path is resolved relative to cwd.
+    - Provide a pre-built nexe binary asset, this can either be an http or https URL or a file path.
+    - default: `null`
 - #### `python: string`
    - On Linux this is the path pointing to your python2 executable
    - On Windows this is the directory where `python` can be accessed
@@ -236,7 +203,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): Promise<void>`
+ - `addResource(filename: string, contents: Buffer): void`
    - Add a resource to the nexe bundle
 - `files: NexeFile[]`
    - The cache of the currently read, modified, or created files within the downloaded Node.js source.
@@ -250,20 +217,9 @@ Any modifications made to `NexeFile#contents` will be maintained in the cache _w

 ## Native Modules

-In order to use native modules, the native binaries must be shipped alongside the binary generated by nexe.
+TODO

-## Troubleshooting
-
-`Error: Entry file "" not found!` means you need to provide `nexe` with input. Either use `-i` or pipe data to it.
-
-`Error: https://github.com/nexe/nexe/releases/download/v3.3.3/windows-x64-15.8.0 is not available, create it using the --build flag` or similar message means that it either:
- You are having networking issues such as the download being blocked
- You should specify the target so `nexe` knows what version of the executable to use.
-	- See the [releases page](https://github.com/nexe/nexe/releases) to find the executable's version number
-	- Example
-		- `nexe -i "app.js" -r "public/**/*.html" -o "dist/myApp.exe" -t x64-14.15.3`
-		- where `-i` specifies the input, `-r` specifies resources to embed, `-o` specifies the output, `-t` specifies the target.
-	- Alternatively you can compile the executable yourself, see that section for details
+- [ ] Implement support for `node-pre-gyp#find`.

 ## Contributing

@@ -271,10 +227,20 @@ Building
 ```
 $ git clone git@github.com:nexe/nexe.git
 $ cd nexe
-$ npm i && npm run build
+$ yarn
 ```

 Testing
 ```
 $ npm test
 ```
+
+## Maintainers
+
+[![Jared Allard](https://avatars.githubusercontent.com/u/2391349?s=130)](https://jaredallard.me/) | [![Caleb Boyd](https://avatars.githubusercontent.com/u/5818726?s=130)](https://github.com/calebboyd) | [![Dustin Greif](https://avatars.githubusercontent.com/u/3026298?s=130)](https://github.com/dgreif) |
+---|---|---|
+[Jared Allard](https://github.com/jaredallard) | [Caleb Boyd](http://github.com/calebboyd) |  [Dustin Greif](https://github.com/dgreif) |
+
+### Former
+
+- [Craig Condon](http://crcn.codes/)
@@ -19,13 +19,13 @@ schedules:
      - master
 jobs:
 - job: BaseBuild
-  timeoutInMinutes: 360
+  timeoutInMinutes: 180
  strategy:
    matrix:
      linux:
        imageName: 'ubuntu-16.04'
      mac:
-        imageName: 'macos-10.15'
+        imageName: 'macos-10.13'
      windows_2017:
        imageName: 'vs2017-win2016'
      windows_2015:
@@ -43,27 +43,18 @@ jobs:
  - task: NodeTool@0
    displayName: Install Node
    inputs:
-      versionSpec: '12.x'
+      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)
-      msbuild_args: /3G
-    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,7 +2,7 @@
  "name": "nexe",
  "description": "Create a single executable out of your Node.js application",
  "license": "MIT",
-  "version": "4.0.0-beta.19",
+  "version": "3.3.6",
  "contributors": [
    "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
    "Jared Allard <jaredallard@outlook.com>",
@@ -30,50 +30,47 @@
    "nexe": "index.js"
  },
  "engines": {
-    "node": ">=10"
-  },
-  "mocha": {
-    "spec": "./test/**/*.spec.ts",
-    "checkLeaks": true,
-    "require": [
-      "ts-node/register"
-    ]
+    "node": ">=6"
  },
  "dependencies": {
    "@calebboyd/semaphore": "^1.3.1",
-    "app-builder": "^7.0.4",
+    "app-builder": "^5.2.0",
    "caw": "^2.0.1",
    "chalk": "^2.4.2",
    "cherow": "1.6.9",
-    "download": "^8.0.0",
-    "globby": "^11.0.2",
-    "got": "^11.8.2",
-    "minimist": "^1.2.5",
-    "mkdirp": "^1.0.4",
-    "multistream": "^4.1.0",
+    "download": "^7.1.0",
+    "globby": "^9.2.0",
+    "got": "^9.6.0",
+    "minimist": "^1.2.0",
+    "mkdirp": "^0.5.1",
+    "multistream": "^2.1.1",
    "ora": "^3.4.0",
-    "resolve-dependencies": "^6.0.7",
-    "rimraf": "^3.0.2"
+    "pify": "^4.0.1",
+    "resolve-dependencies": "^4.2.4",
+    "rimraf": "^2.6.3"
  },
  "devDependencies": {
-    "@types/chai": "^4",
-    "@types/download": "^6",
-    "@types/globby": "^9",
-    "@types/minimist": "^1.2.2",
-    "@types/mkdirp": "^1.0.2",
-    "@types/mocha": "^9.0.0",
+    "@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/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/rimraf": "3.0.2",
-    "@types/semver": "^7.3.8",
-    "chai": "^4.3.4",
-    "execa": "^5.1.1",
-    "mocha": "^9.1.2",
-    "prettier": "^2.4.1",
-    "ts-node": "^10.2.1",
-    "tslint": "^6.1.1",
+    "@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.3.0",
-    "typescript": "^4.4.3"
+    "tslint-plugin-prettier": "^2.0.1",
+    "typescript": "^3.5.2"
  }
 }
@@ -11,14 +11,12 @@ import {
  dequote,
  isWindows,
  bound,
-  semverGt,
-  wrap,
+  semverGt
 } 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'
-import { File } from 'resolve-dependencies'

 const isBsd = Boolean(~process.platform.indexOf('bsd'))
 const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
@@ -29,7 +27,7 @@ type StringReplacer = (match: string) => string
 export interface NexeFile {
  filename: string
  absPath: string
-  contents: string | Buffer
+  contents: string
 }

 export { NexeOptions }
@@ -110,10 +108,12 @@ export class NexeCompiler {
    //SOMEDAY iterate over multiple targets with `--outDir`
    this.targets = options.targets as NexeTarget[]
    this.target = this.targets[0]
-    if (!/https?\:\/\//.test(options.remote)) {
-      throw new NexeError(`Invalid remote URI scheme (must be http or https): ${options.remote}`)
+    if (options.asset && options.asset.startsWith('http')) {
+      this.remoteAsset = options.asset
+    } else {
+      this.remoteAsset =
+        'https://github.com/nexe/nexe/releases/download/v3.3.3/' + this.target.toString()
    }
-    this.remoteAsset = options.remote + 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
@@ -136,23 +136,31 @@ export class NexeCompiler {
  }

  @bound
-  addResource(absoluteFileName: string, content?: Buffer | string | File) {
-    return this.bundle.addResource(absoluteFileName, content)
+  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))
+    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) => {
+        contents: await readFileAsync(absPath, 'utf-8').catch(x => {
          if (x.code === 'ENOENT') return ''
          throw x
-        }),
+        })
      }
      this.files.push(cachedFile)
    }
@@ -168,11 +176,11 @@ export class NexeCompiler {
  @bound
  async replaceInFileAsync(file: string, replace: string | RegExp, value: string | StringReplacer) {
    const entry = await this.readFileAsync(file)
-    entry.contents = entry.contents.toString().replace(replace, value as any)
+    entry.contents = entry.contents.replace(replace, value as any)
  }

  @bound
-  async setFileContentsAsync(file: string, contents: string | Buffer) {
+  async setFileContentsAsync(file: string, contents: string) {
    const entry = await this.readFileAsync(file)
    entry.contents = contents
  }
@@ -190,7 +198,7 @@ export class NexeCompiler {
  }

  public getNodeExecutableLocation(target?: NexeTarget) {
-    if (this.options.asset) {
+    if (this.options.asset && !this.options.asset.startsWith('http')) {
      return resolve(this.options.cwd, this.options.asset)
    }
    if (target) {
@@ -203,11 +211,11 @@ export class NexeCompiler {
    if (this.log.verbose) {
      this.compileStep!.pause()
    }
-    return new Promise<void>((resolve, reject) => {
+    return new Promise((resolve, reject) => {
      spawn(command, args, {
        cwd: this.src,
        env: this.env,
-        stdio: this.log.verbose ? 'inherit' : 'ignore',
+        stdio: this.log.verbose ? 'inherit' : 'ignore'
      })
        .once('error', (e: Error) => {
          if (this.log.verbose) {
@@ -234,7 +242,7 @@ export class NexeCompiler {
    }
    return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
      this.configureScript,
-      ...this.options.configure,
+      ...this.options.configure
    ])
  }

@@ -253,7 +261,10 @@ export class NexeCompiler {
    return createReadStream(this.getNodeExecutableLocation())
  }

-  private async _shouldCompileBinaryAsync(binary: NodeJS.ReadableStream | null, location: string) {
+  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

@@ -287,24 +298,22 @@ export class NexeCompiler {
    return [this.shims.join(''), this.startup].join(';')
  }

-  private async _assembleDeliverable(binary: NodeJS.ReadableStream) {
+  private _assembleDeliverable(binary: NodeJS.ReadableStream) {
    if (!this.options.mangle) {
      return binary
    }
-    const resources = this.bundle.renderIndex()
-    this.shims.unshift(wrap(`process.__nexe = ${JSON.stringify({ resources })};\n`))

-    const code = this.code(),
-      codeSize = Buffer.byteLength(code),
-      lengths = Buffer.from(Array(16))
+    const startup = this.code(),
+      codeSize = Buffer.byteLength(startup)

+    const lengths = Buffer.from(Array(16))
    lengths.writeDoubleLE(codeSize, 0)
-    lengths.writeDoubleLE(this.bundle.size, 8)
-    return new (MultiStream as any)([
+    lengths.writeDoubleLE(this.bundle.blobSize, 8)
+    return combineStreams([
      binary,
-      toStream(code),
+      toStream(startup),
      this.bundle.toStream(),
-      toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths])),
+      toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
    ])
  }
 }
@@ -1,159 +1,70 @@
-import * as fs from 'fs'
-import { promisify } from 'util'
+import { stat as getStat, Stats, createReadStream } from 'fs'
 import { relative } from 'path'
 import { Readable } from 'stream'
-import { argv } from '../options'
-import { File } from 'resolve-dependencies'
-import MultiStream = require('multistream')
+import combineStreams = require('multistream')

-const lstat = promisify(fs.lstat),
-  realpath = promisify(fs.realpath),
-  createReadStream = fs.createReadStream,
-  stat = promisify(fs.stat)
-
-export type MultiStreams = (Readable | (() => Readable))[]
+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)
 }

-function sortEntry(a: [string, File], b: [string, File]) {
-  return a[0] > b[0] ? 1 : -1
-}
-
 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
 }

-async function createFile(absoluteFileName: string) {
-  const stats = await lstat(absoluteFileName),
-    file: File = {
-      size: stats.size,
-      moduleType: 'commonjs',
-      contents: '',
-      absPath: absoluteFileName,
-      deps: {},
-    }
-  if (stats.isSymbolicLink()) {
-    file.size = stats.size
-    const [realPath, realStat] = await Promise.all([
-      realpath(absoluteFileName),
-      stat(absoluteFileName),
-    ])
-    file.realPath = realPath
-    file.realSize = realStat.size
-  }
-  return file
+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 {
-  size = 0
-  cwd: string
-  rendered = false
-  private offset = 0
-  private index: { [key: string]: [number, number] } = {}
-  private files: { [key: string]: File } = {}
-  streams: MultiStreams = []
  constructor({ cwd }: { cwd: string } = { cwd: process.cwd() }) {
    this.cwd = cwd
  }
+  cwd: string
+  blobSize: number = 0
+  index: { [relativeFilePath: string]: [number, number] } = {}
+  streams: (Readable | (() => Readable))[] = []

-  get list() {
-    return Object.keys(this.files)
-  }
-
-  public async addResource(
-    absoluteFileName: string,
-    content?: File | Buffer | string
-  ): Promise<number> {
-    if (this.files[absoluteFileName]) {
-      return this.size
-    }
-    if (typeof content === 'string' || Buffer.isBuffer(content)) {
-      this.files[absoluteFileName] = {
-        size: Buffer.byteLength(content),
-        moduleType: 'commonjs',
-        contents: content as any, //todo type is wrong here... should allow buffer
-        deps: {},
-        absPath: absoluteFileName,
-      }
-    } else if (content) {
-      this.files[content.absPath] = content
+  async addResource(absoluteFileName: string, content?: Buffer | string) {
+    let length = 0
+    if (content !== undefined) {
+      length = Buffer.byteLength(content)
    } else {
-      this.files[absoluteFileName] = {
-        absPath: absoluteFileName,
-        moduleType: 'commonjs',
-        contents: '',
-        deps: {},
-        size: 0,
-      }
-      this.files[absoluteFileName] = await createFile(absoluteFileName)
+      const stats = await stat(absoluteFileName)
+      length = stats.size
    }
-    return (this.size += this.files[absoluteFileName].size)
+
+    const start = this.blobSize
+
+    this.blobSize += length
+    this.index[makeRelative(this.cwd, absoluteFileName)] = [start, length]
+    this.streams.push(() => (content ? toStream(content) : createReadStream(absoluteFileName)))
  }

-  /**
-   * De-dupe files by absolute path, partition by symlink/real
-   * Iterate over real, add entries
-   * Iterate over symlinks, add symlinks
-   */
-  renderIndex() {
-    if (this.rendered) {
-      throw new Error('Bundle index already rendered')
-    }
-    const files = Object.entries(this.files),
-      realFiles: [string, File][] = [],
-      symLinks: [string, File][] = []
-    for (const entry of files) {
-      if (entry[1].realPath) {
-        symLinks.push(entry)
-      } else {
-        realFiles.push(entry)
-      }
-    }
-    realFiles.sort(sortEntry)
-    symLinks.sort(sortEntry)
-
-    for (const [absPath, file] of realFiles) {
-      this.addEntry(absPath, file)
-    }
-    for (const [absPath, file] of symLinks) {
-      this.addEntry(file.realPath as string, file)
-      this.addEntry(absPath, file, file.realPath)
-    }
-    this.rendered = true
-    return this.index
-  }
-
-  /**
-   * Add a stream if needed and an entry with the required offset and size
-   * Ensure the calling order of this method is idempotent (eg, while iterating a sorted set)
-   * @param entryPath
-   * @param file
-   * @param useEntry
-   */
-  addEntry(entryPath: string, file: File, useEntry?: string) {
-    const existingName = useEntry && makeRelative(this.cwd, useEntry),
-      name = makeRelative(this.cwd, entryPath),
-      size = file.realSize ?? file.size,
-      existingEntry = this.index[existingName ?? name]
-
-    this.index[name] = existingEntry || [this.offset, size]
-    if (!existingEntry) {
-      this.streams.push(() =>
-        file.contents ? toStream(file.contents) : createReadStream(file.absPath)
-      )
-      this.offset += size
-    }
+  concat() {
+    throw new Error('Not Implemented')
  }

  toStream() {
-    return new (MultiStream as any)(this.streams)
+    return combineStreams(this.streams)
+  }
+
+  toJSON() {
+    return this.index
  }
 }
@@ -1,5 +1,4 @@
 import { Stats } from 'fs'
-import { getLatestGitRelease } from '../releases'

 export interface NexeBinary {
  blobPath: string
@@ -16,12 +15,6 @@ export interface NexeBinary {
 let originalFsMethods: any = null
 let lazyRestoreFs = () => {}

-// optional Win32 file namespace prefix followed by drive letter and colon
-const windowsFullPathRegex = /^(\\{2}\?\\)?([a-zA-Z]):/
-
-const upcaseDriveLetter = (s: string): string =>
-  s.replace(windowsFullPathRegex, (_match, ns, drive) => `${ns || ''}${drive.toUpperCase()}:`)
-
 function shimFs(binary: NexeBinary, fs: any = require('fs')) {
  if (originalFsMethods !== null) {
    return
@@ -35,21 +28,18 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
    isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
    noop = () => {},
    path = require('path'),
-    winPath: (key: string) => string = isWin ? upcaseDriveLetter : (s) => s,
-    baseDir = winPath(path.dirname(process.execPath))
+    baseDir = path.dirname(process.execPath)

  let log = (_: string) => true
-  let loggedManifest = false
  if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) {
-    log = (text: string) => {
-      setupManifest()
-      if (!loggedManifest) {
-        process.stderr.write('[nexe] - MANIFEST' + JSON.stringify(manifest, null, 4) + '\n')
-        process.stderr.write('[nexe] - DIRECTORIES' + JSON.stringify(directories, null, 4) + '\n')
-        loggedManifest = true
-      }
-      return process.stderr.write('[nexe] - ' + text + '\n')
+    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 {
@@ -64,67 +54,42 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
    return winPath(key)
  }

-  const statTime = function () {
+  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()
    }
  }

-  let BigInt: Function
-  try {
-    BigInt = eval('BigInt')
-  } catch (ignored) {}
-
-  const minBlocks = Math.max(Math.ceil(stat.blksize / 512), 1)
-  const createStat = function (extensions: any, options: any) {
-    const stat = Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
-    if ('size' in extensions) {
-      //Assume non adjustable allocation size for file system
-      stat.blocks = Math.ceil(stat.size / stat.blksize) * minBlocks
-    }
-    if (options && options.bigint && typeof BigInt !== 'undefined') {
-      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)
-    }
-  }
-
-  const getStat = function (fn: string) {
-    return 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)
-      }
-      if (stat) {
-        process.nextTick(() => {
-          callback(null, stat)
-        })
-      } else {
-        return originalFsMethods[fn].apply(fs, arguments)
-      }
+      return createStat({ size: manifest[key][1] })
    }
  }

@@ -137,7 +102,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
  }

  let setupManifest = () => {
-    Object.keys(manifest).forEach((filepath) => {
+    Object.keys(manifest).forEach(filepath => {
      const entry = manifest[filepath]
      const absolutePath = getKey(filepath)
      const longPath = makeLong(absolutePath)
@@ -231,28 +196,25 @@ 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) {
+      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)
+        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) {
@@ -269,7 +231,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
        blobPath,
        Object.assign({}, opts, {
          start: resourceOffset,
-          end: resourceOffset + length - 1,
+          end: resourceOffset + length - 1
        })
      )
    },
@@ -288,25 +250,27 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
      originalFsMethods.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: getStat('stat'),
-    lstat: getStat('lstat'),
-    lstatSync: function statSync(filepath: string | Buffer, options: any) {
-      const stat = ownStat(filepath, options)
+    stat: function stat(filepath: string | Buffer, callback: any) {
+      const stat = ownStat(filepath)
      if (stat) {
-        return stat
+        process.nextTick(() => {
+          callback(null, stat)
+        })
+      } else {
+        return originalFsMethods.stat.apply(fs, arguments)
      }
-      return originalFsMethods.lstatSync.apply(fs, arguments)
-    },
+    }
  }
+
  if (typeof fs.exists === 'function') {
-    nfs.exists = function (filepath: string, cb: Function) {
+    nfs.exists = function(filepath: string, cb: Function) {
      cb = cb || noop
      const exists = nfs.existsSync(filepath)
      process.nextTick(() => cb(exists))
@@ -315,9 +279,9 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {

  const patches = (process as any).nexe.patches || {}
  delete (process as any).nexe
-  patches.internalModuleReadFile = function (this: any, original: any, ...args: any[]) {
+  patches.internalModuleReadFile = function(this: any, original: any, ...args: any[]) {
+    const [filepath] = args
    setupManifest()
-    const filepath = getKey(args[0])
    if (manifest[filepath]) {
      log('read     (hit)              ' + filepath)
      return nfs.readFileSync(filepath, 'utf-8')
@@ -325,17 +289,10 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
    log('read          (miss)       ' + filepath)
    return original.call(this, ...args)
  }
-  let returningArray: boolean
-  patches.internalModuleReadJSON = function (this: any, original: any, ...args: any[]) {
-    if (returningArray == null) returningArray = Array.isArray(original.call(this, ''))
-    const res = patches.internalModuleReadFile.call(this, original, ...args)
-    return returningArray && !Array.isArray(res)
-      ? [res, /"(main|name|type|exports|imports)"/.test(res)]
-      : res
-  }
-  patches.internalModuleStat = function (this: any, original: any, ...args: any[]) {
+  patches.internalModuleReadJSON = patches.internalModuleReadFile
+  patches.internalModuleStat = function(this: any, original: any, ...args: any[]) {
    setupManifest()
-    const filepath = getKey(args[0])
+    const [filepath] = args
    if (manifest[filepath]) {
      log('stat     (hit)              ' + filepath + '   ' + 0)
      return 0
@@ -356,7 +313,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
  }

  if (typeof fs.exists === 'function') {
-    nfs.exists = function (filepath: string, cb: Function) {
+    nfs.exists = function(filepath: string, cb: Function) {
      cb = cb || noop
      const exists = nfs.existsSync(filepath)
      if (!exists) {
@@ -367,7 +324,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
  }

  if (typeof fs.copyFile === 'function') {
-    nfs.copyFile = function (filepath: string, dest: string, flags: number, callback: Function) {
+    nfs.copyFile = function(filepath: string, dest: string, flags: number, callback: Function) {
      setupManifest()
      const entry = manifest[getKey(filepath)]
      if (!entry) {
@@ -389,7 +346,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
        })
      })
    }
-    nfs.copyFileSync = function (filepath: string, dest: string) {
+    nfs.copyFileSync = function(filepath: string, dest: string) {
      setupManifest()
      const entry = manifest[getKey(filepath)]
      if (!entry) {
@@ -399,29 +356,10 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
    }
  }

-  if (typeof fs.realpath.native === 'function') {
-    nfs.realpath.native = function realpathNative(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.native.call(fs, filepath, options, cb)
-    }
-    nfs.realpathSync.native = function realpathSyncNative(filepath: any, options: any) {
-      setupManifest()
-      const key = getKey(filepath)
-      if (manifest[key]) {
-        return filepath
-      }
-      return originalFsMethods.realpathSync.native.call(fs, filepath, options)
-    }
-  }
-
  Object.assign(fs, nfs)

  lazyRestoreFs = () => {
-    Object.keys(nfs).forEach((key) => {
+    Object.keys(nfs).forEach(key => {
      fs[key] = originalFsMethods[key]
    })
    lazyRestoreFs = () => {}
@@ -24,7 +24,7 @@ export class Logger {
      this.ora = ora({
        text: 'Starting...',
        color: 'blue',
-        spinner: 'dots',
+        spinner: 'dots'
      })
      this.ora.stop()
    }
@@ -35,7 +35,7 @@ export class Logger {

  flush() {
    !this.silent && this.ora.succeed()
-    return new Promise((resolve) => setTimeout(resolve, frameLength))
+    return new Promise(resolve => setTimeout(resolve, frameLength))
  }

  _write(update: string, color = 'green') {
@@ -66,7 +66,7 @@ export class Logger {
      modify: this.modify,
      log: this.verbose ? this.write : this.modify,
      pause: () => this.ora.stopAndPersist(),
-      resume: () => this.ora.start(),
+      resume: () => this.ora.start()
    } as LogStep
  }
 }
@@ -15,7 +15,7 @@ async function compile(
  compilerOptions?: Partial<NexeOptions>,
  callback?: (err: Error | null) => void
 ) {
-  let error: Error | null = null,
+  let error = null,
    options: NexeOptions | null = null,
    compiler: NexeCompiler | null = null

@@ -32,7 +32,7 @@ async function compile(
      options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
      options.plugins as NexePatch[]
    )(compiler)
-  } catch (e: any) {
+  } catch (e) {
    error = e
  }

@@ -21,7 +21,6 @@ export interface NexeOptions {
  output: string
  targets: (string | NexeTarget)[]
  name: string
-  remote: string
  asset: string
  cwd: string
  fs: boolean | string[]
@@ -71,18 +70,17 @@ const defaults = {
  build: false,
  bundle: true,
  patches: [],
-  plugins: [],
-  remote: 'https://github.com/nexe/nexe/releases/download/v3.3.3/',
+  plugins: []
 }
 const alias = {
  i: 'input',
  o: 'output',
  v: 'version',
-  a: 'asset',
  t: 'target',
  b: 'build',
  n: 'name',
  r: 'resource',
+  a: 'asset',
  p: 'python',
  f: 'flag',
  c: 'configure',
@@ -90,7 +88,7 @@ const alias = {
  h: 'help',
  l: 'loglevel',
  'fake-argv': 'fakeArgv',
-  'gh-token': 'ghToken',
+  'gh-token': 'ghToken'
 }
 const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
 let help = `
@@ -103,7 +101,7 @@ ${c.bold('nexe <entry-file> [options]')}
  -t   --target                     -- node version description
  -n   --name                       -- main app module name
  -r   --resource                   -- *embed files (glob) within the binary
-       --remote                     -- alternate location (URL) to download pre-built base (nexe) binaries from
+  -a   --asset                      -- alternate asset path, file or url pointing to a base (nexe) binary
       --plugin                     -- extend nexe runtime behavior

   ${c.underline.bold('Building from source:')}
@@ -114,7 +112,7 @@ ${c.bold('nexe <entry-file> [options]')}
  -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
+       --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)
@@ -135,7 +133,7 @@ ${c.bold('nexe <entry-file> [options]')}
 help = EOL + help + EOL

 function flatten(...args: any[]): string[] {
-  return ([] as string[]).concat(...args).filter((x) => x)
+  return ([] as string[]).concat(...args).filter(x => x)
 }

 /**
@@ -146,13 +144,16 @@ 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)
+    .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
+    )
 }

 function extractLogLevel(options: NexeOptions) {
@@ -251,10 +252,6 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
  options.configure = flatten(options.configure)
  options.resources = flatten(opts.resource, options.resources)

-  if (!options.remote.endsWith('/')) {
-    options.remote += '/'
-  }
-
  options.downloadOptions = options.downloadOptions || {}
  options.downloadOptions.headers = options.downloadOptions.headers || {}
  options.downloadOptions.headers['User-Agent'] = 'nexe (https://www.npmjs.com/package/nexe)'
@@ -295,8 +292,8 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
  }

  Object.keys(alias)
-    .filter((k) => k !== 'rc')
-    .forEach((x) => delete opts[x])
+    .filter(k => k !== 'rc')
+    .forEach(x => delete opts[x])

  return options
 }
@@ -20,13 +20,13 @@ const footer = tailWindow.slice(footerPosition, footerPosition + 32),
 Object.defineProperty(
  process,
  '__nexe',
-  (function () {
+  (function() {
    let nexeHeader: any = null
    return {
-      get: function () {
+      get: function() {
        return nexeHeader
      },
-      set: function (value: any) {
+      set: function(value: any) {
        if (nexeHeader) {
          throw new Error('This property is readonly')
        }
@@ -37,13 +37,13 @@ Object.defineProperty(
            contentSize,
            contentStart,
            resourceSize,
-            resourceStart,
-          },
+            resourceStart
+          }
        })
        Object.freeze(nexeHeader)
      },
      enumerable: false,
-      configurable: false,
+      configurable: false
    }
  })()
 )
@@ -9,11 +9,11 @@ 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[^;]*;/gm,
-      '0;/*$&*/'
+      /(?<!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',
@@ -21,7 +21,7 @@ export default async function disableNodeCli(compiler: NexeCompiler, next: () =>
      'int i = v8_argc; i < v8_argc; i++'
    )
    let matches = 0
-    await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, (match) => {
+    await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, match => {
      if (matches++) {
        return 'false'
      }
@@ -13,8 +13,8 @@ export default async function nodeGyp(
    `
    ${nodeGypMarker}
    ${files
-      .filter((x) => x.filename.startsWith('lib'))
-      .map((x) => `'${x.filename}'`)
+      .filter(x => x.filename.startsWith('lib'))
+      .map(x => `'${x.filename}'`)
      .toString()},
  `.trim()
  )
@@ -8,19 +8,18 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise

  const file = await compiler.readFileAsync('src/res/node.rc')

-  Object.keys(options).forEach((key) => {
+  Object.keys(options).forEach(key => {
    let value = options[key]
    const isVar = /^[A-Z_]+$/.test(value)
    value = isVar ? value : `"${value}"`
-    file.contents = file.contents
-      .toString()
-      .replace(new RegExp(`VALUE "${key}",.*`), `VALUE "${key}", ${value}`)
+    file.contents = file.contents.replace(
+      new RegExp(`VALUE "${key}",.*`),
+      `VALUE "${key}", ${value}`
+    )
  })
-  ;['PRODUCTVERSION', 'FILEVERSION'].forEach((x) => {
+  ;['PRODUCTVERSION', 'FILEVERSION'].forEach(x => {
    if (options[x]) {
-      file.contents = file.contents
-        .toString()
-        .replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
+      file.contents = file.contents.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
    }
  })

@@ -2,7 +2,7 @@ import { resolve } from 'path'
 import { NexeCompiler } from '../compiler'
 import { semverGt } from '../util'

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

  if (!snapshot) {
@@ -36,13 +36,13 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
  }

  const file = await compiler.readFileAsync(bootFile),
-    ast = parse(file.contents.toString(), {
+    ast = parse(file.contents, {
      loc: true,
      tolerant: true,
      next: true,
      globalReturn: true,
      node: true,
-      skipShebang: true,
+      skipShebang: true
    }),
    location = { start: { line: 0 } }

@@ -54,7 +54,7 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
    }
  })

-  const fileLines = file.contents.toString().split('\n')
+  const fileLines = file.contents.split('\n')
  fileLines.splice(
    location.start.line,
    0,
@@ -65,40 +65,17 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
  file.contents = fileLines.join('\n')

  if (semverGt(version, '11.99')) {
-    if (semverGt(version, '12.17.99')) {
-      await compiler.replaceInFileAsync(
-        bootFile,
-        'initializeFrozenIntrinsics();',
-        'initializeFrozenIntrinsics();\n' + wrap('{{replace:lib/patches/boot-nexe.js}}')
-      )
-    } else {
-      await compiler.replaceInFileAsync(
-        bootFile,
-        'initializePolicy();',
-        'initializePolicy();\n' + wrap('{{replace:lib/patches/boot-nexe.js}}')
-      )
-    }
    await compiler.replaceInFileAsync(
      bootFile,
-      'assert(!CJSLoader.hasLoadedAnyUserCJSModule)',
-      '/*assert(!CJSLoader.hasLoadedAnyUserCJSModule)*/'
+      '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'
    )
-    const { contents: nodeccContents } = await compiler.readFileAsync('src/node.cc')
-    if (nodeccContents.includes('if (env->worker_context() != nullptr) {')) {
-      await compiler.replaceInFileAsync(
-        'src/node.cc',
-        'if (env->worker_context() != nullptr) {',
-        'if (env->worker_context() == nullptr) {\n' +
-          '  return StartExecution(env, "internal/main/run_main_module"); } else {\n'
-      )
-    } else {
-      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',
@@ -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, 6, 7, 8, 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,21 +25,19 @@ async function getJson<T>(url: string, options?: any) {
 }

 function isBuildableVersion(version: string) {
-  if (version === '12.11.0') {
-    return false
-  }
-  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) {
-  return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/latest', options)
+export function getV3GitRelease(options?: any) {
+  return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/7567580/', options)
 }

 export async function getUnBuiltReleases(options?: any) {
  const nodeReleases = await getJson<NodeRelease[]>(
    'https://nodejs.org/download/release/index.json'
  )
-  const existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name))
+  const existingVersions = (await getV3GitRelease(options)).assets.map(x => getTarget(x.name))

  const versionMap: { [key: string]: true } = {}
  return nodeReleases
@@ -49,8 +47,8 @@ export async function getUnBuiltReleases(options?: any) {
        return versions
      }
      versionMap[version] = true
-      platforms.forEach((platform) => {
-        architectures.forEach((arch) => {
+      platforms.forEach(platform => {
+        architectures.forEach(arch => {
          if (arch === 'x86' && platform === 'mac') return
          if (arch.includes('arm')) return
          versions.push(getTarget({ platform, arch, version }))
@@ -58,5 +56,5 @@ export async function getUnBuiltReleases(options?: any) {
      })
      return versions
    }, [])
-    .filter((x) => !existingVersions.some((t) => targetsEqual(t, x)))
+    .filter(x => !existingVersions.some(t => targetsEqual(t, x)))
 }
@@ -1,28 +1,29 @@
 import { join, dirname } from 'path'
-import * as fs from 'fs'
-import { promisify } from 'util'
+import { readdir, unlink } from 'fs'
 import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util'
-import mkdirpAsync = require('mkdirp')
+import * as mkdirp from 'mkdirp'
 import { NexeCompiler } from '../compiler'
+import pify = require('pify')

-const unlinkAsync = promisify(fs.unlink),
-  readdirAsync = promisify(fs.readdir)
+const mkdirpAsync = pify(mkdirp)
+const unlinkAsync = pify(unlink)
+const readdirAsync = pify(readdir)

 function readDirAsync(dir: string): Promise<string[]> {
-  return readdirAsync(dir).then((paths) => {
+  return readdirAsync(dir).then(paths => {
    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) => {
+    ).then(result => {
      return [].concat(...(result as any))
    })
  })
 }

 function maybeReadFileContentsAsync(file: string) {
-  return readFileAsync(file, 'utf-8').catch((e) => {
+  return readFileAsync(file, 'utf-8').catch(e => {
    if (e.code === 'ENOENT') {
      return ''
    }
@@ -46,16 +47,16 @@ export default async function artifacts(compiler: NexeCompiler, next: () => Prom
  const tmpFiles = await readDirAsync(temp)

  await Promise.all(
-    tmpFiles.map(async (path) => {
+    tmpFiles.map(async path => {
      return compiler.writeFileAsync(path.replace(temp, ''), await readFileAsync(path, 'utf-8'))
    })
  )

  await next()

-  await Promise.all(tmpFiles.map((x) => unlinkAsync(x)))
+  await Promise.all(tmpFiles.map(x => unlinkAsync(x)))
  return Promise.all(
-    compiler.files.map(async (file) => {
+    compiler.files.map(async file => {
      const sourceFile = join(src, file.filename)
      const tempFile = join(temp, file.filename)
      const fileContents = await maybeReadFileContentsAsync(sourceFile)
@@ -1,12 +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, each } from '../util'
+import { dequote, STDIN_FLAG, semverGt } from '../util'
 import { Readable } from 'stream'

 function getStdIn(stdin: Readable): Promise<string> {
  let out = ''
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
    stdin
      .setEncoding('utf8')
      .on('readable', () => {
@@ -25,7 +26,7 @@ function getStdIn(stdin: Readable): Promise<string> {
 }

 export default async function bundle(compiler: NexeCompiler, next: any) {
-  const { bundle: doBundle, cwd, input: inputPath } = compiler.options
+  const { bundle, cwd, input: inputPath } = compiler.options
  let input = inputPath
  compiler.entrypoint = './' + relative(cwd, input)

@@ -35,14 +36,14 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
    compiler.startup = ';require("module").runMain();'
  }

-  if (!doBundle) {
+  if (!bundle) {
    await compiler.addResource(resolve(cwd, input))
    return next()
  }

  let code = ''
-  if (typeof doBundle === 'string') {
-    code = await require(doBundle).createBundle(compiler.options)
+  if (typeof bundle === 'string') {
+    code = await require(bundle).createBundle(compiler.options)
  }

  if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) {
@@ -61,25 +62,20 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
    compiler.entrypoint = './' + relative(cwd, input)
  }

-  const { files, warnings } = resolveFiles(
+  const { files, warnings } = await resolveFiles(
    input,
-    ...Object.keys(compiler.bundle.list).filter((x) => x.endsWith('.js')),
-    { cwd, expand: 'variable', loadContent: false }
+    ...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
+    { cwd, expand: 'all', loadContent: false }
  )

  if (
-    warnings.filter((x) => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
+    warnings.filter(x => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
  ) {
    throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
  }

-  //TODO: warnings.forEach((x) => console.log(x))
-
-  await Promise.all(
-    Object.entries(files).map(([key, file]) => {
-      return compiler.addResource(key, file)
-    })
-  )
-
+  await each(Object.keys(files), (filename: string) => compiler.addResource(filename), {
+    concurrency: 10
+  })
  return next()
 }
@@ -11,7 +11,7 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
    .on('response', (res: IncomingMessage) => {
      const total = +res.headers['content-length']!
      let current = 0
-      res.on('data', (data) => {
+      res.on('data', data => {
        current += data.length
        setText((current / total) * 100)
        if (current === total) {
@@ -32,13 +32,13 @@ async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) {
      (res: IncomingMessage) => {
        const total = +res.headers['content-length']!
        let current = 0
-        res.on('data', (data) => {
+        res.on('data', data => {
          current += data.length
          step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
        })
      }
    )
-  } catch (e: any) {
+  } catch (e) {
    if (e.statusCode === 404) {
      throw new NexeError(`${remoteAsset} is not available, create it using the --build flag`)
    } else {
@@ -1,25 +1,22 @@
-import { each } from '../util'
-import * as globs from 'globby'
-import { resolve } from 'path'
+import { isDirectoryAsync, each } from '../util'
+import globs from 'globby'
 import { NexeCompiler } from '../compiler'

 export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
-  const { cwd, resources } = compiler.options
-  if (!resources.length) {
+  const { cwd } = compiler.options
+  if (!compiler.options.resources.length) {
    return next()
  }
  const step = compiler.log.step('Bundling Resources...')
  let count = 0
-
-  // workaround for https://github.com/sindresorhus/globby/issues/127
-  // and https://github.com/mrmlnc/fast-glob#pattern-syntax
-  const resourcesWithForwardSlashes = resources.map((r) => r.replace(/\\/g, '/'))
-
-  await each(globs(resourcesWithForwardSlashes, { cwd, onlyFiles: true }), async (file) => {
+  await each(globs(compiler.options.resources, { cwd }), async file => {
+    if (await isDirectoryAsync(file)) {
+      return
+    }
    count++
    step.log(`Including file: ${file}`)
-    await compiler.addResource(resolve(cwd, file))
+    await compiler.addResource(file)
  })
-  step.log(`Included ${count} file(s)`)
+  step.log(`Included ${count} file(s). ${(compiler.resourceSize / 1e6).toFixed(3)} MB`)
  return next()
 }
@@ -1,11 +1,10 @@
 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` +
        '{{replace:lib/fs/patch.js}}' +
        '\nshimFs(process.__nexe)' +
        `\n${compiler.options.fs ? '' : 'restoreFs()'}`
@@ -33,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 }

@@ -21,21 +21,21 @@ const prettyPlatform: { [key: string]: NodePlatform } = {
  mac: 'mac',
  linux: 'linux',
  static: 'alpine',
-  alpine: 'alpine',
+  alpine: 'alpine'
 }

 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',
-  x64: 'x64',
+  x64: 'x64'
 }

 function isVersion(x: string) {
@@ -80,7 +80,7 @@ export function getTarget(target: string | Partial<NexeTarget> = ''): NexeTarget
  target
    .toLowerCase()
    .split('-')
-    .forEach((x) => {
+    .forEach(x => {
      if (isVersion(x)) {
        version = x.replace(/v/g, '')
      }
@@ -1,9 +1,9 @@
 import { readFile, writeFile, stat } from 'fs'
 import { execFile } from 'child_process'
-import { promisify } from 'util'
+import pify = require('pify')
 import rimraf = require('rimraf')

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

 export async function each<T>(
@@ -42,10 +42,10 @@ const bound: MethodDecorator = function bound<T>(
      Object.defineProperty(this, propertyKey as string, {
        configurable,
        value,
-        writable: true,
+        writable: true
      })
      return value
-    },
+    }
  }
 }

@@ -64,21 +64,21 @@ export interface ReadFileAsync {
  (path: string, encoding: string): Promise<string>
 }

-const readFileAsync = promisify(readFile)
-const writeFileAsync = promisify(writeFile)
-const statAsync = promisify(stat)
-const execFileAsync = promisify(execFile)
+const readFileAsync = pify(readFile)
+const writeFileAsync = pify(writeFile)
+const statAsync = pify(stat)
+const execFileAsync = pify(execFile)
 const isWindows = process.platform === 'win32'

 function pathExistsAsync(path: string) {
  return statAsync(path)
-    .then((x) => true)
+    .then(x => true)
    .catch(falseOnEnoent)
 }

 function isDirectoryAsync(path: string) {
  return statAsync(path)
-    .then((x) => x.isDirectory())
+    .then(x => x.isDirectory())
    .catch(falseOnEnoent)
 }
 /**
@@ -109,5 +109,5 @@ export {
  readFileAsync,
  pathExistsAsync,
  isDirectoryAsync,
-  writeFileAsync,
+  writeFileAsync
 }
@@ -1,9 +1,9 @@
 import * as nexe from '../lib/nexe'
-import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
+import { getUnBuiltReleases, getV3GitRelease } from '../lib/releases'
 import { runDockerBuild } from './docker'
 import { getTarget, targetsEqual, NexeTarget } from '../lib/target'
 import { pathExistsAsync, readFileAsync, execFileAsync, semverGt } from '../lib/util'
-import got from 'got'
+import got = require('got')
 import { cpus } from 'os'

 const env = process.env,
@@ -14,12 +14,12 @@ const env = process.env,
  isMac = process.platform === 'darwin',
  headers = {
    Authorization: 'token ' + env.GITHUB_TOKEN,
-    'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)',
+    'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
  }

 if (require.main === module) {
  if (!isPullRequest) {
-    build().catch((x) => {
+    build().catch(x => {
      console.error(x)
      process.exit(1)
    })
@@ -31,10 +31,10 @@ async function build() {
  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')
+  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

@@ -62,7 +62,7 @@ async function build() {
      verbose: Boolean(env.NEXE_VERBOSE!),
      target,
      make: ['-j' + cpus().length],
-      output,
+      output
    }
  console.log('Building: ' + target + ' on ' + buildHost)
  const stop = keepalive()
@@ -78,21 +78,21 @@ async function build() {
  stop()
  if (await pathExistsAsync(output)) {
    await assertNexeBinary(output)
-    const gitRelease = await getLatestGitRelease({ headers }),
+    const gitRelease = await getV3GitRelease({ headers }),
      unbuiltReleases = await getUnBuiltReleases({ headers })
-    if (!unbuiltReleases.some((x) => targetsEqual(x, target!))) {
+    if (!unbuiltReleases.some(x => targetsEqual(x, target!))) {
      console.log(`${target} already uploaded.`)
      process.exit(0)
      return
    }
    await got(gitRelease.upload_url.split('{')[0], {
-      searchParams: { name: target.toString() },
+      query: { name: target.toString() },
      body: await readFileAsync(output),
      headers: {
        ...headers,
-        'Content-Type': 'application/octet-stream',
-      },
-    }).catch((reason) => {
+        'Content-Type': 'application/octet-stream'
+      }
+    }).catch(reason => {
      console.log(reason && reason.response && reason.response.body)
      throw reason
    })
@@ -107,7 +107,7 @@ function keepalive() {
 }

 function assertNexeBinary(file: string) {
-  return execFileAsync(file).catch((e) => {
+  return execFileAsync(file).catch(e => {
    if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
      return
    }
@@ -1,12 +1,12 @@
 import { NexeTarget, architectures } from '../lib/target'
 import { writeFileAsync, readFileAsync } from '../lib/util'
-import got from 'got'
+import got = require('got')
 import execa = require('execa')
 import { appendFileSync } from 'fs'

 function alpine(target: NexeTarget) {
  return `
-FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.12
+FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.4
 RUN apk add --no-cache curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ git vim tar gzip wget
 ENV NODE_VERSION=${target.version}
 ENV NEXE_VERSION=latest
@@ -46,10 +46,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)
@@ -58,11 +58,16 @@ export async function runDockerBuild(target: NexeTarget) {
      appendFileSync(outFilename, x.stderr)
      appendFileSync(outFilename, x.stdout)
    })
-    await got(`https://transfer.sh/${Math.random().toString(36).substring(2)}.txt`, {
-      body: await readFileAsync(outFilename),
-      method: 'PUT',
-    })
-      .then((x) => console.log('Posted docker log: ', x.body))
-      .catch((e) => console.log('Error posting log', e))
+    await got(
+      `https://transfer.sh/${Math.random()
+        .toString(36)
+        .substring(2)}.txt`,
+      {
+        body: await readFileAsync(outFilename),
+        method: 'PUT'
+      }
+    )
+      .then(x => console.log('Posted docker log: ', x.body))
+      .catch(e => console.log('Error posting log', e))
  }
 }
@@ -0,0 +1,4 @@
+./test/**/*.spec.ts
+--check-leaks
+--require ts-node/register
+--recursive
@@ -39,26 +39,6 @@ describe('options', () => {
      expect(options.output).to.equal(path.resolve(cwd, `abc${ext}`))
    })
  })
-
-  describe('remote', () => {
-    it('should use default remote', () => {
-      const options = normalizeOptions({})
-      expect(options.remote).to.equal('https://github.com/nexe/nexe/releases/download/v3.3.3/')
-    })
-    it('should append trailing slash to third-party remote if necessary', () => {
-      const options = normalizeOptions({
-        remote: 'https://sitejs.org/nexe'
-      })
-      expect(options.remote).to.equal('https://sitejs.org/nexe/')
-    })
-    it('should not append trailing slash to third-party remote that already has one', () => {
-      const options = normalizeOptions({
-        remote: 'https://sitejs.org/nexe/'
-      })
-      expect(options.remote).to.equal('https://sitejs.org/nexe/')
-    })
-  })
-
  describe('output', () => {
    it('should work', () => {
      const options = normalizeOptions({
@@ -1,6 +1,6 @@
 {
  "compilerOptions": {
-    "target":"es2015",
+    "target":"es5",
    "skipLibCheck": true,
    "experimentalDecorators": true,
    "lib": ["es2018"],
Author	SHA1	Message	Date
calebboyd	00f65e9b91	chore: bump resolve-dependencies node 10 compat	2020-06-26 12:07:39 -05:00
calebboyd	58f276fae6	chore: bump resolve-dependencies	2020-06-26 11:42:23 -05:00
calebboyd	7c539db738	chore: bump resolve-dependencies	2020-06-26 10:26:53 -05:00
calebboyd	ae51cc6b87	fix: set explicit release	2020-06-21 20:16:45 -05:00
calebboyd	cf23147c9c	fix: windows build 10.16	2019-06-24 15:57:54 -05:00