@jsenv/core 40.12.12 → 40.12.14

package/dist/client/import_meta_css/import_meta_css_build.js

@@ -1,20 +1,49 @@
 const installImportMetaCssBuild = (importMeta) => {
-  const stylesheet = new CSSStyleSheet({ baseUrl: importMeta.url });
+  const IMPORT_META_CSS_BUILD = "jsenv_import_meta_css_build";
 
-  let called = false;
-  // eslint-disable-next-line accessor-pairs
+  if (importMeta.css === IMPORT_META_CSS_BUILD) {
+    return;
+  }
+
+  const stylesheetMap = new Map();
+  const adopt = (url, value) => {
+    const stylesheet = new CSSStyleSheet({ baseUrl: importMeta.url });
+    stylesheet.replaceSync(value);
+    stylesheetMap.set(url, stylesheet);
+    document.adoptedStyleSheets = [...document.adoptedStyleSheets, stylesheet];
+  };
+  const update = (url, value) => {
+    stylesheetMap.get(url).replaceSync(value);
+  };
+  const remove = (url) => {
+    const stylesheet = stylesheetMap.get(url);
+    document.adoptedStyleSheets = document.adoptedStyleSheets.filter(
+      (s) => s !== stylesheet,
+    );
+    stylesheetMap.delete(url);
+  };
+
+  const currentCssSourceMap = new Map();
   Object.defineProperty(importMeta, "css", {
     configurable: true,
-    set(value) {
-      if (called) {
-        throw new Error("import.meta.css setter can only be called once");
+    get() {
+      return IMPORT_META_CSS_BUILD;
+    },
+    set([value, url]) {
+      if (value === undefined) {
+        if (stylesheetMap.has(url)) {
+          remove(url);
+          currentCssSourceMap.delete(url);
+        }
+        return;
+      }
+      if (!stylesheetMap.has(url)) {
+        adopt(url, value);
+        currentCssSourceMap.set(url, value);
+      } else if (currentCssSourceMap.get(url) !== value) {
+        update(url, value);
+        currentCssSourceMap.set(url, value);
       }
-      called = true;
-      stylesheet.replaceSync(value);
-      document.adoptedStyleSheets = [
-        ...document.adoptedStyleSheets,
-        stylesheet,
-      ];
     },
   });
 };

package/dist/client/import_meta_css/import_meta_css_dev.js

@@ -1,48 +1,60 @@
 const installImportMetaCssDev = (importMeta) => {
-  let cssText = "";
-  let stylesheet = new CSSStyleSheet({ baseUrl: importMeta.url });
-  let adopted = false;
+  const IMPORT_META_CSS_DEV = "jsenv_import_meta_css_dev";
 
-  const css = {
-    toString: () => cssText,
-    update: (value) => {
-      cssText = value;
-      cssText += `
+  // useless today but browser might catch up to display it in devtools
+  const addUrlInfo = (cssText) => {
+    let cssTextWithUrlInfo = cssText;
+    cssTextWithUrlInfo += `
 /* sourceURL=${importMeta.url} */
 /* inlined from ${importMeta.url} */`;
-      stylesheet.replaceSync(cssText);
-    },
-    inject: () => {
-      if (!adopted) {
-        document.adoptedStyleSheets = [
-          ...document.adoptedStyleSheets,
-          stylesheet,
-        ];
-        adopted = true;
-      }
-    },
-    remove: () => {
-      if (adopted) {
-        document.adoptedStyleSheets = document.adoptedStyleSheets.filter(
-          (s) => s !== stylesheet,
-        );
-        adopted = false;
-      }
-    },
+    return cssTextWithUrlInfo;
+  };
+
+  let stylesheet;
+  const adopt = (value) => {
+    stylesheet = new CSSStyleSheet({ baseUrl: importMeta.url });
+    stylesheet.replaceSync(addUrlInfo(value));
+    document.adoptedStyleSheets = [...document.adoptedStyleSheets, stylesheet];
+  };
+  const update = (value) => {
+    stylesheet.replaceSync(addUrlInfo(value));
+  };
+  const remove = () => {
+    document.adoptedStyleSheets = document.adoptedStyleSheets.filter(
+      (s) => s !== stylesheet,
+    );
   };
 
+  let currentCssSource;
   Object.defineProperty(importMeta, "css", {
     configurable: true,
     get() {
-      return css;
+      return IMPORT_META_CSS_DEV;
     },
     set(value) {
-      css.update(value);
-      css.inject();
+      if (value === undefined) {
+        if (stylesheet) {
+          remove();
+          stylesheet = undefined;
+          currentCssSource = undefined;
+        }
+        return;
+      }
+      if (!stylesheet) {
+        adopt(value);
+        currentCssSource = value;
+      } else if (currentCssSource !== value) {
+        update(value);
+        currentCssSource = value;
+      }
     },
   });
 
-  return css.remove;
+  return () => {
+    remove();
+    stylesheet = undefined;
+    currentCssSource = undefined;
+  };
 };
 
 export { installImportMetaCssDev };

package/dist/start_build_server/jsenv_core_packages.js

@@ -1394,76 +1394,6 @@ const createTaskLog = (
   };
 };
 
-const pathnameToExtension = (pathname) => {
-  const slashLastIndex = pathname.lastIndexOf("/");
-  const filename =
-    slashLastIndex === -1 ? pathname : pathname.slice(slashLastIndex + 1);
-  if (filename.match(/@([0-9])+(\.[0-9]+)?(\.[0-9]+)?$/)) {
-    return "";
-  }
-  const dotLastIndex = filename.lastIndexOf(".");
-  if (dotLastIndex === -1) {
-    return "";
-  }
-  // if (dotLastIndex === pathname.length - 1) return ""
-  const extension = filename.slice(dotLastIndex);
-  return extension;
-};
-
-const resourceToPathname = (resource) => {
-  const searchSeparatorIndex = resource.indexOf("?");
-  if (searchSeparatorIndex > -1) {
-    return resource.slice(0, searchSeparatorIndex);
-  }
-  const hashIndex = resource.indexOf("#");
-  if (hashIndex > -1) {
-    return resource.slice(0, hashIndex);
-  }
-  return resource;
-};
-
-const urlToScheme = (url) => {
-  const urlString = String(url);
-  const colonIndex = urlString.indexOf(":");
-  if (colonIndex === -1) {
-    return "";
-  }
-
-  const scheme = urlString.slice(0, colonIndex);
-  return scheme;
-};
-
-const urlToResource = (url) => {
-  const scheme = urlToScheme(url);
-
-  if (scheme === "file") {
-    const urlAsStringWithoutFileProtocol = String(url).slice("file://".length);
-    return urlAsStringWithoutFileProtocol;
-  }
-
-  if (scheme === "https" || scheme === "http") {
-    // remove origin
-    const afterProtocol = String(url).slice(scheme.length + "://".length);
-    const pathnameSlashIndex = afterProtocol.indexOf("/", "://".length);
-    const urlAsStringWithoutOrigin = afterProtocol.slice(pathnameSlashIndex);
-    return urlAsStringWithoutOrigin;
-  }
-
-  const urlAsStringWithoutProtocol = String(url).slice(scheme.length + 1);
-  return urlAsStringWithoutProtocol;
-};
-
-const urlToPathname = (url) => {
-  const resource = urlToResource(url);
-  const pathname = resourceToPathname(resource);
-  return pathname;
-};
-
-const urlToExtension = (url) => {
-  const pathname = urlToPathname(url);
-  return pathnameToExtension(pathname);
-};
-
 const transformUrlPathname = (url, transformer) => {
   if (typeof url === "string") {
     const urlObject = new URL(url);
@@ -1576,4 +1506,4 @@ const assertAndNormalizeDirectoryUrl = (
   return value;
 };
 
-export { Abort, assertAndNormalizeDirectoryUrl, createLogger, createTaskLog, raceProcessTeardownEvents, urlToExtension, urlToPathname };
+export { Abort, assertAndNormalizeDirectoryUrl, createLogger, createTaskLog, raceProcessTeardownEvents };

package/dist/start_build_server/start_build_server.js

@@ -1,6 +1,6 @@
-import { startServer, jsenvServiceCORS, jsenvAccessControlAllowedHeaders, jsenvServiceErrorHandler, createFileSystemFetch } from "@jsenv/server";
+import { startServer, serverPluginCORS, jsenvAccessControlAllowedHeaders, serverPluginStaticFiles, serverPluginErrorHandler } from "@jsenv/server";
 import { existsSync } from "node:fs";
-import { assertAndNormalizeDirectoryUrl, createLogger, Abort, raceProcessTeardownEvents, createTaskLog, urlToExtension, urlToPathname } from "./jsenv_core_packages.js";
+import { assertAndNormalizeDirectoryUrl, createLogger, Abort, raceProcessTeardownEvents, createTaskLog } from "./jsenv_core_packages.js";
 import "./jsenv_core_node_modules.js";
 import "node:process";
 import "node:os";
@@ -35,7 +35,7 @@ const startBuildServer = async ({
   buildMainFilePath = "index.html",
   port = 9779,
   routes,
-  services = [],
+  serverPlugins = [],
   acceptAnyIp,
   hostname,
   https,
@@ -119,8 +119,8 @@ const startBuildServer = async ({
     serverTiming: true,
     requestWaitingMs: 60_000,
     routes,
-    services: [
-      jsenvServiceCORS({
+    plugins: [
+      serverPluginCORS({
         accessControlAllowRequestOrigin: true,
         accessControlAllowRequestMethod: true,
         accessControlAllowRequestHeaders: true,
@@ -128,13 +128,13 @@ const startBuildServer = async ({
         accessControlAllowCredentials: true,
         timingAllowOrigin: true,
       }),
-      ...services,
-      jsenvBuildFileService({
-        buildDirectoryUrl,
-        buildMainFilePath,
+      ...serverPlugins,
+      serverPluginStaticFiles({
+        directoryUrl: buildDirectoryUrl,
+        mainFilePath: buildMainFilePath,
       }),
-      jsenvServiceErrorHandler({
-        sendErrorDetails: true,
+      serverPluginErrorHandler({
+        sendErrorDetails: false,
       }),
     ],
   });
@@ -156,49 +156,4 @@ const startBuildServer = async ({
   };
 };
 
-const jsenvBuildFileService = ({ buildDirectoryUrl, buildMainFilePath }) => {
-  return {
-    name: "jsenv:build_files",
-    routes: [
-      {
-        endpoint: "GET *",
-        description: "Serve static files.",
-        fetch: (request, helpers) => {
-          const urlIsVersioned = new URL(request.url).searchParams.has("v");
-          if (buildMainFilePath && request.resource === "/") {
-            request = {
-              ...request,
-              resource: `/${buildMainFilePath}`,
-            };
-          }
-          const urlObject = new URL(
-            request.resource.slice(1),
-            buildDirectoryUrl,
-          );
-          return createFileSystemFetch(buildDirectoryUrl, {
-            cacheControl: urlIsVersioned
-              ? `private,max-age=${SECONDS_IN_30_DAYS},immutable`
-              : "private,max-age=0,must-revalidate",
-            etagEnabled: true,
-            compressionEnabled: true,
-            rootDirectoryUrl: buildDirectoryUrl,
-            canReadDirectory: true,
-            ENOENTFallback: () => {
-              if (
-                !urlToExtension(urlObject) &&
-                !urlToPathname(urlObject).endsWith("/")
-              ) {
-                return new URL(buildMainFilePath, buildDirectoryUrl);
-              }
-              return null;
-            },
-          })(request, helpers);
-        },
-      },
-    ],
-  };
-};
-
-const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30;
-
 export { startBuildServer };