evolit 0.4.3 → 0.4.4

package/README.md

@@ -444,6 +444,12 @@ configuration therefore stays isolated per render, extracted SSR data is read
 before the scope closes, and integration response headers are included before
 the response is cached.
 
+The supported SSR combination is `evolit@0.4.4` or newer,
+`@litsx/core@1.0.0-next.8` or newer, and `@litsx/urql@0.4.2` or newer. Evolit
+resolves the server-conditioned URQL adapter from the application project and
+uses that same module instance for setup, request resources, route rendering,
+SSR extraction, and cleanup.
+
 ## Extensions
 
 Optional integrations are configured explicitly in `evolit.config.js`. Core only coordinates their

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolit",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "A convention-driven application framework for LitSX and web components.",
   "type": "module",
   "packageManager": "yarn@4.10.3",
@@ -75,7 +75,7 @@
     "ws": "^8.18.3"
   },
   "peerDependencies": {
-    "@litsx/urql": "^0.4.0"
+    "@litsx/urql": "^0.4.2"
   },
   "peerDependenciesMeta": {
     "@litsx/urql": {
@@ -85,6 +85,7 @@
   "devDependencies": {
     "@litsx/tailwind": "1.0.0-next.8",
     "@litsx/unocss": "1.0.0-next.8",
+    "@litsx/urql": "^0.4.2",
     "@playwright/test": "^1.62.0",
     "@webcomponents/scoped-custom-element-registry": "^0.0.10",
     "unocss": "66.8.1",

package/src/build.js

@@ -606,7 +606,7 @@ export async function buildProject(projectRoot, options = {}) {
             urqlRequestContext,
           ),
         };
-      });
+      }, { projectRoot });
       if (!response) {
         continue;
       }

package/src/client-assets.js

@@ -581,7 +581,22 @@ function createSharedChunkGroup(id) {
     return "vendor-litsx";
   }
 
-  return "vendor-misc";
+  return undefined;
+}
+
+function createBrowserEnvironmentPlugin(mode) {
+  const nodeEnvironment = mode === "production" ? "production" : "development";
+  const replacement = JSON.stringify(nodeEnvironment);
+  return {
+    name: "evolit-browser-environment",
+    transform(code) {
+      if (!code.includes("process.env.NODE_ENV")) return null;
+      return {
+        code: code.replaceAll("process.env.NODE_ENV", replacement),
+        map: null,
+      };
+    },
+  };
 }
 
 function isClientAssetStubModule(relativePath) {
@@ -746,6 +761,7 @@ export async function buildSharedVendorRuntime(
         .map((group) => buildSharedVendorRuntime(projectRoot, mode, {
           ...options,
           additionalEntrySpecifiers: group.specifiers,
+          externalSpecifiers: developmentGroups.baseSpecifiers,
           vendorGroup: group.vendorGroup,
           includeBase: false,
         })),
@@ -790,9 +806,16 @@ export async function buildSharedVendorRuntime(
     const specifierByEntryName = new Map(
       specifiers.map((specifier) => [createSharedEntryName(specifier), specifier]),
     );
+    const externalSpecifiers = new Set(
+      Array.isArray(options.externalSpecifiers) ? options.externalSpecifiers : [],
+    );
     const bundle = await rollup({
       input: inputEntries,
+      external(source) {
+        return externalSpecifiers.has(source);
+      },
       plugins: [
+        createBrowserEnvironmentPlugin(mode),
         {
           name: "evolit-browser-exports",
           resolveId(source) {
@@ -814,10 +837,6 @@ export async function buildSharedVendorRuntime(
       ],
       preserveEntrySignatures: "strict",
       onwarn(warning, warn) {
-        if (warning.code === "CIRCULAR_DEPENDENCY") {
-          return;
-        }
-
         warn(warning);
       },
     });
@@ -836,6 +855,10 @@ export async function buildSharedVendorRuntime(
         manualChunks(id) {
           return createSharedChunkGroup(id);
         },
+        paths(id) {
+          if (!externalSpecifiers.has(id)) return id;
+          return `/_evolit/shared/base/${createSharedEntryName(id)}.mjs`;
+        },
       });
 
       const imports = {};

package/src/deployment-runtime.js

@@ -930,7 +930,7 @@ export async function createRequestRenderer({
           routeResult,
           response,
         };
-      });
+      }, { projectRoot });
     },
     get assetManifest() {
       return currentAssetManifest;

package/src/urql-ssr.js

@@ -1,13 +1,18 @@
-let adapterPromise = null;
+import { createRequire } from "node:module";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+
+const adapterPromisesByModuleUrl = new Map();
 
 function isMissingUrqlAdapter(error) {
-  return error?.code === "ERR_MODULE_NOT_FOUND"
+  return (error?.code === "ERR_MODULE_NOT_FOUND" || error?.code === "MODULE_NOT_FOUND")
     && String(error.message).includes("@litsx/urql");
 }
 
-async function loadSsrUrqlAdapter() {
+function resolveSsrUrqlAdapterUrl(projectRoot) {
   try {
-    return await import("@litsx/urql");
+    const requireFromProject = createRequire(path.join(path.resolve(projectRoot), "package.json"));
+    return pathToFileURL(requireFromProject.resolve("@litsx/urql")).href;
   } catch (error) {
     if (isMissingUrqlAdapter(error)) {
       return null;
@@ -16,9 +21,22 @@ async function loadSsrUrqlAdapter() {
   }
 }
 
-export async function getSsrUrqlAdapter() {
-  adapterPromise ??= loadSsrUrqlAdapter();
-  return adapterPromise;
+export async function getSsrUrqlAdapter(projectRoot = process.cwd()) {
+  const moduleUrl = resolveSsrUrqlAdapterUrl(projectRoot);
+  if (!moduleUrl) return null;
+  let adapterPromise = adapterPromisesByModuleUrl.get(moduleUrl);
+  if (!adapterPromise) {
+    adapterPromise = import(moduleUrl);
+    adapterPromisesByModuleUrl.set(moduleUrl, adapterPromise);
+  }
+  try {
+    return await adapterPromise;
+  } catch (error) {
+    if (adapterPromisesByModuleUrl.get(moduleUrl) === adapterPromise) {
+      adapterPromisesByModuleUrl.delete(moduleUrl);
+    }
+    throw error;
+  }
 }
 
 /**
@@ -40,7 +58,7 @@ export async function runWithOptionalSsrUrqlScope(
   }
   const adapter = Object.hasOwn(options, "adapter")
     ? options.adapter
-    : await getSsrUrqlAdapter();
+    : await getSsrUrqlAdapter(options.projectRoot);
   if (!adapter) {
     return callback(null);
   }