rwsdk 0.1.17 → 0.1.18-test.20250716133535

package/dist/lib/smokeTests/release.mjs

@@ -285,23 +285,52 @@ export async function runRelease(cwd, projectDir, resourceUniqueKey) {
                 console.error(`Warning: Could not update wrangler.jsonc: ${error}`);
             }
         }
-        // Run release command with our interactive $expect utility
-        log("Running release command with interactive prompts");
-        const result = await $expect("npm run release", [
-            {
-                // Make the pattern more flexible to account for potential whitespace differences
-                expect: /Do you want to proceed with deployment\?\s*\(y\/N\)/i,
-                send: "y\r",
-            },
-        ], {
-            reject: false, // Add reject: false to prevent uncaught promise rejections
-            env: {
-                RWSDK_RENAME_WORKER: "1",
-                RWSDK_RENAME_DB: "1",
-                ...process.env,
-            },
-            cwd,
-        });
+        // Run release command with our interactive $expect utility and retry logic
+        log("Running release command with interactive prompts and retries");
+        const MAX_RETRIES = 3;
+        let lastError = null;
+        let result = null;
+        for (let i = 0; i < MAX_RETRIES; i++) {
+            try {
+                console.log(`\n🚀 Deploying worker to Cloudflare (Attempt ${i + 1}/${MAX_RETRIES})...`);
+                result = await $expect("npm run release", [
+                    {
+                        // Make the pattern more flexible to account for potential whitespace differences
+                        expect: /Do you want to proceed with deployment\?\s*\(y\/N\)/i,
+                        send: "y\r",
+                    },
+                ], {
+                    reject: false, // Add reject: false to prevent uncaught promise rejections
+                    env: {
+                        RWSDK_RENAME_WORKER: "1",
+                        RWSDK_RENAME_DB: "1",
+                        ...process.env,
+                    },
+                    cwd,
+                });
+                // Check exit code to ensure command succeeded
+                if (result.code === 0) {
+                    log(`Release command succeeded on attempt ${i + 1}`);
+                    lastError = null; // Clear last error on success
+                    break; // Exit the loop on success
+                }
+                else {
+                    throw new Error(`Release command failed with exit code ${result.code}`);
+                }
+            }
+            catch (error) {
+                lastError = error;
+                log(`Attempt ${i + 1} failed: ${lastError.message}`);
+                if (i < MAX_RETRIES - 1) {
+                    console.log(`   Waiting 5 seconds before retrying...`);
+                    await setTimeout(5000);
+                }
+            }
+        }
+        if (lastError || !result) {
+            log("ERROR: Release command failed after all retries.");
+            throw lastError || new Error("Release command failed after all retries.");
+        }
         // Check exit code to ensure command succeeded
         if (result.code !== 0) {
             // Add more contextual information about the error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.1.17",
+  "version": "0.1.18-test.20250716133535",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -12,6 +12,13 @@
     "./dist",
     "./bin"
   ],
+  "scripts": {
+    "build": "tsc --build --clean && tsc",
+    "release": "./scripts/release.sh",
+    "test": "vitest --run",
+    "debug:sync": "tsx ./src/scripts/debug-sync.mts",
+    "smoke-test": "tsx ./src/scripts/smoke-test.mts"
+  },
   "exports": {
     "./vite": {
       "default": "./dist/vite/index.mjs",
@@ -152,6 +159,7 @@
   "peerDependencies": {
     "vite": "^6.2.6"
   },
+  "packageManager": "pnpm@9.14.4+sha512.c8180b3fbe4e4bca02c94234717896b5529740a6cbadf19fa78254270403ea2f27d4e1d46a08a0f56c89b63dc8ebfd3ee53326da720273794e6200fcf0d184ab",
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/lodash": "^4.17.16",
@@ -161,12 +169,5 @@
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",
     "vitest": "^3.1.1"
-  },
-  "scripts": {
-    "build": "tsc --build --clean && tsc",
-    "release": "./scripts/release.sh",
-    "test": "vitest --run",
-    "debug:sync": "tsx ./src/scripts/debug-sync.mts",
-    "smoke-test": "tsx ./src/scripts/smoke-test.mts"
   }
-}
+}

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 RedwoodJS Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/lib/compileTsModule.d.mts

@@ -1 +0,0 @@
-export declare const compileTsModule: (tsCode: string) => string;

package/dist/lib/compileTsModule.mjs

@@ -1,27 +0,0 @@
-import ts from "typescript";
-import path from "path";
-export const compileTsModule = (tsCode) => {
-    const tsConfigPath = "./tsconfig.json";
-    // Find the nearest tsconfig.json
-    const configPath = ts.findConfigFile(path.dirname(tsConfigPath), ts.sys.fileExists, path.basename(tsConfigPath));
-    if (!configPath) {
-        throw new Error(`Could not find a valid tsconfig.json at path: ${tsConfigPath}`);
-    }
-    // Read and parse tsconfig.json
-    const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
-    if (configFile.error) {
-        throw new Error(`Error reading tsconfig.json: ${ts.formatDiagnostic(configFile.error, ts.createCompilerHost({}))}`);
-    }
-    const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath));
-    const compilerOptions = parsedConfig.options;
-    // Transpile the TypeScript code using the compiler options
-    const output = ts.transpileModule(tsCode, {
-        compilerOptions,
-        reportDiagnostics: true,
-    });
-    if (output.diagnostics && output.diagnostics.length) {
-        const diagnosticMessages = output.diagnostics.map((diagnostic) => ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n"));
-        throw new Error(`TypeScript Compilation Errors:\n${diagnosticMessages.join("\n")}`);
-    }
-    return output.outputText; // Compiled JavaScript code
-};

package/dist/runtime/entries/navigation.d.ts

@@ -1 +0,0 @@
-export * from "../clientNavigation";

package/dist/runtime/entries/navigation.js

@@ -1 +0,0 @@
-export * from "../clientNavigation";

package/dist/runtime/lib/db/typeInference/builders/table.d.ts

@@ -1,10 +0,0 @@
-import { SqlToTsType, ExecutedBuilder, Prettify } from "../utils";
-import { ColumnDefinitionBuilder } from "./columnDefinition";
-export interface TableBuilder<TName extends string, TSchema extends Record<string, any> = {}> {
-    readonly __tableName: TName;
-    readonly __schema: TSchema;
-    addColumn<K extends string, T extends string>(name: K, type: T, build?: (col: ColumnDefinitionBuilder<SqlToTsType<T>>) => ColumnDefinitionBuilder<SqlToTsType<T>>): TableBuilder<TName, Prettify<TSchema & Record<K, SqlToTsType<T>>>>;
-    temporary(): this;
-    ifNotExists(): this;
-    execute(): Promise<ExecutedBuilder<this>>;
-}

package/dist/runtime/lib/db/typeInference/builders/table.js

@@ -1 +0,0 @@
-export {};

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

@@ -1,3 +0,0 @@
-export declare function injectRSCPayload(rscStream: ReadableStream, { nonce }: {
-    nonce: string;
-}): TransformStream<any, any>;

package/dist/runtime/render/injectRSCPayload.js

@@ -1,79 +0,0 @@
-// port(justinvdm, 10 Mar 2025): This is a modified version of https://github.com/devongovett/rsc-html-stream/blob/main/server.js
-// Modification: We needed to add a nonce attribute to the script tag for CSP
-const encoder = new TextEncoder();
-const trailer = "</body></html>";
-export function injectRSCPayload(rscStream, { nonce }) {
-    let decoder = new TextDecoder();
-    let resolveFlightDataPromise;
-    let flightDataPromise = new Promise((resolve) => (resolveFlightDataPromise = resolve));
-    let startedRSC = false;
-    // Buffer all HTML chunks enqueued during the current tick of the event loop (roughly)
-    // and write them to the output stream all at once. This ensures that we don't generate
-    // invalid HTML by injecting RSC in between two partial chunks of HTML.
-    let buffered = [];
-    let timeout = null;
-    function flushBufferedChunks(controller) {
-        for (let chunk of buffered) {
-            let buf = decoder.decode(chunk);
-            if (buf.endsWith(trailer)) {
-                buf = buf.slice(0, -trailer.length);
-            }
-            controller.enqueue(encoder.encode(buf));
-        }
-        buffered.length = 0;
-        timeout = null;
-    }
-    return new TransformStream({
-        transform(chunk, controller) {
-            buffered.push(chunk);
-            if (timeout) {
-                return;
-            }
-            timeout = setTimeout(async () => {
-                flushBufferedChunks(controller);
-                if (!startedRSC) {
-                    startedRSC = true;
-                    writeRSCStream(rscStream, controller, { nonce })
-                        .catch((err) => controller.error(err))
-                        .then(resolveFlightDataPromise);
-                }
-            }, 0);
-        },
-        async flush(controller) {
-            await flightDataPromise;
-            if (timeout) {
-                clearTimeout(timeout);
-                flushBufferedChunks(controller);
-            }
-            controller.enqueue(encoder.encode("</body></html>"));
-        },
-    });
-}
-async function writeRSCStream(rscStream, controller, { nonce }) {
-    let decoder = new TextDecoder("utf-8", { fatal: true });
-    for await (let chunk of rscStream) {
-        // Try decoding the chunk to send as a string.
-        // If that fails (e.g. binary data that is invalid unicode), write as base64.
-        try {
-            writeChunk(JSON.stringify(decoder.decode(chunk, { stream: true })), controller, { nonce });
-        }
-        catch (err) {
-            let base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
-            writeChunk(`Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`, controller, { nonce });
-        }
-    }
-    let remaining = decoder.decode();
-    if (remaining.length) {
-        writeChunk(JSON.stringify(remaining), controller, { nonce });
-    }
-}
-function writeChunk(chunk, controller, { nonce }) {
-    controller.enqueue(encoder.encode(`<script nonce="${nonce}">${escapeScript(`(self.__FLIGHT_DATA||=[]).push(${chunk})`)}</script>`));
-}
-// Escape closing script tags and HTML comments in JS content.
-// https://www.w3.org/TR/html52/semantics-scripting.html#restrictions-for-contents-of-script-elements
-// Avoid replacing </script with <\/script as it would break the following valid JS: 0</script/ (i.e. regexp literal).
-// Instead, escape the s character.
-function escapeScript(script) {
-    return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
-}

package/dist/scripts/build-vendor-bundles.d.mts

@@ -1 +0,0 @@
-export declare const buildVendorBundles: () => Promise<void>;

package/dist/scripts/build-vendor-bundles.mjs

@@ -1,92 +0,0 @@
-import { resolve } from "node:path";
-import { build, mergeConfig } from "vite";
-import { $ } from "../lib/$.mjs";
-import { VENDOR_DIST_DIR, VENDOR_SRC_DIR } from "../lib/constants.mjs";
-import { unlink } from "fs/promises";
-import { pathExists } from "fs-extra";
-const createConfig = (mode) => ({
-    mode,
-    plugins: [],
-    logLevel: process.env.VERBOSE ? "info" : "error",
-    build: {
-        emptyOutDir: false,
-        sourcemap: true,
-        minify: mode === "production",
-    },
-    define: {
-        "process.env.NODE_ENV": JSON.stringify(mode),
-    },
-});
-const configs = {
-    // Build react internals with server conditions
-    reactServerInternals: (mode) => mergeConfig(createConfig(mode), {
-        build: {
-            outDir: VENDOR_DIST_DIR,
-            lib: {
-                entry: resolve(VENDOR_SRC_DIR, "react-server-internals.js"),
-                name: "react-server-internals",
-                formats: ["es"],
-                fileName: () => `react-server-internals.${mode}.js`,
-            },
-        },
-        resolve: {
-            conditions: ["react-server"],
-        },
-    }),
-    // Build custom React implementation (for both development and production)
-    react: (mode) => mergeConfig(createConfig(mode), {
-        build: {
-            outDir: VENDOR_DIST_DIR,
-            lib: {
-                entry: resolve(VENDOR_SRC_DIR, "react.js"),
-                name: "react",
-                formats: ["es"],
-                fileName: () => `react.${mode}.js`,
-            },
-        },
-        resolve: {
-            alias: {
-                "react-server-internals": resolve(VENDOR_DIST_DIR, `react-server-internals.${mode}.js`),
-            },
-        },
-    }),
-};
-export const buildVendorBundles = async () => {
-    console.log("Cleaning vendor directory...");
-    await $ `pnpm clean:vendor`;
-    // Build for both development and production modes
-    const modes = ["development", "production"];
-    // Build the temporary server internals files first
-    console.log("Building react-server-internals...");
-    for (const mode of modes) {
-        await build(configs.reactServerInternals(mode));
-    }
-    // Build React using the server internals
-    console.log("Building React custom builds...");
-    for (const mode of modes) {
-        await build(configs.react(mode));
-    }
-    // Clean up temporary server internals files
-    console.log("Cleaning up temporary server internals files...");
-    for (const mode of modes) {
-        const serverInternalsFile = resolve(VENDOR_DIST_DIR, `react-server-internals.${mode}.js`);
-        const serverInternalsMapFile = `${serverInternalsFile}.map`;
-        try {
-            // Delete the server internals JavaScript file
-            if (await pathExists(serverInternalsFile)) {
-                await unlink(serverInternalsFile);
-            }
-            // Delete the source map file if it exists
-            if (await pathExists(serverInternalsMapFile)) {
-                await unlink(serverInternalsMapFile);
-            }
-        }
-        catch (error) {
-            console.warn(`Warning: Failed to delete ${serverInternalsFile}`, error);
-        }
-    }
-    console.log("Done building vendor bundles");
-};
-if (import.meta.url === new URL(process.argv[1], import.meta.url).href) {
-    buildVendorBundles();
-}

package/dist/vite/aliasByEnvPlugin.d.mts

@@ -1,2 +0,0 @@
-import { Plugin } from "vite";
-export declare const aliasByEnvPlugin: (aliasesByEnv: Record<string, Record<string, string>>) => Plugin;

package/dist/vite/aliasByEnvPlugin.mjs

@@ -1,11 +0,0 @@
-export const aliasByEnvPlugin = (aliasesByEnv) => ({
-    name: "rw-sdk-env-alias",
-    enforce: "pre",
-    resolveId(id, importer) {
-        const aliases = aliasesByEnv[this.environment.name] ?? {};
-        const alias = aliases[id];
-        if (alias) {
-            return alias;
-        }
-    },
-});

package/dist/vite/asyncSetupPlugin.d.mts

@@ -1,6 +0,0 @@
-import { Plugin } from "vite";
-export declare const asyncSetupPlugin: ({ setup, }: {
-    setup: ({ command }: {
-        command: "serve" | "build";
-    }) => Promise<unknown>;
-}) => Plugin[];

package/dist/vite/asyncSetupPlugin.mjs

@@ -1,23 +0,0 @@
-export const asyncSetupPlugin = ({ setup, }) => {
-    let taskPromise = Promise.resolve(null);
-    return [
-        {
-            name: "rw-sdk-async-setup:serve",
-            apply: "serve",
-            configureServer(server) {
-                taskPromise = setup({ command: "serve" });
-                server.middlewares.use(async (_req, _res, next) => {
-                    await taskPromise;
-                    next();
-                });
-            },
-        },
-        {
-            name: "rw-sdk-async-setup:build",
-            apply: "build",
-            async buildStart() {
-                await setup({ command: "build" });
-            },
-        },
-    ];
-};

package/dist/vite/copyPrismaWasmPlugin.d.mts

@@ -1,4 +0,0 @@
-import { Plugin } from "vite";
-export declare const copyPrismaWasmPlugin: ({ rootDir, }: {
-    rootDir: string;
-}) => Plugin;

package/dist/vite/copyPrismaWasmPlugin.mjs

@@ -1,32 +0,0 @@
-import { copy, pathExists } from "fs-extra";
-import { resolve } from "node:path";
-import MagicString from "magic-string";
-import path from "path";
-export const copyPrismaWasmPlugin = ({ rootDir, }) => ({
-    name: "rwsdk:copy-prisma-wasm",
-    enforce: "post",
-    apply: "build",
-    async writeBundle() {
-        const wasmFilePath = resolve(rootDir, "node_modules/.prisma/client/query_engine_bg.wasm");
-        const fileName = path.basename(wasmFilePath);
-        const outputPath = path.resolve(rootDir, "dist", "worker", fileName);
-        if (await pathExists(wasmFilePath)) {
-            await copy(wasmFilePath, outputPath);
-            console.log(`✅ Copied ${fileName} from ${wasmFilePath} to ${outputPath}`);
-        }
-    },
-    renderChunk(code) {
-        if (!code.includes(".wasm")) {
-            return;
-        }
-        const s = new MagicString(code);
-        s.replace(/import\(["'](.+?\.wasm)["']\)/g, (_, filePath) => {
-            const fileName = path.basename(filePath);
-            return `import("./${fileName}")`;
-        });
-        return {
-            code: s.toString(),
-            map: s.generateMap(),
-        };
-    },
-});

package/dist/vite/customReactBuildPlugin.d.mts

@@ -1,4 +0,0 @@
-import { Plugin } from "vite";
-export declare const customReactBuildPlugin: ({ projectRootDir, }: {
-    projectRootDir: string;
-}) => Promise<Plugin>;

package/dist/vite/customReactBuildPlugin.mjs

@@ -1,61 +0,0 @@
-import { resolve } from "path";
-import { mkdirp, copy } from "fs-extra";
-import { VENDOR_DIST_DIR } from "../lib/constants.mjs";
-const copyReactFiles = async (viteDistDir) => {
-    await mkdirp(viteDistDir);
-    await copy(resolve(VENDOR_DIST_DIR, "react.js"), resolve(viteDistDir, "react.js"));
-    await copy(resolve(VENDOR_DIST_DIR, "react.js.map"), resolve(viteDistDir, "react.js.map"));
-    await copy(resolve(VENDOR_DIST_DIR, "react-dom-server-edge.js"), resolve(viteDistDir, "react-dom-server-edge.js"));
-    await copy(resolve(VENDOR_DIST_DIR, "react-dom-server-edge.js.map"), resolve(viteDistDir, "react-dom-server-edge.js.map"));
-};
-export const customReactBuildPlugin = async ({ projectRootDir, }) => {
-    const viteDistDir = resolve(projectRootDir, "node_modules", ".vite_@redwoodjs/sdk");
-    await copyReactFiles(viteDistDir);
-    return {
-        name: "custom-react-build-plugin",
-        enforce: "pre",
-        applyToEnvironment: (environment) => {
-            return environment.name === "worker";
-        },
-        async configureServer() {
-            await mkdirp(viteDistDir);
-            await copy(resolve(VENDOR_DIST_DIR, "react.js"), resolve(viteDistDir, "react.js"));
-            await copy(resolve(VENDOR_DIST_DIR, "react.js.map"), resolve(viteDistDir, "react.js.map"));
-            await copy(resolve(VENDOR_DIST_DIR, "react-dom-server-edge.js"), resolve(viteDistDir, "react-dom-server-edge.js"));
-            await copy(resolve(VENDOR_DIST_DIR, "react-dom-server-edge.js.map"), resolve(viteDistDir, "react-dom-server-edge.js.map"));
-        },
-        resolveId(id) {
-            if (id === "react") {
-                return resolve(viteDistDir, "react.js");
-            }
-            if (id === "react-dom/server.edge" || id === "react-dom/server") {
-                return resolve(viteDistDir, "react-dom-server-edge.js");
-            }
-        },
-        config: () => ({
-            environments: {
-                worker: {
-                    optimizeDeps: {
-                        esbuildOptions: {
-                            plugins: [
-                                {
-                                    name: "rewrite-react-imports",
-                                    setup(build) {
-                                        build.onResolve({ filter: /^react$/ }, (args) => {
-                                            return { path: resolve(viteDistDir, "react.js") };
-                                        });
-                                        build.onResolve({ filter: /^react-dom\/server\.edge$/ }, (args) => {
-                                            return {
-                                                path: resolve(viteDistDir, "react-dom-server-edge.js"),
-                                            };
-                                        });
-                                    },
-                                },
-                            ],
-                        },
-                    },
-                },
-            },
-        }),
-    };
-};

package/dist/vite/injectHmrPreambleJsxPlugin.d.mts

@@ -1,2 +0,0 @@
-import { type Plugin } from "vite";
-export declare const injectHmrPreambleJsxPlugin: () => Plugin;

package/dist/vite/injectHmrPreambleJsxPlugin.mjs

@@ -1,22 +0,0 @@
-import MagicString from "magic-string";
-export const injectHmrPreambleJsxPlugin = () => ({
-    name: "rw-sdk-inject-hmr-preamble",
-    apply: "serve",
-    async transform(code, id) {
-        const htmlHeadRE = /jsxDEV\("html",[^]*?jsxDEV\("head",[^]*?\[(.*?)\]/s;
-        const match = code.match(htmlHeadRE);
-        if (!match) {
-            return;
-        }
-        const s = new MagicString(code);
-        const headContentStart = match.index + match[0].lastIndexOf("[");
-        s.appendLeft(headContentStart + 1, `jsxDEV("script", { 
-        type: "module",
-        src: "/__vite_preamble__",
-      }),`);
-        return {
-            code: s.toString(),
-            map: s.generateMap(),
-        };
-    },
-});

package/dist/vite/miniflarePlugin.d.mts

@@ -1,9 +0,0 @@
-import { Plugin } from "vite";
-import { cloudflare } from "@cloudflare/vite-plugin";
-type BasePluginOptions = Parameters<typeof cloudflare>[0];
-type MiniflarePluginOptions = BasePluginOptions & {};
-export declare const miniflarePlugin: (givenOptions: MiniflarePluginOptions & {
-    rootDir: string;
-    workerEntryPathname: string;
-}) => (Plugin | Plugin[])[];
-export {};