@yao-pkg/pkg 6.14.0 → 6.14.1

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"));
@@ -191,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
@@ -344,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/walker.js

@@ -48,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
@@ -632,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,
             });
@@ -665,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) {
@@ -867,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yao-pkg/pkg",
-  "version": "6.14.0",
+  "version": "6.14.1",
   "description": "Package your Node.js project into an executable",
   "main": "lib-es5/index.js",
   "license": "MIT",