@yao-pkg/pkg 6.13.1 → 6.14.1

package/README.md

@@ -53,7 +53,7 @@ After installing it, run `pkg --help` without arguments to see list of options:
   – Makes executable for particular target machine
     $ pkg -t node14-win-arm64 index.js
   – Makes executables for target machines of your choice
-    $ pkg -t node16-linux,node18-linux,node18-win index.js
+    $ pkg -t node20-linux,node22-linux,node22-win index.js
   – Bakes '--expose-gc' and '--max-heap-size=34' into executable
     $ pkg --options "expose-gc,max-heap-size=34" index.js
   – Consider packageA and packageB to be public
@@ -82,7 +82,7 @@ The entrypoint of your project is a mandatory CLI argument. It may be:
 `pkg` can generate executables for several target machines at a
 time. You can specify a comma-separated list of targets via `--targets`
 option. A canonical target consists of 3 elements, separated by
-dashes, for example `node18-macos-x64` or `node14-linux-arm64`:
+dashes, for example `node20-macos-x64` or `node22-linux-arm64`:
 
 - **nodeRange** (node8), node10, node12, node14, node16 or latest
 - **platform** alpine, linux, linuxstatic, win, macos, (freebsd)

package/lib-es5/detector.js

@@ -86,7 +86,6 @@ function reconstructSpecifiers(specs) {
     return defaults.join(', ');
 }
 function reconstruct(node) {
-    // @ts-expect-error Type mismatch due to @babel/types version in @types/babel__generator
     let v = (0, generator_1.default)(node, { comments: false }).code.replace(/\n/g, '');
     let v2;
     while (true) {

package/lib-es5/esm-transformer.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformESMtoCJS = void 0;
+exports.transformESMtoCJS = exports.rewriteMjsRequirePaths = void 0;
 const babel = __importStar(require("@babel/parser"));
 const traverse_1 = __importDefault(require("@babel/traverse"));
 const esbuild = __importStar(require("esbuild"));
@@ -56,7 +56,6 @@ function hasImportMeta(code) {
             return false;
         }
         let found = false;
-        // @ts-expect-error Type mismatch due to @babel/types version in @types/babel__traverse
         (0, traverse_1.default)(ast, {
             // Detect import.meta usage
             MetaProperty(path) {
@@ -69,7 +68,7 @@ function hasImportMeta(code) {
         });
         return found;
     }
-    catch (error) {
+    catch (_error) {
         // If we can't parse, assume no import.meta
         return false;
     }
@@ -96,7 +95,6 @@ function detectESMFeatures(code, filename) {
         }
         const topLevelAwait = [];
         const unsupportedFeatures = [];
-        // @ts-expect-error Type mismatch due to @babel/types version in @types/babel__traverse
         (0, traverse_1.default)(ast, {
             // Detect top-level await - can be handled with async IIFE wrapper
             AwaitExpression(path) {
@@ -193,6 +191,21 @@ function replaceImportMetaObject(code) {
     // Match: const import_meta = {};
     return code.replace(/const import_meta\s*=\s*\{\s*\};/, shimImplementation);
 }
+/**
+ * Rewrite relative `.mjs` require paths to `.js` in CJS output
+ *
+ * When esbuild transforms ESM to CJS, it converts `import './foo.mjs'` to `require('./foo.mjs')`.
+ * Since the packer renames `.mjs` files to `.js` in the snapshot, the require paths must be
+ * updated to match. This handles the rewriting at build time.
+ *
+ * @param code - The CJS code after esbuild transformation
+ * @returns Code with relative .mjs require paths rewritten to .js
+ */
+function rewriteMjsRequirePaths(code) {
+    // Match require("./path.mjs") or require('../path.mjs') with relative paths only
+    return code.replace(/require\((["'])(\.\.?\/[^"']*?)\.mjs\1\)/g, 'require($1$2.js$1)');
+}
+exports.rewriteMjsRequirePaths = rewriteMjsRequirePaths;
 /**
  * Transform ESM code to CommonJS using esbuild
  * This allows ESM modules to be compiled to bytecode via vm.Script
@@ -259,7 +272,6 @@ function transformESMtoCJS(code, filename) {
             let hasExports = false;
             const codeLines = code.split('\n');
             const importLineIndices = new Set();
-            // @ts-expect-error Type mismatch due to @babel/types version
             (0, traverse_1.default)(ast, {
                 ExportNamedDeclaration() {
                     hasExports = true;
@@ -331,7 +343,7 @@ function transformESMtoCJS(code, filename) {
         const esbuildOptions = {
             loader: 'js',
             format: 'cjs',
-            target: 'node18',
+            target: 'node20',
             sourcemap: false,
             minify: false,
             keepNames: true,
@@ -347,7 +359,7 @@ function transformESMtoCJS(code, filename) {
         // Inject import.meta shims after esbuild transformation if needed
         let finalCode = result.code;
         if (usesImportMeta) {
-            finalCode = replaceImportMetaObject(result.code);
+            finalCode = replaceImportMetaObject(finalCode);
         }
         return {
             code: finalCode,

package/lib-es5/fabricator.js

@@ -64,19 +64,16 @@ function fabricate(bakes, fabricator, snap, body, cb) {
     }
     let stdout = Buffer.alloc(0);
     function onError(error) {
-        // eslint-disable-next-line @typescript-eslint/no-use-before-define
         removeListeners();
         kill();
         cb(new Error(`Failed to make bytecode ${fabricator.nodeRange}-${fabricator.arch} for file ${snap} error (${error.message})`));
     }
     function onClose(code) {
-        // eslint-disable-next-line @typescript-eslint/no-use-before-define
         removeListeners();
         kill();
         if (code !== 0) {
             return cb(new Error(`Failed to make bytecode ${fabricator.nodeRange}-${fabricator.arch} for file ${snap}`));
         }
-        // eslint-disable-next-line no-console
         console.log(stdout.toString());
         return cb(new Error(`${cmd} closed unexpectedly`));
     }
@@ -87,7 +84,6 @@ function fabricate(bakes, fabricator, snap, body, cb) {
             if (stdout.length >= 4 + sizeOfBlob) {
                 const blob = Buffer.alloc(sizeOfBlob);
                 stdout.copy(blob, 0, 4, 4 + sizeOfBlob);
-                // eslint-disable-next-line @typescript-eslint/no-use-before-define
                 removeListeners();
                 return cb(undefined, blob);
             }

package/lib-es5/follow.js

@@ -114,7 +114,7 @@ function follow(x, opts) {
                 // CJS package - fall through to standard CommonJS resolution
                 // to handle all callbacks properly
             }
-            catch (error) {
+            catch (_error) {
                 // ESM resolution failed - fall through to standard CommonJS resolution
             }
         }

package/lib-es5/help.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const colors_1 = require("./colors");
 function help() {
-    // eslint-disable-next-line no-console
     console.log(`
   ${colors_1.pc.bold('pkg')} [options] <input>
 
@@ -34,7 +33,7 @@ function help() {
   ${colors_1.pc.gray('–')} Makes executable for particular target machine
     ${colors_1.pc.cyan('$ pkg -t node14-win-arm64 index.js')}
   ${colors_1.pc.gray('–')} Makes executables for target machines of your choice
-    ${colors_1.pc.cyan('$ pkg -t node16-linux,node18-linux,node18-win index.js')}
+    ${colors_1.pc.cyan('$ pkg -t node22-linux,node24-linux,node24-win index.js')}
   ${colors_1.pc.gray('–')} Bakes '--expose-gc' and '--max-heap-size=34' into executable
     ${colors_1.pc.cyan('$ pkg --options "expose-gc,max-heap-size=34" index.js')}
   ${colors_1.pc.gray('–')} Consider packageA and packageB to be public

package/lib-es5/index.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable require-atomic-updates */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,7 +29,6 @@ function isConfiguration(file) {
 }
 // http://www.openwall.com/lists/musl/2012/12/08/4
 const { hostArch, hostPlatform, isValidNodeRange, knownArchs, knownPlatforms, toFancyArch, toFancyPlatform, } = pkg_fetch_1.system;
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const hostNodeRange = `node${process.version.match(/^v(\d+)/)[1]}`;
 function parseTargets(items) {
     // [ 'node6-macos-x64', 'node6-linux-x64' ]
@@ -191,7 +189,6 @@ async function exec(argv2) {
     }
     // version
     if (argv.v || argv.version) {
-        // eslint-disable-next-line no-console
         console.log(version);
         return;
     }
@@ -218,7 +215,6 @@ async function exec(argv2) {
             throw (0, log_1.wasReported)(`Invalid compression algorithm ${algo} ( should be None, Brotli or Gzip)`);
     }
     if (doCompress !== compress_type_1.CompressType.None) {
-        // eslint-disable-next-line no-console
         console.log('compression: ', compress_type_1.CompressType[doCompress]);
     }
     // _
@@ -288,7 +284,7 @@ async function exec(argv2) {
         if (!(0, fs_1.existsSync)(config)) {
             throw (0, log_1.wasReported)('Config file does not exist', [config]);
         }
-        // eslint-disable-next-line import/no-dynamic-require, global-require
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         configJson = require(config); // may be either json or js
         if (!configJson.name &&
             !configJson.files &&

package/lib-es5/packer.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable complexity */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/lib-es5/resolver.js

@@ -52,7 +52,7 @@ function resolveWithExports(packageName, subpath, packageRoot) {
         }
         return null;
     }
-    catch (error) {
+    catch (_error) {
         log_1.log.debug(`Failed to resolve with exports field: ${packageName}${subpath}`);
         return null;
     }

package/lib-es5/walker.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable require-atomic-updates */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -49,6 +48,9 @@ const options_1 = __importDefault(require("./options"));
 //       performance hit.
 const strictVerify = Boolean(process.env.PKG_STRICT_VER);
 const win32 = process.platform === 'win32';
+// Extensions to try when resolving modules
+// Includes .mjs to support ESM files that get transformed to .js
+const MODULE_RESOLVE_EXTENSIONS = ['.js', '.json', '.node', '.mjs'];
 /**
  * Checks if a module is a core module
  * module.isBuiltin is available in Node.js 16.17.0 or later. Use that if available
@@ -633,7 +635,8 @@ class Walker {
                 // it is not enough because 'typos.json'
                 // is not taken in require('./typos')
                 // in 'normalize-package-data/lib/fixer.js'
-                extensions: ['.js', '.json', '.node'],
+                // Also include .mjs to support ESM files that get transformed to .js
+                extensions: MODULE_RESOLVE_EXTENSIONS,
                 catchReadFile,
                 catchPackageFilter,
             });
@@ -666,7 +669,7 @@ class Walker {
             try {
                 newFile2 = await (0, follow_1.follow)(derivative.alias, {
                     basedir: path_1.default.dirname(record.file),
-                    extensions: ['.js', '.json', '.node'],
+                    extensions: MODULE_RESOLVE_EXTENSIONS,
                     ignoreFile: newPackage.packageJson,
                 });
                 if (strictVerify) {
@@ -838,7 +841,7 @@ class Walker {
                         record.body = Buffer.from(JSON.stringify(pkgContent, null, 2), 'utf8');
                     }
                 }
-                catch (error) {
+                catch (_error) {
                     // Ignore JSON parsing errors
                 }
             }
@@ -868,6 +871,11 @@ class Walker {
                 const derivatives2 = [];
                 stepDetect(record, marker, derivatives2);
                 await this.stepDerivatives(record, marker, derivatives2);
+                // After dependencies are resolved, rewrite .mjs require paths to .js
+                // since the packer renames .mjs files to .js in the snapshot
+                if (record.wasTransformed && record.body) {
+                    record.body = Buffer.from((0, esm_transformer_1.rewriteMjsRequirePaths)(record.body.toString('utf8')), 'utf8');
+                }
             }
         }
         record[store] = true;
@@ -931,7 +939,6 @@ class Walker {
         switch (store) {
             case common_1.STORE_BLOB:
             case common_1.STORE_CONTENT:
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 await this.step_STORE_ANY(record, task.marker, store);
                 break;
             case common_1.STORE_LINKS:
@@ -956,7 +963,7 @@ class Walker {
                 if (this.params.noDictionary?.includes(file)) {
                     continue;
                 }
-                // eslint-disable-next-line import/no-dynamic-require, global-require, @typescript-eslint/no-var-requires
+                // eslint-disable-next-line @typescript-eslint/no-require-imports
                 const config = require(path_1.default.join(dd, file));
                 this.dictionary[name] = config;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yao-pkg/pkg",
-  "version": "6.13.1",
+  "version": "6.14.1",
   "description": "Package your Node.js project into an executable",
   "main": "lib-es5/index.js",
   "license": "MIT",
@@ -26,9 +26,9 @@
     "@babel/parser": "^7.23.0",
     "@babel/traverse": "^7.23.0",
     "@babel/types": "^7.23.0",
-    "esbuild": "^0.24.0",
     "@yao-pkg/pkg-fetch": "3.5.32",
-    "into-stream": "^6.0.0",
+    "esbuild": "^0.27.3",
+    "into-stream": "^9.1.0",
     "minimist": "^1.2.6",
     "multistream": "^4.1.0",
     "picocolors": "^1.1.0",
@@ -37,35 +37,36 @@
     "resolve": "^1.22.10",
     "resolve.exports": "^2.0.3",
     "stream-meter": "^1.0.4",
-    "tar": "^7.5.6",
+    "tar": "^7.5.7",
     "tinyglobby": "^0.2.11",
     "unzipper": "^0.12.3"
   },
   "devDependencies": {
-    "@release-it/conventional-changelog": "^7.0.2",
+    "@release-it/conventional-changelog": "^10.0.5",
     "@types/babel__generator": "^7.6.5",
     "@types/babel__traverse": "^7.20.3",
     "@types/minimist": "^1.2.2",
     "@types/multistream": "^4.1.0",
-    "@types/node": "^16.18.113",
+    "@types/node": "^20.0.0",
     "@types/picomatch": "^3.0.1",
     "@types/resolve": "^1.20.2",
     "@types/stream-meter": "^0.0.22",
     "@types/tar": "^6.1.13",
     "@types/unzipper": "^0.10.10",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
     "esbuild-register": "^3.6.0",
-    "eslint": "^8.50.0",
+    "eslint": "^9.0.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-config-airbnb-typescript": "^18.0.0",
+    "eslint-config-prettier": "^10.0.0",
+    "eslint-plugin-import": "^2.31.0",
+    "globals": "^17.3.0",
     "json-stable-stringify": "^1.0.1",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.0.0",
     "prettier": "^3.0.3",
-    "release-it": "^16.2.1",
-    "rimraf": "^3.0.2",
+    "release-it": "^19.2.4",
+    "rimraf": "^6.1.2",
     "simple-git-hooks": "^2.11.1",
     "typescript": "^4.7.2"
   },
@@ -79,9 +80,10 @@
     "fix": "npm run lint:style -- -w && npm run lint:code -- --fix",
     "prepare": "npm run build",
     "prepublishOnly": "npm run lint",
-    "test": "npm run build && npm run test:host && npm run test:18 && npm run test:20",
+    "test": "npm run build && npm run test:host && npm run test:20 && npm run test:22 && npm run test:24",
     "test:20": "node test/test.js node20 no-npm",
-    "test:18": "node test/test.js node18 no-npm",
+    "test:22": "node test/test.js node22 no-npm",
+    "test:24": "node test/test.js node24 no-npm",
     "test:host": "node test/test.js host only-npm",
     "bump:fetch": "yarn add @yao-pkg/pkg-fetch --exact",
     "release": "read -p 'GITHUB_TOKEN: ' GITHUB_TOKEN && export GITHUB_TOKEN=$GITHUB_TOKEN && release-it"
@@ -97,6 +99,15 @@
   },
   "packageManager": "yarn@1.22.22",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
+  },
+  "resolutions": {
+    "lodash": "^4.17.23",
+    "@octokit/request-error": "^5.1.1",
+    "@octokit/plugin-paginate-rest": "^9.2.2",
+    "@octokit/request": "^8.4.1",
+    "js-yaml": "^4.1.1",
+    "brace-expansion": "^2.0.2",
+    "tmp": "^0.2.4"
   }
 }

package/prelude/bootstrap.js

@@ -1,9 +1,3 @@
-/* eslint-disable import/no-unresolved */
-/* eslint-disable global-require */
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable prefer-rest-params */
-/* eslint-disable prefer-spread */
-
 /* global EXECPATH_FD */
 /* global PAYLOAD_POSITION */
 /* global PAYLOAD_SIZE */

package/prelude/diagnostic.js

@@ -1,5 +1,3 @@
-/* eslint-disable global-require */
-/* eslint-disable no-console */
 /* global DICT */
 
 'use strict';