@yao-pkg/pkg 5.12.0 → 5.13.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) {
@@ -105,10 +121,27 @@ function findPackageJson(nodeFile) {
     }
     return dir;
 }
+function getPrebuildEnvPrefix(pkgName) {
+    return `npm_config_${(pkgName || '')
+        .replace(/[^a-zA-Z0-9]/g, '_')
+        .replace(/^_/, '')}`;
+}
 function nativePrebuildInstall(target, nodeFile) {
     var _a, _b;
     const prebuildInstall = path_1.default.join(__dirname, '../node_modules/.bin/prebuild-install');
     const dir = findPackageJson(nodeFile);
+    const packageJson = JSON.parse(fs_extra_1.default.readFileSync(path_1.default.join(dir, 'package.json'), { encoding: 'utf-8' }));
+    // only try prebuild-install for packages that actually use it or if
+    // explicitly configured via environment variables
+    const envPrefix = getPrebuildEnvPrefix(packageJson.name);
+    if (((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['prebuild-install']) == null &&
+        ![
+            `${envPrefix}_binary_host`,
+            `${envPrefix}_binary_host_mirror`,
+            `${envPrefix}_local_prebuilds`,
+        ].some((i) => i in process.env)) {
+        return;
+    }
     // parse the target node version from the binaryPath
     const nodeVersion = path_1.default.basename(target.binaryPath).split('-')[1];
     if (!/^v[0-9]+\.[0-9]+\.[0-9]+$/.test(nodeVersion)) {
@@ -122,7 +155,7 @@ function nativePrebuildInstall(target, nodeFile) {
     if (!fs_extra_1.default.existsSync(`${nodeFile}.bak`)) {
         fs_extra_1.default.copyFileSync(nodeFile, `${nodeFile}.bak`);
     }
-    const napiVersions = (_b = (_a = JSON.parse(fs_extra_1.default.readFileSync(path_1.default.join(dir, 'package.json'), { encoding: 'utf-8' }))) === null || _a === void 0 ? void 0 : _a.binary) === null || _b === void 0 ? void 0 : _b.napi_versions;
+    const napiVersions = (_b = packageJson === null || packageJson === void 0 ? void 0 : packageJson.binary) === null || _b === void 0 ? void 0 : _b.napi_versions;
     const options = [
         '--platform',
         types_1.platform[target.platform],
@@ -289,7 +322,7 @@ function producer({ backpack, bakes, slash, target, symLinks, doCompress, native
                         if ((0, common_1.isDotNODE)(stripe.file) && nativeBuild) {
                             try {
                                 const platformFile = nativePrebuildInstall(target, stripe.file);
-                                if (fs_extra_1.default.existsSync(platformFile)) {
+                                if (platformFile && fs_extra_1.default.existsSync(platformFile)) {
                                     return cb(null, pipeMayCompressToNewMeter(fs_extra_1.default.createReadStream(platformFile)));
                                 }
                             }

package/lib-es5/walker.js

@@ -29,11 +29,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = __importDefault(require("assert"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const is_core_module_1 = __importDefault(require("is-core-module"));
 const globby_1 = __importDefault(require("globby"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
 const minimatch_1 = require("minimatch");
+const module_1 = require("module");
 const common_1 = require("./common");
 const follow_1 = require("./follow");
 const log_1 = require("./log");
@@ -48,6 +48,17 @@ const options_1 = __importDefault(require("./options"));
 //       performance hit.
 const strictVerify = Boolean(process.env.PKG_STRICT_VER);
 const win32 = process.platform === 'win32';
+/**
+ * Checks if a module is a core module
+ * module.isBuiltin is available in Node.js 16.17.0 or later. Once we drop support for older
+ * versions of Node.js, we can use module.isBuiltin instead of this function.
+ */
+function isBuiltin(moduleName) {
+    const moduleNameWithoutPrefix = moduleName.startsWith('node:')
+        ? moduleName.slice(5)
+        : moduleName;
+    return module_1.builtinModules.includes(moduleNameWithoutPrefix);
+}
 function unlikelyJavascript(file) {
     return ['.css', '.html', '.json', '.vue'].includes(path_1.default.extname(file));
 }
@@ -666,7 +677,7 @@ class Walker {
     async stepDerivatives(record, marker, derivatives) {
         for (const derivative of derivatives) {
             // TODO: actually use the target node version
-            if ((0, is_core_module_1.default)(derivative.alias, '99.0.0'))
+            if (isBuiltin(derivative.alias))
                 continue;
             switch (derivative.aliasType) {
                 case common_1.ALIAS_AS_RELATIVE:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yao-pkg/pkg",
-  "version": "5.12.0",
+  "version": "5.13.0",
   "description": "Package your Node.js project into an executable",
   "main": "lib-es5/index.js",
   "license": "MIT",
@@ -25,12 +25,11 @@
     "@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.10",
     "chalk": "^4.1.2",
     "fs-extra": "^9.1.0",
     "globby": "^11.1.0",
     "into-stream": "^6.0.0",
-    "is-core-module": "2.9.0",
     "minimatch": "9.0.4",
     "minimist": "^1.2.6",
     "multistream": "^4.1.0",
@@ -43,7 +42,6 @@
     "@release-it/conventional-changelog": "7.0.2",
     "@types/babel__generator": "7.6.5",
     "@types/fs-extra": "9.0.13",
-    "@types/is-core-module": "2.2.0",
     "@types/minimatch": "^5.1.2",
     "@types/minimist": "1.2.2",
     "@types/multistream": "4.1.0",
@@ -141,5 +139,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "packageManager": "yarn@1.22.22"
 }