rwsdk 0.2.0-alpha.5 → 0.2.0-alpha.6

package/dist/lib/smokeTests/browser.mjs

@@ -8,7 +8,7 @@ import puppeteer from "puppeteer-core";
 import { takeScreenshot } from "./artifacts.mjs";
 import { RETRIES } from "./constants.mjs";
 import { $ } from "../$.mjs";
-import { fail } from "./utils.mjs";
+import { fail, withRetries } from "./utils.mjs";
 import { reportSmokeTestResult } from "./reporting.mjs";
 import { updateTestStatus } from "./state.mjs";
 import * as fs from "fs/promises";
@@ -404,7 +404,7 @@ export async function checkUrlSmoke(page, url, isRealtime, bail = false, skipCli
             ? "realtimeClientModuleStyles"
             : "initialClientModuleStyles";
         try {
-            await checkUrlStyles(page, "red");
+            await withRetries(() => checkUrlStyles(page, "red"), "URL styles check");
             updateTestStatus(env, urlStylesKey, "PASSED");
             log(`${phase} URL styles check passed`);
         }
@@ -420,7 +420,7 @@ export async function checkUrlSmoke(page, url, isRealtime, bail = false, skipCli
             }
         }
         try {
-            await checkClientModuleStyles(page, "blue");
+            await withRetries(() => checkClientModuleStyles(page, "blue"), "Client module styles check");
             updateTestStatus(env, clientModuleStylesKey, "PASSED");
             log(`${phase} client module styles check passed`);
         }
@@ -507,7 +507,14 @@ export async function checkUrlSmoke(page, url, isRealtime, bail = false, skipCli
                 await testClientComponentHmr(page, targetDir, phase, environment, bail);
                 // Test style HMR if style tests aren't skipped
                 if (!skipStyleTests) {
-                    await testStyleHMR(page, targetDir);
+                    await withRetries(() => testStyleHMR(page, targetDir), "Style HMR test", async () => {
+                        // This logic runs before each retry of testStyleHMR
+                        const urlStylePath = join(targetDir, "src", "app", "smokeTestUrlStyles.css");
+                        const clientStylePath = join(targetDir, "src", "app", "components", "smokeTestClientStyles.module.css");
+                        // Restore original styles before re-running HMR test
+                        await fs.writeFile(urlStylePath, urlStylesTemplate);
+                        await fs.writeFile(clientStylePath, clientStylesTemplate);
+                    });
                 }
                 else {
                     log("Skipping style HMR test as requested");
@@ -1182,9 +1189,9 @@ async function testStyleHMR(page, targetDir) {
     // Allow time for HMR to kick in
     await new Promise((resolve) => setTimeout(resolve, 5000));
     // Check URL-based stylesheet HMR
-    await checkUrlStyles(page, "green");
+    await withRetries(() => checkUrlStyles(page, "green"), "URL styles HMR check");
     // Check client-module stylesheet HMR
-    await checkClientModuleStyles(page, "green");
+    await withRetries(() => checkClientModuleStyles(page, "green"), "Client module styles HMR check");
     // Restore original styles
     await fs.writeFile(urlStylePath, urlStylesTemplate);
     await fs.writeFile(clientStylePath, clientStylesTemplate);

package/dist/lib/smokeTests/utils.d.mts

@@ -13,3 +13,12 @@ export declare function teardown(): Promise<void>;
  * Formats the path suffix from a custom path
  */
 export declare function formatPathSuffix(customPath?: string): string;
+/**
+ * Wraps an async function with retry logic.
+ * @param fn The async function to execute.
+ * @param description A description of the operation for logging.
+ * @param beforeRetry A function to run before each retry attempt.
+ * @param maxRetries The maximum number of retries.
+ * @param delay The delay between retries in milliseconds.
+ */
+export declare function withRetries<T>(fn: () => Promise<T>, description: string, beforeRetry?: () => Promise<void>, maxRetries?: number, delay?: number): Promise<T>;

package/dist/lib/smokeTests/utils.mjs

@@ -145,3 +145,32 @@ export function formatPathSuffix(customPath) {
     log("Formatted path suffix: %s", suffix);
     return suffix;
 }
+/**
+ * Wraps an async function with retry logic.
+ * @param fn The async function to execute.
+ * @param description A description of the operation for logging.
+ * @param beforeRetry A function to run before each retry attempt.
+ * @param maxRetries The maximum number of retries.
+ * @param delay The delay between retries in milliseconds.
+ */
+export async function withRetries(fn, description, beforeRetry, maxRetries = 5, delay = 2000) {
+    for (let i = 0; i < maxRetries; i++) {
+        try {
+            if (i > 0 && beforeRetry) {
+                log(`Running beforeRetry hook for "${description}"`);
+                await beforeRetry();
+            }
+            return await fn();
+        }
+        catch (error) {
+            log(`Attempt ${i + 1} of ${maxRetries} failed for "${description}": ${error instanceof Error ? error.message : String(error)}`);
+            if (i === maxRetries - 1) {
+                log(`All ${maxRetries} retries failed for "${description}".`);
+                throw error;
+            }
+            log(`Retrying in ${delay}ms...`);
+            await setTimeout(delay);
+        }
+    }
+    throw new Error("Retry loop failed unexpectedly.");
+}

package/dist/runtime/lib/manifest.js

@@ -4,10 +4,7 @@ export const getManifest = async (requestInfo) => {
         return manifest;
     }
     if (import.meta.env.VITE_IS_DEV_SERVER) {
-        const url = new URL(requestInfo.request.url);
-        url.searchParams.set("scripts", JSON.stringify(Array.from(requestInfo.rw.scriptsToBeLoaded)));
-        url.pathname = "/__rwsdk_manifest";
-        manifest = await fetch(url.toString()).then((res) => res.json());
+        manifest = {};
     }
     else {
         const { default: prodManifest } = await import("virtual:rwsdk:manifest.js");

package/dist/runtime/render/stylesheets.d.ts

@@ -1,9 +1,4 @@
 import { type RequestInfo } from "../requestInfo/types.js";
-export type CssEntry = {
-    url: string;
-    content: string;
-    absolutePath: string;
-};
 export declare const Stylesheets: ({ requestInfo }: {
     requestInfo: RequestInfo;
 }) => import("react/jsx-runtime.js").JSX.Element;

package/dist/runtime/render/stylesheets.js

@@ -31,15 +31,5 @@ export const Stylesheets = ({ requestInfo }) => {
             allStylesheets.add(entry);
         }
     }
-    return (_jsx(_Fragment, { children: Array.from(allStylesheets).map((entry) => {
-            if (typeof entry === "string") {
-                return (_jsx("link", { rel: "stylesheet", href: entry, precedence: "first" }, entry));
-            }
-            if (import.meta.env.VITE_IS_DEV_SERVER) {
-                return (_jsx("style", { "data-vite-dev-id": entry.absolutePath, dangerouslySetInnerHTML: { __html: entry.content } }, entry.url));
-            }
-            else {
-                return (_jsx("link", { rel: "stylesheet", href: entry.url, precedence: "first" }, entry.url));
-            }
-        }) }));
+    return (_jsx(_Fragment, { children: Array.from(allStylesheets).map((href) => (_jsx("link", { rel: "stylesheet", href: href, precedence: "first" }, href))) }));
 };

package/dist/scripts/smoke-test.mjs

@@ -30,8 +30,7 @@ if (fileURLToPath(import.meta.url) === process.argv[1]) {
         copyProject: false, // Default to false - don't copy project to artifacts
         realtime: false, // Default to false - don't just test realtime
         skipHmr: false, // Default to false - run HMR tests
-        // todo(justinvdm, 2025-07-31): Remove this once style tests working with headless
-        skipStyleTests: true, // Default to true - skip style tests
+        skipStyleTests: false,
         // sync: will be set below
     };
     // Log if we're in CI
@@ -55,8 +54,8 @@ if (fileURLToPath(import.meta.url) === process.argv[1]) {
         else if (arg === "--skip-hmr") {
             options.skipHmr = true;
         }
-        else if (arg === "--run-style-tests") {
-            options.skipStyleTests = false;
+        else if (arg === "--skip-style-tests") {
+            options.skipStyleTests = true;
         }
         else if (arg === "--keep") {
             options.keep = true;
@@ -94,7 +93,7 @@ Options:
   --skip-release          Skip testing the release/production deployment
   --skip-client           Skip client-side tests, only run server-side checks
   --skip-hmr              Skip hot module replacement (HMR) tests
-  --run-style-tests       Enable stylesheet-related tests (disabled by default)
+  --skip-style-tests      Skip stylesheet-related tests
   --path=PATH             Project directory to test
   --artifact-dir=DIR      Directory to store test artifacts (default: .artifacts)
   --keep                  Keep temporary test directory after tests complete

package/dist/vite/manifestPlugin.mjs

@@ -4,36 +4,6 @@ import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const log = debug("rwsdk:vite:manifest-plugin");
 const virtualModuleId = "virtual:rwsdk:manifest.js";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;
-const getCssForModule = (server, moduleId, css) => {
-    const stack = [moduleId];
-    const visited = new Set();
-    while (stack.length > 0) {
-        const currentModuleId = stack.pop();
-        if (visited.has(currentModuleId)) {
-            continue;
-        }
-        visited.add(currentModuleId);
-        const moduleNode = server.environments.client.moduleGraph.getModuleById(currentModuleId);
-        if (!moduleNode) {
-            continue;
-        }
-        for (const importedModule of moduleNode.importedModules) {
-            if (importedModule.url.endsWith(".css")) {
-                const absolutePath = importedModule.file;
-                css.add({
-                    url: importedModule.url,
-                    // The `ssrTransformResult` has the CSS content, because the default
-                    // transform for CSS is to a string of the CSS content.
-                    content: importedModule.ssrTransformResult?.code ?? "",
-                    absolutePath,
-                });
-            }
-            if (importedModule.id) {
-                stack.push(importedModule.id);
-            }
-        }
-    }
-};
 export const manifestPlugin = ({ manifestPath, }) => {
     let isBuild = false;
     let root;
@@ -106,46 +76,5 @@ export const manifestPlugin = ({ manifestPath, }) => {
                 },
             });
         },
-        configureServer(server) {
-            log("Configuring server middleware for manifest");
-            server.middlewares.use("/__rwsdk_manifest", async (req, res, next) => {
-                log("Manifest request received: %s", req.url);
-                try {
-                    const url = new URL(req.url, `http://${req.headers.host}`);
-                    const scripts = JSON.parse(url.searchParams.get("scripts") || "[]");
-                    process.env.VERBOSE && log("Transforming scripts: %o", scripts);
-                    for (const script of scripts) {
-                        await server.environments.client.transformRequest(script);
-                    }
-                    const manifest = {};
-                    log("Building manifest from module graph");
-                    for (const file of server.environments.client.moduleGraph.fileToModulesMap.keys()) {
-                        const modules = server.environments.client.moduleGraph.getModulesByFile(file);
-                        if (!modules) {
-                            continue;
-                        }
-                        for (const module of modules) {
-                            if (module.file) {
-                                const css = new Set();
-                                getCssForModule(server, module.id, css);
-                                manifest[normalizeModulePath(module.file, server.config.root)] =
-                                    {
-                                        file: module.url,
-                                        css: Array.from(css),
-                                    };
-                            }
-                        }
-                    }
-                    log("Manifest built successfully");
-                    process.env.VERBOSE && log("Manifest: %o", manifest);
-                    res.setHeader("Content-Type", "application/json");
-                    res.end(JSON.stringify(manifest));
-                }
-                catch (e) {
-                    log("Error building manifest: %o", e);
-                    next(e);
-                }
-            });
-        },
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.2.0-alpha.5",
+  "version": "0.2.0-alpha.6",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {