@yao-pkg/pkg 5.12.1 → 5.14.0

package/lib-es5/producer.js

@@ -16,12 +16,28 @@ const log_1 = require("./log");
 const fabricator_1 = require("./fabricator");
 const types_1 = require("./types");
 const compress_type_1 = require("./compress_type");
-function discoverPlaceholder(binaryBuffer, searchString, padder) {
+function discoverPlaceholder(binaryBuffer, searchString, padder, searchOffset = 0) {
     const placeholder = Buffer.from(searchString);
-    const position = binaryBuffer.indexOf(placeholder);
+    const position = binaryBuffer.indexOf(placeholder, searchOffset);
     if (position === -1) {
         return { notFound: true };
     }
+    /**
+     * the PAYLOAD/PRELUDE placeholders can occur twice in the binaries:
+     *  - in source text as a string literal
+     *  - in bytecode as a raw string
+     * the ordering depends on the platform - we need to make sure that
+     * the bytecode string is replaced, not the source literal.
+     *
+     * this rejects the source code literal if it occurs first in the binary
+     * also see: https://github.com/yao-pkg/pkg/pull/86
+     */
+    if (binaryBuffer[position - 1] === 39 /* ascii for ' APOSTROPHE */) {
+        const nextPlaceholder = discoverPlaceholder(binaryBuffer, searchString, padder, position + placeholder.length);
+        if (!('notFound' in nextPlaceholder)) {
+            return nextPlaceholder;
+        }
+    }
     return { position, size: placeholder.length, padder };
 }
 function injectPlaceholder(fd, placeholder, value, cb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yao-pkg/pkg",
-  "version": "5.12.1",
+  "version": "5.14.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.9",
+    "@yao-pkg/pkg-fetch": "3.5.11",
     "chalk": "^4.1.2",
     "fs-extra": "^9.1.0",
     "globby": "^11.1.0",