chore: bump package-lock version and dev deps

closes #645

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.paypal.me/calebsboyd

README.md

@@ -202,7 +202,7 @@ For examples, see the built in patches: [src/patches](src/patches).
     - Quickly perform a replace in a file within the downloaded Node.js source. The rest arguments are passed along to `String.prototype.replace`
  - `readFileAsync(filename: string): Promise<NexeFile>`
     - Access (or create) a file within the downloaded Node.js source.
- - `addResource(filename: string, contents: Buffer): void`
+ - `addResource(filename: string, contents: Buffer): Promise<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.
@@ -216,9 +216,7 @@ Any modifications made to `NexeFile#contents` will be maintained in the cache _w
 
 ## Native Modules
 
-TODO
-
-- [ ] Implement support for `node-pre-gyp#find`.
+In order to use native modules, the native binaries must be shipped alongside the binary generated by nexe.
 
 ## Contributing
 
@@ -226,20 +224,10 @@ Building
 ```
 $ git clone git@github.com:nexe/nexe.git
 $ cd nexe
-$ yarn
+$ npm i && npm run build
 ```
 
 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/)

package.json

@@ -2,7 +2,7 @@
   "name": "nexe",
   "description": "Create a single executable out of your Node.js application",
   "license": "MIT",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.18",
   "contributors": [
     "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
     "Jared Allard <jaredallard@outlook.com>",
@@ -32,41 +32,47 @@
   "engines": {
     "node": ">=10"
   },
+  "mocha": {
+    "spec": "./test/**/*.spec.ts",
+    "checkLeaks": true,
+    "require": [
+      "ts-node/register"
+    ]
+  },
   "dependencies": {
     "@calebboyd/semaphore": "^1.3.1",
     "app-builder": "^6.2.2",
     "caw": "^2.0.1",
     "chalk": "^2.4.2",
     "cherow": "1.6.9",
-    "download": "^7.1.0",
-    "globby": "^11.0.1",
-    "got": "^9.6.0",
+    "download": "^8.0.0",
+    "globby": "^11.0.2",
+    "got": "^11.8.1",
     "minimist": "^1.2.5",
     "mkdirp": "^1.0.4",
-    "multistream": "^4.0.0",
+    "multistream": "^4.0.1",
     "ora": "^3.4.0",
-    "pify": "^4.0.1",
-    "resolve-dependencies": "^4.2.2",
-    "rimraf": "^3.0.0"
+    "pify": "^5.0.0",
+    "resolve-dependencies": "^6.0.5",
+    "rimraf": "^3.0.2"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.11",
-    "@types/download": "^6.2.4",
-    "@types/execa": "^2.0.0",
-    "@types/globby": "^9.1.0",
-    "@types/got": "^9.6.10",
-    "@types/minimist": "^1.2.0",
-    "@types/mkdirp": "^1.0.0",
-    "@types/mocha": "^7.0.2",
+    "@types/chai": "^4",
+    "@types/download": "^6",
+    "@types/globby": "^9",
+    "@types/got": "^9.6.11",
+    "@types/minimist": "^1.2.1",
+    "@types/mkdirp": "^1.0.1",
+    "@types/mocha": "^8.2.1",
     "@types/multistream": "^2.1.1",
     "@types/ora": "^3.2.0",
-    "@types/pify": "3.0.2",
+    "@types/pify": "5.0.0",
     "@types/rimraf": "3.0.0",
-    "@types/semver": "^7.1.0",
-    "chai": "^4.2.0",
-    "execa": "^4.0.0",
-    "mocha": "^7.1.1",
-    "prettier": "^2.0.5",
+    "@types/semver": "^7.3.4",
+    "chai": "^4.3.0",
+    "execa": "^5.0.0",
+    "mocha": "^8.3.0",
+    "prettier": "^2.2.1",
     "ts-node": "^8.9.0",
     "tslint": "^6.1.1",
     "tslint-config-prettier": "^1.18.0",

src/compiler.ts

@@ -18,6 +18,7 @@ import { NexeOptions, version } from './options'
 import { NexeTarget } from './target'
 import MultiStream = 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'
@@ -28,7 +29,7 @@ type StringReplacer = (match: string) => string
 export interface NexeFile {
   filename: string
   absPath: string
-  contents: string
+  contents: string | Buffer
 }
 
 export { NexeOptions }
@@ -109,13 +110,7 @@ export class NexeCompiler {
     //SOMEDAY iterate over multiple targets with `--outDir`
     this.targets = options.targets as NexeTarget[]
     this.target = this.targets[0]
-    if (
-      !(
-        options.remote.startsWith('http://') ||
-        options.remote.startsWith('https://') ||
-        options.remote.startsWith('file://')
-      )
-    ) {
+    if (!/https?\:\/\//.test(options.remote)) {
       throw new NexeError(
         `Invalid remote URI scheme (must be http, https, or file): ${options.remote}`
       )
@@ -143,7 +138,7 @@ export class NexeCompiler {
   }
 
   @bound
-  addResource(absoluteFileName: string, content?: Buffer | string) {
+  addResource(absoluteFileName: string, content?: Buffer | string | File) {
     return this.bundle.addResource(absoluteFileName, content)
   }
 
@@ -175,11 +170,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.replace(replace, value as any)
+    entry.contents = entry.contents.toString().replace(replace, value as any)
   }
 
   @bound
-  async setFileContentsAsync(file: string, contents: string) {
+  async setFileContentsAsync(file: string, contents: string | Buffer) {
     const entry = await this.readFileAsync(file)
     entry.contents = contents
   }
@@ -197,6 +192,9 @@ export class NexeCompiler {
   }
 
   public getNodeExecutableLocation(target?: NexeTarget) {
+    if (this.options.asset) {
+      return resolve(this.options.cwd, this.options.asset)
+    }
     if (target) {
       return join(this.options.temp, target.toString())
     }
@@ -257,10 +255,7 @@ export class NexeCompiler {
     return createReadStream(this.getNodeExecutableLocation())
   }
 
-  private async _shouldCompileBinaryAsync(
-    binary: NodeJS.ReadableStream | null,
-    location: string | undefined
-  ) {
+  private async _shouldCompileBinaryAsync(binary: NodeJS.ReadableStream | null, location: string) {
     //SOMEDAY combine make/configure/vcBuild/and modified times of included files
     const { snapshot, build } = this.options
 
@@ -298,22 +293,19 @@ export class NexeCompiler {
     if (!this.options.mangle) {
       return binary
     }
-    const bundle = await this.bundle.toStream()
+    const resources = this.bundle.renderIndex()
+    this.shims.unshift(wrap(`process.__nexe = ${JSON.stringify({ resources })};\n`))
 
-    this.shims.unshift(
-      wrap(`process.__nexe = ${JSON.stringify({ resources: this.bundle.fileIndex() })};\n`)
-    )
-
-    const startup = this.code(),
-      codeSize = Buffer.byteLength(startup),
+    const code = this.code(),
+      codeSize = Buffer.byteLength(code),
       lengths = Buffer.from(Array(16))
 
     lengths.writeDoubleLE(codeSize, 0)
     lengths.writeDoubleLE(this.bundle.size, 8)
     return new (MultiStream as any)([
       binary,
-      toStream(startup),
-      bundle,
+      toStream(code),
+      this.bundle.toStream(),
       toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths])),
     ])
   }

src/fs/bundle.ts

@@ -2,28 +2,25 @@ import * as fs from 'fs'
 import { promisify } from 'util'
 import { relative } from 'path'
 import { Readable } from 'stream'
-import { each } from '@calebboyd/semaphore'
+import { argv } from '../options'
+import { File } from 'resolve-dependencies'
 import MultiStream = require('multistream')
 
-const { createReadStream } = fs,
-  lstat = promisify(fs.lstat),
+const lstat = promisify(fs.lstat),
   realpath = promisify(fs.realpath),
+  createReadStream = fs.createReadStream,
   stat = promisify(fs.stat)
 
 export type MultiStreams = (Readable | (() => Readable))[]
 
-function renderSortedObject(entries: [string, [number, number]][], streams: MultiStreams) {
-  return entries.sort().reduce((obj, [key, value]) => {
-    streams.push((value as any).stream)
-    ;(value as any).stream = void 0
-    return Object.assign(obj, { [key]: value })
-  }, {})
-}
-
 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() {
@@ -34,81 +31,126 @@ export function toStream(content: Buffer | string) {
   return readable
 }
 
-export type File = { absPath: string; contents: string; deps: FileMap }
-export type FileMap = { [absPath: string]: File | null }
-
-export interface BundleOptions {
-  entries: string[]
-  cwd: string
-  expand: boolean
-  loadContent: boolean
-  files: FileMap
+async function createFile(absoluteFileName: string) {
+  const stats = await lstat(absoluteFileName),
+    file: File = {
+      size: stats.size,
+      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 class Bundle {
   size = 0
   cwd: string
   rendered = false
-  files: { [key: string]: string | Buffer | undefined } = {}
+  private offset = 0
+  private index: { [key: string]: [number, number] } = {}
+  private files: { [key: string]: File } = {}
   streams: MultiStreams = []
-  private index: { [relativeFilePath: string]: [number, number] } = {}
   constructor({ cwd }: { cwd: string } = { cwd: process.cwd() }) {
     this.cwd = cwd
   }
 
-  addResource(absoluteFileName: string, content?: Buffer | string) {
-    this.files[absoluteFileName] = content
+  get list() {
+    return Object.keys(this.files)
   }
 
-  async addEntry(absoluteFileName: string, content?: Buffer | string) {
-    let length = 0
-    let linkpath = ''
-    if (content !== undefined) {
-      length = Buffer.byteLength(content)
-    } else {
-      let stats = await lstat(absoluteFileName)
-      if (stats.isSymbolicLink()) {
-        linkpath = absoluteFileName
-        absoluteFileName = await realpath(linkpath)
-        stats = await stat(linkpath)
+  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),
+        contents: content as any, //todo type is wrong here... should allow buffer
+        deps: {},
+        absPath: absoluteFileName,
       }
-      length = stats.size
-    }
-    const name = makeRelative(this.cwd, absoluteFileName),
-      existing = this.index[name]
-    if (!existing) {
-      const start = this.size
-      this.size += length
-      this.index[name] = [start, length]
-    }
-    if (linkpath) {
-      const linkName = makeRelative(this.cwd, absoluteFileName)
-      this.index[linkName] = this.index[name]
-    }
-    if (!existing) {
-      ;(this.index[name] as any).stream = () =>
-        content ? toStream(content) : createReadStream(absoluteFileName)
+    } else if (content) {
+      this.files[content.absPath] = content
+    } else {
+      this.files[absoluteFileName] = {
+        absPath: absoluteFileName,
+        contents: '',
+        deps: {},
+        size: 0,
+      }
+      this.files[absoluteFileName] = await createFile(absoluteFileName)
     }
+    return (this.size += this.files[absoluteFileName].size)
   }
 
-  fileIndex() {
-    if (!this.rendered) {
-      throw new Error('Index not rendered must call toStream() first')
+  /**
+   * 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
   }
 
-  async toStream() {
-    this.files
-    await each(
-      Object.keys(this.files),
-      (key: string) => {
-        return this.addEntry(key, this.files[key])
-      },
-      { concurrency: 10 }
-    )
-    this.index = renderSortedObject(Object.entries(this.index), this.streams)
-    this.rendered = true
+  /**
+   * 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
+    }
+  }
+
+  toStream() {
     return new (MultiStream as any)(this.streams)
   }
 }

src/fs/patch.ts

@@ -1,4 +1,5 @@
 import { Stats } from 'fs'
+import { getLatestGitRelease } from '../releases'
 
 export interface NexeBinary {
   blobPath: string
@@ -115,6 +116,25 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
     }
   }
 
+  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)
+      }
+    }
+  }
+
   function makeLong(filepath: string) {
     return (path as any)._makeLong && (path as any)._makeLong(filepath)
   }
@@ -220,23 +240,26 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
 
       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.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.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) {
@@ -279,24 +302,16 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       }
       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: getStat('stat'),
+    lstat: getStat('lstat'),
+    lstatSync: function statSync(filepath: string | Buffer, options: any) {
+      const stat = ownStat(filepath, options)
       if (stat) {
-        process.nextTick(() => {
-          callback(null, stat)
-        })
-      } else {
-        return originalFsMethods.stat.apply(fs, arguments)
+        return stat
       }
+      return originalFsMethods.lstatSync.apply(fs, arguments)
     },
   }
-
   if (typeof fs.exists === 'function') {
     nfs.exists = function (filepath: string, cb: Function) {
       cb = cb || noop
@@ -317,7 +332,14 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
     log('read          (miss)       ' + filepath)
     return original.call(this, ...args)
   }
-  patches.internalModuleReadJSON = patches.internalModuleReadFile
+  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[]) {
     setupManifest()
     const filepath = getKey(args[0])

src/options.ts

@@ -22,6 +22,7 @@ export interface NexeOptions {
   targets: (string | NexeTarget)[]
   name: string
   remote: string
+  asset: string
   cwd: string
   fs: boolean | string[]
   flags: string[]
@@ -77,6 +78,7 @@ const alias = {
   i: 'input',
   o: 'output',
   v: 'version',
+  a: 'asset',
   t: 'target',
   b: 'build',
   n: 'name',

src/patches/node-rc.ts

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

src/patches/third-party-main.ts

@@ -36,7 +36,7 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
   }
 
   const file = await compiler.readFileAsync(bootFile),
-    ast = parse(file.contents, {
+    ast = parse(file.contents.toString(), {
       loc: true,
       tolerant: true,
       next: true,
@@ -54,7 +54,7 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
     }
   })
 
-  const fileLines = file.contents.split('\n')
+  const fileLines = file.contents.toString().split('\n')
   fileLines.splice(
     location.start.line,
     0,
@@ -83,12 +83,22 @@ export default async function main(compiler: NexeCompiler, next: () => Promise<v
       'assert(!CJSLoader.hasLoadedAnyUserCJSModule)',
       '/*assert(!CJSLoader.hasLoadedAnyUserCJSModule)*/'
     )
-    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',

src/steps/bundle.ts

@@ -1,8 +1,7 @@
 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 { dequote, STDIN_FLAG, semverGt, each } from '../util'
 import { Readable } from 'stream'
 
 function getStdIn(stdin: Readable): Promise<string> {
@@ -26,7 +25,7 @@ function getStdIn(stdin: Readable): Promise<string> {
 }
 
 export default async function bundle(compiler: NexeCompiler, next: any) {
-  const { bundle, cwd, input: inputPath } = compiler.options
+  const { bundle: doBundle, cwd, input: inputPath } = compiler.options
   let input = inputPath
   compiler.entrypoint = './' + relative(cwd, input)
 
@@ -36,14 +35,14 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
     compiler.startup = ';require("module").runMain();'
   }
 
-  if (!bundle) {
+  if (!doBundle) {
     await compiler.addResource(resolve(cwd, input))
     return next()
   }
 
   let code = ''
-  if (typeof bundle === 'string') {
-    code = await require(bundle).createBundle(compiler.options)
+  if (typeof doBundle === 'string') {
+    code = await require(doBundle).createBundle(compiler.options)
   }
 
   if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) {
@@ -62,9 +61,9 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
     compiler.entrypoint = './' + relative(cwd, input)
   }
 
-  const { files, warnings } = await resolveFiles(
+  const { files, warnings } = resolveFiles(
     input,
-    ...Object.keys(compiler.bundle.files).filter((x) => x.endsWith('.js')),
+    ...Object.keys(compiler.bundle.list).filter((x) => x.endsWith('.js')),
     { cwd, expand: 'variable', loadContent: false }
   )
 
@@ -74,6 +73,13 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
     throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
   }
 
-  Object.keys(files).forEach((x) => compiler.addResource(x))
+  //TODO: warnings.forEach((x) => console.log(x))
+
+  await Promise.all(
+    Object.entries(files).map(([key, file]) => {
+      return compiler.addResource(key, file)
+    })
+  )
+
   return next()
 }

src/steps/resource.ts

@@ -1,5 +1,6 @@
-import { isDirectoryAsync, each } from '../util'
+import { each } from '../util'
 import * as globs from 'globby'
+import { resolve } from 'path'
 import { NexeCompiler } from '../compiler'
 
 export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
@@ -14,13 +15,10 @@ export default async function resource(compiler: NexeCompiler, next: () => Promi
   // and https://github.com/mrmlnc/fast-glob#pattern-syntax
   const resourcesWithForwardSlashes = resources.map((r) => r.replace(/\\/g, '/'))
 
-  await each(globs(resourcesWithForwardSlashes, { cwd }), async (file) => {
-    if (await isDirectoryAsync(file)) {
-      return
-    }
+  await each(globs(resourcesWithForwardSlashes, { cwd, onlyFiles: true }), async (file) => {
     count++
     step.log(`Including file: ${file}`)
-    await compiler.addResource(file)
+    await compiler.addResource(resolve(cwd, file))
   })
   step.log(`Included ${count} file(s)`)
   return next()

src/util.ts

@@ -1,9 +1,9 @@
 import { readFile, writeFile, stat } from 'fs'
 import { execFile } from 'child_process'
-import pify = require('pify')
+import { promisify } from 'util'
 import rimraf = require('rimraf')
 
-const rimrafAsync = pify(rimraf)
+const rimrafAsync = promisify(rimraf)
 export const STDIN_FLAG = '[stdin]'
 
 export async function each<T>(
@@ -64,10 +64,10 @@ export interface ReadFileAsync {
   (path: string, encoding: string): Promise<string>
 }
 
-const readFileAsync = pify(readFile)
-const writeFileAsync = pify(writeFile)
-const statAsync = pify(stat)
-const execFileAsync = pify(execFile)
+const readFileAsync = promisify(readFile)
+const writeFileAsync = promisify(writeFile)
+const statAsync = promisify(stat)
+const execFileAsync = promisify(execFile)
 const isWindows = process.platform === 'win32'
 
 function pathExistsAsync(path: string) {

tasks/build.ts

@@ -3,7 +3,7 @@ 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 got from 'got'
 import { cpus } from 'os'
 
 const env = process.env,
@@ -86,7 +86,7 @@ async function build() {
       return
     }
     await got(gitRelease.upload_url.split('{')[0], {
-      query: { name: target.toString() },
+      searchParams: { name: target.toString() },
       body: await readFileAsync(output),
       headers: {
         ...headers,

test/mocha.opts

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

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target":"es5",
+    "target":"es2015",
     "skipLibCheck": true,
     "experimentalDecorators": true,
     "lib": ["es2018"],