@jsenv/core 35.0.2 → 35.0.3

package/dist/jsenv_core.js

@@ -17713,7 +17713,7 @@ const addRelationshipWithPackageJson = ({
  */
 const jsenvPluginUrlResolution = ({
   runtimeCompat,
-  mainFileUrl,
+  defaultFileUrl,
   urlResolution
 }) => {
   const resolveUrlUsingWebResolution = reference => {
@@ -17781,7 +17781,7 @@ const jsenvPluginUrlResolution = ({
     appliesDuring: "*",
     resolveUrl: (reference, context) => {
       if (reference.specifier === "/") {
-        return String(mainFileUrl);
+        return String(defaultFileUrl);
       }
       if (reference.specifier[0] === "/") {
         return new URL(reference.specifier.slice(1), context.rootDirectoryUrl).href;
@@ -21137,7 +21137,7 @@ const jsenvPluginCacheControl = ({
 };
 const SECONDS_IN_30_DAYS$1 = 60 * 60 * 24 * 30;
 
-const explorerHtmlFileUrl = new URL("./html/explorer.html", import.meta.url);
+const explorerHtmlFileUrl = String(new URL("./html/explorer.html", import.meta.url));
 const jsenvPluginExplorer = ({
   groups = {
     src: {
@@ -21147,8 +21147,7 @@ const jsenvPluginExplorer = ({
     tests: {
       "./**/*.test.html": true
     }
-  },
-  mainFileUrl
+  }
 }) => {
   const faviconClientFileUrl = new URL("./other/jsenv.png", import.meta.url);
   return {
@@ -21156,7 +21155,7 @@ const jsenvPluginExplorer = ({
     appliesDuring: "dev",
     transformUrlContent: {
       html: async (urlInfo, context) => {
-        if (urlInfo.url !== mainFileUrl) {
+        if (urlInfo.url !== explorerHtmlFileUrl) {
           return null;
         }
         let html = urlInfo.content;
@@ -21256,7 +21255,7 @@ injectRibbon(${paramsJson});`
 
 const getCorePlugins = ({
   rootDirectoryUrl,
-  mainFileUrl,
+  defaultFileUrl,
   runtimeCompat,
   urlAnalysis = {},
   urlResolution = {},
@@ -21306,7 +21305,7 @@ const getCorePlugins = ({
     ...fileSystemMagicRedirection
   }), jsenvPluginHttpUrls(), jsenvPluginUrlResolution({
     runtimeCompat,
-    mainFileUrl,
+    defaultFileUrl,
     urlResolution
   }), jsenvPluginUrlVersion(), jsenvPluginCommonJsGlobals(), jsenvPluginImportMetaScenarios(), ...(scenarioPlaceholders ? [jsenvPluginGlobalScenarios()] : []), jsenvPluginNodeRuntime({
     runtimeCompat
@@ -21314,10 +21313,7 @@ const getCorePlugins = ({
     ...clientAutoreload,
     clientFileChangeCallbackList,
     clientFilesPruneCallbackList
-  })] : []), ...(cacheControl ? [jsenvPluginCacheControl(cacheControl)] : []), ...(explorer ? [jsenvPluginExplorer({
-    ...explorer,
-    mainFileUrl
-  })] : []), ...(ribbon ? [jsenvPluginRibbon({
+  })] : []), ...(cacheControl ? [jsenvPluginCacheControl(cacheControl)] : []), ...(explorer ? [jsenvPluginExplorer(explorer)] : []), ...(ribbon ? [jsenvPluginRibbon({
     rootDirectoryUrl,
     ...ribbon
   })] : [])];
@@ -23286,11 +23282,13 @@ const createFileService = ({
     const clientRuntimeCompat = {
       [runtimeName]: runtimeVersion
     };
-    let mainFileUrl;
-    if (sourceMainFilePath === undefined) {
-      mainFileUrl = explorer ? String(explorerHtmlFileUrl) : String(new URL("./index.html", sourceDirectoryUrl));
+    let defaultFileUrl;
+    if (explorer) {
+      defaultFileUrl = String(explorerHtmlFileUrl);
+    } else if (sourceMainFilePath) {
+      defaultFileUrl = String(new URL(sourceMainFilePath, sourceDirectoryUrl));
     } else {
-      mainFileUrl = String(new URL(sourceMainFilePath, sourceDirectoryUrl));
+      defaultFileUrl = String(new URL("./index.html", sourceDirectoryUrl));
     }
     const kitchen = createKitchen({
       signal,
@@ -23303,7 +23301,7 @@ const createFileService = ({
       systemJsTranspilation: !RUNTIME_COMPAT.isSupported(clientRuntimeCompat, "script_type_module") || !RUNTIME_COMPAT.isSupported(clientRuntimeCompat, "import_dynamic") || !RUNTIME_COMPAT.isSupported(clientRuntimeCompat, "import_meta"),
       plugins: [...plugins, ...getCorePlugins({
         rootDirectoryUrl: sourceDirectoryUrl,
-        mainFileUrl,
+        defaultFileUrl,
         runtimeCompat,
         urlAnalysis,
         urlResolution,

package/package.json

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

package/src/dev/file_service.js

@@ -93,14 +93,15 @@ export const createFileService = ({
     })
     const clientRuntimeCompat = { [runtimeName]: runtimeVersion }
 
-    let mainFileUrl
-    if (sourceMainFilePath === undefined) {
-      mainFileUrl = explorer
-        ? String(explorerHtmlFileUrl)
-        : String(new URL("./index.html", sourceDirectoryUrl))
+    let defaultFileUrl
+    if (explorer) {
+      defaultFileUrl = String(explorerHtmlFileUrl)
+    } else if (sourceMainFilePath) {
+      defaultFileUrl = String(new URL(sourceMainFilePath, sourceDirectoryUrl))
     } else {
-      mainFileUrl = String(new URL(sourceMainFilePath, sourceDirectoryUrl))
+      defaultFileUrl = String(new URL("./index.html", sourceDirectoryUrl))
     }
+
     const kitchen = createKitchen({
       signal,
       logLevel,
@@ -120,7 +121,7 @@ export const createFileService = ({
         ...plugins,
         ...getCorePlugins({
           rootDirectoryUrl: sourceDirectoryUrl,
-          mainFileUrl,
+          defaultFileUrl,
           runtimeCompat,
 
           urlAnalysis,

package/src/plugins/explorer/jsenv_plugin_explorer.js

@@ -3,9 +3,8 @@ import { DATA_URL } from "@jsenv/urls"
 import { collectFiles } from "@jsenv/filesystem"
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
-export const explorerHtmlFileUrl = new URL(
-  "./client/explorer.html",
-  import.meta.url,
+export const explorerHtmlFileUrl = String(
+  new URL("./client/explorer.html", import.meta.url),
 )
 
 export const jsenvPluginExplorer = ({
@@ -18,7 +17,6 @@ export const jsenvPluginExplorer = ({
       "./**/*.test.html": true,
     },
   },
-  mainFileUrl,
 }) => {
   const faviconClientFileUrl = new URL("./client/jsenv.png", import.meta.url)
 
@@ -27,7 +25,7 @@ export const jsenvPluginExplorer = ({
     appliesDuring: "dev",
     transformUrlContent: {
       html: async (urlInfo, context) => {
-        if (urlInfo.url !== mainFileUrl) {
+        if (urlInfo.url !== explorerHtmlFileUrl) {
           return null
         }
         let html = urlInfo.content

package/src/plugins/plugins.js

@@ -23,7 +23,7 @@ import { jsenvPluginRibbon } from "./ribbon/jsenv_plugin_ribbon.js"
 
 export const getCorePlugins = ({
   rootDirectoryUrl,
-  mainFileUrl,
+  defaultFileUrl,
   runtimeCompat,
 
   urlAnalysis = {},
@@ -78,7 +78,7 @@ export const getCorePlugins = ({
     jsenvPluginHttpUrls(),
     jsenvPluginUrlResolution({
       runtimeCompat,
-      mainFileUrl,
+      defaultFileUrl,
       urlResolution,
     }),
     jsenvPluginUrlVersion(),
@@ -99,7 +99,7 @@ export const getCorePlugins = ({
         ]
       : []),
     ...(cacheControl ? [jsenvPluginCacheControl(cacheControl)] : []),
-    ...(explorer ? [jsenvPluginExplorer({ ...explorer, mainFileUrl })] : []),
+    ...(explorer ? [jsenvPluginExplorer(explorer)] : []),
     ...(ribbon ? [jsenvPluginRibbon({ rootDirectoryUrl, ...ribbon })] : []),
   ]
 }

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -33,7 +33,7 @@ import { createNodeEsmResolver } from "./node_esm_resolver.js"
 
 export const jsenvPluginUrlResolution = ({
   runtimeCompat,
-  mainFileUrl,
+  defaultFileUrl,
   urlResolution,
 }) => {
   const resolveUrlUsingWebResolution = (reference) => {
@@ -105,7 +105,7 @@ export const jsenvPluginUrlResolution = ({
     appliesDuring: "*",
     resolveUrl: (reference, context) => {
       if (reference.specifier === "/") {
-        return String(mainFileUrl)
+        return String(defaultFileUrl)
       }
       if (reference.specifier[0] === "/") {
         return new URL(reference.specifier.slice(1), context.rootDirectoryUrl)