@jsenv/plugin-commonjs 2.8.29 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "2.8.29",
+  "version": "2.9.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -21,10 +21,10 @@
     "/src/"
   ],
   "dependencies": {
-    "@jsenv/filesystem": "4.10.11",
+    "@jsenv/filesystem": "4.10.12",
     "@jsenv/humanize": "1.2.8",
     "@jsenv/url-meta": "8.5.2",
-    "@jsenv/urls": "2.5.2",
+    "@jsenv/urls": "2.5.3",
     "@rollup/plugin-commonjs": "28.0.1",
     "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "15.3.0",

package/src/cjs_to_esm_raw.js

@@ -1,6 +1,5 @@
 import { createLogger } from "@jsenv/humanize";
-import { fileURLToPath } from "node:url";
-
+import { urlToFileSystemPath } from "@jsenv/urls";
 import { rollupPluginCommonJsNamedExports } from "./rollup_plugin_commonjs_named_exports.js";
 
 export const commonJsToJsModuleRaw = async ({
@@ -28,7 +27,7 @@ export const commonJsToJsModuleRaw = async ({
       `compatible only with file:// protocol, got ${sourceFileUrl}`,
     );
   }
-  const sourceFilePath = fileURLToPath(sourceFileUrl);
+  const sourceFilePath = urlToFileSystemPath(sourceFileUrl);
 
   const { nodeResolve } = await import("@rollup/plugin-node-resolve");
   const nodeResolveRollupPlugin = nodeResolve({
@@ -160,7 +159,7 @@ export const commonJsToJsModuleRaw = async ({
     sourcemap: true,
     sourcemapExcludeSources,
     exports: "named",
-    dir: fileURLToPath(abstractDirUrl),
+    dir: urlToFileSystemPath(abstractDirUrl),
     sourcemapPathTransform: (relativePath) => {
       const sourceUrl = new URL(relativePath, abstractDirUrl).href;
       return sourceUrl;

package/src/compile_cache/update_compile_cache.js

@@ -1,7 +1,6 @@
 import { bufferToEtag, writeFileSync } from "@jsenv/filesystem";
-import { urlToRelativeUrl } from "@jsenv/urls";
+import { urlToFileSystemPath, urlToRelativeUrl } from "@jsenv/urls";
 import { existsSync, utimesSync } from "node:fs";
-import { fileURLToPath } from "node:url";
 
 export const updateCompileCache = ({
   logger,
@@ -38,7 +37,9 @@ cache will be reused even if one of the source file is modified
 ${filesRemoved.join(`\n`)}`);
   }
 
-  logger.debug(`write compiled file at ${fileURLToPath(compiledFileUrl)}`);
+  logger.debug(
+    `write compiled file at ${urlToFileSystemPath(compiledFileUrl)}`,
+  );
   writeFileSync(compiledFileUrl, content, {
     fileLikelyNotFound: isNew,
   });
@@ -50,7 +51,9 @@ ${filesRemoved.join(`\n`)}`);
 
   const assetInfos = {};
   Object.keys(assets).forEach((assetUrl) => {
-    logger.debug(`write compiled file asset at ${fileURLToPath(assetUrl)}`);
+    logger.debug(
+      `write compiled file asset at ${urlToFileSystemPath(assetUrl)}`,
+    );
     const asset = assets[assetUrl];
     writeFileSync(assetUrl, asset.content, {
       fileLikelyNotFound: isNew,
@@ -82,7 +85,7 @@ ${filesRemoved.join(`\n`)}`);
     };
   }
   logger.debug(
-    `write compiled file info at ${fileURLToPath(compileInfoFileUrl)}`,
+    `write compiled file info at ${urlToFileSystemPath(compileInfoFileUrl)}`,
   );
   writeFileSync(
     compileInfoFileUrl,

package/src/compile_cache/validate_compile_cache.js

@@ -1,5 +1,5 @@
-import { bufferToEtag } from "@jsenv/filesystem";
-import { readFileSync, statSync } from "node:fs";
+import { bufferToEtag, readEntryStatSync } from "@jsenv/filesystem";
+import { readFileSync } from "node:fs";
 
 export const validateCompileCache = ({
   compiledFileUrl,
@@ -94,7 +94,7 @@ const validateCompiledFile = ({
       }
     }
     if (compileCacheStrategy === "mtime" && lastModificationTime) {
-      const stats = statSync(new URL(compiledFileUrl));
+      const stats = readEntryStatSync(new URL(compiledFileUrl));
       const mtime = Math.floor(stats.mtimeMs);
       validity.data.mtime = mtime;
       let ifModifiedSinceDate;

package/src/jsenv_plugin_commonjs.js

@@ -78,17 +78,13 @@ export const jsenvPluginCommonJs = ({
       return turnIntoJsModuleProxy(reference);
     },
     fetchUrlContent: async (urlInfo) => {
-      const commonJsUrlInfo = urlInfo.getWithoutSearchParam(
-        "cjs_as_js_module",
-        {
-          // during this fetch we don't want to alter the original file
-          // so we consider it as text
-          expectedType: "text",
-        },
-      );
+      const commonJsUrlInfo = urlInfo.getWithoutSearchParam("cjs_as_js_module");
       if (!commonJsUrlInfo) {
         return null;
       }
+      // during this fetch we don't want to alter the original file
+      // so we consider it as text
+      commonJsUrlInfo.type = "text";
       await commonJsUrlInfo.cook();
       const nodeRuntimeEnabled = Object.keys(
         urlInfo.context.runtimeCompat,

package/src/rollup_plugin_commonjs_named_exports.js

@@ -1,10 +1,11 @@
 // https://github.com/snowpackjs/snowpack/blob/main/esinstall/src/rollup-plugins/rollup-plugin-wrap-install-targets.ts
 
+import { urlToFileSystemPath } from "@jsenv/urls";
 import { init, parse } from "cjs-module-lexer";
 import isValidIdentifier from "is-valid-identifier";
 import { readFileSync } from "node:fs";
 import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { pathToFileURL } from "node:url";
 import { Worker } from "node:worker_threads";
 import resolve from "resolve";
 
@@ -101,7 +102,7 @@ const detectStaticExports = ({ logger, filePath, visited = new Set() }) => {
     if (reexports.length > 0) {
       reexports.forEach((reexport) => {
         const reExportedFilePath = resolve.sync(reexport, {
-          basedir: fileURLToPath(new URL("./", pathToFileURL(filePath))),
+          basedir: urlToFileSystemPath(new URL("./", pathToFileURL(filePath))),
         });
         const staticExports = detectStaticExports({
           logger,