ensure inline content is recognized into @fs files too

jsenv · Dec 30, 2024 · 14302af · 14302af
1 parent 8929423
commit 14302af
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/dist/jsenv_core.js b/dist/jsenv_core.js
@@ -17634,10 +17634,17 @@ const jsenvPluginInlineContentFetcher = () => {
       }
       let isDirectRequestToFile;
       if (urlInfo.context.request) {
-        const requestedUrl = new URL(
-          urlInfo.context.request.resource.slice(1),
-          urlInfo.context.rootDirectoryUrl,
-        ).href;
+        let requestResource = urlInfo.context.request.resource;
+        let requestedUrl;
+        if (requestResource.startsWith("/@fs/")) {
+          const fsRootRelativeUrl = requestResource.slice("/@fs/".length);
+          requestedUrl = `file:///${fsRootRelativeUrl}`;
+        } else {
+          requestedUrl = new URL(
+            requestResource.slice(1),
+            urlInfo.context.rootDirectoryUrl,
+          ).href;
+        }
         isDirectRequestToFile = requestedUrl === urlInfo.url;
       }
       /*

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.9.0",
+  "version": "39.9.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

diff --git a/src/plugins/reference_analysis/jsenv_plugin_reference_analysis.js b/src/plugins/reference_analysis/jsenv_plugin_reference_analysis.js
@@ -43,10 +43,17 @@ const jsenvPluginInlineContentFetcher = () => {
       }
       let isDirectRequestToFile;
       if (urlInfo.context.request) {
-        const requestedUrl = new URL(
-          urlInfo.context.request.resource.slice(1),
-          urlInfo.context.rootDirectoryUrl,
-        ).href;
+        let requestResource = urlInfo.context.request.resource;
+        let requestedUrl;
+        if (requestResource.startsWith("/@fs/")) {
+          const fsRootRelativeUrl = requestResource.slice("/@fs/".length);
+          requestedUrl = `file:///${fsRootRelativeUrl}`;
+        } else {
+          requestedUrl = new URL(
+            requestResource.slice(1),
+            urlInfo.context.rootDirectoryUrl,
+          ).href;
+        }
         isDirectRequestToFile = requestedUrl === urlInfo.url;
       }
       /*