rwsdk 0.1.15 → 0.1.16

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

@@ -1,5 +0,0 @@
-import { SmokeTestOptions, TestResources } from "./types.mjs";
-/**
- * Cleans up any resources used during testing
- */
-export declare function cleanupResources(resources: TestResources, options: SmokeTestOptions): Promise<void>;

package/dist/lib/smokeTests/cleanup.mjs

@@ -1,214 +0,0 @@
-import { join } from "path";
-import { setTimeout } from "node:timers/promises";
-import { pathExists } from "fs-extra";
-import { mkdirp } from "fs-extra";
-import * as fs from "fs/promises";
-import { copy } from "fs-extra";
-import { relative } from "path";
-import ignore from "ignore";
-import { log } from "./constants.mjs";
-import { deleteWorker, listD1Databases, deleteD1Database } from "./release.mjs";
-import { isRunningInCI } from "./utils.mjs";
-import { capturer } from "./artifacts.mjs";
-import { state } from "./state.mjs";
-/**
- * Cleans up any resources used during testing
- */
-export async function cleanupResources(resources, options) {
-    log("Cleaning up resources");
-    const inCIMode = isRunningInCI(options.ci);
-    // Stop dev server if it was started
-    if (resources.stopDev) {
-        console.log("Stopping development server...");
-        try {
-            // Set a timeout for the stopDev function
-            const stopTimeout = 10000; // 10 seconds
-            await Promise.race([
-                resources.stopDev(),
-                (async () => {
-                    await setTimeout(stopTimeout);
-                    log("Timed out waiting for dev server to stop, continuing cleanup");
-                    console.log("⚠️ Timed out waiting for development server to stop");
-                    // Record this issue
-                    state.failures.push({
-                        step: "Development Server Shutdown",
-                        error: "Timed out waiting for development server to stop after 10 seconds",
-                    });
-                    // If the dev server didn't stop in time, we'll continue with cleanup
-                    return null;
-                })(),
-            ]);
-        }
-        catch (error) {
-            log("Error while stopping development server: %O", error);
-            console.error(`Error while stopping development server: ${error instanceof Error ? error.message : String(error)}`);
-            // Record this issue
-            state.failures.push({
-                step: "Development Server Shutdown",
-                error: error instanceof Error ? error.message : String(error),
-                details: error instanceof Error && error.stack ? error.stack : undefined,
-            });
-        }
-    }
-    // Clean up resources only if release tests have run
-    if (resources.workerName && state.releaseTestsRan) {
-        // First, clean up any D1 databases associated with this worker
-        try {
-            log(`Finding D1 databases associated with worker ${resources.workerName}`);
-            console.log(`🔍 Looking for D1 databases associated with worker ${resources.workerName}...`);
-            const databases = await listD1Databases(resources.targetDir);
-            // Look for databases that contain the unique resource key
-            const resourceUniqueKey = resources.resourceUniqueKey;
-            const relatedDatabases = databases.filter((db) => db.name.includes(resourceUniqueKey));
-            log(`Found ${relatedDatabases.length} related D1 databases with unique key: ${resourceUniqueKey}`);
-            if (relatedDatabases.length > 0) {
-                console.log(`Found ${relatedDatabases.length} D1 database(s) to clean up`);
-                for (const db of relatedDatabases) {
-                    try {
-                        log(`Deleting D1 database: ${db.name}`);
-                        await deleteD1Database(db.name, resources.targetDir || "", // Provide empty string as fallback
-                        resourceUniqueKey);
-                    }
-                    catch (dbError) {
-                        log("Error while deleting D1 database: %O", dbError);
-                        console.error(`Error while deleting D1 database: ${dbError instanceof Error ? dbError.message : String(dbError)}`);
-                        // Record this issue
-                        state.failures.push({
-                            step: `D1 Database Deletion: ${db.name}`,
-                            error: dbError instanceof Error ? dbError.message : String(dbError),
-                            details: dbError instanceof Error && dbError.stack
-                                ? dbError.stack
-                                : undefined,
-                        });
-                    }
-                }
-            }
-            else {
-                log("No related D1 databases found to clean up");
-            }
-        }
-        catch (error) {
-            log("Error finding D1 databases: %O", error);
-            console.error(`Error finding D1 databases: ${error instanceof Error ? error.message : String(error)}`);
-            // Record this issue
-            state.failures.push({
-                step: "D1 Database Lookup",
-                error: error instanceof Error ? error.message : String(error),
-                details: error instanceof Error && error.stack ? error.stack : undefined,
-            });
-        }
-        // Now delete the worker
-        console.log(`🧹 Cleaning up: Deleting worker ${resources.workerName}...`);
-        try {
-            await deleteWorker(resources.workerName, resources.targetDir || "", // Provide empty string as fallback
-            resources.resourceUniqueKey);
-        }
-        catch (error) {
-            log("Error while deleting worker: %O", error);
-            console.error(`Error while deleting worker: ${error instanceof Error ? error.message : String(error)}`);
-            // Record this issue
-            state.failures.push({
-                step: `Worker Deletion: ${resources.workerName}`,
-                error: error instanceof Error ? error.message : String(error),
-                details: error instanceof Error && error.stack ? error.stack : undefined,
-            });
-        }
-    }
-    else if (resources.workerName && !state.releaseTestsRan) {
-        log("Skipping worker and D1 database cleanup because release tests did not run");
-        console.log("⏭️ Skipping worker and D1 database cleanup (release tests did not run)");
-    }
-    else {
-        log("No worker name provided for cleanup");
-    }
-    // Always copy test directory to artifact directory if targetDir exists
-    if (resources.targetDir && options.artifactDir && options.copyProject) {
-        try {
-            // Use the standardized project directory
-            const projectDir = join(options.artifactDir, "project");
-            // Ensure directory exists
-            await mkdirp(projectDir);
-            // Use a simple project directory name without timestamp
-            const testResult = state.exitCode === 0 ? "passed" : "failed";
-            const artifactTargetDir = projectDir;
-            log("Copying test directory to artifacts: %s → %s", resources.targetDir, artifactTargetDir);
-            console.log(`📦 Copying test directory to artifacts: ${artifactTargetDir}`);
-            // Remove existing project directory if it exists
-            if (await pathExists(artifactTargetDir)) {
-                await fs.rm(artifactTargetDir, { recursive: true, force: true });
-            }
-            // Create gitignore filter for copying to artifacts
-            let ig = ignore();
-            const gitignorePath = join(resources.targetDir, ".gitignore");
-            if (await pathExists(gitignorePath)) {
-                log("Found .gitignore file at %s", gitignorePath);
-                const gitignoreContent = await fs.readFile(gitignorePath, "utf-8");
-                ig = ig.add(gitignoreContent);
-            }
-            else {
-                log("No .gitignore found, using default ignore patterns");
-                // Add default ignores if no .gitignore exists
-                ig = ig.add([
-                    "node_modules",
-                    ".git",
-                    "dist",
-                    "build",
-                    ".DS_Store",
-                    "coverage",
-                    ".cache",
-                    ".wrangler",
-                    ".env",
-                ].join("\n"));
-            }
-            // Copy project directory respecting the .gitignore
-            await copy(resources.targetDir, artifactTargetDir, {
-                filter: (src) => {
-                    // Get path relative to project directory
-                    const relativePath = relative(resources.targetDir, src);
-                    if (!relativePath)
-                        return true; // Include the root directory
-                    // Check against ignore patterns
-                    const result = !ig.ignores(relativePath);
-                    return result;
-                },
-            });
-            log("Project directory copied successfully");
-            console.log(`✅ Test directory copied to artifacts: ${artifactTargetDir}`);
-        }
-        catch (error) {
-            log("Error copying test directory to artifacts: %O", error);
-            console.error(`Error copying test directory to artifacts: ${error instanceof Error ? error.message : String(error)}`);
-            // Record this issue
-            state.failures.push({
-                step: "Artifact Copy",
-                error: error instanceof Error ? error.message : String(error),
-                details: error instanceof Error && error.stack ? error.stack : undefined,
-            });
-        }
-    }
-    // Clean up temporary directory only if keep flag is false and not in CI mode
-    if (resources.tempDirCleanup && !options.keep && !inCIMode) {
-        log("Cleaning up temporary directory");
-        try {
-            await resources.tempDirCleanup();
-            log("Temporary directory cleaned up");
-        }
-        catch (error) {
-            log("Error while cleaning up temporary directory: %O", error);
-            console.error(`Error while cleaning up temporary directory: ${error instanceof Error ? error.message : String(error)}`);
-            // Record this issue
-            state.failures.push({
-                step: "Temporary Directory Cleanup",
-                error: error instanceof Error ? error.message : String(error),
-                details: error instanceof Error && error.stack ? error.stack : undefined,
-            });
-        }
-    }
-    else if (resources.tempDirCleanup && resources.targetDir) {
-        console.log(`📂 Keeping temporary directory for inspection: ${resources.targetDir}`);
-    }
-    log("Resource cleanup completed");
-    // At the end of cleanup, stop log capturing
-    capturer.stop();
-    log("Log capturing stopped");
-}

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

@@ -1,8 +0,0 @@
-/**
- * Creates the smoke test components in the target project directory
- */
-export declare function createSmokeTestComponents(targetDir: string, skipClient?: boolean): Promise<void>;
-/**
- * Modifies the worker.tsx and wrangler.jsonc files to add realtime support
- */
-export declare function modifyAppForRealtime(targetDir: string): Promise<void>;

package/dist/lib/smokeTests/codeUpdates.mjs

@@ -1,229 +0,0 @@
-import { join } from "path";
-import * as fs from "fs/promises";
-import { log } from "./constants.mjs";
-import { getSmokeTestFunctionsTemplate } from "./templates/smokeTestFunctions.template";
-import { getSmokeTestTemplate } from "./templates/SmokeTest.template";
-import { getSmokeTestClientTemplate } from "./templates/SmokeTestClient.template";
-import MagicString from "magic-string";
-import { parse as parseJsonc } from "jsonc-parser";
-/**
- * Creates the smoke test components in the target project directory
- */
-export async function createSmokeTestComponents(targetDir, skipClient = false) {
-    console.log("Creating smoke test components in project...");
-    // Create directories if they don't exist
-    const componentsDir = join(targetDir, "src", "app", "components");
-    log("Creating components directory: %s", componentsDir);
-    await fs.mkdir(componentsDir, { recursive: true });
-    // Create __smokeTestFunctions.ts
-    const smokeTestFunctionsPath = join(componentsDir, "__smokeTestFunctions.ts");
-    log("Creating __smokeTestFunctions.ts at: %s", smokeTestFunctionsPath);
-    const smokeTestFunctionsContent = getSmokeTestFunctionsTemplate();
-    // Create SmokeTest.tsx with conditional client component import
-    const smokeTestPath = join(componentsDir, "__SmokeTest.tsx");
-    log("Creating __SmokeTest.tsx at: %s", smokeTestPath);
-    const smokeTestContent = getSmokeTestTemplate(skipClient);
-    // Write the server files
-    log("Writing SmokeTestFunctions file");
-    await fs.writeFile(smokeTestFunctionsPath, smokeTestFunctionsContent);
-    log("Writing SmokeTest component file");
-    await fs.writeFile(smokeTestPath, smokeTestContent);
-    // Only create client component if not skipping client-side tests
-    if (!skipClient) {
-        // Create SmokeTestClient.tsx
-        const smokeTestClientPath = join(componentsDir, "__SmokeTestClient.tsx");
-        log("Creating __SmokeTestClient.tsx at: %s", smokeTestClientPath);
-        const smokeTestClientContent = getSmokeTestClientTemplate();
-        log("Writing SmokeTestClient component file");
-        await fs.writeFile(smokeTestClientPath, smokeTestClientContent);
-        log("Created client-side smoke test component");
-    }
-    else {
-        log("Skipping client-side smoke test component creation");
-    }
-    // Modify worker.tsx and wrangler.jsonc for realtime support
-    await modifyAppForRealtime(targetDir);
-    log("Smoke test components created successfully");
-    console.log("Created smoke test components:");
-    console.log(`- ${smokeTestFunctionsPath}`);
-    console.log(`- ${smokeTestPath}`);
-    if (!skipClient) {
-        console.log(`- ${join(componentsDir, "__SmokeTestClient.tsx")}`);
-    }
-    else {
-        console.log("- Client component skipped (--skip-client was specified)");
-    }
-}
-/**
- * Modifies the worker.tsx and wrangler.jsonc files to add realtime support
- */
-export async function modifyAppForRealtime(targetDir) {
-    log("Modifying worker.tsx and wrangler.jsonc for realtime support");
-    // Modify worker.tsx
-    const workerPath = join(targetDir, "src", "worker.tsx");
-    if (await fs
-        .access(workerPath)
-        .then(() => true)
-        .catch(() => false)) {
-        log("Found worker.tsx, checking for realtime code");
-        const workerContent = await fs.readFile(workerPath, "utf-8");
-        // Check if the realtime export line already exists
-        const hasRealtimeExport = workerContent.includes('export { RealtimeDurableObject } from "rwsdk/realtime/durableObject"');
-        const hasRealtimeRoute = workerContent.includes("realtimeRoute(");
-        const hasEnvImport = workerContent.includes('import { env } from "cloudflare:workers"');
-        if (!hasRealtimeExport || !hasRealtimeRoute || !hasEnvImport) {
-            log("Need to modify worker.tsx for realtime support");
-            const s = new MagicString(workerContent);
-            // Add the export line if it doesn't exist
-            if (!hasRealtimeExport) {
-                const importRegex = /import.*?from.*?;\n/g;
-                let lastImportMatch;
-                let lastImportPosition = 0;
-                // Find the position after the last import statement
-                while ((lastImportMatch = importRegex.exec(workerContent)) !== null) {
-                    lastImportPosition =
-                        lastImportMatch.index + lastImportMatch[0].length;
-                }
-                if (lastImportPosition > 0) {
-                    s.appendRight(lastImportPosition, 'export { RealtimeDurableObject } from "rwsdk/realtime/durableObject";\n');
-                    log("Added RealtimeDurableObject export");
-                }
-            }
-            // Add the env import if it doesn't exist
-            if (!hasEnvImport) {
-                const importRegex = /import.*?from.*?;\n/g;
-                let firstImportMatch = importRegex.exec(workerContent);
-                if (firstImportMatch) {
-                    s.appendLeft(firstImportMatch.index, 'import { env } from "cloudflare:workers";\n');
-                    log("Added env import from cloudflare:workers");
-                }
-            }
-            // Add the realtimeRoute line if it doesn't exist
-            if (!hasRealtimeRoute) {
-                const defineAppMatch = workerContent.match(/export default defineApp\(\[/);
-                if (defineAppMatch && defineAppMatch.index !== undefined) {
-                    const insertPosition = defineAppMatch.index + defineAppMatch[0].length;
-                    s.appendRight(insertPosition, "\n  realtimeRoute(() => env.REALTIME_DURABLE_OBJECT),");
-                    log("Added realtimeRoute to defineApp");
-                }
-            }
-            // Import realtimeRoute if it's not already imported
-            if (!workerContent.includes("realtimeRoute")) {
-                // First check if we already have the import from rwsdk/realtime/worker
-                const realtimeImportMatch = workerContent.match(/import.*?from "rwsdk\/realtime\/worker";/);
-                if (realtimeImportMatch) {
-                    // If we have the import but not the specific function, add it
-                    if (!realtimeImportMatch[0].includes("realtimeRoute")) {
-                        s.replace(realtimeImportMatch[0], realtimeImportMatch[0].replace(/import (.*?) from "rwsdk\/realtime\/worker";/, (match, imports) => {
-                            if (imports.includes("{") && imports.includes("}")) {
-                                // It's a named import
-                                return imports.includes("realtimeRoute")
-                                    ? match
-                                    : match.replace(/\{ (.*?) \}/, `{ realtimeRoute, $1 }`);
-                            }
-                            else {
-                                // It's a default import or something else
-                                return `import { realtimeRoute } from "rwsdk/realtime/worker";${match}`;
-                            }
-                        }));
-                    }
-                }
-                else {
-                    // We don't have the rwsdk/realtime/worker import at all, add it
-                    const importRegex = /import.*?from.*?;\n/g;
-                    let lastImportMatch;
-                    let lastImportPosition = 0;
-                    // Find the position after the last import statement
-                    while ((lastImportMatch = importRegex.exec(workerContent)) !== null) {
-                        lastImportPosition =
-                            lastImportMatch.index + lastImportMatch[0].length;
-                    }
-                    if (lastImportPosition > 0) {
-                        s.appendRight(lastImportPosition, 'import { realtimeRoute } from "rwsdk/realtime/worker";\n');
-                        log("Added realtimeRoute import from rwsdk/realtime/worker");
-                    }
-                }
-            }
-            // Write the modified file
-            await fs.writeFile(workerPath, s.toString(), "utf-8");
-            log("Successfully modified worker.tsx");
-        }
-        else {
-            log("worker.tsx already has realtime support, no changes needed");
-        }
-    }
-    else {
-        log("worker.tsx not found, skipping modification");
-    }
-    // Modify wrangler.jsonc
-    const wranglerPath = join(targetDir, "wrangler.jsonc");
-    if (await fs
-        .access(wranglerPath)
-        .then(() => true)
-        .catch(() => false)) {
-        log("Found wrangler.jsonc, checking for realtime durable objects");
-        const wranglerContent = await fs.readFile(wranglerPath, "utf-8");
-        const wranglerConfig = parseJsonc(wranglerContent);
-        let modified = false;
-        // Check if REALTIME_DURABLE_OBJECT already exists in durable_objects bindings
-        const hasDurableObjectBinding = wranglerConfig.durable_objects?.bindings?.some((binding) => binding.name === "REALTIME_DURABLE_OBJECT");
-        // Check if RealtimeDurableObject is already in migrations
-        const hasMigration = wranglerConfig.migrations?.some((migration) => migration.new_sqlite_classes?.includes("RealtimeDurableObject"));
-        if (!hasDurableObjectBinding || !hasMigration) {
-            log("Need to modify wrangler.jsonc for realtime support");
-            // Create a deep copy of the config to make modifications
-            const newConfig = JSON.parse(JSON.stringify(wranglerConfig));
-            // Add durable objects binding if needed
-            if (!hasDurableObjectBinding) {
-                if (!newConfig.durable_objects) {
-                    newConfig.durable_objects = {};
-                }
-                if (!newConfig.durable_objects.bindings) {
-                    newConfig.durable_objects.bindings = [];
-                }
-                newConfig.durable_objects.bindings.push({
-                    name: "REALTIME_DURABLE_OBJECT",
-                    class_name: "RealtimeDurableObject",
-                });
-                modified = true;
-                log("Added REALTIME_DURABLE_OBJECT to durable_objects bindings");
-            }
-            // Add migration if needed
-            if (!hasMigration) {
-                if (!newConfig.migrations) {
-                    newConfig.migrations = [
-                        {
-                            tag: "v1",
-                            new_sqlite_classes: ["RealtimeDurableObject"],
-                        },
-                    ];
-                    modified = true;
-                    log("Added new migrations with RealtimeDurableObject");
-                }
-                else if (newConfig.migrations.length > 0) {
-                    // Add RealtimeDurableObject to the first migration's sqlite classes
-                    const firstMigration = newConfig.migrations[0];
-                    if (!firstMigration.new_sqlite_classes) {
-                        firstMigration.new_sqlite_classes = ["RealtimeDurableObject"];
-                    }
-                    else if (!firstMigration.new_sqlite_classes.includes("RealtimeDurableObject")) {
-                        firstMigration.new_sqlite_classes.push("RealtimeDurableObject");
-                    }
-                    modified = true;
-                    log("Added RealtimeDurableObject to existing migration");
-                }
-            }
-            if (modified) {
-                // Write the modified config back to the file
-                await fs.writeFile(wranglerPath, JSON.stringify(newConfig, null, 2), "utf-8");
-                log("Successfully modified wrangler.jsonc");
-            }
-        }
-        else {
-            log("wrangler.jsonc already has realtime support, no changes needed");
-        }
-    }
-    else {
-        log("wrangler.jsonc not found, skipping modification");
-    }
-}

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

@@ -1,5 +0,0 @@
-import debug from "debug";
-export declare const log: debug.Debugger;
-export declare const TIMEOUT = 30000;
-export declare const RETRIES = 3;
-export declare const REDWOODJS_ACCOUNT_ID = "1634a8e653b2ce7e0f7a23cca8cbd86a";

package/dist/lib/smokeTests/constants.mjs

@@ -1,10 +0,0 @@
-import debug from "debug";
-// Configure debug logger
-if (!process.env.DEBUG) {
-    debug.enable("rwsdk:smoke");
-}
-export const log = debug("rwsdk:smoke");
-export const TIMEOUT = 30000; // 30 seconds timeout
-export const RETRIES = 3;
-// Known Cloudflare account ID - default to RedwoodJS account if we need one
-export const REDWOODJS_ACCOUNT_ID = "1634a8e653b2ce7e0f7a23cca8cbd86a";

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

@@ -1,11 +0,0 @@
-/**
- * Run the local development server and return the URL
- */
-export declare function runDevServer(cwd?: string): Promise<{
-    url: string;
-    stopDev: () => Promise<void>;
-}>;
-/**
- * Runs tests against the development server
- */
-export declare function runDevTest(url: string, artifactDir: string, customPath?: string, browserPath?: string, headless?: boolean, bail?: boolean, skipClient?: boolean, realtime?: boolean, skipHmr?: boolean): Promise<void>;