@yao-pkg/pkg 6.0.0 → 6.1.0

package/lib-es5/mach-o.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signMachOExecutable = exports.patchMachOExecutable = void 0;
+exports.signMachOExecutable = exports.removeMachOExecutableSignature = exports.patchMachOExecutable = void 0;
 const child_process_1 = require("child_process");
 function parseCStr(buf) {
     for (let i = 0; i < buf.length; i += 1) {
@@ -28,6 +28,11 @@ function patchCommand(type, buf, file) {
         buf.writeUInt32LE(strsizePatched, 12);
     }
 }
+/**
+ * It would be nice to explain the purpose of this patching function
+ * @param file
+ * @returns
+ */
 function patchMachOExecutable(file) {
     const align = 8;
     const hsize = 32;
@@ -58,4 +63,10 @@ function signMachOExecutable(executable) {
     }
 }
 exports.signMachOExecutable = signMachOExecutable;
+function removeMachOExecutableSignature(executable) {
+    (0, child_process_1.execFileSync)('codesign', ['--remove-signature', executable], {
+        stdio: 'inherit',
+    });
+}
+exports.removeMachOExecutableSignature = removeMachOExecutableSignature;
 //# sourceMappingURL=mach-o.js.map

package/lib-es5/sea.js

@@ -192,7 +192,13 @@ async function bake(nodePath, target, blobPath) {
     // copy the executable as the output executable
     await (0, promises_1.copyFile)(nodePath, outPath);
     log_1.log.info(`Injecting the blob into ${outPath}...`);
-    await exec(`npx postject "${outPath}" NODE_SEA_BLOB "${blobPath}" --sentinel-fuse NODE_SEA_FUSE_fce680ab2cc467b6e072b8b5df1996b2`);
+    if (target.platform === 'macos') {
+        (0, mach_o_1.removeMachOExecutableSignature)(outPath);
+        await exec(`npx postject "${outPath}" NODE_SEA_BLOB "${blobPath}" --sentinel-fuse NODE_SEA_FUSE_fce680ab2cc467b6e072b8b5df1996b2 --macho-segment-name NODE_SEA`);
+    }
+    else {
+        await exec(`npx postject "${outPath}" NODE_SEA_BLOB "${blobPath}" --sentinel-fuse NODE_SEA_FUSE_fce680ab2cc467b6e072b8b5df1996b2`);
+    }
 }
 /** Create NodeJS executable using sea */
 async function sea(entryPoint, opts) {

package/lib-es5/walker.js

@@ -235,13 +235,30 @@ function stepDetect(record, marker, derivatives) {
         throw (0, log_1.wasReported)(error.message);
     }
 }
-function findCommonJunctionPoint(file, realFile) {
+/**
+ * Find a common junction point between a symlink and the real file path.
+ *
+ * @param {string} file The file path, including symlink(s).
+ * @param {string} realFile The real path to the file.
+ *
+ * @throws {Error} If no common junction point is found prior to hitting the
+ *                 filesystem root.
+ */
+async function findCommonJunctionPoint(file, realFile) {
     // find common denominator => where the link changes
-    while ((0, common_1.toNormalizedRealPath)(path_1.default.dirname(file)) === path_1.default.dirname(realFile)) {
+    while (true) {
+        const stats = await promises_1.default.lstat(file);
+        if (stats.isSymbolicLink()) {
+            return { file, realFile };
+        }
         file = path_1.default.dirname(file);
         realFile = path_1.default.dirname(realFile);
+        // If the directory is /, break out of the loop and log an error.
+        if (file === path_1.default.parse(file).root ||
+            realFile === path_1.default.parse(realFile).root) {
+            throw new Error('Reached root directory without finding a common junction point');
+        }
     }
-    return { file, realFile };
 }
 class Walker {
     constructor() {
@@ -286,8 +303,8 @@ class Walker {
             log_1.log.debug(`${what} ${task.file} is added to queue.`);
         }
     }
-    appendSymlink(file, realFile) {
-        const a = findCommonJunctionPoint(file, realFile);
+    async appendSymlink(file, realFile) {
+        const a = await findCommonJunctionPoint(file, realFile);
         file = a.file;
         realFile = a.realFile;
         if (!this.symLinks[file]) {
@@ -337,7 +354,7 @@ class Walker {
             store: common_1.STORE_STAT,
         });
     }
-    appendBlobOrContent(task) {
+    async appendBlobOrContent(task) {
         if (strictVerify) {
             (0, assert_1.default)(task.file === (0, common_1.normalizePath)(task.file));
         }
@@ -360,7 +377,7 @@ class Walker {
             return;
         }
         this.append(Object.assign(Object.assign({}, task), { file: realFile }));
-        this.appendSymlink(task.file, realFile);
+        await this.appendSymlink(task.file, realFile);
         this.appendStat({
             file: task.file,
             store: common_1.STORE_STAT,
@@ -382,7 +399,7 @@ class Walker {
                                 script,
                             ]);
                         }
-                        this.appendBlobOrContent({
+                        await this.appendBlobOrContent({
                             file: (0, common_1.normalizePath)(script),
                             marker,
                             store: common_1.STORE_BLOB,
@@ -398,7 +415,7 @@ class Walker {
                     log_1.log.debug(' Adding asset : .... ', asset);
                     const stat = await promises_1.default.stat(asset);
                     if (stat.isFile()) {
-                        this.appendBlobOrContent({
+                        await this.appendBlobOrContent({
                             file: (0, common_1.normalizePath)(asset),
                             marker,
                             store: common_1.STORE_CONTENT,
@@ -420,7 +437,7 @@ class Walker {
                         // 2) non-source (non-js) files of top-level package are shipped as CONTENT
                         // 3) parsing some js 'files' of non-top-level packages fails, hence all CONTENT
                         if (marker.toplevel) {
-                            this.appendBlobOrContent({
+                            await this.appendBlobOrContent({
                                 file,
                                 marker,
                                 store: (0, common_1.isDotJS)(file) ? common_1.STORE_BLOB : common_1.STORE_CONTENT,
@@ -428,7 +445,7 @@ class Walker {
                             });
                         }
                         else {
-                            this.appendBlobOrContent({
+                            await this.appendBlobOrContent({
                                 file,
                                 marker,
                                 store: common_1.STORE_CONTENT,
@@ -576,7 +593,7 @@ class Walker {
             ]);
         }
         if (stat && stat.isFile()) {
-            this.appendBlobOrContent({
+            await this.appendBlobOrContent({
                 file,
                 marker,
                 store: common_1.STORE_CONTENT,
@@ -662,14 +679,14 @@ class Walker {
                 (0, assert_1.default)(newPackageForNewRecords.packageJson ===
                     (0, common_1.normalizePath)(newPackageForNewRecords.packageJson));
             }
-            this.appendBlobOrContent({
+            await this.appendBlobOrContent({
                 file: newPackageForNewRecords.packageJson,
                 marker: newPackageForNewRecords.marker,
                 store: common_1.STORE_CONTENT,
                 reason: record.file,
             });
         }
-        this.appendBlobOrContent({
+        await this.appendBlobOrContent({
             file: newFile,
             marker: newPackageForNewRecords ? newPackageForNewRecords.marker : marker,
             store: common_1.STORE_BLOB,
@@ -709,7 +726,7 @@ class Walker {
         await this.stepDerivatives(record, marker, derivatives1);
         if (store === common_1.STORE_BLOB) {
             if (unlikelyJavascript(record.file) || (0, common_1.isDotNODE)(record.file)) {
-                this.appendBlobOrContent({
+                await this.appendBlobOrContent({
                     file: record.file,
                     marker,
                     store: common_1.STORE_CONTENT,
@@ -717,7 +734,7 @@ class Walker {
                 return; // discard
             }
             if (marker.public || marker.hasDictionary) {
-                this.appendBlobOrContent({
+                await this.appendBlobOrContent({
                     file: record.file,
                     marker,
                     store: common_1.STORE_CONTENT,
@@ -847,14 +864,14 @@ class Walker {
         this.symLinks = {};
         await this.readDictionary(marker);
         entrypoint = (0, common_1.normalizePath)(entrypoint);
-        this.appendBlobOrContent({
+        await this.appendBlobOrContent({
             file: entrypoint,
             marker,
             store: common_1.STORE_BLOB,
         });
         if (addition) {
             addition = (0, common_1.normalizePath)(addition);
-            this.appendBlobOrContent({
+            await this.appendBlobOrContent({
                 file: addition,
                 marker,
                 store: common_1.STORE_CONTENT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yao-pkg/pkg",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Package your Node.js project into an executable",
   "main": "lib-es5/index.js",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "@babel/generator": "^7.23.0",
     "@babel/parser": "^7.23.0",
     "@babel/types": "^7.23.0",
-    "@yao-pkg/pkg-fetch": "3.5.16",
+    "@yao-pkg/pkg-fetch": "3.5.17",
     "into-stream": "^6.0.0",
     "minimist": "^1.2.6",
     "multistream": "^4.1.0",
@@ -60,11 +60,11 @@
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
     "json-stable-stringify": "^1.0.1",
-    "lint-staged": "^10.5.4",
+    "lint-staged": "^15.2.10",
     "prettier": "^3.0.3",
     "release-it": "^16.2.1",
     "rimraf": "^3.0.2",
-    "simple-git-hooks": ">=2.8.0",
+    "simple-git-hooks": "^2.11.1",
     "typescript": "^4.7.2"
   },
   "scripts": {

package/prelude/bootstrap.js

@@ -22,7 +22,7 @@ const fs = require('fs');
 const { isRegExp } = require('util').types;
 const Module = require('module');
 const path = require('path');
-const { promisify, _extend } = require('util');
+const { promisify } = require('util');
 const { Script } = require('vm');
 const { homedir } = require('os');
 const util = require('util');
@@ -2005,7 +2005,7 @@ function payloadFileSync(pointer) {
       args.splice(pos, 0, {});
     }
     const opts = args[pos];
-    if (!opts.env) opts.env = _extend({}, process.env);
+    if (!opts.env) opts.env = { ...process.env };
     // see https://github.com/vercel/pkg/issues/897#issuecomment-1049370335
     if (opts.env.PKG_EXECPATH !== undefined) return;
     opts.env.PKG_EXECPATH = EXECPATH;