@jsenv/core 37.0.3 → 37.0.5

package/dist/jsenv_core.js

@@ -11423,14 +11423,15 @@ const createUrlGraph = ({
     const referencedUrl = useGeneratedUrl
       ? reference.generatedUrl
       : reference.url;
-    const existingUrlInfo = getUrlInfo(referencedUrl);
-    if (existingUrlInfo) return existingUrlInfo;
-    const ownerUrlInfo = reference.ownerUrlInfo;
-    const ownerContext = ownerUrlInfo.context;
-    const context = Object.create(ownerContext);
-    const referencedUrlInfo = createUrlInfo(referencedUrl, context);
-    addUrlInfo(referencedUrlInfo);
-    createUrlInfoCallbackRef.current(referencedUrlInfo);
+    let referencedUrlInfo = getUrlInfo(referencedUrl);
+    if (!referencedUrlInfo) {
+      const ownerUrlInfo = reference.ownerUrlInfo;
+      const ownerContext = ownerUrlInfo.context;
+      const context = Object.create(ownerContext);
+      referencedUrlInfo = createUrlInfo(referencedUrl, context);
+      addUrlInfo(referencedUrlInfo);
+      createUrlInfoCallbackRef.current(referencedUrlInfo);
+    }
     if (referencedUrlInfo.searchParams.size > 0 && !kitchen.context.shape) {
       // A resource is represented by a url.
       // Variations of a resource are represented by url search params
@@ -18438,6 +18439,12 @@ const jsenvPluginAutoreloadServer = ({
         });
         clientFilesPruneCallbackList.push(
           (prunedUrlInfo, lastReferenceFromOther) => {
+            if (lastReferenceFromOther.type === "sourcemap_comment") {
+              // Can happen when starting dev server with sourcemaps: "file"
+              // In that case, as sourcemaps are injected, the reference
+              // are lost and sourcemap is considered as pruned
+              return;
+            }
             const parentHotUpdate = propagateUpdate(
               lastReferenceFromOther.ownerUrlInfo,
             );
@@ -21241,11 +21248,7 @@ const createFileService = ({
       return responseFromPlugin;
     }
     let reference;
-    const parentUrl = inferParentFromRequest(
-      request,
-      sourceDirectoryUrl,
-      sourceMainFilePath,
-    );
+    const parentUrl = inferParentFromRequest(request, sourceDirectoryUrl);
     if (parentUrl) {
       reference = kitchen.graph.inferReference(request.resource, parentUrl);
     }
@@ -21414,20 +21417,12 @@ const createFileService = ({
   };
 };
 
-const inferParentFromRequest = (
-  request,
-  sourceDirectoryUrl,
-  sourceMainFilePath,
-) => {
+const inferParentFromRequest = (request, sourceDirectoryUrl) => {
   const { referer } = request.headers;
   if (!referer) {
     return null;
   }
-  const refererUrlObject = new URL(referer);
-  const refererUrl =
-    refererUrlObject.pathname === `/`
-      ? new URL(sourceMainFilePath, request.origin).href
-      : referer;
+  const refererUrl = referer;
   return WEB_URL_CONVERTER.asFileUrl(refererUrl, {
     origin: request.origin,
     rootDirectoryUrl: sourceDirectoryUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "37.0.3",
+  "version": "37.0.5",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/dev/file_service.js

@@ -245,11 +245,7 @@ export const createFileService = ({
       return responseFromPlugin;
     }
     let reference;
-    const parentUrl = inferParentFromRequest(
-      request,
-      sourceDirectoryUrl,
-      sourceMainFilePath,
-    );
+    const parentUrl = inferParentFromRequest(request, sourceDirectoryUrl);
     if (parentUrl) {
       reference = kitchen.graph.inferReference(request.resource, parentUrl);
     }
@@ -418,20 +414,12 @@ export const createFileService = ({
   };
 };
 
-const inferParentFromRequest = (
-  request,
-  sourceDirectoryUrl,
-  sourceMainFilePath,
-) => {
+const inferParentFromRequest = (request, sourceDirectoryUrl) => {
   const { referer } = request.headers;
   if (!referer) {
     return null;
   }
-  const refererUrlObject = new URL(referer);
-  const refererUrl =
-    refererUrlObject.pathname === `/`
-      ? new URL(sourceMainFilePath, request.origin).href
-      : referer;
+  const refererUrl = referer;
   return WEB_URL_CONVERTER.asFileUrl(refererUrl, {
     origin: request.origin,
     rootDirectoryUrl: sourceDirectoryUrl,

package/src/kitchen/url_graph/url_graph.js

@@ -65,14 +65,15 @@ export const createUrlGraph = ({
     const referencedUrl = useGeneratedUrl
       ? reference.generatedUrl
       : reference.url;
-    const existingUrlInfo = getUrlInfo(referencedUrl);
-    if (existingUrlInfo) return existingUrlInfo;
-    const ownerUrlInfo = reference.ownerUrlInfo;
-    const ownerContext = ownerUrlInfo.context;
-    const context = Object.create(ownerContext);
-    const referencedUrlInfo = createUrlInfo(referencedUrl, context);
-    addUrlInfo(referencedUrlInfo);
-    createUrlInfoCallbackRef.current(referencedUrlInfo);
+    let referencedUrlInfo = getUrlInfo(referencedUrl);
+    if (!referencedUrlInfo) {
+      const ownerUrlInfo = reference.ownerUrlInfo;
+      const ownerContext = ownerUrlInfo.context;
+      const context = Object.create(ownerContext);
+      referencedUrlInfo = createUrlInfo(referencedUrl, context);
+      addUrlInfo(referencedUrlInfo);
+      createUrlInfoCallbackRef.current(referencedUrlInfo);
+    }
     if (referencedUrlInfo.searchParams.size > 0 && !kitchen.context.shape) {
       // A resource is represented by a url.
       // Variations of a resource are represented by url search params

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -156,6 +156,12 @@ export const jsenvPluginAutoreloadServer = ({
         });
         clientFilesPruneCallbackList.push(
           (prunedUrlInfo, lastReferenceFromOther) => {
+            if (lastReferenceFromOther.type === "sourcemap_comment") {
+              // Can happen when starting dev server with sourcemaps: "file"
+              // In that case, as sourcemaps are injected, the reference
+              // are lost and sourcemap is considered as pruned
+              return;
+            }
             const parentHotUpdate = propagateUpdate(
               lastReferenceFromOther.ownerUrlInfo,
             );