bump deps

BREAKING: drop support for node < 14

BREAKING: removed snapshot, ico, and rc options

BREAKING: use python3 as default python binary

.circleci/build.sh

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

.circleci/config.yml

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

.circleci/setup.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-export NVS_HOME="$HOME/.nvs"
-git clone --depth=1 https://github.com/jasongin/nvs "$NVS_HOME"
-. "$NVS_HOME/nvs.sh" install
-nvs add lts && nvs link lts nvs use default
-node -v
-npm -v
-npm i

.editorconfig

@@ -4,6 +4,5 @@ end_of_line = lf
 charset = utf-8
 indent_style = space
 indent_size = 2
-#https://github.com/Microsoft/vscode/issues/23983#event-1087502108
+trim_trailing_whitespace = true
-#trim_trailing_whitespace = true
 insert_final_newline = true

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,23 @@
+---
+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:

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,11 @@
+---
+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**:

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+**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**:

.github/actions/nexe-alpine/Dockerfile

@@ -0,0 +1,4 @@
+FROM node:fermium-alpine3.10
+RUN apk add --no-cache build-base linux-headers bash clang python3
+SHELL ["/bin/bash", "--login", "-c"]
+CMD ["bash"]

.github/actions/nexe-alpine/action.yml

@@ -0,0 +1,16 @@
+# action.yml
+name: 'Hello World'
+description: 'Greet someone and record the time'
+inputs:
+  who-to-greet:  # id of input
+    description: 'Who to greet'
+    required: true
+    default: 'World'
+outputs:
+  time: # id of output
+    description: 'The time we greeted you'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{ inputs.who-to-greet }}

.github/actions/nexe-linux/Dockerfile

@@ -0,0 +1,23 @@
+FROM centos:7
+
+RUN yum install -y which centos-release-scl && \
+  yum install -y devtoolset-9-gcc \
+    devtoolset-9-gcc-c++ \
+    make \
+    wget \
+    python3 && \
+  echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
+
+SHELL ["/bin/bash", "--login", "-c"]
+
+ADD flags.sh flags.sh
+
+ARG NODE_VERSION=14.20.0
+
+RUN wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}.tar.gz -O node.tar.gz && \
+  mkdir node && tar -zxf node.tar.gz -C node --strip-components=1 && \
+  rm node.tar.gz && \
+  cd node && \
+  . ../flags.sh && \
+  ./configure $(echo $CONFIGURE_FLAGS) && \
+  make $(echo $MAKE_FLAGS) && make install

.github/actions/nexe-linux/action.yml

@@ -0,0 +1,16 @@
+# action.yml
+name: 'Hello World'
+description: 'Greet someone and record the time'
+inputs:
+  who-to-greet:  # id of input
+    description: 'Who to greet'
+    required: true
+    default: 'World'
+outputs:
+  time: # id of output
+    description: 'The time we greeted you'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{ inputs.who-to-greet }}

.github/actions/nexe-linux/flags.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+ARCH=$(uname -m)
+
+case $ARCH in
+  "x86_64")
+    CONFIGURE_FLAGS="--dest-cpu=x64"
+  ;;
+  "aarch64")
+  ;&
+  "armv7l")
+    CONFIGURE_FLAGS="--openssl-no-asm --dest-cpu=arm --with-arm-float-abi=hard"
+  ;;
+  *)
+    CONFIGURE_FLAGS=""
+  ;;
+esac
+
+MAKE_FLAGS="-j$(getconf _NPROCESSORS_ONLN)"

.github/workflows/auto-close-no-response.yml

@@ -0,0 +1,20 @@
+name: No Response
+
+# Both `issue_comment` and `scheduled` event types are required for this Action
+# to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    - 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

.github/workflows/cd.yml

@@ -0,0 +1,52 @@
+name: Base Builds
+on:
+  push:
+    branches:
+      - refactor-old-node
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        version: ['14.20.0', '16.16.0', '18.5.0']
+        arch: [x64, x86]
+        plat: [arm, macos, windows, linux, alpine]
+        exclude:
+          - plat: arm
+            arch: x86
+          - plat: macos
+            arch: x86
+        include:
+          - plat: arm
+            os: ubuntu-20.04
+          - plat: macos
+            os: macos-12
+          - plat: windows
+            os: windows-2022
+          - plat: linux
+            os: ubuntu-20.04
+          - plat: alpine
+            os: ubuntu-20.04
+    name: 'Target: ${{matrix.plat}}-${{ matrix.arch }}-${{ matrix.version }} on ${{ matrix.os }}'
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Setup Python
+        uses: actions/setup-python@v3.1.2
+        with:
+          python-version: '3.10.4'
+      - name: Setup Nasm
+        if: ${{ matrix.plat == 'windows' }}
+        uses: ilammy/setup-nasm@v1.3.0
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.version }}
+      - uses: actions/checkout@v3
+        with:
+          node-version: 18
+      - name: 'Install Dependencies'
+        run: npm ci
+      - name: 'Build nexe base binary'
+        env:
+          NEXE_TARGET: ${{ matrix.plat }}-${{ matrix.arch }}-${{ matrix.version }}
+        run: npx ts-node tasks/build.ts

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 temp/
 coverage
+nexe
 node_modules
 *.log
 *.exe

.node-version

@@ -0,0 +1 @@
+18.12.1

.swcrc

@@ -0,0 +1,19 @@
+{
+  "module": {
+    "type": "commonjs",
+    "ignoreDynamic": true
+    
+  },
+  "jsc": {
+    "parser": {
+      "syntax": "typescript",
+      "dynamicImport": true,
+      "decorators": true
+    },
+    "transform": {
+      "legacyDecorator": true
+    },
+    "target": "es2019",
+    "externalHelpers": false
+  }
+}

.travis.yml

@@ -1,14 +0,0 @@
-language: node_js
-node_js:
-- '6'
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y g++-multilib
-node_js:
-- '8'
-script: npm run asset-compile
-env:
-  global:
-    - secure: LyC6djYqPfPKz5gHILES9JmSRxQ+ntKOcoaZNM5WID0+gogUoXZBhcmmtvq9RnMpFZN3pYujY6LB5iy7QS2seGjg+feyewNKI30yIK6N9ulJyZZKmrJVDdRx4wvl8YVTkttjcJFkanDGa6zRvFfFDKx/iIdcWLEpnqR/WO1ppf8=
-notifications:
-  email: false

.vscode/extensions.json

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

.vscode/settings.json

@@ -1,7 +1,4 @@
 {
-  "tslint.enable": true,
-  "tslint.run": "onType",
-  "tslint.autoFixOnSave": true,
   "files.exclude": {
     "**/.git": true,
     "**/.svn": true,
@@ -14,5 +11,32 @@
     "**/node_modules": true,
     "**/bower_components": true
   },
-  "typescript.tsdk": "node_modules\\typescript\\lib"
+  "eslint.workingDirectories": [{ "mode": "auto" }],
+  "eslint.format.enable": true,
+  "editor.formatOnSave": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "[javascript]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascriptreact]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
 }

LICENSE

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

README.md

@@ -1,15 +1,15 @@
+
 <p align="center"><img src="https://cloud.githubusercontent.com/assets/2391349/23598327/a17bb68a-01ee-11e7-8f55-88a5fc96e997.png" /></p>
 
 <p align="center">
-  <a href="https://circleci.com/gh/nexe/nexe"><img src="https://img.shields.io/circleci/project/github/nexe/nexe/master.svg" alt="Mac Build Status"></a>
+  <a href="https://dev.azure.com/nexe-ci/Nexe/_build?definitionId=1"><img src="https://img.shields.io/azure-devops/build/nexe-ci/nexe/1/master.svg" alt="Build Status"></a>
-  <a href="https://travis-ci.org/nexe/nexe/builds"><img src="https://img.shields.io/travis/nexe/nexe/master.svg" alt="Linux Build Status"></a>
-  <a href="https://ci.appveyor.com/project/calebboyd/nexe/history"><img src="https://img.shields.io/appveyor/ci/calebboyd/nexe/master.svg" alt="Windows Build Status"></a>
   <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/dt/nexe.svg" alt="Downloads"></a>
   <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/v/nexe.svg" alt="Version"></a>
   <a href="https://www.npmjs.com/package/nexe"><img src="https://img.shields.io/npm/l/nexe.svg" alt="License"></a>
+  <a href="https://discord.gg/2qTH52zNcZ"><img src="https://discordapp.com/api/guilds/814334925049561168/widget.png?style=shield"></a>
 </p>
 
-<p align="center"><code>npm i nexe -g</code></p>
+<p align="center">Install:&nbsp<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">
@@ -23,7 +23,7 @@
 - Distribute binaries without needing node / npm.
 - Idempotent builds
 - Start and deploy faster.
-- Lockdown specific application versions, and easily rollback.
+- Lock-down specific application versions, and easily rollback.
 - Flexible build pipeline
 - Cross platform builds
 
@@ -49,10 +49,38 @@ 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 Node
+## Compiling the nexe Executable
 
-By default `nexe` will attempt to download a pre-built executable. However, It may be unavailable ([github releases](https://github.com/nexe/nexe/releases))
+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 3; you can create a [symlink](https://github.com/nexe/nexe/issues/354#issuecomment-319874486) or use the `--python` parameter (e.g. `nexe --build --python=$(which python3)`).
-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).
+
+### 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 python3.8
+```
+Where `2019` is the version of Visual Studio you have (if you have it).
+
+**Notes:**
+- 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.
 
 ## Node.js API
 
@@ -88,14 +116,14 @@ compile({
     - Output executable file path
     - default: same as `name` with an OS specific extension.
  - #### `target: string | object`
-    - An object or string describing platform-arch-version. e.g. `'windows-ia32-10.13.0'`
+    - An object or string describing platform-arch-version. e.g. `'windows-ia32-18.1.0'`
       - each segment is optional, and will be merged with the current environment
       - Examples: ([full list](https://github.com/nexe/nexe/releases))
-        - `'win32-x86-10.13.0`
+        - `'win32-x86-18.1.0`
         - `{ platform: 'alpine' }`
-        - `darwin-10.13.0`
+        - `darwin-14.19.1`
         - `linux-x64`
-        - `macos-10.13.0`
+        - `macos-16.15.0`
 
         See [test/target.spec.ts](test/target.spec.ts)
     - If the [`build`](#build-boolean) flag is set, the platform portion of the target is ignored.
@@ -113,10 +141,19 @@ compile({
  - #### `cwd: string`
     - Directory nexe will operate on as though it is the cwd
     - default: process.cwd()
+ - #### `mangle: boolean`
+    - If set to false, nexe will not include the virtual filesystem (your application and resources) on the output.
+    - This will cause the output to error as an "Invalid Binary" unless a userland patch alters the contents of lib/_third_party_main.js in the nodejs source.
+    - default: true
  - #### `build: boolean`
     - Build node from source, passing this flag tells nexe to download and build from source. Subsequently using this flag will cause nexe to use the previously built binary. To rebuild, first add [`--clean`](#clean-boolean)
+ - #### `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.
  - #### `python: string`
-    - On Linux this is the path pointing to your python2 executable
+    - On Linux this is the path pointing to your python3 executable
     - On Windows this is the directory where `python` can be accessed
     - default: `null`
  - #### `flags: string[]`
@@ -133,9 +170,6 @@ compile({
  - #### `vcBuild: string[]`
     - Options for windows build
     - default: `['nosign', 'release']`
- - #### `snapshot: string`
-    - path to a file to be used as the warmup snapshot for the build
-    - default: `null`
  - #### `resources: string[]`
     - Array of globs with files to include in the build
     - Example: `['./public/**/*']`
@@ -144,20 +178,6 @@ compile({
     - Path to use for storing nexe's build files
     - Override in the env with `NEXE_TEMP`
     - default: `~/.nexe`
- - #### `ico: string`
-    - Path to a user provided icon to be used (Windows only). Requires `--build` to be set.
- - #### `rc: object`
-    - Settings for patching the [node.rc](https://github.com/nodejs/node/blob/master/src/res/node.rc) configuration file (Windows only).
-    - Example (keys may vary depending ont the version. Reference the file linked above):
-      ```javascript
-        {
-          CompanyName: "ACME Corp",
-          PRODUCTVERSION: "17,3,0,0",
-          FILEVERSION: "1,2,3,4"
-          ...
-        }
-      ```
-    - default: `{}`
  - #### `clean: boolean`
     - If included, nexe will remove temporary files for the accompanying configuration and exit
  - #### `enableNodeCli: boolean`
@@ -198,7 +218,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.
@@ -212,9 +232,18 @@ Any modifications made to `NexeFile#contents` will be maintained in the cache _w
 
 ## Native Modules
 
-TODO
+In order to use native modules, the native binaries must be shipped alongside the binary generated by nexe.
 
-- [ ] Implement support for `node-pre-gyp#find`.
+## Troubleshooting
+
+`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-18.1.0`
+		- 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
 
 ## Contributing
 
@@ -222,20 +251,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/)

appveyor.yml

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

dockerfiles/linux/Dockerfile

@@ -0,0 +1,13 @@
+FROM centos:7
+
+RUN yum install -y which centos-release-scl \
+  && yum install -y devtoolset-9-gcc \
+    devtoolset-9-gcc-c++ \
+    make \
+    python3 \
+    curl \
+  && curl -sL https://rpm.nodesource.com/setup_16.x | bash - \
+  && yum install -y nodejs && npm install nexe -g \
+  && echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
+
+SHELL ["/bin/bash", "--login", "-c"]

dockerfiles/musl/Dockerfile

@@ -0,0 +1,4 @@
+FROM node:16-alpine
+RUN apk add --no-cache build-base linux-headers bash clang python3
+SHELL ["/bin/bash", "--login", "-c"]
+CMD ["bash"]

examples/express-app/index.js

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

examples/express-app/package-lock.json

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

examples/express-app/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "express-app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "express": "^4.16.3"
-  }
-}

examples/express-app/public/index.html

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

index.js

@@ -1,32 +1,45 @@
 #!/usr/bin/env node
-const options = require('./lib/options')
-if (require.main === module) {
-  //fast path for help/version
-  const argv = options.argv
-  const eol = require('os').EOL
-  const showHelp = argv.help || argv._.some(x => x === 'help')
-  const showVersion = argv.version || argv._.some(x => x === 'version')
-  if (showHelp || showVersion) {    
-    process.stderr.write(showHelp ? options.help : options.version + eol)
-  } else {
-    const nexe = require('./lib/nexe')
-    nexe.compile(argv).catch((error) => {
-      const NexeError = require('./lib/compiler').NexeError
-      const chalk = require('chalk')
-      const isSilent = Boolean(argv.silent === true || argv.loglevel === 'silent')
-      if (!isSilent) {
-        if (error instanceof NexeError) {
-          process.stderr.write(eol + chalk.red('Error: ') + error.message + eol
-            + eol + 'See nexe -h for usage..' + eol + eol
-          )
-        } else {
-          process.stderr.write(error.stack + eol)
-        }
-      }
 
-      process.exit(1)
+/* eslint-disable no-undef */
-    })
+/* eslint-disable @typescript-eslint/no-var-requires */
+
+const eol = require('os').EOL
+async function main() {
+  const util = require('./lib/cjs/util.js')
+  await util.initEsm()
+  const color = util.color,
+    options = require('./lib/cjs/options.js'),
+    nexe = require('./lib/cjs/nexe.js'),
+    NexeError = require('./lib/cjs/compiler.js').NexeError,
+    del = eol + eol,
+    argv = options.argv,
+    showHelp = argv.help || argv._.some((x) => x === 'help'),
+    showVersion = argv.version || argv._.some((x) => x === 'version')
+
+  try {
+    if (!(showHelp || showVersion)) {
+      await nexe.compile(argv)
+    } else {
+      process.stderr.write(showHelp ? options.help() : options.version + eol)
+    }
+  } catch (error) {
+    if (argv.loglevel !== 'silent') {
+      if (error instanceof NexeError) {
+        process.stderr.write(
+          `${eol}${color('red', 'Error: ')}${error.message}${del}See nexe -h for usage..${del}`
+        )
+      } else {
+        process.stderr.write(error.stack + eol)
+      }
+    }
+    process.exit(1)
   }
-} else {
+  process.exit(0)
-  module.exports = require('./lib/nexe')
+}
+
+if (require.main === module) {
+  main()
+} else {
+  process.stderr.write('Cannot require(..) the nexe cli')
+  process.exit(1)
 }

issue_template.md

@@ -1,19 +0,0 @@
-<!-- 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:

package.json

@@ -2,75 +2,123 @@
   "name": "nexe",
   "description": "Create a single executable out of your Node.js application",
   "license": "MIT",
-  "version": "3.0.0-beta.15",
+  "type": "commonjs",
-  "contributors": [
+  "version": "4.0.0-rc.local",
-    "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
+  "bin": {
-    "Jared Allard <jaredallard@outlook.com>",
+    "nexe": "./index.js"
-    "Caleb Boyd <caleb.boyd@hotmail.com>"
+  },
-  ],
+  "types": "./lib/types/nexe.d.ts",
-  "scripts": {
+  "main": "./lib/cjs/nexe.js",
-    "asset-compile": "ts-node tasks/asset-compile",
+  "exports": {
-    "test": "mocha",
+    "./package.json": "./package.json",
-    "lint": "tslint \"{src,plugins,tasks}/**/*.ts\" --fix",
+    ".": {
-    "prepare": "npm run lint && npm run build && npm test",
+      "types": "./lib/types/nexe.d.ts",
-    "prebuild": "rimraf lib",
+      "node": {
-    "build": "tsc --declaration",
+        "import": "./lib/esm/nexe.js",
-    "postbuild": "ts-node tasks/post-build"
+        "require": "./lib/cjs/nexe.js"
+      }
+    }
+  },
+  "engines": {
+    "node": ">=14"
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/nexe/nexe.git"
   },
   "files": [
-    "lib"
+    "lib",
+    "index.js"
   ],
-  "typings": "lib/nexe.d.ts",
+  "scripts": {
-  "main": "index.js",
+    "lint": "tsc --noEmit && eslint \"{src,tasks,test}/**/*.ts\" --fix",
-  "bin": {
+    "test": "vitest run && node test/exports.mjs",
-    "nexe": "index.js"
+    "prepublishOnly": "npm run lint && npm run build && npm test",
-  },
+    "build": "npm run cjs:build & npm run esm:build",
-  "engines": {
+    "prebuild": "rm -rf lib",
-    "node": ">=6"
+    "cjs:build": "swc src -d lib/cjs --copy-files",
+    "esm:build": "swc src -d lib/esm --copy-files -C module.type=es6",
+    "postbuild": "node -p \"JSON.stringify({type:'module'})\" > lib/esm/package.json && tsc --emitDeclarationOnly && ts-node tasks/post-build"
   },
+  "contributors": [
+    "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
+    "Jared Allard <jaredallard@outlook.com>",
+    "Caleb Boyd <caleb.boyd@hotmail.com>"
+  ],
   "dependencies": {
-    "@calebboyd/semaphore": "^1.3.1",
-    "app-builder": "^5.2.0",
     "caw": "^2.0.1",
-    "chalk": "^2.4.1",
+    "chalk": "^5.2.0",
-    "cherow": "1.6.8",
+    "download": "^8.0.0",
-    "download": "^7.1.0",
+    "fast-glob": "^3.2.12",
-    "globby": "^8.0.1",
+    "got": "^12.5.3",
-    "got": "^9.5.0",
+    "meriyah": "^4.3.3",
-    "minimist": "^1.2.0",
+    "minimist": "^1.2.7",
-    "mkdirp": "^0.5.1",
+    "multistream": "^4.1.0",
-    "multistream": "^2.1.1",
+    "ora": "^6.1.2",
-    "ora": "^3.0.0",
+    "resolve-dependencies": "^6.0.8"
-    "pify": "^4.0.1",
-    "resolve-dependencies": "^2.2.1",
-    "rimraf": "^2.6.2"
   },
   "devDependencies": {
-    "@types/chai": "^4.1.7",
+    "@swc/cli": "^0.1.57",
-    "@types/download": "^6.2.4",
+    "@swc/core": "^1.3.24",
-    "@types/execa": "^0.9.0",
+    "@types/minimist": "^1.2.2",
-    "@types/globby": "^8.0.0",
+    "@types/multistream": "^4.1.0",
-    "@types/got": "^9.2.2",
+    "@typescript-eslint/eslint-plugin": "^5.47.0",
-    "@types/minimist": "^1.2.0",
+    "@typescript-eslint/parser": "^5.47.0",
-    "@types/mkdirp": "^0.5.2",
+    "eslint": "^8.30.0",
-    "@types/mocha": "^5.2.5",
+    "eslint-config-prettier": "~8.5.0",
-    "@types/multistream": "^2.1.1",
+    "eslint-plugin-import": "^2.26.0",
-    "@types/ora": "^1.3.4",
+    "eslint-plugin-prettier": "^4.2.1",
-    "@types/pify": "3.0.2",
+    "prettier": "^2.8.1",
-    "@types/rimraf": "2.0.2",
+    "ts-node": "^10.9.1",
-    "@types/semver": "^5.5.0",
+    "typescript": "^4.9.4",
-    "chai": "^4.2.0",
+    "vitest": "^0.26.2"
-    "execa": "^1.0.0",
+  },
-    "mocha": "^5.2.0",
+  "prettier": {
-    "prettier": "^1.15.3",
+    "parser": "typescript",
-    "ts-node": "^7.0.1",
+    "semi": false,
-    "tslint": "^5.12.0",
+    "singleQuote": true,
-    "tslint-config-prettier": "^1.17.0",
+    "printWidth": 100
-    "tslint-plugin-prettier": "^2.0.1",
+  },
-    "typescript": "^3.2.2"
+  "eslintConfig": {
+    "parser": "@typescript-eslint/parser",
+    "plugins": [
+      "import",
+      "@typescript-eslint"
+    ],
+    "extends": [
+      "eslint:recommended",
+      "plugin:@typescript-eslint/recommended",
+      "prettier",
+      "plugin:prettier/recommended"
+    ],
+    "rules": {
+      "@typescript-eslint/consistent-type-imports": [
+        2,
+        {
+          "prefer": "type-imports",
+          "disallowTypeAnnotations": false
+        }
+      ],
+      "import/extensions": [
+        2,
+        "ignorePackages"
+      ],
+      "@typescript-eslint/no-unused-vars": [
+        2,
+        {
+          "args": "after-used",
+          "ignoreRestSiblings": true,
+          "argsIgnorePattern": "^_"
+        }
+      ],
+      "@typescript-eslint/no-use-before-define": 0,
+      "@typescript-eslint/no-explicit-any": 0,
+      "@typescript-eslint/explicit-function-return-type": 0,
+      "no-warning-comments": 1,
+      "one-var": [
+        "error",
+        "consecutive"
+      ]
+    }
   }
 }

src/compiler.ts

@@ -1,36 +1,29 @@
-import { delimiter, dirname, normalize, join } from 'path'
+import { resolve, normalize, join } from 'node:path'
-import { Buffer } from 'buffer'
+import { Buffer } from 'node:buffer'
-import { createReadStream, ReadStream } from 'fs'
+import type { ReadStream } from 'node:fs'
-import { spawn } from 'child_process'
+import { createReadStream } from 'node:fs'
-import { Logger, LogStep } from './logger'
+import { spawn } from 'node:child_process'
-import {
-  readFileAsync,
-  writeFileAsync,
-  pathExistsAsync,
-  statAsync,
-  dequote,
-  isWindows,
-  bound,
-  semverGt
-} from './util'
-import { NexeOptions, version } from './options'
-import { NexeTarget } from './target'
-import download = require('download')
-import { getLatestGitRelease } from './releases'
-import { IncomingMessage } from 'http'
-import combineStreams = require('multistream')
-import { Bundle, toStream } from './fs/bundle'
 
-const isBsd = Boolean(~process.platform.indexOf('bsd'))
+import type { File } from 'resolve-dependencies'
-const make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
+import MultiStream from 'multistream'
-const configure = isWindows ? 'configure' : './configure'
+
+import type { LogStep } from './logger.js'
+import { Logger } from './logger.js'
+import { readFile, writeFile, pathExists, isWindows, bound, wrap } from './util.js'
+import { version } from './options.js'
+import type { NexeOptions } from './options.js'
+import type { NexeTarget } from './target.js'
+import { Bundle, toStream } from './fs/bundle.js'
+
+const isBsd = Boolean(~process.platform.indexOf('bsd')),
+  make = isWindows ? 'vcbuild.bat' : isBsd ? 'gmake' : 'make'
 
 type StringReplacer = (match: string) => string
 
 export interface NexeFile {
   filename: string
   absPath: string
-  contents: string
+  contents: string | Buffer
 }
 
 export { NexeOptions }
@@ -46,7 +39,7 @@ export class NexeCompiler {
   /**
    * Epoch of when compilation started
    */
-  private start = Date.now()
+  private readonly start = Date.now()
   private compileStep: LogStep | undefined
   public log = new Logger(this.options.loglevel)
   /**
@@ -72,7 +65,7 @@ export class NexeCompiler {
   /**
    * The last shim (defaults to "require('module').runMain()")
    */
-  public startup: string = ''
+  public startup = ''
   /**
    * The main entrypoint filename for your application - eg. node mainFile.js
    */
@@ -93,66 +86,55 @@ export class NexeCompiler {
    * Flag to indicate whether or notstdin was used for input
    */
   public stdinUsed = false
-  /**
-   * Path to the configure script
-   */
-  public configureScript: string
   /**
    * The file path of node binary
    */
   public nodeSrcBinPath: string
+  /**
+   * Remote asset path if available
+   */
+  public remoteAsset: string
 
   constructor(public options: NexeOptions) {
     const { python } = (this.options = options)
+    // SOMEDAY iterate over multiple targets with `--outDir`
     this.targets = options.targets as NexeTarget[]
     this.target = this.targets[0]
+    if (!/https?:\/\//.test(options.remote)) {
+      throw new NexeError(`Invalid remote URI scheme (must be http or https): ${options.remote}`)
+    }
+    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
       ? join(this.src, 'Release', 'node.exe')
       : join(this.src, 'out', 'Release', 'node')
     this.log.step('nexe ' + version, 'info')
     this.bundle = new Bundle(options)
-    if (isWindows) {
+
-      const originalPath = process.env.PATH
+    this.env = { ...process.env }
-      delete process.env.PATH
+    if (python) {
-      this.env = { ...process.env }
+      this.env.PYTHON = python
-      this.env.PATH = python
-        ? (this.env.PATH = dequote(normalize(python)) + delimiter + originalPath)
-        : originalPath
-      process.env.PATH = originalPath
-    } else {
-      this.env = { ...process.env }
-      python && (this.env.PYTHON = python)
     }
   }
 
   @bound
-  addResource(file: string, content?: Buffer | string) {
+  async addResource(absoluteFileName: string, content?: Buffer | string | File) {
-    return this.bundle.addResource(file, content)
+    return await this.bundle.addResource(absoluteFileName, 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 readFile(absPath, 'utf-8').catch((x) => {
           if (x.code === 'ENOENT') return ''
           throw x
-        })
+        }),
       }
       this.files.push(cachedFile)
     }
@@ -160,27 +142,38 @@ export class NexeCompiler {
   }
 
   @bound
-  writeFileAsync(file: string, contents: string | Buffer) {
+  async writeFileAsync(file: string, contents: string | Buffer) {
     this.assertBuild()
-    return writeFileAsync(join(this.src, file), contents)
+    return await writeFile(join(this.src, file), contents)
   }
 
   @bound
-  async replaceInFileAsync(file: string, replace: string | RegExp, value: string | StringReplacer) {
+  async replaceInFileAsync(
+    file: string,
+    replace: string | RegExp,
+    value: string | StringReplacer
+  ): Promise<boolean> {
     const entry = await this.readFileAsync(file)
-    entry.contents = entry.contents.replace(replace, value as any)
+    let replaced = false
+    const replacer = (match: string) => {
+      replaced = true
+      if (typeof value === 'function') return value(match)
+      return value
+    }
+    entry.contents = entry.contents.toString().replace(replace, replacer)
+    return replaced
   }
 
   @bound
-  async setFileContentsAsync(file: string, contents: string) {
+  async setFileContentsAsync(file: string, contents: string | Buffer) {
     const entry = await this.readFileAsync(file)
     entry.contents = contents
   }
 
-  quit(error?: any) {
+  async quit(error?: any) {
     const time = Date.now() - this.start
     this.log.write(`Finished in ${time / 1000}s`, error ? 'red' : 'green')
-    return this.log.flush()
+    return await this.log.flush()
   }
 
   assertBuild() {
@@ -190,31 +183,34 @@ 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())
     }
     return this.nodeSrcBinPath
   }
 
-  private _runBuildCommandAsync(command: string, args: string[]) {
+  private async _runBuildCommandAsync(command: string, args: string[]) {
     if (this.log.verbose) {
-      this.compileStep!.pause()
+      this.compileStep?.pause()
     }
-    return new Promise((resolve, reject) => {
+    return await new Promise<void>((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) {
-            this.compileStep!.resume()
+            this.compileStep?.resume()
           }
           reject(e)
         })
         .once('close', (code: number) => {
           if (this.log.verbose) {
-            this.compileStep!.resume()
+            this.compileStep?.resume()
           }
           if (code != 0) {
             const error = `${command} ${args.join(' ')} exited with code: ${code}`
@@ -225,119 +221,66 @@ export class NexeCompiler {
     })
   }
 
-  private _configureAsync() {
+  private async _configureAsync() {
-    return this._runBuildCommandAsync(this.env.PYTHON || 'python', [
+    if (isWindows) {
-      this.configureScript,
+      return await Promise.resolve()
-      ...this.options.configure
+    }
+    return await this._runBuildCommandAsync(this.env.PYTHON || 'python3', [
+      './configure.py',
+      ...this.options.configure,
     ])
   }
 
   public async build(): Promise<ReadStream> {
-    this.compileStep!.log(
+    this.compileStep?.log(
       `Configuring node build${
-        this.options.configure.length ? ': ' + this.options.configure : '...'
+        this.options.configure.length > 0 ? ': ' + this.options.configure : '...'
       }`
     )
     await this._configureAsync()
     const buildOptions = this.options.make
-    this.compileStep!.log(
+    this.compileStep?.log(
-      `Compiling Node${buildOptions.length ? ' with arguments: ' + buildOptions : '...'}`
+      `Compiling Node${buildOptions.length > 0 ? ' with arguments: ' + buildOptions : '...'}`
     )
     await this._runBuildCommandAsync(make, buildOptions)
     return createReadStream(this.getNodeExecutableLocation())
   }
 
-  private async _fetchPrebuiltBinaryAsync(target: NexeTarget) {
+  async compileAsync(target: NexeTarget) {
-    let downloadOptions = this.options.downloadOptions
+    const step = (this.compileStep = this.log.step('Compiling result')),
-
+      build = this.options.build,
-    if (this.options.ghToken) {
+      location = this.getNodeExecutableLocation(build ? undefined : target)
-      downloadOptions = Object.assign({}, downloadOptions)
+    let binary = (await pathExists(location)) ? createReadStream(location) : null
-      downloadOptions.headers = Object.assign({}, downloadOptions.headers, {
-        Authorization: 'token ' + this.options.ghToken
-      })
-    }
-
-    const githubRelease = await getLatestGitRelease(downloadOptions)
-    const assetName = target.toString()
-    const asset = githubRelease.assets.find(x => x.name === assetName)
-
-    if (!asset) {
-      throw new NexeError(`${assetName} not available, create it using the --build flag`)
-    }
-    const filename = this.getNodeExecutableLocation(target)
-
-    await download(asset.browser_download_url, dirname(filename), this.options.downloadOptions).on(
-      'response',
-      (res: IncomingMessage) => {
-        const total = +res.headers['content-length']!
-        let current = 0
-        res.on('data', data => {
-          current += data.length
-          this.compileStep!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
-        })
-      }
-    )
-    return createReadStream(filename)
-  }
-
-  private async _shouldCompileBinaryAsync(
-    binary: NodeJS.ReadableStream | null,
-    location: string | undefined
-  ) {
-    //TODO combine make/configure/vcBuild/and modified times of included files
-    const { snapshot, build } = this.options
 
     if (!binary) {
-      return true
-    }
-
-    if (build && snapshot != null && (await pathExistsAsync(snapshot))) {
-      const snapshotLastModified = (await statAsync(snapshot)).mtimeMs
-      const binaryLastModified = (await statAsync(location)).mtimeMs
-      // if build was requested and there's a snapshot to embed in the binary,
-      // we need to rebuild if the snapshot was just modified.
-      return snapshotLastModified > binaryLastModified
-    }
-
-    return false
-  }
-
-  async compileAsync(target: NexeTarget) {
-    const step = (this.compileStep = this.log.step('Compiling result'))
-    const build = this.options.build
-    const location = this.getNodeExecutableLocation(build ? undefined : target)
-    let binary = (await pathExistsAsync(location)) ? createReadStream(location) : null
-    if (!build && !binary) {
-      step.modify('Fetching prebuilt binary')
-      binary = await this._fetchPrebuiltBinaryAsync(target)
-    }
-    if (await this._shouldCompileBinaryAsync(binary, location)) {
       binary = await this.build()
       step.log('Node binary compiled')
     }
-    return this._assembleDeliverable(binary!)
+    return await this._assembleDeliverable(binary)
   }
 
   code() {
     return [this.shims.join(''), this.startup].join(';')
   }
 
-  private _assembleDeliverable(binary: NodeJS.ReadableStream) {
+  private async _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 startup = this.code(),
+    const code = this.code(),
-      codeSize = Buffer.byteLength(startup)
+      codeSize = Buffer.byteLength(code),
+      lengths = Buffer.from(Array(16))
 
-    const lengths = Buffer.from(Array(16))
     lengths.writeDoubleLE(codeSize, 0)
-    lengths.writeDoubleLE(this.bundle.blobSize, 8)
+    lengths.writeDoubleLE(this.bundle.size, 8)
-    return combineStreams([
+    return new (MultiStream as any)([
       binary,
-      toStream(startup),
+      toStream(code),
       this.bundle.toStream(),
-      toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths]))
+      toStream(Buffer.concat([Buffer.from('<nexe~~sentinel>'), lengths])),
     ])
   }
 }

src/fs/bootstrap.js

@@ -1,20 +1,21 @@
 if (true) {
-  const __nexe_patches = (process.nexe = { patches: {} }).patches
+  const patches = (process.nexe = { patches: {} }).patches
-  const slice = [].slice
+
-  const __nexe_noop_patch = function (original) {
+  ;["ReadFile", "ReadJSON", "Stat"].forEach((x) => {
-    const args = slice.call(arguments, 1)
+    patch(process.binding("fs"), "internalModule" + x, noop)
+  })
+
+  function noop(original, ...args) {
     return original.apply(this, args)
   }
-  const __nexe_patch = function (obj, method, patch) {
+
-    const original = obj[method]
+  function patch(obj, method, patch) {
+    const original = obj[method];
     if (!original) return
-    __nexe_patches[method] = patch
+    patches[method] = patch
-    obj[method] = function() {
+    obj[method] = function (...args) {
-      const args = [original].concat(slice.call(arguments))
+      args.unshift(original)
-      return __nexe_patches[method].apply(this, args)
+      return patches[method].apply(this, args)
     }
   }
-  __nexe_patch((process).binding('fs'), 'internalModuleReadFile', __nexe_noop_patch)
-  __nexe_patch((process).binding('fs'), 'internalModuleReadJSON', __nexe_noop_patch)
-  __nexe_patch((process).binding('fs'), 'internalModuleStat', __nexe_noop_patch)
 }

src/fs/bundle.ts

@@ -1,70 +1,154 @@
-import { stat as getStat, Stats, createReadStream } from 'fs'
+import { lstat, realpath, stat } from 'node:fs/promises'
-import { relative } from 'path'
+import { createReadStream } from 'node:fs'
-import { Readable } from 'stream'
+import { relative } from 'node:path'
-import combineStreams = require('multistream')
+import { Readable } from 'node:stream'
 
-const stat = (file: string): Promise<Stats> => {
+import type { File } from 'resolve-dependencies'
-  return new Promise((resolve, reject) => {
+import MultiStream from 'multistream'
-    getStat(file, (err, stats) => (err ? reject(err) : resolve(stats)))
+
-  })
+export type MultiStreams = Array<Readable | (() => Readable)>
-}
 
 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() {} })
+  const readable = new Readable({
-  readable.push(content)
+    read() {
-  readable.push(null)
+      this.push(content)
+      this.push(null)
+    },
+  })
   return readable
 }
 
-export type File = { absPath: string; contents: string; deps: FileMap }
+async function createFile(absoluteFileName: string) {
-export type FileMap = { [absPath: string]: File | null }
+  const stats = await lstat(absoluteFileName),
-
+    file: File = {
-export interface BundleOptions {
+      size: stats.size,
-  entries: string[]
+      moduleType: 'commonjs',
-  cwd: string
+      contents: '',
-  expand: boolean
+      absPath: absoluteFileName,
-  loadContent: boolean
+      deps: {},
-  files: FileMap
+    }
+  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
+  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))[] = []
 
-  async addResource(absoluteFileName: string, content?: Buffer | string) {
+  get list() {
-    let length = 0
+    return Object.keys(this.files)
-    if (content !== undefined) {
-      length = Buffer.byteLength(content)
-    } else {
-      const stats = await stat(absoluteFileName)
-      length = stats.size
-    }
-
-    const start = this.blobSize
-
-    this.blobSize += length
-    this.index[makeRelative(this.cwd, absoluteFileName)] = [start, length]
-    this.streams.push(() => (content ? toStream(content) : createReadStream(absoluteFileName)))
   }
 
-  concat() {
+  public async addResource(
-    throw new Error('Not Implemented')
+    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.toString(),
+        deps: {},
+        absPath: absoluteFileName,
+      }
+    } else if (content) {
+      this.files[content.absPath] = content
+    } else {
+      this.files[absoluteFileName] = {
+        absPath: absoluteFileName,
+        moduleType: 'commonjs',
+        contents: '',
+        deps: {},
+        size: 0,
+      }
+      this.files[absoluteFileName] = await createFile(absoluteFileName)
+    }
+    return (this.size += this.files[absoluteFileName].size)
+  }
+
+  /**
+   * 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: Array<[string, File]> = [],
+      symLinks: Array<[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
+    }
   }
 
   toStream() {
-    return combineStreams(this.streams)
+    return new MultiStream(this.streams)
-  }
-
-  toJSON() {
-    return this.index
   }
 }

src/fs/package.json

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

src/fs/patch.ts

@@ -1,4 +1,7 @@
-import { Stats } from 'fs'
+/* eslint-disable prefer-rest-params */
+/* eslint-disable @typescript-eslint/no-var-requires */
+import type { Stats } from 'fs'
+import type { Func } from '../util'
 
 export interface NexeBinary {
   blobPath: string
@@ -12,100 +15,121 @@ export interface NexeBinary {
   }
 }
 
-let originalFsMethods: any = null
+let originalFsMethods: any = null,
-let nexeBinary: NexeBinary | null = null
+  lazyRestoreFs = () => void 0
 
-function restoreFs(fs: any = require('fs')): NexeBinary | false {
+// optional Win32 file namespace prefix followed by drive letter and colon
-  if (!nexeBinary) {
+const windowsFullPathRegex = /^(\\{2}\?\\)?([a-zA-Z]):/,
-    return false
+  upcaseDriveLetter = (s: string): string =>
-  }
+    s.replace(windowsFullPathRegex, (_match, ns, drive) => `${ns || ''}${drive.toUpperCase()}:`)
-  const source = nexeBinary
-  Object.assign(fs, originalFsMethods)
-  nexeBinary = originalFsMethods = null
-  return source
-}
 
 function shimFs(binary: NexeBinary, fs: any = require('fs')) {
   if (originalFsMethods !== null) {
     return
   }
   originalFsMethods = Object.assign({}, fs)
-  nexeBinary = binary
+  const { blobPath, resources: manifest } = binary,
-  const { blobPath, resources: manifest } = binary
+    { resourceStart, stat } = binary.layout,
-  const { resourceStart, stat } = binary.layout
+    directories: { [key: string]: { [key: string]: boolean } } = {},
-  const directories: { [key: string]: { [key: string]: boolean } } = {},
     notAFile = '!@#$%^&*',
     isWin = process.platform.startsWith('win'),
     isString = (x: any): x is string => typeof x === 'string' || x instanceof String,
-    isNotFile = () => false,
+    noop = () => void 0
-    isNotDirectory = isNotFile,
+  const path = require('path')
-    isFile = () => true,
+  const winPath: (key: string) => string = isWin ? upcaseDriveLetter : (s) => s,
-    noop = () => {},
+    baseDir = winPath(path.dirname(process.execPath))
-    isDirectory = isFile,
-    path = require('path')
 
-  let log = (text: string) => true
+  let log = (_: string) => true,
+    loggedManifest = false
   if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) {
-    log = (text: string) => process.stderr.write('[nexe] - ' + text + '\n')
+    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')
+    }
   }
 
   const getKey = function getKey(filepath: string | Buffer | null): string {
-    if (Buffer.isBuffer(filepath)) {
+      if (Buffer.isBuffer(filepath)) {
-      filepath = filepath.toString()
+        filepath = filepath.toString()
-    }
+      }
-    if (!isString(filepath)) {
+      if (!isString(filepath)) {
-      return notAFile
+        return notAFile
-    }
+      }
-    let key = path.resolve(filepath)
+      const key = path.resolve(baseDir, filepath)
 
-    if (isWin && key.substr(1, 2) === ':\\') {
+      return winPath(key)
-      key = key[0].toUpperCase() + key.substr(1)
+    },
+    statTime = function () {
+      return {
+        atime: new Date(stat.atime),
+        mtime: new Date(stat.mtime),
+        ctime: new Date(stat.ctime),
+        birthtime: new Date(stat.birthtime),
+      }
     }
-    return key
+
+  let BigInt: any
+  try {
+    BigInt = eval('BigInt')
+  } catch (ignored) {
+    void ignored
   }
 
-  const statTime = function() {
+  const minBlocks = Math.max(Math.ceil(stat.blksize / 512), 1),
-    return {
+    createStat = function (extensions: any, options: any) {
-      dev: 0,
+      const stat = Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
-      ino: 0,
+      if ('size' in extensions) {
-      nlink: 0,
+        // Assume non adjustable allocation size for file system
-      rdev: 0,
+        stat.blocks = Math.ceil(stat.size / stat.blksize) * minBlocks
-      uid: 123,
+      }
-      gid: 500,
+      if (options && options.bigint && typeof BigInt !== 'undefined') {
-      blksize: 4096,
+        for (const k in stat) {
-      blocks: 0,
+          if (Object.prototype.hasOwnProperty.call(stat, k) && typeof stat[k] === 'number') {
-      atime: new Date(stat.atime),
+            stat[k] = BigInt(stat[k])
-      atimeMs: stat.atime.getTime(),
+          }
-      mtime: new Date(stat.mtime),
+        }
-      mtimeMs: stat.mtime.getTime(),
+      }
-      ctime: new Date(stat.ctime),
+      return stat
-      ctimMs: stat.ctime.getTime(),
+    },
-      birthtime: new Date(stat.birthtime),
+    ownStat = function (filepath: any, options: any) {
-      birthtimeMs: stat.birthtime.getTime()
+      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)
+      }
+      if (manifest[key]) {
+        return createStat({ size: manifest[key][1] }, options)
+      }
+    },
+    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)
+        }
+      }
     }
-  }
-
-  const createStat = function(directoryExtensions: any, fileExtensions?: any) {
-    if (!fileExtensions) {
-      return Object.assign({}, binary.layout.stat, directoryExtensions, { size: 0 }, statTime())
-    }
-    const size = directoryExtensions[1]
-    return Object.assign({}, binary.layout.stat, fileExtensions, { size }, statTime())
-  }
-
-  const ownStat = function(filepath: any) {
-    setupManifest()
-    const key = getKey(filepath)
-    if (directories[key]) {
-      return createStat({ isDirectory, isFile: isNotFile })
-    }
-    if (manifest[key]) {
-      return createStat(manifest[key], { isFile, isDirectory: isNotDirectory })
-    }
-  }
 
   function makeLong(filepath: string) {
-    return (path as any)._makeLong && (path as any)._makeLong(filepath)
+    return path._makeLong && path._makeLong(filepath)
   }
 
   function fileOpts(options: any) {
@@ -113,11 +137,11 @@ 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 entry = manifest[filepath],
-      const absolutePath = getKey(filepath)
+        absolutePath = getKey(filepath),
-      const longPath = makeLong(absolutePath)
+        longPath = makeLong(absolutePath),
-      const normalizedPath = path.normalize(filepath)
+        normalizedPath = winPath(path.normalize(filepath))
 
       if (!manifest[absolutePath]) {
         manifest[absolutePath] = entry
@@ -129,8 +153,8 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
         manifest[normalizedPath] = manifest[filepath]
       }
 
-      let currentDir = path.dirname(absolutePath)
+      let currentDir = path.dirname(absolutePath),
-      let prevDir = absolutePath
+        prevDir = absolutePath
 
       while (currentDir !== prevDir) {
         directories[currentDir] = directories[currentDir] || {}
@@ -148,7 +172,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
     setupManifest = noop
   }
 
-  //naive patches intended to work for most use cases
+  // naive patches intended to work for most use cases
   const nfs: any = {
     existsSync: function existsSync(filepath: string) {
       setupManifest()
@@ -178,7 +202,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       setupManifest()
       const dir = directories[getKey(filepath)]
       if (dir) {
-        if ('function' === typeof options) {
+        if (typeof options === 'function') {
           callback = options
           options = { encoding: 'utf8' }
         }
@@ -187,7 +211,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
         return originalFsMethods.readdir.apply(fs, arguments)
       }
     },
-    readdirSync: function readdirSync(filepath: string | Buffer, options: any) {
+    readdirSync: function readdirSync(filepath: string | Buffer) {
       setupManifest()
       const dir = directories[getKey(filepath)]
       if (dir) {
@@ -202,30 +226,33 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       if (!entry) {
         return originalFsMethods.readFile.apply(fs, arguments)
       }
-      const [offset, length] = entry
+      const [offset, length] = entry,
-      const resourceOffset = resourceStart + offset
+        resourceOffset = resourceStart + offset,
-      const encoding = fileOpts(options).encoding
+        encoding = fileOpts(options).encoding
       callback = typeof options === 'function' ? options : callback
 
-      fs.open(blobPath, 'r', function(err: Error, fd: number) {
+      originalFsMethods.open(blobPath, 'r', function (err: Error, fd: number) {
         if (err) return callback(err, null)
-        fs.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function(
+        originalFsMethods.read(
-          error: Error,
+          fd,
-          bytesRead: number,
+          Buffer.alloc(length),
-          result: Buffer
+          0,
-        ) {
+          length,
-          if (error) {
+          resourceOffset,
-            return fs.close(fd, function() {
+          function (error: Error, bytesRead: number, result: Buffer) {
-              callback(error, null)
+            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)
             })
           }
-          fs.close(fd, function(err: Error) {
+        )
-            if (err) {
-              return callback(err, result)
-            }
-            callback(err, encoding ? result.toString(encoding) : result)
-          })
-        })
       })
     },
     createReadStream: function createReadStream(filepath: any, options: any) {
@@ -234,15 +261,15 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       if (!entry) {
         return originalFsMethods.createReadStream.apply(fs, arguments)
       }
-      const [offset, length] = entry
+      const [offset, length] = entry,
-      const resourceOffset = resourceStart + offset
+        resourceOffset = resourceStart + offset,
-      const opts = fileOpts(options)
+        opts = fileOpts(options)
 
-      return fs.createReadStream(
+      return originalFsMethods.createReadStream(
         blobPath,
         Object.assign({}, opts, {
           start: resourceOffset,
-          end: resourceOffset + length - 1
+          end: resourceOffset + length - 1,
         })
       )
     },
@@ -252,36 +279,34 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       if (!entry) {
         return originalFsMethods.readFileSync.apply(fs, arguments)
       }
-      const [offset, length] = entry
+      const [offset, length] = entry,
-      const resourceOffset = resourceStart + offset
+        resourceOffset = resourceStart + offset,
-      const encoding = fileOpts(options).encoding
+        encoding = fileOpts(options).encoding,
-      const fd = fs.openSync(process.execPath, 'r')
+        fd = originalFsMethods.openSync(process.execPath, 'r'),
-      const result = Buffer.alloc(length)
+        result = Buffer.alloc(length)
-      fs.readSync(fd, result, 0, length, resourceOffset)
+      originalFsMethods.readSync(fd, result, 0, length, resourceOffset)
-      fs.closeSync(fd)
+      originalFsMethods.closeSync(fd)
       return encoding ? result.toString(encoding) : result
     },
-    statSync: function statSync(filepath: string | Buffer) {
+    statSync: function statSync(filepath: string | Buffer, options: any) {
-      const stat = ownStat(filepath)
+      const stat = ownStat(filepath, options)
       if (stat) {
         return stat
       }
       return originalFsMethods.statSync.apply(fs, arguments)
     },
-    stat: function stat(filepath: string | Buffer, callback: any) {
+    stat: getStat('stat'),
-      const stat = ownStat(filepath)
+    lstat: getStat('lstat'),
+    lstatSync: function statSync(filepath: string | Buffer, options: any) {
+      const stat = ownStat(filepath, options)
       if (stat) {
-        process.nextTick(() => {
+        return stat
-          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: Func) {
       cb = cb || noop
       const exists = nfs.existsSync(filepath)
       process.nextTick(() => cb(exists))
@@ -290,9 +315,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')
@@ -300,10 +325,17 @@ 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.internalModuleStat = function(this: any, original: any, ...args: any[]) {
+  patches.internalModuleReadJSON = function (this: any, original: any, ...args: any[]) {
+    if (!returningArray) 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] = args
+    const filepath = getKey(args[0])
     if (manifest[filepath]) {
       log('stat     (hit)              ' + filepath + '   ' + 0)
       return 0
@@ -324,7 +356,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: Func) {
       cb = cb || noop
       const exists = nfs.existsSync(filepath)
       if (!exists) {
@@ -333,8 +365,73 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
       process.nextTick(() => cb(exists))
     }
   }
+
+  if (typeof fs.copyFile === 'function') {
+    nfs.copyFile = function (filepath: string, dest: string, flags: number, callback: Func) {
+      setupManifest()
+      const entry = manifest[getKey(filepath)]
+      if (!entry) {
+        return originalFsMethods.copyFile.apply(fs, arguments)
+      }
+      if (typeof flags === 'function') {
+        callback = flags
+        flags = 0
+      }
+      nfs.readFile(filepath, (err: any, buffer: any) => {
+        if (err) {
+          return callback(err)
+        }
+        originalFsMethods.writeFile(dest, buffer, (err: any) => {
+          if (err) {
+            return callback(err)
+          }
+          callback(null)
+        })
+      })
+    }
+    nfs.copyFileSync = function (filepath: string, dest: string) {
+      setupManifest()
+      const entry = manifest[getKey(filepath)]
+      if (!entry) {
+        return originalFsMethods.copyFileSync.apply(fs, arguments)
+      }
+      return originalFsMethods.writeFileSync(dest, nfs.readFileSync(filepath))
+    }
+  }
+
+  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) => {
+      fs[key] = originalFsMethods[key]
+    })
+    lazyRestoreFs = () => void 0
+    return void 0
+  }
   return true
 }
 
+function restoreFs() {
+  lazyRestoreFs()
+}
+
 export { shimFs, restoreFs }

src/logger.ts

@@ -1,45 +1,45 @@
-import colors = require('chalk')
+import type { Func } from './util.js'
-import ora = require('ora')
+import { color, esm } from './util.js'
 
 const frameLength = 120
 
 export interface LogStep {
-  modify(text: string, color?: string): void
+  modify: (text: string, color?: string) => void
-  log(text: string, color?: string): void
+  log: (text: string, color?: string) => void
-  pause(): void
+  pause: () => void
-  resume(): void
+  resume: () => void
 }
 
 export class Logger {
   public verbose: boolean
-  private silent: boolean
+  private readonly silent: boolean
   private ora: any
-  private modify: Function
+  private readonly modify: Func
   public write: (text: string, color?: string) => void
 
   constructor(level: 'verbose' | 'silent' | 'info') {
     this.verbose = level === 'verbose'
     this.silent = level === 'silent'
     if (!this.silent) {
-      this.ora = ora({
+      this.ora = esm.ora?.default({
         text: 'Starting...',
         color: 'blue',
-        spinner: 'dots'
+        spinner: 'dots',
       })
       this.ora.stop()
     }
-    const noop = () => {}
+    const noop = () => void 0
     this.modify = this.silent ? noop : this._modify.bind(this)
     this.write = this.silent ? noop : this._write.bind(this)
   }
 
-  flush() {
+  async flush() {
     !this.silent && this.ora.succeed()
-    return new Promise(resolve => setTimeout(resolve, frameLength))
+    return await new Promise((resolve) => setTimeout(resolve, frameLength))
   }
 
-  _write(update: string, color = 'green') {
+  _write(update: string, clr = 'green') {
-    this.ora.succeed().text = (colors as any)[color](update)
+    this.ora.succeed().text = color(clr, update)
     this.ora.start()
   }
 
@@ -48,10 +48,12 @@ export class Logger {
     this.ora.color = color
   }
 
-  step(text: string, method: string = 'succeed'): LogStep {
+  step(text: string, method = 'succeed', clr?: string): LogStep {
     if (this.silent) {
+      // eslint-disable-next-line @typescript-eslint/no-empty-function
       return { modify() {}, log() {}, pause() {}, resume() {} }
     }
+    text = color(clr, text)
     if (!this.ora.id) {
       this.ora.start().text = text
       if (method !== 'succeed') {
@@ -66,7 +68,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
   }
 }

src/nexe.ts

@@ -1,48 +1,55 @@
-import { EOL } from 'os'
+import { NexeCompiler } from './compiler.js'
-import { compose } from 'app-builder'
+import type { NexeOptions, NexePatch } from './options.js'
-import { NexeCompiler, NexeError } from './compiler'
+import { normalizeOptions } from './options.js'
-import { normalizeOptions, NexeOptions, NexePatch } from './options'
+
-import resource from './steps/resource'
+import resource from './steps/resource.js'
-import clean from './steps/clean'
+import clean from './steps/clean.js'
-import cli from './steps/cli'
+import cli from './steps/cli.js'
-import bundle from './steps/bundle'
+import bundle from './steps/bundle.js'
-import download from './steps/download'
+import download from './steps/download.js'
-import shim from './steps/shim'
+import shim from './steps/shim.js'
-import artifacts from './steps/artifacts'
+import artifacts from './steps/artifacts.js'
-import patches from './patches'
+import patches from './patches/index.js'
+import { initEsm } from './util.js'
 
 async function compile(
   compilerOptions?: Partial<NexeOptions>,
   callback?: (err: Error | null) => void
 ) {
-  let error = null,
+  await initEsm()
+  let error: Error | null = null,
     options: NexeOptions | null = null,
     compiler: NexeCompiler | null = null
 
   try {
     options = normalizeOptions(compilerOptions)
     compiler = new NexeCompiler(options)
-    await compose(
+    const plugins = options.plugins as NexePatch[],
-      clean,
+      buildSteps = options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : []
-      resource,
+    await exec([clean, resource, cli, bundle, shim, download, ...buildSteps, ...plugins], compiler)
-      cli,
+  } catch (e: any) {
-      bundle,
-      shim,
-      options.build ? [download, artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
-      options.plugins as NexePatch[]
-    )(compiler)
-  } catch (e) {
     error = e
   }
 
   if (error) {
-    compiler && compiler.quit(error)
+    compiler?.quit(error)
     if (callback) return callback(error)
-    return Promise.reject(error)
+    throw error
   }
 
   if (callback) callback(null)
 }
 
 export { compile, NexeCompiler }
-export { argv, version, NexeOptions, help } from './options'
+export { argv, version, help } from './options.js'
+export type { NexeOptions } from './options.js'
+
+function exec<T>(mw: any[], ctx: T): Promise<void> | void {
+  let i = -1
+  const nxt = (): void | Promise<void> => {
+    if (++i < mw.length) {
+      return mw[i](ctx, nxt)
+    }
+  }
+  return nxt()
+}

src/options.ts

@@ -1,45 +1,48 @@
-import * as parseArgv from 'minimist'
+import { basename, extname, join, isAbsolute, resolve, dirname } from 'node:path'
-import { NexeCompiler, NexeError } from './compiler'
+import { fileURLToPath } from 'node:url'
-import { isWindows, STDIN_FLAG } from './util'
+import { EOL, homedir } from 'node:os'
-import { basename, extname, join, isAbsolute, resolve } from 'path'
+import { globalAgent } from 'node:https'
-import { getTarget, NexeTarget } from './target'
+import { createRequire } from 'node:module'
-import { EOL, homedir } from 'os'
+
-import chalk from 'chalk'
+const dir = typeof __dirname === 'string' ? __dirname : dirname(fileURLToPath(import.meta.url)),
-import { resolveFileNameSync } from 'resolve-dependencies'
+  cjs = createRequire(dir)
-const caw = require('caw')
+
-const c = process.platform === 'win32' ? chalk.constructor({ enabled: false }) : chalk
+import { resolveSync } from 'resolve-dependencies'
+import parseArgv from 'minimist'
+
+import caw from 'caw'
+
+import type { NexeCompiler } from './compiler.js'
+import { NexeError } from './compiler.js'
+import type { NexeTarget } from './target.js'
+import { getTarget } from './target.js'
+import { isWindows, STDIN_FLAG, esm } from './util.js'
 
 export const version = '{{replace:0}}'
 
-export interface NexePatch {
+export type NexePatch = (compiler: NexeCompiler, next: () => Promise<void>) => Promise<void>
-  (compiler: NexeCompiler, next: () => Promise<void>): Promise<void>
-}
 
 export interface NexeOptions {
   build: boolean
   input: string
   output: string
-  targets: (string | NexeTarget)[]
+  targets: Array<string | NexeTarget>
   name: string
+  remote: string
+  asset: string
   cwd: string
+  fs: boolean | string[]
   flags: string[]
   configure: string[]
   vcBuild: string[]
   make: string[]
-  snapshot?: string
   resources: string[]
   temp: string
-  rc: { [key: string]: string }
   enableNodeCli: boolean
   bundle: boolean | string
-  patches: (string | NexePatch)[]
+  patches: Array<string | NexePatch>
-  plugins: (string | NexePatch)[]
+  plugins: Array<string | NexePatch>
   native: any
-  /**
-   * @deprecated
-   * Use mangle: false instead
-   */
-  empty: boolean
   mangle: boolean
   ghToken: string
   sourceUrl?: string
@@ -50,10 +53,8 @@ export interface NexeOptions {
   fakeArgv?: boolean
   verbose?: boolean
   info?: boolean
-  ico?: string
   debugBundle?: boolean
   warmup?: string
-  compress?: boolean
   clean?: boolean
   /**
    * Api Only
@@ -62,62 +63,67 @@ export interface NexeOptions {
 }
 
 const defaults = {
-  flags: [],
+    flags: [],
-  cwd: process.cwd(),
+    cwd: process.cwd(),
-  configure: [],
+    fs: true,
-  make: [],
+    configure: [],
-  targets: [],
+    mangle: true,
-  vcBuild: isWindows ? ['nosign', 'release'] : [],
+    make: [],
-  enableNodeCli: false,
+    targets: [],
-  compress: false,
+    vcBuild: isWindows ? ['nosign', 'release'] : [],
-  build: false,
+    enableNodeCli: false,
-  bundle: true,
+    build: false,
-  patches: [],
+    bundle: true,
-  plugins: []
+    patches: [],
-}
+    plugins: [],
-const alias = {
+    remote: 'https://github.com/nexe/nexe/releases/download/v3.3.3/',
-  i: 'input',
+  },
-  o: 'output',
+  alias = {
-  v: 'version',
+    i: 'input',
-  t: 'target',
+    o: 'output',
-  b: 'build',
+    v: 'version',
-  n: 'name',
+    a: 'asset',
-  r: 'resource',
+    t: 'target',
-  a: 'resource',
+    b: 'build',
-  p: 'python',
+    n: 'name',
-  f: 'flag',
+    r: 'resource',
-  c: 'configure',
+    p: 'python',
-  m: 'make',
+    f: 'flag',
-  h: 'help',
+    c: 'configure',
-  l: 'loglevel',
+    m: 'make',
-  'fake-argv': 'fakeArgv',
+    h: 'help',
-  'gh-token': 'ghToken'
+    l: 'loglevel',
-}
+    'fake-argv': 'fakeArgv',
-const argv = parseArgv(process.argv, { alias, default: { ...defaults } })
+    'gh-token': 'ghToken',
-let help = `
+  },
+  argv = parseArgv(process.argv, { alias, default: { ...defaults } }),
+  help = () => {
+    const c = esm.chalk?.default as typeof import('chalk').default
+    return (
+      EOL +
+      `
 ${c.bold('nexe <entry-file> [options]')}
 
    ${c.underline.bold('Options:')}
 
   -i   --input                      -- application entry point
   -o   --output                     -- path to output file
-  -t   --target                     -- node version description
+  -t   --target                     --  * node version description
   -n   --name                       -- main app module name
-  -r   --resource                   -- *embed files (glob) within the binary
+  -r   --resource                   --  * embed additional files (glob) within the binary
+       --remote                     -- alternate root directory for pre-built base (nexe) binaries from
        --plugin                     -- extend nexe runtime behavior
 
    ${c.underline.bold('Building from source:')}
 
   -b   --build                      -- build from source
-  -p   --python                     -- python2 (as python) executable path
+  -p   --python                     -- python3 executable path
-  -f   --flag                       -- *v8 flags to include during compilation
+  -f   --flag                       --  * v8 flags to include during compilation
-  -c   --configure                  -- *arguments to the configure step
+  -c   --configure                  --  * arguments to the configure step
-  -m   --make                       -- *arguments to the make/build step
+  -m   --make                       --  * arguments to the make/build step
-       --no-mangle                  -- used when generating base binaries, or when pathing _third_party_main manually.
+       --patch                      --  * extend patches applied to source
-       --snapshot                   -- path to a warmup snapshot
+       --no-mangle                  -- used when generating base binaries, or when patching _third_party_main manually
-       --ico                        -- file name for alternate icon file (windows)
+       --sourceUrl                  -- pass an alternate source tarball (node.tar.gz) url
-       --rc-*                       -- populate rc file options (windows)
-       --sourceUrl                  -- pass an alternate source (node.tar.gz) url
        --enableNodeCli              -- enable node cli enforcement (blocks app cli)
 
    ${c.underline.bold('Other options:')}
@@ -130,31 +136,13 @@ ${c.bold('nexe <entry-file> [options]')}
        --silent                     -- disable logging
        --verbose                    -- set logging to verbose
 
-       -* variable key name         * option can be used more than once`.trim()
+  "*" indicates an option can be used more than once`.trim() +
-help = EOL + help + EOL
+      EOL
+    )
+  }
 
 function flatten(...args: any[]): string[] {
-  return ([] as string[]).concat(...args).filter(x => x)
+  return ([] as string[]).concat(...args).filter((x) => x)
-}
-
-/**
- * Extract keys such as { "rc-CompanyName": "Node.js" } to
- * { CompanyName: "Node.js" }
- * @param {*} match
- * @param {*} options
- */
-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
-    )
 }
 
 function extractLogLevel(options: NexeOptions) {
@@ -165,16 +153,16 @@ function extractLogLevel(options: NexeOptions) {
 }
 
 function isName(name: string) {
-  return name && name !== 'index'
+  return name && name !== 'index' && name !== STDIN_FLAG
 }
 
 function extractName(options: NexeOptions) {
   let name = options.name
-  //try and use the input filename as the output filename if its not index
+  // try and use the input filename as the output filename if its not index
   if (!isName(name) && typeof options.input === 'string') {
     name = basename(options.input).replace(extname(options.input), '')
   }
-  //try and use the directory as the filename
+  // try and use the directory as the filename
   if (!isName(name) && basename(options.cwd)) {
     name = basename(options.cwd)
   }
@@ -209,20 +197,20 @@ export function resolveEntry(
   }
   if (input) {
     const inputPath = padRelative(input)
-    result = resolveFileNameSync(cwd, inputPath)
+    result = resolveSync(cwd, inputPath)
   }
   if (isEntryFile(maybeEntry) && (!result || !result.absPath)) {
     const inputPath = padRelative(maybeEntry)
-    result = resolveFileNameSync(cwd, inputPath)
+    result = resolveSync(cwd, inputPath)
   }
-  if (!process.stdin.isTTY && (!result || !result.absPath) && bundle === defaults.bundle) {
+  if (!process.stdin.isTTY && !result?.absPath && bundle === defaults.bundle) {
     return STDIN_FLAG
   }
-  if (!result || !result.absPath) {
+  if (!result?.absPath) {
-    result = resolveFileNameSync(cwd, '.')
+    result = resolveSync(cwd, '.')
   }
   if (!result.absPath) {
-    throw new NexeError(`Entry file "${input || ''}" not found!`)
+    throw new NexeError(`Entry file "${input || maybeEntry}" not found!`)
   }
   return result.absPath
 }
@@ -232,9 +220,9 @@ function isCli(options?: Partial<NexeOptions>) {
 }
 
 function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
-  const options = Object.assign({}, defaults, input) as NexeOptions
+  const options = Object.assign({}, defaults, input) as NexeOptions,
-  const opts = options as any
+    opts = options as any,
-  const cwd = (options.cwd = resolve(options.cwd))
+    cwd = (options.cwd = resolve(options.cwd))
   options.temp = options.temp
     ? resolve(cwd, options.temp)
     : process.env.NEXE_TEMP || join(homedir(), '.nexe')
@@ -245,7 +233,7 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
   options.loglevel = extractLogLevel(options)
   options.flags = flatten(opts.flag, options.flags)
   options.targets = flatten(opts.target, options.targets).map(getTarget)
-  if (!options.targets.length) {
+  if (options.targets.length === 0) {
     options.targets.push(getTarget())
   }
   options.ghToken = options.ghToken || process.env.GITHUB_TOKEN || ''
@@ -253,21 +241,39 @@ 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)'
   options.downloadOptions.agent = process.env.HTTPS_PROXY
     ? caw(process.env.HTTPS_PROXY, { protocol: 'https' })
-    : options.downloadOptions.agent || require('https').globalAgent
+    : options.downloadOptions.agent || globalAgent
-  options.downloadOptions.rejectUnauthorized = process.env.HTTPS_PROXY ? false : true
+  options.downloadOptions.rejectUnauthorized = !process.env.NODE_TLS_REJECT_UNAUTHORIZED
 
-  options.rc = options.rc || extractCliMap(/^rc-.*/, options)
   options.output =
     (options.targets[0] as NexeTarget).platform === 'windows'
       ? `${(options.output || options.name).replace(/\.exe$/, '')}.exe`
       : `${options.output || options.name}`
   options.output = resolve(cwd, options.output)
 
+  const requireDefault = (x: string) => {
+    if (typeof x === 'string') {
+      return cjs(x).default
+    }
+    return x
+  }
+
+  options.mangle = 'mangle' in opts ? opts.mangle : true
+  options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault)
+  options.patches = flatten(opts.patch, options.patches).map(requireDefault)
+
+  if ((!options.mangle && !options.bundle) || options.patches.length > 0) {
+    options.build = true
+  }
+
   if (options.build) {
     const { arch } = options.targets[0] as NexeTarget
     if (isWindows) {
@@ -277,20 +283,9 @@ function normalizeOptions(input?: Partial<NexeOptions>): NexeOptions {
     }
   }
 
-  const requireDefault = (x: string) => {
-    if (typeof x === 'string') {
-      return require(x).default
-    }
-    return x
-  }
-
-  options.mangle = 'mangle' in opts ? opts.mangle : !opts.empty
-  options.plugins = flatten(opts.plugin, options.plugins).map(requireDefault)
-  options.patches = flatten(opts.patch, options.patches).map(requireDefault)
-
   Object.keys(alias)
-    .filter(k => k !== 'rc')
+    .filter((k) => k !== 'rc')
-    .forEach(x => delete opts[x])
+    .forEach((x) => delete opts[x])
 
   return options
 }

src/patches/boot-nexe.ts

@@ -1,29 +1,34 @@
-const fs = require('fs'),
+/* eslint-disable @typescript-eslint/no-var-requires */
-  fd = fs.openSync(process.execPath, 'r'),
+const fs = require('fs')
+const fd = fs.openSync(process.execPath, 'r'),
   stat = fs.statSync(process.execPath),
-  footer = Buffer.alloc(32, 0)
+  tailSize = Math.min(stat.size, 16000),
+  tailWindow = Buffer.from(Array(tailSize))
 
-fs.readSync(fd, footer, 0, 32, stat.size - 32)
+fs.readSync(fd, tailWindow, 0, tailSize, stat.size - tailSize)
 
-if (!footer.slice(0, 16).equals(Buffer.from('<nexe~~sentinel>'))) {
+const footerPosition = tailWindow.indexOf('<nexe~~sentinel>')
-  throw 'Invalid Nexe binary'
+if (footerPosition == -1) {
+  process.stderr.write('\nInvalid Nexe binary\n')
+  process.exit(1)
 }
 
-const contentSize = footer.readDoubleLE(16),
+const footer = tailWindow.slice(footerPosition, footerPosition + 32),
+  contentSize = footer.readDoubleLE(16),
   resourceSize = footer.readDoubleLE(24),
-  contentStart = stat.size - 32 - resourceSize - contentSize,
+  contentStart = stat.size - tailSize + footerPosition - resourceSize - contentSize,
   resourceStart = contentStart + contentSize
 
 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')
         }
@@ -34,19 +39,19 @@ Object.defineProperty(
             contentSize,
             contentStart,
             resourceSize,
-            resourceStart
+            resourceStart,
-          }
+          },
         })
         Object.freeze(nexeHeader)
       },
       enumerable: false,
-      configurable: false
+      configurable: false,
     }
   })()
 )
 
-const contentBuffer = Buffer.from(Array(contentSize)),
+const contentBuffer = Buffer.from(Array(contentSize))
-  Module = require('module')
+const Module = require('module')
 
 fs.readSync(fd, contentBuffer, 0, contentSize, contentStart)
 fs.closeSync(fd)

src/patches/build-fixes.ts

@@ -1,17 +0,0 @@
-import { NexeCompiler } from '../compiler'
-
-export default async function buildFixes(compiler: NexeCompiler, next: () => Promise<void>) {
-  if (!compiler.target.version.startsWith('8.2')) {
-    return next()
-  }
-
-  const file = await compiler.readFileAsync('./tools/msvs/find_python.cmd')
-
-  await compiler.replaceInFileAsync(
-    './tools/msvs/find_python.cmd',
-    '%p%python.exe -V 2>&1',
-    '"%p%python.exe" -V 2>&1'
-  )
-
-  return next()
-}

src/patches/disable-node-cli.ts

@@ -1,38 +1,20 @@
-import { NexeCompiler } from '../compiler'
+import type { NexeCompiler } from '../compiler.js'
-import { semverGt } from '../util'
+import { NexeError } from '../compiler.js'
+import { semverGt } from '../util.js'
 
 export default async function disableNodeCli(compiler: NexeCompiler, next: () => Promise<void>) {
   if (compiler.options.enableNodeCli) {
-    return next()
+    return await next()
   }
 
-  if (semverGt(compiler.target.version, '10.9')) {
+  const [regex, replacement] = semverGt(compiler.target.version, '18.99')
-    await compiler.replaceInFileAsync('src/node.cc', /(?<!void )ProcessArgv\(/g, '//ProcessArgv(')
+      ? [/(?<!int )ProcessGlobalArgsInternal\(argv[^;]*;/gm, 'ExitCode::kNoFailure']
-  } else if (semverGt(compiler.target.version, '9.999')) {
+      : [/(?<!int )ProcessGlobalArgs\(argv[^;]*;/gm, 0],
-    await compiler.replaceInFileAsync(
+    replaced = await compiler.replaceInFileAsync('src/node.cc', regex, `${replacement};/*$&*/`)
-      'src/node.cc',
-      'int i = 1; i < v8_argc; i++',
-      'int i = v8_argc; i < v8_argc; i++'
-    )
-    let matches = 0
-    await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, match => {
-      if (matches++) {
-        return 'false'
-      }
-      return match
-    })
-  } else {
-    const nodeccMarker = 'argv[index][0] =='
 
-    await compiler.replaceInFileAsync(
+  if (!replaced) {
-      'src/node.cc',
+    throw new NexeError('There was an error applying the Node CLI patch. Please open an issue.')
-      `${nodeccMarker} '-'`,
-      // allow NODE_OPTIONS, introduced in 8.0
-      semverGt(compiler.target.version, '7.99')
-        ? `(${nodeccMarker} (is_env ? '-' : ']'))`
-        : `(${nodeccMarker} ']')`
-    )
   }
 
-  return next()
+  return await next()
 }

src/patches/flags.ts

@@ -1,16 +1,21 @@
-import { NexeCompiler } from '../compiler'
+import type { NexeCompiler } from '../compiler.js'
+import { NexeError } from '../compiler.js'
 
 export default async function flags(compiler: NexeCompiler, next: () => Promise<void>) {
   const nodeflags = compiler.options.flags
-  if (!nodeflags.length) {
+  if (nodeflags.length === 0) {
-    return next()
+    return await next()
   }
 
-  await compiler.replaceInFileAsync(
+  const replaced = await compiler.replaceInFileAsync(
     'node.gyp',
     "'node_v8_options%': ''",
     `'node_v8_options%': '${nodeflags.join(' ')}'`
   )
 
-  return next()
+  if (!replaced) {
+    throw new NexeError('Node Flags not applied. Please report an issue')
+  }
+
+  return await next()
 }

src/patches/gyp.ts

@@ -1,21 +0,0 @@
-import { NexeCompiler } from '../compiler'
-
-export default async function nodeGyp(
-  { files, replaceInFileAsync }: NexeCompiler,
-  next: () => Promise<void>
-) {
-  await next()
-
-  const nodeGypMarker = "'lib/fs.js',"
-  await replaceInFileAsync(
-    'node.gyp',
-    nodeGypMarker,
-    `
-    ${nodeGypMarker}
-    ${files
-      .filter(x => x.filename.startsWith('lib'))
-      .map(x => `'${x.filename}'`)
-      .toString()},
-  `.trim()
-  )
-}

src/patches/ico.ts

@@ -1,12 +0,0 @@
-import { normalize } from 'path'
-import { readFileAsync } from '../util'
-import { NexeCompiler } from '../compiler'
-
-export default async function ico(compiler: NexeCompiler, next: () => Promise<void>) {
-  const iconFile = compiler.options.ico
-  if (!iconFile) {
-    return next()
-  }
-  await compiler.setFileContentsAsync('src/res/node.ico', await readFileAsync(normalize(iconFile)))
-  return next()
-}

src/patches/index.ts

@@ -1,12 +1,7 @@
-import gyp from './gyp'
+import bootNexe from './third-party-main.js'
-import bootNexe from './third-party-main'
+import cli from './disable-node-cli.js'
-import buildFixes from './build-fixes'
+import flags from './flags.js'
-import cli from './disable-node-cli'
-import flags from './flags'
-import ico from './ico'
-import rc from './node-rc'
-import snapshot from './snapshot'
 
-const patches = [gyp, bootNexe, buildFixes, cli, flags, ico, rc, snapshot]
+const patches = [bootNexe, cli, flags]
 
 export default patches

src/patches/node-rc.ts

@@ -1,27 +0,0 @@
-import { NexeCompiler } from '../compiler'
-
-export default async function nodeRc(compiler: NexeCompiler, next: () => Promise<void>) {
-  const options = compiler.options.rc
-  if (!options) {
-    return next()
-  }
-
-  const file = await compiler.readFileAsync('src/res/node.rc')
-
-  Object.keys(options).forEach(key => {
-    let value = options[key]
-    const isVar = /^[A-Z_]+$/.test(value)
-    value = isVar ? value : `"${value}"`
-    file.contents = file.contents.replace(
-      new RegExp(`VALUE "${key}",.*`),
-      `VALUE "${key}", ${value}`
-    )
-  })
-  ;['PRODUCTVERSION', 'FILEVERSION'].forEach(x => {
-    if (options[x]) {
-      file.contents = file.contents.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`)
-    }
-  })
-
-  return next()
-}

src/patches/snapshot.ts

@@ -1,21 +0,0 @@
-import { resolve } from 'path'
-import { NexeCompiler } from '../compiler'
-
-export default async function(compiler: NexeCompiler, next: () => Promise<void>) {
-  const { snapshot, warmup, cwd } = compiler.options
-
-  if (!snapshot) {
-    return next()
-  }
-
-  await compiler.replaceInFileAsync(
-    compiler.configureScript,
-    'def configure_v8(o):',
-    `def configure_v8(o):\n  o['variables']['embed_script'] = r'${resolve(
-      cwd,
-      snapshot
-    )}'\n  o['variables']['warmup_script'] = r'${resolve(cwd, warmup || snapshot)}'`
-  )
-
-  return next()
-}

src/patches/third-party-main.ts

@@ -1,14 +1,78 @@
-import { NexeCompiler } from '../compiler'
+import { parse } from 'meriyah'
-import { parse } from 'cherow'
+import type { NexeCompiler } from '../compiler.js'
-import { semverGt } from '../util'
+import { NexeError } from '../compiler.js'
+import { wrap, semverGt } from '../util.js'
 
-function walkSome(node: any, visit: Function) {
+export default async function main(compiler: NexeCompiler, next: () => Promise<void>) {
+  let bootFile = 'lib/internal/bootstrap/pre_execution.js'
+  if (semverGt(compiler.target.version, '18.11.99')) {
+    bootFile = 'lib/internal/process/pre_execution.js'
+  }
+  const file = await compiler.readFileAsync(bootFile),
+    ast = parse(file.contents.toString(), {
+      next: true,
+      globalReturn: true,
+      loc: true,
+      specDeviation: true,
+    }),
+    location = { start: { line: 0 } }
+
+  walkSome(ast, (node: any) => {
+    if (!location.start.line && node.type === 'BlockStatement') {
+      // Find the first block statement and mark the location
+      Object.assign(location, node.loc)
+      return true
+    }
+  })
+
+  const fileLines = file.contents.toString().split('\n')
+
+  fileLines.splice(
+    location.start.line,
+    0,
+    '{{replace:lib/MOD/fs/bootstrap.js}}' + '\n' + 'expandArgv1 = false;\n'
+  )
+  file.contents = fileLines.join('\n')
+
+  const boot = await compiler.replaceInFileAsync(
+      bootFile,
+      'initializeFrozenIntrinsics();',
+      'initializeFrozenIntrinsics();\n' + wrap('{{replace:lib/MOD/patches/boot-nexe.js}}')
+    ),
+    userModuleAssertion = await compiler.replaceInFileAsync(
+      bootFile,
+      'assert(!CJSLoader.hasLoadedAnyUserCJSModule)',
+      '/*assert(!CJSLoader.hasLoadedAnyUserCJSModule)*/'
+    ),
+    workerSupport = 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'
+    )
+
+  assertPatches({ boot, userModuleAssertion, workerSupport })
+
+  return await next()
+}
+
+function assertPatches(patches: Record<string, boolean>) {
+  if (!Object.values(patches).every((x) => x)) {
+    let message = ''
+    Object.entries(patches).forEach(([k, v]) => {
+      if (!v) message += `\nFailed to apply patch for: "${k}". Please open an issue.`
+    })
+    throw new NexeError(message.trim())
+  }
+}
+
+function walkSome(node: any, visit: (node: any) => boolean | undefined) {
   if (!node || typeof node.type !== 'string' || node._visited) {
     return false
   }
   visit(node)
   node._visited = true
-  for (let childNode in node) {
+  for (const childNode in node) {
     const child = node[childNode]
     if (Array.isArray(child)) {
       for (let i = 0; i < child.length; i++) {
@@ -22,43 +86,3 @@ function walkSome(node: any, visit: Function) {
   }
   return false
 }
-
-export default async function main(compiler: NexeCompiler, next: () => Promise<void>) {
-  let bootFile = 'lib/internal/bootstrap_node.js'
-  const { version } = compiler.target
-
-  if (version.startsWith('4.')) {
-    bootFile = 'src/node.js'
-  } else if (semverGt(version, '9.10.1')) {
-    bootFile = 'lib/internal/bootstrap/node.js'
-  }
-
-  const file = await compiler.readFileAsync(bootFile),
-    ast = parse(file.contents, {
-      loc: true,
-      tolerant: true,
-      next: true,
-      globalReturn: true,
-      node: true,
-      skipShebang: true
-    }),
-    location = { start: { line: 0 } }
-
-  walkSome(ast, (node: any) => {
-    if (!location.start.line && node.type === 'BlockStatement') {
-      //Find the first block statement and mark the location
-      Object.assign(location, node.loc)
-      return true
-    }
-  })
-
-  const fileLines = file.contents.split('\n')
-  fileLines.splice(location.start.line, 0, '{{replace:lib/fs/bootstrap.js}}' + '\n')
-  file.contents = fileLines.join('\n')
-
-  await compiler.setFileContentsAsync(
-    'lib/_third_party_main.js',
-    '{{replace:lib/patches/boot-nexe.js}}'
-  )
-  return next()
-}

src/releases.ts

@@ -1,8 +1,7 @@
-import got = require('got')
+import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target.js'
-import { platforms, architectures, NexeTarget, getTarget, targetsEqual } from './target'
 export { NexeTarget }
 
-const versionsToSkip = [0, 1, 2, 3, 4, 5, 7, 9, 11]
+const versionsToSkip = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 13, 15, 17, 19, 21, 22]
 export interface GitAsset {
   name: string
   url: string
@@ -21,25 +20,30 @@ interface NodeRelease {
 }
 
 async function getJson<T>(url: string, options?: any) {
+  const { default: got } = await import('got')
   return JSON.parse((await got(url, options)).body) as T
 }
 
 function isBuildableVersion(version: string) {
-  const major = Number(version.split('.')[0])
+  if (version === '12.11.0') {
-  return !versionsToSkip.includes(major) || version === '4.8.4'
+    return false
+  }
+  return !versionsToSkip.includes(Number(version.split('.')[0]))
 }
 
-export function getLatestGitRelease(options?: any) {
+export async function getLatestGitRelease(options?: any) {
-  return getJson<GitRelease>('https://api.github.com/repos/nexe/nexe/releases/latest', options)
+  return await getJson<GitRelease>(
+    'https://api.github.com/repos/nexe/nexe/releases/latest',
+    options
+  )
 }
 
 export async function getUnBuiltReleases(options?: any) {
   const nodeReleases = await getJson<NodeRelease[]>(
-    'https://nodejs.org/download/release/index.json'
+      'https://nodejs.org/download/release/index.json'
-  )
+    ),
-  const existingVersions = (await getLatestGitRelease(options)).assets.map(x => getTarget(x.name))
+    existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name)),
-
+    versionMap: { [key: string]: true } = {}
-  const versionMap: { [key: string]: true } = {}
   return nodeReleases
     .reduce((versions: NexeTarget[], { version }) => {
       version = version.replace('v', '').trim()
@@ -47,8 +51,8 @@ export async function getUnBuiltReleases(options?: any) {
         return versions
       }
       versionMap[version] = true
-      platforms.forEach(platform => {
+      platforms.forEach((platform) => {
-        architectures.forEach(arch => {
+        architectures.forEach((arch) => {
           if (arch === 'x86' && platform === 'mac') return
           if (arch.includes('arm')) return
           versions.push(getTarget({ platform, arch, version }))
@@ -56,5 +60,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)))
 }

src/steps/artifacts.ts

@@ -1,29 +1,22 @@
-import { join, dirname } from 'path'
+import { join, dirname } from 'node:path'
-import { readdir, unlink } from 'fs'
+import { unlink, readdir, mkdir } from 'node:fs/promises'
-import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util'
-import * as mkdirp from 'mkdirp'
-import { NexeCompiler } from '../compiler'
-import pify = require('pify')
 
-const mkdirpAsync = pify(mkdirp)
+import { readFile, writeFile, isDirectory } from '../util.js'
-const unlinkAsync = pify(unlink)
+import type { NexeCompiler } from '../compiler.js'
-const readdirAsync = pify(readdir)
 
-function readDirAsync(dir: string): Promise<string[]> {
+async function readDirAsync(dir: string): Promise<string[]> {
-  return readdirAsync(dir).then(paths => {
+  return await readdir(dir).then(async (paths) => {
-    return Promise.all(
+    return await Promise.all(
-      paths.map((file: string) => {
+      paths.map(async (file: string) => {
         const path = join(dir, file)
-        return isDirectoryAsync(path).then(x => (x ? readDirAsync(path) : (path as any)))
+        return await isDirectory(path).then((x) => (x ? readDirAsync(path) : (path as any)))
       })
-    ).then(result => {
+    ).then((result) => result.flat())
-      return [].concat(...(result as any))
-    })
   })
 }
 
-function maybeReadFileContentsAsync(file: string) {
+async function maybeReadFileContentsAsync(file: string) {
-  return readFileAsync(file, 'utf-8').catch(e => {
+  return await readFile(file, 'utf-8').catch((e) => {
     if (e.code === 'ENOENT') {
       return ''
     }
@@ -41,28 +34,28 @@ function maybeReadFileContentsAsync(file: string) {
  *  - Finally, The patched files are written into source.
  */
 export default async function artifacts(compiler: NexeCompiler, next: () => Promise<void>) {
-  const { src } = compiler
+  const { src } = compiler,
-  const temp = join(src, 'nexe')
+    temp = join(src, 'nexe')
-  await mkdirpAsync(temp)
+  await mkdir(temp, { recursive: true })
   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'))
+      return await compiler.writeFileAsync(path.replace(temp, ''), await readFile(path, 'utf-8'))
     })
   )
 
   await next()
 
-  await Promise.all(tmpFiles.map(x => unlinkAsync(x)))
+  await Promise.all(tmpFiles.map(async (x) => await unlink(x)))
-  return Promise.all(
+  return await Promise.all(
-    compiler.files.map(async file => {
+    compiler.files.map(async (file) => {
-      const sourceFile = join(src, file.filename)
+      const sourceFile = join(src, file.filename),
-      const tempFile = join(temp, file.filename)
+        tempFile = join(temp, file.filename),
-      const fileContents = await maybeReadFileContentsAsync(sourceFile)
+        fileContents = await maybeReadFileContentsAsync(sourceFile)
 
-      await mkdirpAsync(dirname(tempFile))
+      await mkdir(dirname(tempFile), { recursive: true })
-      await writeFileAsync(tempFile, fileContents)
+      await writeFile(tempFile, fileContents)
       await compiler.writeFileAsync(file.filename, file.contents)
     })
   )

src/steps/bundle.ts

@@ -1,13 +1,14 @@
-import { NexeCompiler, NexeError } from '../compiler'
+import { resolve, relative } from 'node:path'
-import { resolve, relative } from 'path'
+import type { Readable } from 'node:stream'
-import { each } from '@calebboyd/semaphore'
+import resolveFiles, { resolveSync } from 'resolve-dependencies'
-import resolveFiles from 'resolve-dependencies'
-import { dequote, STDIN_FLAG } from '../util'
-import { Readable } from 'stream'
 
-function getStdIn(stdin: Readable): Promise<string> {
+import type { NexeCompiler } from '../compiler.js'
-  return new Promise(resolve => {
+import { NexeError } from '../compiler.js'
-    let out = ''
+import { dequote, STDIN_FLAG } from '../util.js'
+
+async function getStdIn(stdin: Readable): Promise<string> {
+  let out = ''
+  return await new Promise((resolve) => {
     stdin
       .setEncoding('utf8')
       .on('readable', () => {
@@ -16,43 +17,68 @@ function getStdIn(stdin: Readable): Promise<string> {
           out += current
         }
       })
-      .on('end', () => resolve(out))
+      .on('end', () => resolve(out.trim()))
+    setTimeout(() => {
+      if (!out.trim()) {
+        resolve(out.trim())
+      }
+    }, 1000)
   })
 }
 
 export default async function bundle(compiler: NexeCompiler, next: any) {
-  const { bundle, cwd, input } = compiler.options
+  const { bundle: doBundle, cwd, input: inputPath } = compiler.options
+  let input = inputPath
   compiler.entrypoint = './' + relative(cwd, input)
-  compiler.startup = ';require("module").runMain();'
+  compiler.startup = ''
 
-  if (!bundle) {
+  if (!doBundle) {
     await compiler.addResource(resolve(cwd, input))
     return next()
   }
 
   let code = ''
-  if (typeof bundle === 'string') {
+  if (typeof doBundle === 'string') {
-    code = await require(bundle).createBundle(compiler.options)
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    code = await require(doBundle).createBundle(compiler.options)
   }
 
-  if (input === STDIN_FLAG) {
+  if (input === STDIN_FLAG && (code = code || dequote(await getStdIn(process.stdin)))) {
     compiler.stdinUsed = true
     compiler.entrypoint = './__nexe_stdin.js'
-    code = code || dequote(await getStdIn(process.stdin))
     await compiler.addResource(resolve(cwd, compiler.entrypoint), code)
     return next()
   }
 
-  const { files, warnings } = await resolveFiles(input, { cwd, expand: true, loadContent: false })
+  if (input === STDIN_FLAG) {
+    const maybeInput = resolveSync(cwd, '.')
+    if (!maybeInput || !maybeInput.absPath) {
+      throw new NexeError('No valid input detected')
+    }
+    input = maybeInput.absPath
+    compiler.entrypoint = './' + relative(cwd, input)
+  }
+
+  const { files, warnings } = resolveFiles(
+    input,
+    ...Object.keys(compiler.bundle.list).filter((x) => x.endsWith('.js')),
+    { cwd, expand: 'variable', 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 > 0
   ) {
     throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
   }
 
-  await each(Object.keys(files), (filename: string) => compiler.addResource(filename), {
+  warnings.forEach((x: string) => compiler.log.step('[WARNING]: ' + x, 'stopAndPersist', 'yellow'))
-    concurrency: 10
+
-  })
+  await Promise.all(
+    Object.entries(files).map(async ([key, file]) => {
+      return await compiler.addResource(key, file)
+    })
+  )
+
   return next()
 }

src/steps/clean.ts

@@ -1,6 +1,7 @@
-import { NexeCompiler } from '../compiler'
+import { rm } from 'node:fs/promises'
-import { rimrafAsync } from '../util'
+
-import { NexeTarget } from '../target'
+import type { NexeCompiler } from '../compiler.js'
+import type { NexeTarget } from '../target.js'
 
 export default async function clean(compiler: NexeCompiler, next: () => Promise<any>) {
   const { options } = compiler
@@ -11,9 +12,9 @@ export default async function clean(compiler: NexeCompiler, next: () => Promise<
     }
     const step = compiler.log.step('Cleaning up nexe build artifacts...')
     step.log(`Deleting contents at: ${path}`)
-    await rimrafAsync(path)
+    await rm(path, { recursive: true, force: true })
     step.log(`Deleted contents at: ${path}`)
-    return compiler.quit()
+    return await compiler.quit()
   }
-  return next()
+  return await next()
 }

src/steps/cli.ts

@@ -1,8 +1,8 @@
-import { normalize, relative } from 'path'
+import { dirname, normalize, relative, resolve } from 'node:path'
-import { createWriteStream, chmodSync, statSync } from 'fs'
+import { createWriteStream, chmodSync, statSync, mkdirSync } from 'node:fs'
-import { NexeCompiler } from '../compiler'
+import type { NexeCompiler } from '../compiler.js'
-import { NexeTarget } from '../target'
+import type { NexeTarget } from '../target.js'
-import { STDIN_FLAG } from '../util'
+import { STDIN_FLAG } from '../util.js'
 
 /**
  * The "cli" step detects the appropriate input. If no input options are passed,
@@ -16,30 +16,42 @@ import { STDIN_FLAG } from '../util'
  */
 export default async function cli(compiler: NexeCompiler, next: () => Promise<void>) {
   await next()
-  const { log } = compiler
+  const { log } = compiler,
-  const target = compiler.options.targets.shift() as NexeTarget
+    target = compiler.options.targets.shift() as NexeTarget,
-  const deliverable = await compiler.compileAsync(target)
+    deliverable = await compiler.compileAsync(target),
+    output = normalize(compiler.output)
 
-  return new Promise((resolve, reject) => {
+  mkdirSync(dirname(output), { recursive: true })
+
+  return await new Promise((res, rej) => {
     const step = log.step('Writing result to file')
     deliverable
-      .pipe(createWriteStream(normalize(compiler.output!)))
+      .pipe(createWriteStream(output))
-      .on('error', reject)
+      .on('error', rej)
       .once('close', (e: Error) => {
         if (e) {
-          reject(e)
+          rej(e)
         } else if (compiler.output) {
-          const output = compiler.output
+          const output = compiler.output,
-          const mode = statSync(output).mode | 0o111
+            mode = statSync(output).mode | 0o111,
+            inputFileLogOutput = relative(
+              process.cwd(),
+              resolve(compiler.options.cwd, compiler.entrypoint || compiler.options.input)
+            ),
+            outputFileLogOutput = relative(process.cwd(), output)
+
           chmodSync(output, mode.toString(8).slice(-3))
-          const inputFile = relative(process.cwd(), compiler.options.input)
-          const outputFile = relative(process.cwd(), output)
           step.log(
             `Entry: '${
-              compiler.stdinUsed ? (compiler.options.mangle ? STDIN_FLAG : '[none]') : inputFile
+              compiler.stdinUsed
-            }' written to: ${outputFile}`
+                ? compiler.options.mangle
+                  ? STDIN_FLAG
+                  : '[none]'
+                : inputFileLogOutput
+            }' written to: ${outputFileLogOutput}`
           )
-          resolve(compiler.quit())
+          compiler.quit()
+          res(output)
         }
       })
   })

src/steps/download.ts

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

src/steps/resource.ts

@@ -1,22 +1,34 @@
-import { isDirectoryAsync, each } from '../util'
+import { relative } from 'node:path'
-import * as globs from 'globby'
+
-import { NexeCompiler } from '../compiler'
+import fg from 'fast-glob'
+
+import { each } from '../util.js'
+import type { NexeCompiler } from '../compiler.js'
 
 export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {
-  const { cwd } = compiler.options
+  const { cwd, resources } = compiler.options
-  if (!compiler.options.resources.length) {
+  if (resources.length === 0) {
-    return next()
+    return await next()
   }
-  const step = compiler.log.step('Bundling Resources...')
   let count = 0
-  await each(globs(compiler.options.resources, { cwd }), async file => {
+
-    if (await isDirectoryAsync(file)) {
+  resources.forEach((x: string) => {
-      return
+    if (x.includes('node_modules/**')) {
+      compiler.log.step(
+        `[WARNING]: pattern "${x}" will include many files, consider narrowing the pattern`,
+        'stopAndPersist',
+        'yellow'
+      )
     }
+  })
+
+  const step = compiler.log.step('Bundling Resources...')
+
+  await each(fg(resources, { cwd, absolute: true, onlyFiles: true }), async (file) => {
     count++
-    step.log(`Including file: ${file}`)
+    step.log(`Including file: ${relative(cwd, file)}`)
     await compiler.addResource(file)
   })
-  step.log(`Included ${count} file(s). ${(compiler.resourceSize / 1e6).toFixed(3)} MB`)
+  compiler.log.step(`Included ${count} file(s)`, 'stopAndPersist')
-  return next()
+  return await next()
 }

src/steps/shim.ts

@@ -1,12 +1,14 @@
-import { NexeCompiler } from '../compiler'
+import type { NexeCompiler } from '../compiler.js'
-import { wrap } from '../util'
+import { wrap } from '../util.js'
 
-export default function(compiler: NexeCompiler, next: () => Promise<void>) {
+export default async function (compiler: NexeCompiler, next: () => Promise<void>) {
+  await next()
   compiler.shims.push(
     wrap(
-      `process.__nexe = ${JSON.stringify(compiler.binaryConfiguration)};\n` +
+      '' +
-        '{{replace:lib/fs/patch.js}}' +
+        '{{replace:lib/MOD/fs/patch.js}}' +
-        '\nshimFs(process.__nexe)'
+        '\nshimFs(process.__nexe)' +
+        `\n${compiler.options.fs ? '' : 'restoreFs()'}`
     )
   )
   compiler.shims.push(
@@ -22,10 +24,12 @@ export default function(compiler: NexeCompiler, next: () => Promise<void>) {
   compiler.shims.push(
     wrap(`
       if (!process.send) {
-        process.argv.splice(1,0, require.resolve(${JSON.stringify(compiler.entrypoint)}))  
+        const path = require('path')
+        const entry = path.resolve(path.dirname(process.execPath),${JSON.stringify(
+          compiler.entrypoint
+        )})
+        process.argv.splice(1,0, entry)
       }
     `)
   )
-
-  return next()
 }

src/target.ts

@@ -1,8 +1,8 @@
 export type NodePlatform = 'windows' | 'mac' | 'alpine' | 'linux'
-export type NodeArch = 'x86' | 'x64' | 'arm7l' | 'arm6l' | 'arm64'
+export type NodeArch = 'x86' | 'x64' | 'arm' | 'arm64'
 
 const platforms: NodePlatform[] = ['windows', 'mac', 'alpine', 'linux'],
-  architectures: NodeArch[] = ['x86', 'x64', 'arm7l', 'arm6l', 'arm64']
+  architectures: NodeArch[] = ['x86', 'x64', 'arm', 'arm64']
 
 export { platforms, architectures }
 
@@ -13,30 +13,29 @@ export interface NexeTarget {
 }
 
 const prettyPlatform: { [key: string]: NodePlatform } = {
-  win32: 'windows',
+    win32: 'windows',
-  windows: 'windows',
+    windows: 'windows',
-  win: 'windows',
+    win: 'windows',
-  darwin: 'mac',
+    darwin: 'mac',
-  macos: 'mac',
+    macos: 'mac',
-  mac: 'mac',
+    mac: 'mac',
-  linux: 'linux',
+    linux: 'linux',
-  static: 'alpine',
+    static: 'alpine',
-  alpine: 'alpine'
+    alpine: 'alpine',
-}
+  },
-
+  prettyArch: { [key: string]: NodeArch } = {
-const prettyArch: { [key: string]: NodeArch } = {
+    x86: 'x86',
-  x86: 'x86',
+    arm6: 'arm',
-  arm6: 'arm6l',
+    arm64: 'arm64',
-  arm64: 'arm64',
+    arm6l: 'arm',
-  arm6l: 'arm6l',
+    arm: 'arm',
-  arm: 'arm7l',
+    arm7: 'arm',
-  arm7: 'arm7l',
+    arm7l: 'arm',
-  arm7l: 'arm7l',
+    amd64: 'x64',
-  amd64: 'x64',
+    ia32: 'x86',
-  ia32: 'x86',
+    x32: 'x86',
-  x32: 'x86',
+    x64: 'x64',
-  x64: 'x64'
+  }
-}
 
 function isVersion(x: string) {
   if (!x) {
@@ -58,6 +57,7 @@ class Target implements NexeTarget {
   toJSON() {
     return this.toString()
   }
+
   toString() {
     return `${this.platform}-${this.arch}-${this.version}`
   }
@@ -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, '')
       }

src/types.d.ts

@@ -6,8 +6,11 @@ declare module 'got' {
   const got: GotFn
   export = got
 }
+
+declare module 'caw'
+
 declare module 'download' {
-  import { Duplex } from 'stream'
+  import type { Duplex } from 'stream'
   interface DownloadOptions {
     extract?: boolean
     strip?: number

src/util.ts

@@ -1,17 +1,40 @@
-import { readFile, writeFile, stat } from 'fs'
+import { readFile, writeFile, stat } from 'node:fs/promises'
-import { execFile } from 'child_process'
+import { execFile as exec } from 'node:child_process'
-import pify = require('pify')
+import { promisify } from 'node:util'
-import rimraf = require('rimraf')
 
-const rimrafAsync = pify(rimraf)
 export const STDIN_FLAG = '[stdin]'
 
+export const esm: {
+  chalk: typeof import('chalk') | null
+  ora: typeof import('ora') | null
+  got: typeof import('got') | null
+} = {
+  got: null,
+  chalk: null,
+  ora: null,
+}
+
+export async function initEsm() {
+  await Promise.all(
+    (['chalk', 'got', 'ora'] as const).map(async (x) => {
+      esm[x] = await import(x)
+    })
+  )
+}
+
+const id = (x: any) => x
+export function color(color?: string, text?: string) {
+  return !color ? text : ((esm.chalk?.default as any)[color] || id)(text)
+}
+
+export type Func<T = any, Args = any> = (...args: Args[]) => T
+
 export async function each<T>(
   list: T[] | Promise<T[]>,
   action: (item: T, index: number, list: T[]) => Promise<any>
 ) {
   const l = await list
-  return Promise.all(l.map(action))
+  return await Promise.all(l.map(action))
 }
 
 export function wrap(code: string) {
@@ -26,12 +49,12 @@ function falseOnEnoent(e: any) {
 }
 
 function padRight(str: string, l: number) {
-  return (str + ' '.repeat(l)).substr(0, l)
+  return (str + ' '.repeat(l)).slice(0, l)
 }
 
 const bound: MethodDecorator = function bound<T>(
-  target: Object,
+  target: object,
-  propertyKey: string | Symbol,
+  propertyKey: string | symbol,
   descriptor: TypedPropertyDescriptor<T>
 ) {
   const configurable = true
@@ -42,17 +65,17 @@ const bound: MethodDecorator = function bound<T>(
       Object.defineProperty(this, propertyKey as string, {
         configurable,
         value,
-        writable: true
+        writable: true,
       })
       return value
-    }
+    },
   }
 }
 
 function dequote(input: string) {
   input = input.trim()
-  const singleQuote = input.startsWith("'") && input.endsWith("'")
+  const singleQuote = input.startsWith("'") && input.endsWith("'"),
-  const doubleQuote = input.startsWith('"') && input.endsWith('"')
+    doubleQuote = input.startsWith('"') && input.endsWith('"')
   if (singleQuote || doubleQuote) {
     return input.slice(1).slice(0, -1)
   }
@@ -64,30 +87,25 @@ export interface ReadFileAsync {
   (path: string, encoding: string): Promise<string>
 }
 
-const readFileAsync = pify(readFile)
+const execFile = promisify(exec),
-const writeFileAsync = pify(writeFile)
+  isWindows = process.platform === 'win32'
-const statAsync = pify(stat)
-const execFileAsync = pify(execFile)
-const isWindows = process.platform === 'win32'
 
-function pathExistsAsync(path: string) {
+async function pathExists(path: string) {
-  return statAsync(path)
+  return await stat(path)
-    .then(x => true)
+    .then(() => true)
     .catch(falseOnEnoent)
 }
 
-function isDirectoryAsync(path: string) {
+async function isDirectory(path: string) {
-  return statAsync(path)
+  return await stat(path)
-    .then(x => x.isDirectory())
+    .then((x) => x.isDirectory())
     .catch(falseOnEnoent)
 }
-/**
+
- * @param version See if this version is greather than the second one
- * @param operand Version to compare against
- */
 function semverGt(version: string, operand: string) {
   const [cMajor, cMinor, cPatch] = version.split('.').map(Number)
   let [major, minor, patch] = operand.split('.').map(Number)
+  major = Number(major)
   if (!minor) minor = 0
   if (!patch) patch = 0
   return (
@@ -100,14 +118,13 @@ function semverGt(version: string, operand: string) {
 export {
   dequote,
   padRight,
-  semverGt,
   bound,
   isWindows,
-  rimrafAsync,
+  stat,
-  statAsync,
+  execFile,
-  execFileAsync,
+  readFile,
-  readFileAsync,
+  pathExists,
-  pathExistsAsync,
+  isDirectory,
-  isDirectoryAsync,
+  writeFile,
-  writeFileAsync
+  semverGt,
 }

tasks/asset-compile.ts

@@ -1,101 +0,0 @@
-import * as nexe from '../lib/nexe'
-import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
-import * as ci from './ci'
-import { runDockerBuild } from './docker'
-import { getTarget } from '../lib/target'
-import { pathExistsAsync, readFileAsync, execFileAsync } from '../lib/util'
-import got = require('got')
-
-const env = process.env,
-  branchName = env.CIRCLE_BRANCH || env.APPVEYOR_REPO_BRANCH || env.TRAVIS_BRANCH || '',
-  isScheduled = Boolean(env.APPVEYOR_SCHEDULED_BUILD || env.NEXE_TRIGGERED),
-  isWindows = Boolean(env.APPVEYOR),
-  isPullRequest =
-    Boolean(env.CIRCLE_PR_NUMBER) ||
-    Boolean(env.APPVEYOR_PULL_REQUEST_NUMBER) ||
-    Boolean(env.TRAVIS_PULL_REQUEST_BRANCH),
-  headers = {
-    Authorization: 'token ' + env.GITHUB_TOKEN,
-    'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)'
-  }
-
-if (require.main === module) {
-  if (!isPullRequest) {
-    build().catch(x => {
-      console.error(x)
-      process.exit(1)
-    })
-  }
-}
-
-async function build() {
-  if (isScheduled) {
-    const releases = await getUnBuiltReleases({ headers })
-    if (!releases.length) {
-      return
-    }
-    const windowsBuild = releases.find(x => x.platform === 'windows')
-    const macBuild = releases.find(x => x.platform === 'mac')
-    const linuxOrAlpine = releases.find(x => x.platform === 'linux' || x.platform === 'alpine')
-
-    if (linuxOrAlpine) {
-      await ci.triggerDockerBuild(linuxOrAlpine, branchName)
-    }
-    if (macBuild) {
-      await ci.triggerMacBuild(macBuild, branchName)
-    }
-    if (windowsBuild) {
-      await ci.triggerWindowsBuild(windowsBuild)
-    }
-  }
-
-  if (env.NEXE_VERSION) {
-    const target = getTarget(env.NEXE_VERSION),
-      output = isWindows ? './out.exe' : './out',
-      options = {
-        empty: true,
-        build: true,
-        target,
-        output
-      }
-    console.log('Building: ', target)
-    const stop = keepalive()
-    if (['arm7l', 'arm6l', 'arm64', 'alpine'].includes(target.platform)) {
-      await runDockerBuild(target)
-    } else {
-      await nexe.compile(options)
-    }
-    stop()
-
-    if (await pathExistsAsync(output)) {
-      await assertNexeBinary(output)
-      const gitRelease = await getLatestGitRelease({ headers })
-      await got(gitRelease.upload_url.split('{')[0], {
-        query: { name: target.toString() },
-        body: await readFileAsync(output),
-        headers: {
-          ...headers,
-          'Content-Type': 'application/octet-stream'
-        }
-      }).catch(reason => {
-        console.log(reason && reason.response && reason.response.body)
-        throw reason
-      })
-      console.log(target + ' uploaded.')
-    }
-  }
-}
-
-function keepalive() {
-  const keepalive = setInterval(() => console.log('Building...'), 300 * 1000)
-  return () => clearInterval(keepalive)
-}
-
-function assertNexeBinary(file: string) {
-  return execFileAsync(file).catch(e => {
-    if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
-      return
-    }
-    throw e
-  })
-}

tasks/build.ts

@@ -0,0 +1,65 @@
+import { env } from 'node:process'
+import { execSync } from 'node:child_process'
+import { buildArm, buildAlpine } from './docker.js'
+
+export async function build(target = env.NEXE_TARGET || null) {
+  if (!target?.trim()) {
+    throw new Error('Environment variable NEXE_TARGET not found. Received: ' + target)
+  }
+
+  const done = keepalive()
+  let file = ''
+  try {
+    if (target.includes('alpine')) {
+      file = await buildAlpine(target)
+    } else if (target.includes('arm')) {
+      file = await buildArm(target)
+    } else {
+      file = await nexeBuild(target)
+      assertNexeBinary(file)
+    }
+  } catch (e: any) {
+    done()
+    throw e
+  }
+
+  if (!file) {
+    throw new Error('Binary failed to build')
+  }
+
+  uploadBinary(target, file)
+}
+
+function nexeBuild(target: string) {
+  console.log('building: ' + target)
+  return Promise.resolve('')
+}
+
+function uploadBinary(target: string, file: string) {
+  void file
+  console.log('uploading to release')
+}
+
+function keepalive() {
+  const keepalive = setInterval(() => console.log('Building...'), 300 * 1000)
+  return () => clearInterval(keepalive)
+}
+
+function assertNexeBinary(file: string) {
+  if (!file) throw new Error('Invalid filename: "' + file + '"')
+  let result = ''
+  try {
+    result = execSync(file).toString('utf8')
+  } catch (e: any) {
+    if (e && e.stack && e.stack.includes('Invalid Nexe binary')) {
+      return
+    }
+    throw e
+  }
+  throw new Error('Not a bare nexe binary: ' + result)
+}
+
+build().catch((e) => {
+  console.error(e)
+  process.exit(1)
+})

tasks/ci.ts

@@ -1,58 +0,0 @@
-import { NexeTarget } from '../lib/releases'
-import got = require('got')
-import * as assert from 'assert'
-import { getTarget } from '../lib/target'
-const { env } = process
-
-export function triggerMacBuild(release: NexeTarget, branch: string) {
-  assert.ok(env.CIRCLE_TOKEN)
-  const circle = `https://circleci.com/api/v1.1/project/github/nexe/nexe/tree/${branch}?circle-token=${
-    env.CIRCLE_TOKEN
-  }`
-  return got(circle, {
-    json: true,
-    body: {
-      build_parameters: {
-        NEXE_VERSION: release.toString()
-      }
-    }
-  })
-}
-
-export function triggerDockerBuild(release: NexeTarget, branch: string) {
-  assert.ok(env.TRAVIS_TOKEN)
-  const travis = `https://api.travis-ci.org/repo/nexe%2Fnexe/requests`
-  return got(travis, {
-    json: true,
-    body: {
-      request: {
-        branch: branch,
-        config: {
-          merge_mode: 'deep_merge',
-          env: {
-            //use matrix so that secure global variable is merged
-            matrix: {
-              NEXE_VERSION: release.toString()
-            }
-          }
-        }
-      }
-    },
-    headers: {
-      'Travis-API-Version': '3',
-      Authorization: `token ${env.TRAVIS_TOKEN}`
-    }
-  })
-}
-
-export function triggerWindowsBuild(release: NexeTarget) {
-  const version = 'NEXE_VERSION' in env ? env.NEXE_VERSION!.trim() : release.toString()
-  if (getTarget(version).version.startsWith('10.')) {
-    if ((env.APPVEYOR_BUILD_WORKER_IMAGE || '').includes('2017')) {
-      env.NEXE_VERSION = version
-    }
-  } else {
-    env.NEXE_VERSION = version
-  }
-  return Promise.resolve()
-}

tasks/docker.d.ts

@@ -0,0 +1,2 @@
+export declare function buildArm(target: string): Promise<string>
+export declare function buildAlpine(target: string): Promise<string>

tasks/docker.ts

@@ -1,72 +1,9 @@
-import { NexeTarget, architectures } from '../lib/target'
+export function buildArm(target: string) {
-import { writeFileAsync, readFileAsync } from '../lib/util'
+  console.log('building arm: ' + target)
-import got = require('got')
+  return Promise.resolve('')
-import execa = require('execa')
-import { appendFileSync } from 'fs'
-
-function alpine(target: NexeTarget) {
-  return `
-FROM ${target.arch === 'x64' ? '' : 'i386/'}alpine:3.4
-RUN apk add --no-cache curl make gcc g++ binutils-gold python linux-headers paxctl libgcc libstdc++ git vim tar gzip wget
-ENV NODE_VERSION=${target.version}
-ENV NEXE_VERSION=beta
-WORKDIR /
-
-RUN curl -sSL https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}.tar.gz | tar -xz && \
-  mkdir /nexe_temp && mv /node-v\${NODE_VERSION} /nexe_temp/\${NODE_VERSION} && \
-  cd /nexe_temp/\${NODE_VERSION} && \
-  ./configure --prefix=/usr --fully-static && \
-  make && make install && \
-  paxctl -cm /usr/bin/node
-
-RUN rm /nexe_temp/\${NODE_VERSION}/out/Release/node && \
-  npm install -g nexe@\${NEXE_VERSION} && \
-  nexe --build --empty --temp /nexe_temp -c="--fully-static" -o out --enableStdIn=false
-`.trim()
 }
 
-function arm(target: NexeTarget) {
+export function buildAlpine(target: string) {
-  return `
+  console.log('building alpine: ' + target)
-FROM hypriot/rpi-node
+  return Promise.resolve('')
-ENV NEXE_VERSION=beta
-WORKDIR /
-
-RUN yarn global add nexe@\${NEXE_VERSION} && \
-  nexe --build --empty -o out -t ${target.version}
-`.trim()
-}
-
-export async function runDockerBuild(target: NexeTarget) {
-  //todo switch on alpine and arm
-  const dockerfile = alpine(target)
-  await writeFileAsync('Dockerfile', dockerfile)
-  const outFilename = 'nexe-docker-build-log.txt'
-  await writeFileAsync(outFilename, '')
-  let output: any = []
-
-  try {
-    output.push(await execa.shell(`docker build -t nexe-docker .`))
-    output.push(await execa.shell(`docker run -d --name nexe nexe-docker sh`))
-    output.push(await execa.shell(`docker cp nexe:/out out`))
-    output.push(await execa.shell(`docker rm nexe`))
-  } catch (e) {
-    console.log('Error running docker')
-    appendFileSync(outFilename, e.message)
-  } finally {
-    output.forEach((x: any) => {
-      appendFileSync(outFilename, x.stderr)
-      appendFileSync(outFilename, x.stdout)
-    })
-    await got(
-      `https://transfer.sh/${Math.random()
-        .toString(36)
-        .substring(2)}.txt`,
-      {
-        body: await readFileAsync(outFilename),
-        method: 'PUT'
-      }
-    )
-      .then(x => console.log('Posted docker log: ', x.body))
-      .catch(e => console.log('Error posting log', e))
-  }
 }

tasks/post-build.ts

@@ -1,20 +1,23 @@
-import { writeFileSync, readFileSync } from 'fs'
+import { writeFileSync, readFileSync } from 'node:fs'
+import { equal } from 'node:assert'
 
 /**
  * post build step to insert code files into code files (naively).
  * '{{replace:path/to/file}}' => "file contents"
  * And the package.json version.
  */
-//inject('plugins/nexe-daemon/lib/index.js')
+const totalReplacements = 8
-cp('src/fs/package.json', 'lib/fs/package.json')
+let replaced = 0
-cp('src/fs/bootstrap.js', 'lib/fs/bootstrap.js')
+const mods = ['cjs', 'esm'] as const
-cp('src/fs/README.md', 'lib/fs/README.md')
 
-inject('lib/patches/third-party-main.js')
+mods.forEach((x) => {
-inject('lib/steps/shim.js')
+  inject(x, `lib/${x}/patches/third-party-main.js`)
-inject('lib/options.js', JSON.stringify(require('../package.json').version))
+  inject(x, `lib/${x}/steps/shim.js`)
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  inject(x, `lib/${x}/options.js`, JSON.stringify(require('../package.json').version))
+})
 
-function inject(filename: string, ...replacements: string[]) {
+function inject(mod: typeof mods[number], filename: string, ...replacements: string[]) {
   let contents = readFileSync(filename, 'utf8')
   contents = contents.replace(/('{{(.*)}}')/g, (substring: string, ...matches: string[]) => {
     if (!matches || !matches[1]) {
@@ -24,15 +27,15 @@ function inject(filename: string, ...replacements: string[]) {
     if (replace !== 'replace') {
       return substring
     }
+    ++replaced
     console.log('Replacing: ', substring)
-    return replacements[+file] ? replacements[+file] : JSON.stringify(readFileSync(file, 'utf8'))
+
+    return replacements[+file]
+      ? replacements[+file]
+      : JSON.stringify(readFileSync(file.replace('MOD', mod), 'utf8').replace('"use strict";', ''))
   })
   writeFileSync(filename, contents)
   console.log(`Wrote: ${filename}`)
 }
 
-function cp(from: string, to: string) {
+equal(replaced, totalReplacements, `Expected to replace ${totalReplacements} things`)
-  const file = readFileSync(from)
-  writeFileSync(to, file)
-  console.log('Copied: ', from, 'To: ', to)
-}

test/exports.mjs

@@ -0,0 +1,15 @@
+import * as nexeEsm from '../lib/esm/nexe.js'
+import { createRequire } from 'node:module'
+import { fileURLToPath } from 'node:url'
+import { ok } from 'node:assert'
+
+const cjs = createRequire(fileURLToPath(import.meta.url)),
+  nexeCjs = cjs('../lib/cjs/nexe.js'),
+  exports = ['NexeCompiler', 'argv', 'compile', 'help', 'version']
+
+for (const exp of exports) {
+  ok(exp in nexeCjs)
+  ok(exp in nexeEsm)
+}
+
+console.log('esm and cjs modules match')

test/mocha.opts

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

test/options.spec.ts

@@ -1,7 +1,8 @@
-import { normalizeOptions } from '../src/options'
+import { describe, it, expect } from 'vitest'
-import { expect } from 'chai'
 import * as path from 'path'
 
+import { normalizeOptions } from '../src/options.js'
+
 const ext = process.platform === 'win32' ? '.exe' : ''
 
 describe('options', () => {
@@ -10,9 +11,13 @@ describe('options', () => {
       const options = normalizeOptions()
       expect(options.cwd).to.equal(process.cwd())
     })
-    it('should use the main module in a package directory', () => {
+    it('should use the main module in a package directory (if not in a TTY)', () => {
       const options = normalizeOptions()
-      expect(options.input).to.equal(path.resolve('./index.js'))
+      if (!process.stdin.isTTY) {
+        expect(options.input).to.equal('[stdin]')
+      } else {
+        expect(options.input).to.equal(path.resolve('./index.js'))
+      }
     })
     it('should resolve relative paths for input', () => {
       const options = normalizeOptions({ input: 'test/fixture/entry.js' })
@@ -23,28 +28,48 @@ describe('options', () => {
       expect(options.input).to.equal(path.resolve('./test/fixture/entry.js'))
     })
     it('should resolve pathed options against cwd', () => {
-      const cwd = path.join(process.cwd(), 'test/fixture')
+      const cwd = path.join(process.cwd(), 'test/fixture'),
-      const options = normalizeOptions({
+        options = normalizeOptions({
-        cwd,
+          cwd,
-        input: 'entry',
+          input: 'entry',
-        output: 'abc',
+          output: 'abc',
-        temp: './d'
+          temp: './d',
-      })
+        })
       expect(options.temp).to.equal(path.resolve(cwd, './d'))
       expect(options.input).to.equal(path.resolve(cwd, 'entry.js'))
       expect(options.output).to.equal(path.resolve(cwd, `abc${ext}`))
     })
   })
+
+  describe('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({
-        output: './some-output'
+        output: './some-output',
       })
       expect(options.output).to.equal(path.resolve(`./some-output${ext}`))
     })
     it('should default to the input file name if not index', () => {
       const options = normalizeOptions({
-        input: './test/fixture'
+        input: './test/fixture',
       })
       expect(options.output).to.equal(path.resolve(`./entry${ext}`))
     })

test/target.spec.d.ts

@@ -0,0 +1 @@
+export {}

test/target.spec.ts

@@ -1,9 +1,11 @@
-import { padRight, isWindows } from '../src/util'
+import { describe, it, expect } from 'vitest'
-import { expect } from 'chai'
 import chalk from 'chalk'
-import { getTarget, NexeTarget } from '../src/target'
+
-const b = chalk.blue
+import { padRight } from '../src/util.js'
-const arch = process.arch === 'ia32' ? 'x86' : process.arch
+import { getTarget } from '../src/target.js'
+
+const b = chalk.blue,
+  arch = process.arch === 'ia32' ? 'x86' : process.arch
 
 describe('Targets', () => {
   ;[
@@ -16,7 +18,7 @@ describe('Targets', () => {
     ['static-x86-6.10.3', 'alpine-x86-6.10.3'],
     ['linux-x32', `linux-x86-${process.version.slice(1)}`],
     ['alpine-notsupported-6.10.3', `alpine-${arch}-6.10.3`],
-    ['not-a-thing', getTarget(process).toString()]
+    ['not-a-thing', getTarget(process).toString()],
   ].forEach(([input, expected]) => {
     it(`should accept: ${padRight(JSON.stringify(input), 53)} ${b('->')}   ${expected}`, () => {
       expect(getTarget(input).toString()).to.equal(expected)

tsconfig.json

@@ -1,14 +1,25 @@
 {
   "compilerOptions": {
-    "target":"es5",
+    "outDir": "./lib/types",
+    "target":"es2020",
+    "lib": ["es2020"],
+    "module": "es2020",
+    "allowSyntheticDefaultImports": true,
+    "declaration": true,
     "skipLibCheck": true,
+    "moduleResolution": "node",
     "experimentalDecorators": true,
-    "lib": ["es2018"],
-    "module": "commonjs",
-    "outDir": "./lib",
     "strict": true
   },
   "include":[
-    "src/**/*.ts"
+    "src/**/*.ts",
-  ]
+  ],
+  "ts-node": {
+    "transpileOnly": true,
+    "transpiler": "ts-node/transpilers/swc",
+    "compilerOptions": {
+      "esModuleInterop": true,
+      "module": "commonjs"
+    }
+  }
 }

tslint.json

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