diff --git a/.github/workflows/build-alpine.yml b/.github/workflows/build-alpine.yml
index 1ddd9737..62f4fe22 100644
--- a/.github/workflows/build-alpine.yml
+++ b/.github/workflows/build-alpine.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [8, 10, 12, 14]
+        target-node: [10, 12, 14, 16]
         target-arch: [x64, arm64]
         include:
           - target-arch: x64
@@ -41,7 +41,13 @@ jobs:
         run: |
           tar xvf ../out.tar root/pkg-fetch/dist
 
+      - name: Check if binary is compiled
+        id: check_file
+        run: |
+          (test -f root/pkg-fetch/dist/*.sha256sum && echo ::set-output name=EXISTS::true) || echo ::set-output name=EXISTS::false
+
       - uses: actions/upload-artifact@v2
+        if: steps.check_file.outputs.EXISTS == 'true'
         with:
           name: node${{ matrix.target-node }}-alpine-${{ matrix.target-arch }}
           path: root/pkg-fetch/dist/*
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 0b55a4c5..103d2a89 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [8, 10, 12, 14]
+        target-node: [10, 12, 14, 16]
 
     steps:
       - uses: actions/checkout@v2
@@ -39,7 +39,13 @@ jobs:
         run: |
           tar xvf ../out.tar root/pkg-fetch/dist
 
+      - name: Check if binary is compiled
+        id: check_file
+        run: |
+          (test -f root/pkg-fetch/dist/*.sha256sum && echo ::set-output name=EXISTS::true) || echo ::set-output name=EXISTS::false
+
       - uses: actions/upload-artifact@v2
+        if: steps.check_file.outputs.EXISTS == 'true'
         with:
           name: node${{ matrix.target-node }}-linux-x64
           path: root/pkg-fetch/dist/*
@@ -50,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [8, 10, 12, 14]
+        target-node: [10, 12, 14, 16]
 
     steps:
       - uses: actions/checkout@v2
@@ -65,7 +71,7 @@ jobs:
 
       - run: yarn install
 
-      - run: yarn start --force-build --node-range node${{ matrix.target-node }} --arch arm64 --output dist
+      - run: yarn start --node-range node${{ matrix.target-node }} --arch arm64 --output dist
         env:
           CC: /usr/bin/aarch64-linux-gnu-gcc-8
           CXX: /usr/bin/aarch64-linux-gnu-g++-8
@@ -79,7 +85,13 @@ jobs:
           NM_host: /usr/bin/nm
           READELF_host: /usr/bin/readelf
 
+      - name: Check if binary is compiled
+        id: check_file
+        run: |
+          (test -f dist/*.sha256sum && echo ::set-output name=EXISTS::true) || echo ::set-output name=EXISTS::false
+
       - uses: actions/upload-artifact@v2
+        if: steps.check_file.outputs.EXISTS == 'true'
         with:
           name: node${{ matrix.target-node }}-linux-arm64
           path: dist/*
diff --git a/.github/workflows/build-linuxstatic.yml b/.github/workflows/build-linuxstatic.yml
index 199f1139..b7896e21 100644
--- a/.github/workflows/build-linuxstatic.yml
+++ b/.github/workflows/build-linuxstatic.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [8, 10, 12, 14]
+        target-node: [10, 12, 14, 16]
         target-arch: [x64, arm64]
         include:
           - target-arch: x64
@@ -41,7 +41,13 @@ jobs:
         run: |
           tar xvf ../out.tar root/pkg-fetch/dist
 
+      - name: Check if binary is compiled
+        id: check_file
+        run: |
+          (test -f root/pkg-fetch/dist/*.sha256sum && echo ::set-output name=EXISTS::true) || echo ::set-output name=EXISTS::false
+
       - uses: actions/upload-artifact@v2
+        if: steps.check_file.outputs.EXISTS == 'true'
         with:
           name: node${{ matrix.target-node }}-linuxstatic-${{ matrix.target-arch }}
           path: root/pkg-fetch/dist/*
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 8826ef2c..38e48181 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [8, 10, 12, 14]
+        target-node: [10, 12, 14, 16]
 
     steps:
       - uses: actions/checkout@v2
@@ -26,9 +26,15 @@ jobs:
 
       - run: yarn install
 
-      - run: yarn start --force-build --node-range node${{ matrix.target-node }} --output dist
+      - run: yarn start --node-range node${{ matrix.target-node }} --output dist
+
+      - name: Check if binary is compiled
+        id: check_file
+        run: |
+          (test -f dist/*.sha256sum && echo ::set-output name=EXISTS::true) || echo ::set-output name=EXISTS::false
 
       - uses: actions/upload-artifact@v2
+        if: steps.check_file.outputs.EXISTS == 'true'
         with:
           name: node${{ matrix.target-node }}-macos-x64
           path: dist/*
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 37e734a1..b75141e4 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [8, 10, 12]
+        target-node: [10, 12]
         target-arch: [x64]
 
     steps:
@@ -29,11 +29,17 @@ jobs:
 
       - run: choco install nasm
 
-      - run: yarn start --force-build --node-range node${{ matrix.target-node }} --arch ${{ matrix.target-arch }} --output dist
+      - run: yarn start --node-range node${{ matrix.target-node }} --arch ${{ matrix.target-arch }} --output dist
         env:
           PKG_BUILD_PATH: build
 
+      - name: Check if binary is compiled
+        id: check_file
+        run: |
+          if (Test-Path -Path dist\\*.sha256sum -PathType Leaf) { echo "::set-output name=EXISTS::true" } else { echo "::set-output name=EXISTS::false" }
+
       - uses: actions/upload-artifact@v2
+        if: steps.check_file.outputs.EXISTS == 'true'
         with:
           name: node${{ matrix.target-node }}-windows-${{ matrix.target-arch }}
           path: dist\\*
@@ -44,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [14]
+        target-node: [14, 16]
         target-arch: [x64, arm64]
 
     steps:
@@ -59,9 +65,15 @@ jobs:
 
       - run: choco install nasm
 
-      - run: yarn start --force-build --node-range node${{ matrix.target-node }} --arch ${{ matrix.target-arch }} --output dist
+      - run: yarn start --node-range node${{ matrix.target-node }} --arch ${{ matrix.target-arch }} --output dist
+
+      - name: Check if binary is compiled
+        id: check_file
+        run: |
+          if (Test-Path -Path dist\\*.sha256sum -PathType Leaf) { echo "::set-output name=EXISTS::true" } else { echo "::set-output name=EXISTS::false" }
 
       - uses: actions/upload-artifact@v2
+        if: steps.check_file.outputs.EXISTS == 'true'
         with:
           name: node${{ matrix.target-node }}-windows-${{ matrix.target-arch }}
           path: dist\\*
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 99532aff..855e88ff 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -35,4 +35,4 @@ COPY . ./
 
 RUN yarn install
 
-RUN yarn start --force-build --arch $PKG_FETCH_OPTION_a --node-range $PKG_FETCH_OPTION_n --platform $PKG_FETCH_OPTION_p --output dist
+RUN yarn start --arch $PKG_FETCH_OPTION_a --node-range $PKG_FETCH_OPTION_n --platform $PKG_FETCH_OPTION_p --output dist
diff --git a/Dockerfile.linux b/Dockerfile.linux
index 96ef367c..f3eef3d9 100644
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -19,4 +19,4 @@ RUN npm install -g yarn
 
 RUN yarn install
 
-RUN yarn start --force-build --node-range $PKG_FETCH_OPTION_n --output dist
+RUN yarn start --node-range $PKG_FETCH_OPTION_n --output dist
diff --git a/patches/node.v16.0.0.cpp.patch b/patches/node.v16.0.0.cpp.patch
new file mode 100644
index 00000000..a7db9893
--- /dev/null
+++ b/patches/node.v16.0.0.cpp.patch
@@ -0,0 +1,509 @@
+--- node/common.gypi
++++ node/common.gypi
+@@ -164,7 +164,7 @@
+           'v8_enable_handle_zapping': 0,
+           'pgo_generate': ' -fprofile-generate ',
+           'pgo_use': ' -fprofile-use -fprofile-correction ',
+-          'lto': ' -flto=4 -fuse-linker-plugin -ffat-lto-objects ',
++          'lto': ' -flto=4 -ffat-lto-objects ',
+           'conditions': [
+             ['node_shared != "true"', {
+               'MSVC_runtimeType': 0    # MultiThreaded (/MT)
+--- node/deps/v8/include/v8.h
++++ node/deps/v8/include/v8.h
+@@ -9934,6 +9934,10 @@ class V8_EXPORT V8 {
+                                       char** argv,
+                                       bool remove_flags);
+ 
++  static void EnableCompilationForSourcelessUse();
++  static void DisableCompilationForSourcelessUse();
++  static void FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> script);
++
+   /** Get the version string. */
+   static const char* GetVersion();
+ 
+--- node/deps/v8/src/api/api.cc
++++ node/deps/v8/src/api/api.cc
+@@ -628,6 +628,29 @@ void V8::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) {
+                                        HelpOptions(HelpOptions::kDontExit));
+ }
+ 
++bool save_lazy;
++bool save_predictable;
++
++void V8::EnableCompilationForSourcelessUse() {
++  save_lazy = i::FLAG_lazy;
++  i::FLAG_lazy = false;
++  save_predictable = i::FLAG_predictable;
++  i::FLAG_predictable = true;
++}
++
++void V8::DisableCompilationForSourcelessUse() {
++  i::FLAG_lazy = save_lazy;
++  i::FLAG_predictable = save_predictable;
++}
++
++void V8::FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> unbound_script) {
++  auto isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
++  auto function_info =
++      i::Handle<i::SharedFunctionInfo>::cast(Utils::OpenHandle(*unbound_script));
++  i::Handle<i::Script> script(i::Script::cast(function_info->script()), isolate);
++  script->set_source(i::ReadOnlyRoots(isolate).undefined_value());
++}
++
+ RegisteredExtension* RegisteredExtension::first_extension_ = nullptr;
+ 
+ RegisteredExtension::RegisteredExtension(std::unique_ptr<Extension> extension)
+--- node/deps/v8/src/codegen/compiler.cc
++++ node/deps/v8/src/codegen/compiler.cc
+@@ -2840,7 +2840,7 @@ MaybeHandle<SharedFunctionInfo> Compiler::GetSharedFunctionInfoForScript(
+         source, script_details.name_obj, script_details.line_offset,
+         script_details.column_offset, origin_options, isolate->native_context(),
+         language_mode);
+-    if (!maybe_result.is_null()) {
++    if (!maybe_result.is_null() && source_length) {
+       compile_timer.set_hit_isolate_cache();
+     } else if (can_consume_code_cache) {
+       compile_timer.set_consuming_code_cache();
+--- node/deps/v8/src/objects/js-function.cc
++++ node/deps/v8/src/objects/js-function.cc
+@@ -905,6 +905,9 @@ Handle<String> JSFunction::ToString(Handle<JSFunction> function) {
+   Handle<Object> maybe_class_positions = JSReceiver::GetDataProperty(
+       function, isolate->factory()->class_positions_symbol());
+   if (maybe_class_positions->IsClassPositions()) {
++    if (String::cast(Script::cast(shared_info->script()).source()).IsUndefined(isolate)) {
++      return isolate->factory()->NewStringFromAsciiChecked("class {}");
++    }
+     ClassPositions class_positions =
+         ClassPositions::cast(*maybe_class_positions);
+     int start_position = class_positions.start();
+--- node/deps/v8/src/objects/shared-function-info-inl.h
++++ node/deps/v8/src/objects/shared-function-info-inl.h
+@@ -568,6 +568,14 @@ bool SharedFunctionInfo::ShouldFlushBytecode(BytecodeFlushMode mode) {
+   Object data = function_data(kAcquireLoad);
+   if (!data.IsBytecodeArray()) return false;
+ 
++  Object script_obj = script();
++  if (!script_obj.IsUndefined()) {
++    Script script = Script::cast(script_obj);
++    if (script.source().IsUndefined()) {
++      return false;
++    }
++  }
++
+   if (mode == BytecodeFlushMode::kStressFlushBytecode) return true;
+ 
+   BytecodeArray bytecode = BytecodeArray::cast(data);
+--- node/deps/v8/src/parsing/parsing.cc
++++ node/deps/v8/src/parsing/parsing.cc
+@@ -42,6 +42,7 @@ bool ParseProgram(ParseInfo* info, Handle<Script> script,
+                   Isolate* isolate, ReportStatisticsMode mode) {
+   DCHECK(info->flags().is_toplevel());
+   DCHECK_NULL(info->literal());
++  if (String::cast(script->source()).IsUndefined(isolate)) return false;
+ 
+   VMState<PARSER> state(isolate);
+ 
+@@ -76,6 +77,7 @@ bool ParseFunction(ParseInfo* info, Handle<SharedFunctionInfo> shared_info,
+ 
+   // Create a character stream for the parser.
+   Handle<Script> script(Script::cast(shared_info->script()), isolate);
++  if (String::cast(script->source()).IsUndefined(isolate)) return false;
+   Handle<String> source(String::cast(script->source()), isolate);
+   isolate->counters()->total_parse_size()->Increment(source->length());
+   std::unique_ptr<Utf16CharacterStream> stream(
+--- node/deps/v8/src/snapshot/code-serializer.cc
++++ node/deps/v8/src/snapshot/code-serializer.cc
+@@ -439,12 +439,10 @@ SerializedCodeData::SanityCheckResult SerializedCodeData::SanityCheck(
+   uint32_t magic_number = GetMagicNumber();
+   if (magic_number != kMagicNumber) return MAGIC_NUMBER_MISMATCH;
+   uint32_t version_hash = GetHeaderValue(kVersionHashOffset);
+-  uint32_t source_hash = GetHeaderValue(kSourceHashOffset);
+   uint32_t flags_hash = GetHeaderValue(kFlagHashOffset);
+   uint32_t payload_length = GetHeaderValue(kPayloadLengthOffset);
+   uint32_t c = GetHeaderValue(kChecksumOffset);
+   if (version_hash != Version::Hash()) return VERSION_MISMATCH;
+-  if (source_hash != expected_source_hash) return SOURCE_MISMATCH;
+   if (flags_hash != FlagList::Hash()) return FLAGS_MISMATCH;
+   uint32_t max_payload_length = this->size_ - kHeaderSize;
+   if (payload_length > max_payload_length) return LENGTH_MISMATCH;
+--- node/lib/child_process.js
++++ node/lib/child_process.js
+@@ -140,7 +140,7 @@ function fork(modulePath /* , args, options */) {
+   options.execPath = options.execPath || process.execPath;
+   options.shell = false;
+ 
+-  return spawn(options.execPath, args, options);
++  return module.exports.spawn(options.execPath, args, options);
+ }
+ 
+ function _forkChild(fd, serializationMode) {
+index 0000000000..fb2d47f52b
+--- /dev/null
++++ node/lib/internal/bootstrap/pkg.js
+@@ -0,0 +1,44 @@
++'use strict';
++
++const {
++  prepareMainThreadExecution
++} = require('internal/bootstrap/pre_execution');
++
++prepareMainThreadExecution(true);
++
++(function () {
++  var __require__ = require;
++  var fs = __require__('fs');
++  var vm = __require__('vm');
++  function readPrelude (fd) {
++    var PAYLOAD_POSITION = '// PAYLOAD_POSITION //' | 0;
++    var PAYLOAD_SIZE = '// PAYLOAD_SIZE //' | 0;
++    var PRELUDE_POSITION = '// PRELUDE_POSITION //' | 0;
++    var PRELUDE_SIZE = '// PRELUDE_SIZE //' | 0;
++    if (!PRELUDE_POSITION) {
++      // no prelude - remove entrypoint from argv[1]
++      process.argv.splice(1, 1);
++      return { undoPatch: true };
++    }
++    var prelude = Buffer.alloc(PRELUDE_SIZE);
++    var read = fs.readSync(fd, prelude, 0, PRELUDE_SIZE, PRELUDE_POSITION);
++    if (read !== PRELUDE_SIZE) {
++      console.error('Pkg: Error reading from file.');
++      process.exit(1);
++    }
++    var s = new vm.Script(prelude, { filename: 'pkg/prelude/bootstrap.js' });
++    var fn = s.runInThisContext();
++    return fn(process, __require__,
++      console, fd, PAYLOAD_POSITION, PAYLOAD_SIZE);
++  }
++  (function () {
++    var fd = fs.openSync(process.execPath, 'r');
++    var result = readPrelude(fd);
++    if (result && result.undoPatch) {
++      var bindingFs = process.binding('fs');
++      fs.internalModuleStat = bindingFs.internalModuleStat;
++      fs.internalModuleReadJSON = bindingFs.internalModuleReadJSON;
++      fs.closeSync(fd);
++    }
++  }());
++}());
+--- node/lib/internal/bootstrap/pre_execution.js
++++ node/lib/internal/bootstrap/pre_execution.js
+@@ -19,7 +19,12 @@ const { Buffer } = require('buffer');
+ const { ERR_MANIFEST_ASSERT_INTEGRITY } = require('internal/errors').codes;
+ const assert = require('internal/assert');
+ 
++let _alreadyPrepared = false;
++
+ function prepareMainThreadExecution(expandArgv1 = false) {
++  if (_alreadyPrepared === true) return;
++  _alreadyPrepared = true;
++
+   // TODO(joyeecheung): this is also necessary for workers when they deserialize
+   // this toggle from the snapshot.
+   reconnectZeroFillToggle();
+@@ -99,7 +104,8 @@ function patchProcessObject(expandArgv1) {
+   process.argv[0] = process.execPath;
+ 
+   if (expandArgv1 && process.argv[1] &&
+-      !StringPrototypeStartsWith(process.argv[1], '-')) {
++      !StringPrototypeStartsWith(process.argv[1], '-') &&
++      process.argv[1] !== 'PKG_DUMMY_ENTRYPOINT') {
+     // Expand process.argv[1] into a full path.
+     const path = require('path');
+     try {
+--- node/lib/internal/modules/cjs/loader.js
++++ node/lib/internal/modules/cjs/loader.js
+@@ -85,7 +85,7 @@ const fs = require('fs');
+ const internalFS = require('internal/fs/utils');
+ const path = require('path');
+ const { sep } = path;
+-const { internalModuleStat } = internalBinding('fs');
++const internalModuleStat = function (f) { return require('fs').internalModuleStat(f); };
+ const packageJsonReader = require('internal/modules/package_json_reader');
+ const { safeGetenv } = internalBinding('credentials');
+ const {
+--- node/lib/internal/modules/package_json_reader.js
++++ node/lib/internal/modules/package_json_reader.js
+@@ -1,7 +1,7 @@
+ 'use strict';
+ 
+ const { SafeMap } = primordials;
+-const { internalModuleReadJSON } = internalBinding('fs');
++const internalModuleReadJSON = function (f) { return require('fs').internalModuleReadJSON(f); };
+ const { pathToFileURL } = require('url');
+ const { toNamespacedPath } = require('path');
+ 
+--- node/lib/vm.js
++++ node/lib/vm.js
+@@ -78,6 +78,7 @@ class Script extends ContextifyScript {
+       produceCachedData = false,
+       importModuleDynamically,
+       [kParsingContext]: parsingContext,
++      sourceless = false,
+     } = options;
+ 
+     validateString(filename, 'options.filename');
+@@ -102,7 +103,8 @@ class Script extends ContextifyScript {
+             columnOffset,
+             cachedData,
+             produceCachedData,
+-            parsingContext);
++            parsingContext,
++            sourceless);
+     } catch (e) {
+       throw e; /* node-do-not-add-exception-line */
+     }
+--- node/node.gyp
++++ node/node.gyp
+@@ -31,6 +31,7 @@
+       'lib/internal/bootstrap/environment.js',
+       'lib/internal/bootstrap/loaders.js',
+       'lib/internal/bootstrap/node.js',
++      'lib/internal/bootstrap/pkg.js',
+       'lib/internal/bootstrap/pre_execution.js',
+       'lib/internal/bootstrap/switches/does_own_process_state.js',
+       'lib/internal/bootstrap/switches/does_not_own_process_state.js',
+--- node/src/inspector_agent.cc
++++ node/src/inspector_agent.cc
+@@ -682,8 +682,6 @@ bool Agent::Start(const std::string& path,
+                               StartIoThreadAsyncCallback));
+     uv_unref(reinterpret_cast<uv_handle_t*>(&start_io_thread_async));
+     start_io_thread_async.data = this;
+-    // Ignore failure, SIGUSR1 won't work, but that should not block node start.
+-    StartDebugSignalHandler();
+ 
+     parent_env_->AddCleanupHook([](void* data) {
+       Environment* env = static_cast<Environment*>(data);
+--- node/src/node.cc
++++ node/src/node.cc
+@@ -473,6 +473,8 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
+     return scope.EscapeMaybe(cb(info));
+   }
+ 
++  StartExecution(env, "internal/bootstrap/pkg");
++
+   if (env->worker_context() != nullptr) {
+     return StartExecution(env, "internal/main/worker_thread");
+   }
+@@ -583,13 +585,6 @@ static struct {
+ 
+ inline void PlatformInit() {
+ #ifdef __POSIX__
+-#if HAVE_INSPECTOR
+-  sigset_t sigmask;
+-  sigemptyset(&sigmask);
+-  sigaddset(&sigmask, SIGUSR1);
+-  const int err = pthread_sigmask(SIG_SETMASK, &sigmask, nullptr);
+-#endif  // HAVE_INSPECTOR
+-
+   // Make sure file descriptors 0-2 are valid before we start logging anything.
+   for (auto& s : stdio) {
+     const int fd = &s - stdio;
+@@ -605,10 +600,6 @@ inline void PlatformInit() {
+       ABORT();
+   }
+ 
+-#if HAVE_INSPECTOR
+-  CHECK_EQ(err, 0);
+-#endif  // HAVE_INSPECTOR
+-
+   // TODO(addaleax): NODE_SHARED_MODE does not really make sense here.
+ #ifndef NODE_SHARED_MODE
+   // Restore signal dispositions, the parent process may have changed them.
+--- node/src/node_contextify.cc
++++ node/src/node_contextify.cc
+@@ -73,6 +73,7 @@ using v8::ScriptOrModule;
+ using v8::String;
+ using v8::Uint32;
+ using v8::UnboundScript;
++using v8::V8;
+ using v8::Value;
+ using v8::WeakCallbackInfo;
+ using v8::WeakCallbackType;
+@@ -686,11 +687,12 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+   Local<ArrayBufferView> cached_data_buf;
+   bool produce_cached_data = false;
+   Local<Context> parsing_context = context;
++  bool sourceless = false;
+ 
+   if (argc > 2) {
+     // new ContextifyScript(code, filename, lineOffset, columnOffset,
+     //                      cachedData, produceCachedData, parsingContext)
+-    CHECK_EQ(argc, 7);
++    CHECK_EQ(argc, 8);
+     CHECK(args[2]->IsNumber());
+     line_offset = args[2].As<Int32>()->Value();
+     CHECK(args[3]->IsNumber());
+@@ -709,6 +711,7 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+       CHECK_NOT_NULL(sandbox);
+       parsing_context = sandbox->context();
+     }
++    sourceless = args[7]->IsTrue();
+   }
+ 
+   ContextifyScript* contextify_script =
+@@ -761,6 +764,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+   ShouldNotAbortOnUncaughtScope no_abort_scope(env);
+   Context::Scope scope(parsing_context);
+ 
++  if (sourceless && produce_cached_data) {
++    V8::EnableCompilationForSourcelessUse();
++  }
++
+   MaybeLocal<UnboundScript> v8_script = ScriptCompiler::CompileUnboundScript(
+       isolate,
+       &source,
+@@ -777,6 +784,13 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+         contextify_script);
+     return;
+   }
++
++  if (sourceless && compile_options == ScriptCompiler::kConsumeCodeCache) {
++    if (!source.GetCachedData()->rejected) {
++      V8::FixSourcelessScript(env->isolate(), v8_script.ToLocalChecked());
++    }
++  }
++
+   contextify_script->script_.Reset(isolate, v8_script.ToLocalChecked());
+ 
+   Local<Context> env_context = env->context();
+@@ -803,6 +817,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+         env->cached_data_produced_string(),
+         Boolean::New(isolate, cached_data_produced)).Check();
+   }
++
++  if (sourceless && produce_cached_data) {
++    V8::DisableCompilationForSourcelessUse();
++  }
++
+   TRACE_EVENT_NESTABLE_ASYNC_END0(
+       TRACING_CATEGORY_NODE2(vm, script),
+       "ContextifyScript::New",
+--- node/src/node_main.cc
++++ node/src/node_main.cc
+@@ -22,6 +22,8 @@
+ #include "node.h"
+ #include <cstdio>
+ 
++int reorder(int argc, char** argv);
++
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <VersionHelpers.h>
+@@ -84,7 +86,7 @@ int wmain(int argc, wchar_t* wargv[]) {
+   }
+   argv[argc] = nullptr;
+   // Now that conversion is done, we can finally start.
+-  return node::Start(argc, argv);
++  return reorder(argc, argv);
+ }
+ #else
+ // UNIX
+@@ -124,6 +126,73 @@ int main(int argc, char* argv[]) {
+   // calls elsewhere in the program (e.g., any logging from V8.)
+   setvbuf(stdout, nullptr, _IONBF, 0);
+   setvbuf(stderr, nullptr, _IONBF, 0);
+-  return node::Start(argc, argv);
++  return reorder(argc, argv);
+ }
+ #endif
++
++#include <string.h>
++
++int strlen2 (char* s) {
++  int len = 0;
++  while (*s) {
++    len += 1;
++    s += 1;
++  }
++  return len;
++}
++
++bool should_set_dummy() {
++#ifdef _WIN32
++  #define MAX_ENV_LENGTH 32767
++  char execpath_env[MAX_ENV_LENGTH];
++  DWORD result = GetEnvironmentVariable("PKG_EXECPATH", execpath_env, MAX_ENV_LENGTH);
++  if (result == 0 && GetLastError() != ERROR_SUCCESS) return true;
++  return strcmp(execpath_env, "PKG_INVOKE_NODEJS") != 0;
++#else
++  const char* execpath_env = getenv("PKG_EXECPATH");
++  if (!execpath_env) return true;
++  return strcmp(execpath_env, "PKG_INVOKE_NODEJS") != 0;
++#endif
++}
++
++// for uv_setup_args
++int adjacent(int argc, char** argv) {
++  size_t size = 0;
++  for (int i = 0; i < argc; i++) {
++    size += strlen(argv[i]) + 1;
++  }
++  char* args = new char[size];
++  size_t pos = 0;
++  for (int i = 0; i < argc; i++) {
++    memcpy(&args[pos], argv[i], strlen(argv[i]) + 1);
++    argv[i] = &args[pos];
++    pos += strlen(argv[i]) + 1;
++  }
++  return node::Start(argc, argv);
++}
++
++volatile char* BAKERY = (volatile char*) "\0// BAKERY // BAKERY " \
++  "// BAKERY // BAKERY // BAKERY // BAKERY // BAKERY // BAKERY " \
++  "// BAKERY // BAKERY // BAKERY // BAKERY // BAKERY // BAKERY " \
++  "// BAKERY // BAKERY // BAKERY // BAKERY // BAKERY // BAKERY ";
++
++int reorder(int argc, char** argv) {
++  int i;
++  char** nargv = new char*[argc + 64];
++  int c = 0;
++  nargv[c++] = argv[0];
++  char* bakery = (char*) BAKERY;
++  while (true) {
++    size_t width = strlen2(bakery);
++    if (width == 0) break;
++    nargv[c++] = bakery;
++    bakery += width + 1;
++  }
++  if (should_set_dummy()) {
++    nargv[c++] = (char*) "PKG_DUMMY_ENTRYPOINT";
++  }
++  for (i = 1; i < argc; i++) {
++    nargv[c++] = argv[i];
++  }
++  return adjacent(c, nargv);
++}
+--- node/src/node_options.cc
++++ node/src/node_options.cc
+@@ -252,6 +252,7 @@ void Parse(
+ // TODO(addaleax): Make that unnecessary.
+ 
+ DebugOptionsParser::DebugOptionsParser() {
++  return;
+   AddOption("--inspect-port",
+             "set host:port for inspector",
+             &DebugOptions::host_port,
+--- node/tools/icu/icu-generic.gyp
++++ node/tools/icu/icu-generic.gyp
+@@ -52,7 +52,7 @@
+         'conditions': [
+           [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
+             'cflags': [ '-Wno-deprecated-declarations', '-Wno-strict-aliasing' ],
+-            'cflags_cc': [ '-frtti' ],
++            'cflags_cc': [ '-frtti', '-fno-lto' ],
+             'cflags_cc!': [ '-fno-rtti' ],
+           }],
+           [ 'OS == "mac" or OS == "ios"', {
+--- node/tools/v8_gypfiles/v8.gyp
++++ node/tools/v8_gypfiles/v8.gyp
+@@ -1378,6 +1378,9 @@
+           '<(V8_ROOT)/src/heap/base/worklist.h',
+         ],
+         'conditions': [
++          ['enable_lto=="true"', {
++            'cflags_cc': [ '-fno-lto' ],
++          }],
+           ['clang or OS!="win"', {
+             'conditions': [
+               ['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', {
diff --git a/patches/patches.json b/patches/patches.json
index 36748a02..83b4376a 100644
--- a/patches/patches.json
+++ b/patches/patches.json
@@ -1,4 +1,5 @@
 {
+  "v16.0.0": ["node.v16.0.0.cpp.patch"],
   "v14.16.1": ["node.v14.16.1.cpp.patch"],
   "v12.22.1": ["node.v12.22.1.cpp.patch"],
   "v10.24.1": ["node.v10.24.1.cpp.patch"],