rwsdk 1.0.0-alpha.9 → 1.0.0-beta.0

package/dist/lib/constants.mjs

@@ -1,5 +1,4 @@
-import { resolve } from "node:path";
-import path from "node:path";
+import path, { resolve } from "node:path";
 const __dirname = new URL(".", import.meta.url).pathname;
 export const ROOT_DIR = resolve(__dirname, "..", "..");
 export const SRC_DIR = resolve(ROOT_DIR, "src");

package/dist/lib/e2e/browser.d.mts

@@ -1,5 +1,5 @@
-import { SmokeTestOptions } from "./types.mjs";
 import type { Browser } from "puppeteer-core";
+import { SmokeTestOptions } from "./types.mjs";
 /**
  * Launch a browser instance
  */

package/dist/lib/e2e/browser.mjs

@@ -1,9 +1,8 @@
+import { computeExecutablePath, detectBrowserPlatform, install, Browser as PuppeteerBrowser, resolveBuildId, } from "@puppeteer/browsers";
+import debug from "debug";
+import { mkdirp, pathExists } from "fs-extra";
 import * as os from "os";
 import { join } from "path";
-import { pathExists } from "fs-extra";
-import debug from "debug";
-import { mkdirp } from "fs-extra";
-import { install, resolveBuildId, computeExecutablePath, detectBrowserPlatform, Browser as PuppeteerBrowser, } from "@puppeteer/browsers";
 import puppeteer from "puppeteer-core";
 const log = debug("rwsdk:e2e:browser");
 /**

package/dist/lib/e2e/dev.mjs

@@ -1,6 +1,10 @@
-import { setTimeout } from "node:timers/promises";
 import debug from "debug";
+import { setTimeout as sleep } from "node:timers/promises";
 import { $ } from "../../lib/$.mjs";
+import { poll } from "./poll.mjs";
+const DEV_SERVER_CHECK_TIMEOUT = process.env.RWSDK_DEV_SERVER_CHECK_TIMEOUT
+    ? parseInt(process.env.RWSDK_DEV_SERVER_CHECK_TIMEOUT, 10)
+    : 5 * 60 * 1000;
 const log = debug("rwsdk:e2e:dev");
 /**
  * Run the local development server and return the URL
@@ -12,59 +16,47 @@ export async function runDevServer(packageManager = "pnpm", cwd) {
     let isErrorExpected = false;
     const stopDev = async () => {
         isErrorExpected = true;
-        if (!devProcess) {
-            log("No dev process to stop");
+        if (!devProcess || !devProcess.pid) {
+            log("No dev process to stop or PID is missing");
             return;
         }
         console.log("Stopping development server...");
         try {
-            // Send a regular termination signal first
-            devProcess.kill();
-            // Wait for the process to terminate with a timeout
-            const terminationTimeout = 5000; // 5 seconds timeout
-            const terminationPromise = Promise.race([
-                // Wait for natural process termination
-                (async () => {
-                    try {
-                        await devProcess;
-                        log("Dev server process was terminated normally");
-                        return true;
-                    }
-                    catch (e) {
-                        // Expected error when the process is killed
-                        log("Dev server process was terminated");
-                        return true;
-                    }
-                })(),
-                // Or timeout
-                (async () => {
-                    await setTimeout(terminationTimeout);
-                    return false;
-                })(),
-            ]);
-            // Check if process terminated within timeout
-            const terminated = await terminationPromise;
-            // If not terminated within timeout, force kill
-            if (!terminated) {
-                log("Dev server process did not terminate within timeout, force killing with SIGKILL");
-                console.log("⚠️ Development server not responding after 5 seconds timeout, force killing...");
-                // Try to kill with SIGKILL if the process still has a pid
-                if (devProcess.pid) {
-                    try {
-                        // Use process.kill with SIGKILL for a stronger termination
-                        process.kill(devProcess.pid, "SIGKILL");
-                        log("Sent SIGKILL to process %d", devProcess.pid);
-                    }
-                    catch (killError) {
-                        log("Error sending SIGKILL to process: %O", killError);
-                        // Non-fatal, as the process might already be gone
-                    }
-                }
-            }
+            // Send a regular termination signal to the entire process group first
+            process.kill(-devProcess.pid, "SIGTERM");
         }
         catch (e) {
-            // Process might already have exited
-            log("Could not kill dev server process: %O", e);
+            log("Could not send SIGTERM to dev server process group: %O", e);
+        }
+        // Wait for the process to terminate with a timeout
+        const terminationTimeout = 5000; // 5 seconds
+        const processExitPromise = devProcess.catch(() => {
+            // We expect this promise to reject when the process is killed,
+            // so we catch and ignore the error.
+        });
+        const timeoutPromise = new Promise((resolve) => setTimeout(() => resolve(undefined), terminationTimeout));
+        await Promise.race([processExitPromise, timeoutPromise]);
+        // Check if the process is still alive. We can't reliably check exitCode
+        // on a detached process, so we try sending a signal 0, which errors
+        // if the process doesn't exist.
+        let isAlive = true;
+        try {
+            // Sending signal 0 doesn't kill the process, but checks if it exists
+            process.kill(-devProcess.pid, 0);
+        }
+        catch (e) {
+            isAlive = false;
+        }
+        // If not terminated within timeout, force kill the entire process group
+        if (isAlive) {
+            log("Dev server process did not terminate within timeout, force killing with SIGKILL");
+            console.log("⚠️ Development server not responding after 5 seconds timeout, force killing...");
+            try {
+                process.kill(-devProcess.pid, "SIGKILL");
+            }
+            catch (e) {
+                log("Could not send SIGKILL to dev server process group: %O", e);
+            }
         }
         console.log("Development server stopped");
     };
@@ -96,7 +88,7 @@ export async function runDevServer(packageManager = "pnpm", cwd) {
         // Use the provided cwd if available
         devProcess = $({
             all: true,
-            detached: false, // Keep attached so we can access streams
+            detached: true, // Run in a new process group so we can kill the entire group
             cleanup: false, // Don't auto-kill on exit
             cwd: cwd || process.cwd(), // Use provided directory or current directory
             env, // Pass the updated environment variables
@@ -104,8 +96,10 @@ export async function runDevServer(packageManager = "pnpm", cwd) {
         }) `${pm} run dev`;
         devProcess.catch((error) => {
             if (!isErrorExpected) {
-                // Just throw the error, let the caller handle it.
-                throw error;
+                // Don't re-throw. The error will be handled gracefully by the polling
+                // logic in `waitForUrl`, which will detect that the process has exited.
+                // Re-throwing here would cause an unhandled promise rejection.
+                log("Dev server process exited unexpectedly:", error.shortMessage);
             }
         });
         log("Development server process spawned in directory: %s", cwd || process.cwd());
@@ -211,7 +205,7 @@ export async function runDevServer(packageManager = "pnpm", cwd) {
                     log("ERROR: Development server process exited with code %d. Final output: %s", devProcess.exitCode, allOutput);
                     throw new Error(`Development server process exited with code ${devProcess.exitCode}`);
                 }
-                await setTimeout(500); // Check every 500ms
+                await sleep(500); // Check every 500ms
             }
             log("ERROR: Timed out waiting for dev server URL. Final accumulated output: %s", allOutput);
             throw new Error("Timed out waiting for dev server URL");
@@ -219,6 +213,22 @@ export async function runDevServer(packageManager = "pnpm", cwd) {
         // Wait for the URL
         const serverUrl = await waitForUrl();
         console.log(`✅ Development server started at ${serverUrl}`);
+        // Poll the URL to ensure it's live before proceeding
+        await poll(async () => {
+            try {
+                const response = await fetch(serverUrl, {
+                    signal: AbortSignal.timeout(1000),
+                });
+                // We consider any response (even 4xx or 5xx) as success,
+                // as it means the worker is routable.
+                return response.status > 0;
+            }
+            catch (e) {
+                return false;
+            }
+        }, {
+            timeout: DEV_SERVER_CHECK_TIMEOUT,
+        });
         return { url: serverUrl, stopDev };
     }
     catch (error) {

package/dist/lib/e2e/environment.d.mts

@@ -1,13 +1,9 @@
 import tmp from "tmp-promise";
-import { SmokeTestOptions, TestResources, PackageManager } from "./types.mjs";
-/**
- * Sets up the test environment, preparing any resources needed for testing
- */
-export declare function setupTestEnvironment(options?: SmokeTestOptions): Promise<TestResources>;
+import { PackageManager } from "./types.mjs";
 /**
  * Copy project to a temporary directory with a unique name
  */
-export declare function copyProjectToTempDir(projectDir: string, resourceUniqueKey: string, packageManager?: PackageManager): Promise<{
+export declare function copyProjectToTempDir(projectDir: string, resourceUniqueKey: string, packageManager?: PackageManager, monorepoRoot?: string): Promise<{
     tempDir: tmp.DirectoryResult;
     targetDir: string;
     workerName: string;

package/dist/lib/e2e/environment.mjs

@@ -1,15 +1,14 @@
-import { join } from "path";
 import debug from "debug";
-import { pathExists, copy } from "fs-extra";
+import { copy, pathExists } from "fs-extra";
+import ignore from "ignore";
 import * as fs from "node:fs";
+import path from "node:path";
+import os from "os";
+import { basename, join, relative, resolve } from "path";
 import tmp from "tmp-promise";
-import ignore from "ignore";
-import { relative, basename, resolve } from "path";
-import { uniqueNamesGenerator, adjectives, animals, } from "unique-names-generator";
-import { createHash } from "crypto";
 import { $ } from "../../lib/$.mjs";
 import { ROOT_DIR } from "../constants.mjs";
-import path from "node:path";
+import { retry } from "./retry.mjs";
 const log = debug("rwsdk:e2e:environment");
 const createSdkTarball = async () => {
     const packResult = await $({ cwd: ROOT_DIR, stdio: "pipe" }) `npm pack`;
@@ -24,83 +23,36 @@ const createSdkTarball = async () => {
     };
     return { tarballPath, cleanupTarball };
 };
-const setTarballDependency = async (targetDir, tarballPath) => {
+const setTarballDependency = async (targetDir, tarballName) => {
     const filePath = join(targetDir, "package.json");
     const packageJson = await fs.promises.readFile(filePath, "utf-8");
     const packageJsonContent = JSON.parse(packageJson);
-    packageJsonContent.dependencies.rwsdk = `file:${tarballPath}`;
+    packageJsonContent.dependencies.rwsdk = `file:${tarballName}`;
     await fs.promises.writeFile(filePath, JSON.stringify(packageJsonContent, null, 2));
 };
-/**
- * Sets up the test environment, preparing any resources needed for testing
- */
-export async function setupTestEnvironment(options = {}) {
-    log("Setting up test environment with options: %O", options);
-    // Generate a resource unique key for this test run right at the start
-    const uniqueNameSuffix = uniqueNamesGenerator({
-        dictionaries: [adjectives, animals],
-        separator: "-",
-        length: 2,
-        style: "lowerCase",
-    });
-    // Create a short unique hash based on the timestamp
-    const hash = createHash("md5")
-        .update(Date.now().toString())
-        .digest("hex")
-        .substring(0, 8);
-    // Create a resource unique key even if we're not copying a project
-    const resourceUniqueKey = `${uniqueNameSuffix}-${hash}`;
-    const resources = {
-        tempDirCleanup: undefined,
-        workerName: undefined,
-        originalCwd: process.cwd(),
-        targetDir: undefined,
-        workerCreatedDuringTest: false,
-        stopDev: undefined,
-        resourceUniqueKey, // Set at initialization
-    };
-    log("Current working directory: %s", resources.originalCwd);
-    try {
-        // If a project dir is specified, copy it to a temp dir with a unique name
-        if (options.projectDir) {
-            log("Project directory specified: %s", options.projectDir);
-            const { tempDir, targetDir, workerName } = await copyProjectToTempDir(options.projectDir, resourceUniqueKey, // Pass in the existing resourceUniqueKey
-            options.packageManager);
-            // Store cleanup function
-            resources.tempDirCleanup = tempDir.cleanup;
-            resources.workerName = workerName;
-            resources.targetDir = targetDir;
-            log("Target directory: %s", targetDir);
-        }
-        else {
-            log("No project directory specified, using current directory");
-            // When no project dir is specified, we'll use the current directory
-            resources.targetDir = resources.originalCwd;
-        }
-        return resources;
-    }
-    catch (error) {
-        log("Error during test environment setup: %O", error);
-        throw error;
-    }
-}
 /**
  * Copy project to a temporary directory with a unique name
  */
-export async function copyProjectToTempDir(projectDir, resourceUniqueKey, packageManager) {
+export async function copyProjectToTempDir(projectDir, resourceUniqueKey, packageManager, monorepoRoot) {
     const { tarballPath, cleanupTarball } = await createSdkTarball();
     try {
         log("Creating temporary directory for project");
         // Create a temporary directory
         const tempDir = await tmp.dir({ unsafeCleanup: true });
+        // Determine the source directory to copy from
+        const sourceDir = monorepoRoot || projectDir;
         // Create unique project directory name
-        const originalDirName = basename(projectDir);
+        const originalDirName = basename(sourceDir);
         const workerName = `${originalDirName}-test-${resourceUniqueKey}`;
-        const targetDir = resolve(tempDir.path, workerName);
-        console.log(`Copying project from ${projectDir} to ${targetDir}`);
+        const tempCopyRoot = resolve(tempDir.path, workerName);
+        // If it's a monorepo, the targetDir for commands is a subdirectory
+        const targetDir = monorepoRoot
+            ? resolve(tempCopyRoot, relative(monorepoRoot, projectDir))
+            : tempCopyRoot;
+        console.log(`Copying project from ${sourceDir} to ${tempCopyRoot}`);
         // Read project's .gitignore if it exists
         let ig = ignore();
-        const gitignorePath = join(projectDir, ".gitignore");
+        const gitignorePath = join(sourceDir, ".gitignore");
         if (await pathExists(gitignorePath)) {
             log("Found .gitignore file at %s", gitignorePath);
             const gitignoreContent = await fs.promises.readFile(gitignorePath, "utf-8");
@@ -123,10 +75,10 @@ export async function copyProjectToTempDir(projectDir, resourceUniqueKey, packag
         }
         // Copy the project directory, respecting .gitignore
         log("Starting copy process with ignored patterns");
-        await copy(projectDir, targetDir, {
+        await copy(sourceDir, tempCopyRoot, {
             filter: (src) => {
                 // Get path relative to project directory
-                const relativePath = relative(projectDir, src);
+                const relativePath = relative(sourceDir, src);
                 if (!relativePath)
                     return true; // Include the root directory
                 // Check against ignore patterns
@@ -135,6 +87,32 @@ export async function copyProjectToTempDir(projectDir, resourceUniqueKey, packag
             },
         });
         log("Project copy completed successfully");
+        // Copy the SDK tarball into the target directory
+        const tarballFilename = basename(tarballPath);
+        const tempTarballPath = join(targetDir, tarballFilename);
+        await fs.promises.copyFile(tarballPath, tempTarballPath);
+        if (monorepoRoot) {
+            log("⚙️  Configuring monorepo workspace...");
+            const rwsdkWsPath = join(tempCopyRoot, "rwsdk-workspace.json");
+            if (await pathExists(rwsdkWsPath)) {
+                const rwsdkWs = JSON.parse(await fs.promises.readFile(rwsdkWsPath, "utf-8"));
+                const workspaces = rwsdkWs.workspaces;
+                if (packageManager === "pnpm") {
+                    const pnpmWsPath = join(tempCopyRoot, "pnpm-workspace.yaml");
+                    const pnpmWsConfig = `packages:\n${workspaces.map((w) => `  - '${w}'`).join("\n")}\n`;
+                    await fs.promises.writeFile(pnpmWsPath, pnpmWsConfig);
+                    log("Created pnpm-workspace.yaml");
+                }
+                else {
+                    // For npm and yarn, add a workspaces property to package.json
+                    const pkgJsonPath = join(tempCopyRoot, "package.json");
+                    const pkgJson = JSON.parse(await fs.promises.readFile(pkgJsonPath, "utf-8"));
+                    pkgJson.workspaces = workspaces;
+                    await fs.promises.writeFile(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
+                    log("Added workspaces to package.json");
+                }
+            }
+        }
         // Configure temp project to not use frozen lockfile
         log("⚙️  Configuring temp project to not use frozen lockfile...");
         const npmrcPath = join(targetDir, ".npmrc");
@@ -142,17 +120,24 @@ export async function copyProjectToTempDir(projectDir, resourceUniqueKey, packag
         // For yarn, create .yarnrc.yml to disable PnP and allow lockfile changes
         if (packageManager === "yarn") {
             const yarnrcPath = join(targetDir, ".yarnrc.yml");
+            const yarnCacheDir = path.join(os.tmpdir(), "yarn-cache");
+            await fs.promises.mkdir(yarnCacheDir, { recursive: true });
             const yarnConfig = [
                 // todo(justinvdm, 23-09-23): Support yarn pnpm
                 "nodeLinker: node-modules",
                 "enableImmutableInstalls: false",
+                `cacheFolder: "${yarnCacheDir}"`,
             ].join("\n");
             await fs.promises.writeFile(yarnrcPath, yarnConfig);
             log("Created .yarnrc.yml to allow lockfile changes for yarn");
         }
-        await setTarballDependency(targetDir, tarballPath);
+        await setTarballDependency(targetDir, tarballFilename);
         // Install dependencies in the target directory
-        await installDependencies(targetDir, packageManager);
+        const installDir = monorepoRoot ? tempCopyRoot : targetDir;
+        await retry(() => installDependencies(installDir, packageManager), {
+            retries: 3,
+            delay: 1000,
+        });
         // Return the environment details
         return { tempDir, targetDir, workerName };
     }
@@ -193,9 +178,11 @@ async function installDependencies(targetDir, packageManager = "pnpm") {
                 });
             }
         }
+        const npmCacheDir = path.join(os.tmpdir(), "npm-cache");
+        await fs.promises.mkdir(npmCacheDir, { recursive: true });
         const installCommand = {
             pnpm: ["pnpm", "install"],
-            npm: ["npm", "install"],
+            npm: ["npm", "install", "--cache", npmCacheDir],
             yarn: ["yarn", "install"],
             "yarn-classic": ["yarn"],
         }[packageManager];

package/dist/lib/e2e/index.d.mts

@@ -1,7 +1,8 @@
-export * from "./testHarness.mjs";
-export * from "./tarball.mjs";
-export * from "./environment.mjs";
-export * from "./dev.mjs";
 export * from "./browser.mjs";
+export * from "./dev.mjs";
+export * from "./environment.mjs";
+export * from "./poll.mjs";
 export * from "./release.mjs";
+export * from "./tarball.mjs";
+export * from "./testHarness.mjs";
 export * from "./types.mjs";

package/dist/lib/e2e/index.mjs

@@ -1,7 +1,8 @@
-export * from "./testHarness.mjs";
-export * from "./tarball.mjs";
-export * from "./environment.mjs";
-export * from "./dev.mjs";
 export * from "./browser.mjs";
+export * from "./dev.mjs";
+export * from "./environment.mjs";
+export * from "./poll.mjs";
 export * from "./release.mjs";
+export * from "./tarball.mjs";
+export * from "./testHarness.mjs";
 export * from "./types.mjs";

package/dist/lib/e2e/poll.d.mts

@@ -0,0 +1,8 @@
+export interface PollOptions {
+    timeout: number;
+    interval: number;
+    minTries: number;
+    onRetry?: (error: unknown, tries: number) => void;
+}
+export declare function poll(fn: () => Promise<boolean>, options?: Partial<PollOptions>): Promise<void>;
+export declare function pollValue<T>(fn: () => Promise<T>, options?: Partial<PollOptions>): Promise<T>;

package/dist/lib/e2e/poll.mjs

@@ -0,0 +1,31 @@
+import { setTimeout } from "node:timers/promises";
+const POLL_TIMEOUT = process.env.RWSDK_POLL_TIMEOUT
+    ? parseInt(process.env.RWSDK_POLL_TIMEOUT, 10)
+    : 2 * 60 * 1000;
+export async function poll(fn, options = {}) {
+    const { timeout = POLL_TIMEOUT, interval = 100, minTries = 3, onRetry, } = options;
+    const startTime = Date.now();
+    let tries = 0;
+    while (Date.now() - startTime < timeout || tries < minTries) {
+        tries++;
+        try {
+            if (await fn()) {
+                return;
+            }
+        }
+        catch (error) {
+            onRetry?.(error, tries);
+            // Continue polling on errors
+        }
+        await setTimeout(interval);
+    }
+    throw new Error(`Polling timed out after ${Date.now() - startTime}ms and ${tries} attempts`);
+}
+export async function pollValue(fn, options = {}) {
+    let value;
+    await poll(async () => {
+        value = await fn();
+        return true;
+    }, options);
+    return value;
+}

package/dist/lib/e2e/release.mjs

@@ -1,12 +1,12 @@
-import { join, basename, dirname, resolve } from "path";
-import { setTimeout } from "node:timers/promises";
 import debug from "debug";
-import { $ } from "../../lib/$.mjs";
 import { execaCommand } from "execa";
 import { existsSync, readFileSync } from "fs";
 import { pathExists } from "fs-extra";
-import { parse as parseJsonc } from "jsonc-parser";
 import * as fs from "fs/promises";
+import { parse as parseJsonc } from "jsonc-parser";
+import { setTimeout } from "node:timers/promises";
+import { basename, dirname, join, resolve } from "path";
+import { $ } from "../../lib/$.mjs";
 import { extractLastJson, parseJson } from "../../lib/jsonUtils.mjs";
 const log = debug("rwsdk:e2e:release");
 /**

package/dist/lib/e2e/retry.d.mts

@@ -0,0 +1,4 @@
+export declare function retry<T>(fn: () => Promise<T>, options: {
+    retries: number;
+    delay: number;
+}): Promise<T>;

package/dist/lib/e2e/retry.mjs

@@ -0,0 +1,16 @@
+import { setTimeout } from "node:timers/promises";
+const log = console.log;
+export async function retry(fn, options) {
+    let lastError;
+    for (let i = 0; i < options.retries; i++) {
+        try {
+            return await fn();
+        }
+        catch (e) {
+            lastError = e;
+            log(`Attempt ${i + 1} failed. Retrying in ${options.delay}ms...`);
+            await setTimeout(options.delay);
+        }
+    }
+    throw lastError;
+}

package/dist/lib/e2e/setup.d.mts

@@ -0,0 +1,2 @@
+export type { Browser } from "puppeteer-core";
+export { launchBrowser } from "./browser.mjs";

package/dist/lib/e2e/setup.mjs

@@ -0,0 +1 @@
+export { launchBrowser } from "./browser.mjs";

package/dist/lib/e2e/tarball.d.mts

@@ -1,6 +1,7 @@
 interface SetupTarballOptions {
     projectDir: string;
-    packageManager?: "pnpm" | "npm" | "yarn";
+    monorepoRoot?: string;
+    packageManager?: "pnpm" | "npm" | "yarn" | "yarn-classic";
 }
 interface TarballEnvironment {
     targetDir: string;
@@ -9,5 +10,5 @@ interface TarballEnvironment {
 /**
  * Creates a tarball-based test environment similar to the release script approach
  */
-export declare function setupTarballEnvironment({ projectDir, packageManager, }: SetupTarballOptions): Promise<TarballEnvironment>;
+export declare function setupTarballEnvironment({ projectDir, monorepoRoot, packageManager, }: SetupTarballOptions): Promise<TarballEnvironment>;
 export {};

package/dist/lib/e2e/tarball.mjs

@@ -1,10 +1,10 @@
+import { createHash } from "crypto";
 import { $ } from "execa";
 import fs from "node:fs";
 import path from "node:path";
-import { copyProjectToTempDir } from "./environment.mjs";
-import { uniqueNamesGenerator, adjectives, animals, } from "unique-names-generator";
-import { createHash } from "crypto";
+import { adjectives, animals, uniqueNamesGenerator, } from "unique-names-generator";
 import { ROOT_DIR } from "../constants.mjs";
+import { copyProjectToTempDir } from "./environment.mjs";
 const log = (message) => console.log(message);
 /**
  * Copies wrangler cache from monorepo to temp directory for deployment tests
@@ -63,7 +63,7 @@ async function copyWranglerCache(targetDir, sdkRoot) {
 /**
  * Creates a tarball-based test environment similar to the release script approach
  */
-export async function setupTarballEnvironment({ projectDir, packageManager = "pnpm", }) {
+export async function setupTarballEnvironment({ projectDir, monorepoRoot, packageManager = "pnpm", }) {
     log(`🚀 Setting up tarball environment for ${projectDir}`);
     // Generate a resource unique key for this test run
     const uniqueNameSuffix = uniqueNamesGenerator({
@@ -79,7 +79,7 @@ export async function setupTarballEnvironment({ projectDir, packageManager = "pn
         .substring(0, 8);
     const resourceUniqueKey = `${uniqueNameSuffix}-${hash}`;
     try {
-        const { tempDir, targetDir } = await copyProjectToTempDir(projectDir, resourceUniqueKey, packageManager);
+        const { tempDir, targetDir } = await copyProjectToTempDir(projectDir, resourceUniqueKey, packageManager, monorepoRoot);
         // Copy wrangler cache to improve deployment performance
         const sdkRoot = ROOT_DIR;
         await copyWranglerCache(targetDir, sdkRoot);