@contrast/esm-hooks 2.6.1 → 2.6.3

package/lib/hooks.mjs

@@ -122,10 +122,21 @@ async function load(url, context, nextLoad) {
   }
 
   if (loaderAgent.config.agent.node.rewrite.cache.enable) {
-    const cached = await loaderAgent.rewriter.cache.find(filename);
-
-    if (cached) {
-      return nextLoad(pathToFileURL(cached).href, context);
+    const cachedURL = await loaderAgent.rewriter.cache.find(filename);
+    if (cachedURL) {
+      // allow other load hooks to run
+      const loadResult = await nextLoad(pathToFileURL(cachedURL).href, context);
+      // use original url so that import.meta.url and import.meta.resolve work as expected
+      loadResult.responseURL = url;
+
+      if (process.env.CSI_EXPOSE_CORE) {
+        // only do this in testing scenarios
+        loaderAgent.esmHooks.portClient.sendStatus('rewritten file loaded from cache', {
+          cachedURL,
+          responseURL: loadResult.responseURL,
+        });
+      }
+      return loadResult;
     }
   }
 
@@ -150,7 +161,7 @@ async function load(url, context, nextLoad) {
   }
 
   if (loaderAgent.config.agent.node.rewrite.cache.enable) {
-    loaderAgent.rewriter.cache.write(filename, rewriteResult);
+    await loaderAgent.rewriter.cache.write(filename, rewriteResult);
   }
 
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/esm-hooks",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "type": "module",
   "description": "Support for loading and instrumenting ECMAScript modules",
   "license": "SEE LICENSE IN LICENSE",
@@ -19,8 +19,8 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.21.1",
-    "@contrast/core": "1.32.1",
+    "@contrast/common": "1.21.3",
+    "@contrast/core": "1.32.3",
     "@contrast/find-package-json": "^1.0.0"
   }
 }