@jsenv/core 41.0.2 → 41.0.4

package/dist/build/build.js

@@ -10,7 +10,7 @@ import { generateSourcemapFileUrl, createMagicSource, composeTwoSourcemaps, gene
 import { createPluginsController } from "@jsenv/server/src/plugins_controller.js";
 import { jsenvPluginSupervisor } from "@jsenv/plugin-supervisor";
 import { WebSocketResponse, pickContentType } from "@jsenv/server";
-import { randomUUID, createHash } from "node:crypto";
+import { createHash } from "node:crypto";
 import "./jsenv_core_node_modules.js";
 import "node:os";
 import "node:tty";
@@ -8823,47 +8823,6 @@ const jsenvPluginCleanHTML = () => {
   };
 };
 
-/**
- * https://docs.google.com/document/d/1rfKPnxsNuXhnF7AiQZhu9kIwdiMS5hnAI05HBwFuBSM/edit?tab=t.0#heading=h.7nki9mck5t64
- * https://chromium.googlesource.com/devtools/devtools-frontend/+/main/docs/ecosystem/automatic_workspace_folders.md
- * https://github.com/ChromeDevTools/vite-plugin-devtools-json
- */
-
-
-const jsenvPluginChromeDevtoolsJson = () => {
-  const getOrCreateUUID = (kitchen) => {
-    const { outDirectoryUrl } = kitchen.context;
-    const uuidFileUrl = new URL("./uuid.json", outDirectoryUrl);
-    if (existsSync(uuidFileUrl)) {
-      const { uuid } = JSON.parse(readFileSync(uuidFileUrl, "utf8"));
-      return uuid;
-    }
-    const uuid = randomUUID();
-    writeFileSync(uuidFileUrl, JSON.stringify({ uuid }), { });
-    return uuid;
-  };
-
-  return {
-    name: "jsenv_plugin_chrome_devtools_json",
-    appliesDuring: "dev",
-    serverRoutes: [
-      {
-        endpoint: "GET /.well-known/appspecific/com.chrome.devtools.json",
-        declarationSource: import.meta.url,
-        fetch: (request, { kitchen }) => {
-          const { rootDirectoryUrl } = kitchen.context;
-          return Response.json({
-            workspace: {
-              root: urlToFileSystemPath(rootDirectoryUrl),
-              uuid: getOrCreateUUID(kitchen),
-            },
-          });
-        },
-      },
-    ],
-  };
-};
-
 const jsenvPluginAutoreloadOnServerRestart = () => {
   const autoreloadOnRestartClientFileUrl = import.meta
     .resolve("@jsenv/server/src/plugins/autoreload_on_server_restart/client/autoreload_on_server_restart.js");
@@ -9308,7 +9267,6 @@ const getCorePlugins = ({
     ...(ribbon ? [jsenvPluginRibbon({ rootDirectoryUrl, ...ribbon })] : []),
     ...(dropToOpen ? [jsenvPluginDropToOpen()] : []),
     jsenvPluginCleanHTML(),
-    jsenvPluginChromeDevtoolsJson(),
     ...(packageSideEffects
       ? [jsenvPluginPackageSideEffects({ packageDirectory })]
       : []),

package/dist/start_build_server/jsenv_core_packages.js

@@ -1,6 +1,5 @@
 import { createSupportsColor, isUnicodeSupported, emojiRegex, eastAsianWidth, clearTerminal, eraseLines } from "./jsenv_core_node_modules.js";
 import { stripVTControlCharacters } from "node:util";
-import { pathToFileURL } from "node:url";
 
 const createCallbackListNotifiedOnce = () => {
   let callbacks = [];
@@ -1394,116 +1393,4 @@ const createTaskLog = (
   };
 };
 
-const transformUrlPathname = (url, transformer) => {
-  if (typeof url === "string") {
-    const urlObject = new URL(url);
-    const { pathname } = urlObject;
-    const pathnameTransformed = transformer(pathname);
-    if (pathnameTransformed === pathname) {
-      return url;
-    }
-    let { origin } = urlObject;
-    // origin is "null" for "file://" urls with Node.js
-    if (origin === "null" && urlObject.href.startsWith("file:")) {
-      origin = "file://";
-    }
-    const { search, hash } = urlObject;
-    const urlWithPathnameTransformed = `${origin}${pathnameTransformed}${search}${hash}`;
-    return urlWithPathnameTransformed;
-  }
-  const pathnameTransformed = transformer(url.pathname);
-  url.pathname = pathnameTransformed;
-  return url;
-};
-const ensurePathnameTrailingSlash = (url) => {
-  return transformUrlPathname(url, (pathname) => {
-    return pathname.endsWith("/") ? pathname : `${pathname}/`;
-  });
-};
-
-const isFileSystemPath = (value) => {
-  if (typeof value !== "string") {
-    throw new TypeError(
-      `isFileSystemPath first arg must be a string, got ${value}`,
-    );
-  }
-  if (value[0] === "/") {
-    return true;
-  }
-  return startsWithWindowsDriveLetter(value);
-};
-
-const startsWithWindowsDriveLetter = (string) => {
-  const firstChar = string[0];
-  if (!/[a-zA-Z]/.test(firstChar)) return false;
-
-  const secondChar = string[1];
-  if (secondChar !== ":") return false;
-
-  return true;
-};
-
-const fileSystemPathToUrl = (value) => {
-  if (!isFileSystemPath(value)) {
-    throw new Error(`value must be a filesystem path, got ${value}`);
-  }
-  return String(pathToFileURL(value));
-};
-
-const validateDirectoryUrl = (value) => {
-  let urlString;
-
-  if (value instanceof URL) {
-    urlString = value.href;
-  } else if (typeof value === "string") {
-    if (isFileSystemPath(value)) {
-      urlString = fileSystemPathToUrl(value);
-    } else {
-      try {
-        urlString = String(new URL(value));
-      } catch {
-        return {
-          valid: false,
-          value,
-          message: `must be a valid url`,
-        };
-      }
-    }
-  } else if (
-    value &&
-    typeof value === "object" &&
-    typeof value.href === "string"
-  ) {
-    value = value.href;
-  } else {
-    return {
-      valid: false,
-      value,
-      message: `must be a string or an url`,
-    };
-  }
-  if (!urlString.startsWith("file://")) {
-    return {
-      valid: false,
-      value,
-      message: 'must start with "file://"',
-    };
-  }
-  return {
-    valid: true,
-    value: ensurePathnameTrailingSlash(urlString),
-  };
-};
-
-const assertAndNormalizeDirectoryUrl = (
-  directoryUrl,
-  name = "directoryUrl",
-) => {
-  const { valid, message, value } = validateDirectoryUrl(directoryUrl);
-  if (!valid) {
-    throw new TypeError(`${name} ${message}, got ${value}`);
-  }
-  return value;
-};
-
-export { Abort, assertAndNormalizeDirectoryUrl, createLogger, createTaskLog, raceProcessTeardownEvents };
+export { Abort, createLogger, createTaskLog, raceProcessTeardownEvents };

package/dist/start_build_server/start_build_server.js

@@ -1,12 +1,10 @@
-import { startServer, serverPluginCORS, jsenvAccessControlAllowedHeaders, serverPluginStaticFiles, serverPluginErrorHandler } from "@jsenv/server";
-import { existsSync } from "node:fs";
-import { assertAndNormalizeDirectoryUrl, createLogger, Abort, raceProcessTeardownEvents, createTaskLog } from "./jsenv_core_packages.js";
+import { startServer, createFileSystemFetch, serverPluginCORS, jsenvAccessControlAllowedHeaders, serverPluginErrorHandler } from "@jsenv/server";
+import { createLogger, Abort, raceProcessTeardownEvents, createTaskLog } from "./jsenv_core_packages.js";
 import "./jsenv_core_node_modules.js";
 import "node:process";
 import "node:os";
 import "node:tty";
 import "node:util";
-import "node:url";
 
 /*
  * startBuildServer is mean to interact with the build files;
@@ -34,7 +32,7 @@ const startBuildServer = async ({
   buildDirectoryUrl,
   buildDirectoryMainFileRelativeUrl = "index.html",
   port = 9779,
-  routes,
+  routes = [],
   serverPlugins = [],
   acceptAnyIp,
   hostname,
@@ -46,55 +44,7 @@ const startBuildServer = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
   keepProcessAlive = true,
-
-  ...rest
 }) => {
-  // params validation
-  {
-    const unexpectedParamNames = Object.keys(rest);
-    if (unexpectedParamNames.length > 0) {
-      throw new TypeError(
-        `${unexpectedParamNames.join(",")}: there is no such param`,
-      );
-    }
-    buildDirectoryUrl = assertAndNormalizeDirectoryUrl(
-      buildDirectoryUrl,
-      "buildDirectoryUrl",
-    );
-
-    if (buildDirectoryMainFileRelativeUrl) {
-      if (typeof buildDirectoryMainFileRelativeUrl !== "string") {
-        throw new TypeError(
-          `buildDirectoryMainFileRelativeUrl must be a string, got ${buildDirectoryMainFileRelativeUrl}`,
-        );
-      }
-      if (buildDirectoryMainFileRelativeUrl[0] === "/") {
-        buildDirectoryMainFileRelativeUrl =
-          buildDirectoryMainFileRelativeUrl.slice(1);
-      } else {
-        const buildMainFileUrl = new URL(
-          buildDirectoryMainFileRelativeUrl,
-          buildDirectoryUrl,
-        ).href;
-        if (!buildMainFileUrl.startsWith(buildDirectoryUrl)) {
-          throw new Error(
-            `buildDirectoryMainFileRelativeUrl must be relative, got ${buildDirectoryMainFileRelativeUrl}`,
-          );
-        }
-        buildDirectoryMainFileRelativeUrl = buildMainFileUrl.slice(
-          buildDirectoryUrl.length,
-        );
-      }
-      if (
-        !existsSync(
-          new URL(buildDirectoryMainFileRelativeUrl, buildDirectoryUrl),
-        )
-      ) {
-        buildDirectoryMainFileRelativeUrl = null;
-      }
-    }
-  }
-
   const logger = createLogger({ logLevel });
   const operation = Abort.startOperation();
   operation.addAbortSignal(signal);
@@ -127,7 +77,6 @@ const startBuildServer = async ({
     port,
     serverTiming: true,
     requestWaitingMs: 60_000,
-    routes,
     plugins: [
       serverPluginCORS({
         accessControlAllowRequestOrigin: true,
@@ -138,15 +87,20 @@ const startBuildServer = async ({
         timingAllowOrigin: true,
       }),
       ...serverPlugins,
-      serverPluginStaticFiles({
-        serverRelativeUrl: "/",
-        directoryUrl: buildDirectoryUrl,
-        directoryMainFileRelativeUrl: buildDirectoryMainFileRelativeUrl,
-      }),
       serverPluginErrorHandler({
         sendErrorDetails: false,
       }),
     ],
+    routes: [
+      ...routes,
+      {
+        endpoint: "GET /",
+        description: "Serve build files",
+        fetch: createFileSystemFetch(buildDirectoryUrl, {
+          mainFileRelativeUrl: buildDirectoryMainFileRelativeUrl,
+        }),
+      },
+    ],
   });
   startBuildServerTask.done();
   if (hostname) {