diff --git a/packages/create-cloudflare/e2e-tests/cli.test.ts b/packages/create-cloudflare/e2e-tests/cli.test.ts index 0b1122bb370f..906d2b5586c2 100644 --- a/packages/create-cloudflare/e2e-tests/cli.test.ts +++ b/packages/create-cloudflare/e2e-tests/cli.test.ts @@ -1,9 +1,9 @@ import { existsSync, rmSync, mkdtempSync, realpathSync } from "fs"; import { tmpdir } from "os"; import { join } from "path"; -import * as shellquote from "../src/helpers/shell-quote"; import { beforeEach, afterEach, describe, test, expect } from "vitest"; import { version } from "../package.json"; +import * as shellquote from "../src/helpers/shell-quote"; import { frameworkToTest } from "./frameworkToTest"; import { isQuarantineMode, keys, runC3 } from "./helpers"; diff --git a/packages/create-cloudflare/src/common.ts b/packages/create-cloudflare/src/common.ts index bef9ac9ea7e0..d543b77c7fe2 100644 --- a/packages/create-cloudflare/src/common.ts +++ b/packages/create-cloudflare/src/common.ts @@ -1,7 +1,6 @@ import { existsSync, mkdirSync, readdirSync } from "fs"; import { basename, dirname, resolve } from "path"; import { chdir } from "process"; -import * as shellquote from "./helpers/shell-quote"; import { getFrameworkCli } from "frameworks/index"; import { processArgument } from "helpers/args"; import { @@ -29,6 +28,7 @@ import { detectPackageManager } from "helpers/packages"; import { poll } from "helpers/poll"; import { version as wranglerVersion } from "wrangler/package.json"; import { version } from "../package.json"; +import * as shellquote from "./helpers/shell-quote"; import type { C3Args, PagesGeneratorContext } from "types"; const { name, npm } = detectPackageManager(); diff --git a/packages/create-cloudflare/src/helpers/__tests__/command.test.ts b/packages/create-cloudflare/src/helpers/__tests__/command.test.ts index c737248f5da7..5aaeb2761091 100644 --- a/packages/create-cloudflare/src/helpers/__tests__/command.test.ts +++ b/packages/create-cloudflare/src/helpers/__tests__/command.test.ts @@ -1,6 +1,5 @@ import { spawn } from "cross-spawn"; import { detectPackageManager } from "helpers/packages"; -import * as shellquote from "../shell-quote"; import { beforeEach, afterEach, describe, expect, test, vi } from "vitest"; import whichPMRuns from "which-pm-runs"; import { @@ -10,6 +9,7 @@ import { npmInstall, runCommand, } from "../command"; +import * as shellquote from "../shell-quote"; // We can change how the mock spawn works by setting these variables let spawnResultCode = 0; diff --git a/packages/create-cloudflare/src/helpers/command.ts b/packages/create-cloudflare/src/helpers/command.ts index 5163cbb97055..35957f2f59a4 100644 --- a/packages/create-cloudflare/src/helpers/command.ts +++ b/packages/create-cloudflare/src/helpers/command.ts @@ -1,11 +1,11 @@ import { existsSync, rmSync } from "fs"; import path from "path"; import { spawn } from "cross-spawn"; -import * as shellquote from "./shell-quote"; import { endSection, stripAnsi } from "./cli"; import { brandColor, dim } from "./colors"; import { spinner } from "./interactive"; import { detectPackageManager } from "./packages"; +import * as shellquote from "./shell-quote"; import type { PagesGeneratorContext } from "types"; /**