C3 - Re-enable pnpm test and cleanup pages projects between retries (#3796)

* C3 - Re-enable pnpm test and cleanup pages projects between retries

* C3: Convert CI scripts to .ts

Author: jculvey

.github/workflows/test-c3.yml

@@ -62,7 +62,7 @@ jobs:
         # os: [ubuntu-latest, windows-latest, macos-latest]
         os: [ubuntu-latest]
         # pm: [npm, yarn, pnpm]
-        pm: [npm]
+        pm: [npm, pnpm]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repo

packages/create-cloudflare/e2e-tests/pages.test.ts

@@ -3,6 +3,7 @@ import { FrameworkMap } from "frameworks/index";
 import { readJSON } from "helpers/files";
 import { fetch } from "undici";
 import { describe, expect, test, afterEach, beforeEach } from "vitest";
+import { deleteProject } from "../scripts/e2eCleanup";
 import { keys, runC3, testProjectDir } from "./helpers";
 import type { RunnerConfig } from "./helpers";
 
@@ -16,16 +17,25 @@ type FrameworkTestConfig = RunnerConfig & {
 };
 
 describe(`E2E: Web frameworks`, () => {
-	const { getPath, clean } = testProjectDir("pages");
+	const { getPath, getName, clean } = testProjectDir("pages");
 
 	beforeEach((ctx) => {
 		const framework = ctx.meta.name;
 		clean(framework);
 	});
 
-	afterEach((ctx) => {
+	afterEach(async (ctx) => {
 		const framework = ctx.meta.name;
 		clean(framework);
+
+		// Cleanup the pages project in case we need to retry it
+		const projectName = getName(framework);
+		try {
+			await deleteProject(projectName);
+		} catch (error) {
+			console.error(`Failed to cleanup project: ${projectName}`);
+			console.error(error);
+		}
 	});
 
 	const runCli = async (

packages/create-cloudflare/package.json

@@ -26,16 +26,16 @@
 		"templates"
 	],
 	"scripts": {
-		"build": "node scripts/build.js",
+		"build": "node -r esbuild-register scripts/build.ts",
 		"check:lint": "eslint .",
 		"check:type": "tsc",
 		"lint": "eslint",
 		"prepublishOnly": "npm run build",
-		"test:e2e:cleanup": "node scripts/e2eCleanup.mjs",
+		"test:e2e:cleanup": "node -r esbuild-register scripts/e2eCleanup.ts",
 		"test:e2e:npm": "npm run build && TEST_PM=npm vitest run --config ./vitest-e2e.config.ts",
 		"test:e2e:pnpm": "npm run build && TEST_PM=pnpm vitest run --config ./vitest-e2e.config.ts",
 		"test:unit": "vitest run --config ./vitest.config.ts",
-		"watch": "node scripts/build.js --watch"
+		"watch": "node -r esbuild-register scripts/build.ts --watch"
 	},
 	"devDependencies": {
 		"@babel/parser": "^7.21.3",

packages/create-cloudflare/scripts/build.js renamed to packages/create-cloudflare/scripts/build.ts

@@ -1,11 +1,11 @@
-const { build, context } = require("esbuild");
-const { cp } = require("fs/promises");
+import { build, context, BuildOptions } from "esbuild";
+import { cp } from "fs/promises";
 
 const run = async () => {
 	const argv = process.argv.slice(2);
 	const watchMode = argv[0] === "--watch";
 
-	const config = {
+	const config: BuildOptions = {
 		entryPoints: ["./src/cli.ts"],
 		bundle: true,
 		outdir: "./dist",

packages/create-cloudflare/scripts/e2eCleanup.mjs renamed to packages/create-cloudflare/scripts/e2eCleanup.ts

@@ -10,7 +10,23 @@ if (!process.env.CLOUDFLARE_ACCOUNT_ID) {
 	process.exit(1);
 }
 
-const apiFetch = async (path, init = { method: "GET" }, queryParams = {}) => {
+type ApiErrorBody = {
+	errors: string[];
+};
+
+type ApiSuccessBody = {
+	result: any[];
+};
+
+type Project = {
+	name: string;
+};
+
+const apiFetch = async (
+	path: string,
+	init = { method: "GET" },
+	queryParams = {}
+) => {
 	const baseUrl = `https://api.cloudflare.com/client/v4/accounts/${process.env.CLOUDFLARE_ACCOUNT_ID}`;
 	const queryString = queryParams
 		? `?${new URLSearchParams(queryParams).toString()}`
@@ -27,7 +43,7 @@ const apiFetch = async (path, init = { method: "GET" }, queryParams = {}) => {
 	if (response.status >= 400) {
 		console.error(`REQUEST ERROR: ${url}`);
 		console.error(`(${response.status}) ${response.statusText}`);
-		const body = await response.json();
+		const body = (await response.json()) as ApiErrorBody;
 		console.error(body.errors);
 
 		// Returning null instead of throwing an error here allows the caller to decide whether
@@ -37,7 +53,7 @@ const apiFetch = async (path, init = { method: "GET" }, queryParams = {}) => {
 		return null;
 	}
 
-	const json = await response.json();
+	const json = (await response.json()) as ApiSuccessBody;
 
 	return json.result;
 };
@@ -72,20 +88,25 @@ const listC3Projects = async () => {
 	return projects.filter((p) => p.name.startsWith("c3-e2e-"));
 };
 
-const deleteProject = async (project) => {
-	console.log(`Deleting project: ${project.name}`);
-	await apiFetch(`/pages/projects/${project.name}`, {
+export const deleteProject = async (project: string) => {
+	console.log(`Deleting project: ${project}`);
+	await apiFetch(`/pages/projects/${project}`, {
 		method: "DELETE",
 	});
 };
 
-const projectsToDelete = await listC3Projects();
-for (const project of projectsToDelete) {
-	await deleteProject(project);
-}
+const run = async () => {
+	const projectsToDelete = (await listC3Projects()) as Project[];
 
-if (projectsToDelete.length === 0) {
-	console.log(`No projects to delete.`);
-} else {
-	console.log(`Successfully deleted ${projectsToDelete.length} projects`);
-}
+	for (const project of projectsToDelete) {
+		await deleteProject(project.name);
+	}
+
+	if (projectsToDelete.length === 0) {
+		console.log(`No projects to delete.`);
+	} else {
+		console.log(`Successfully deleted ${projectsToDelete.length} projects`);
+	}
+};
+
+run();

packages/create-cloudflare/src/helpers/command.ts

@@ -251,6 +251,7 @@ export const resetPackageManager = async (ctx: PagesGeneratorContext) => {
 
 	await runCommand(`${npm} install`, {
 		silent: true,
+		cwd: ctx.project.path,
 		startText: "Installing dependencies",
 		doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
 	});