From 729417bec41c0ae1f036d9943264687b5705770d Mon Sep 17 00:00:00 2001 From: Oreoezi Date: Tue, 3 Dec 2024 18:55:35 +0200 Subject: [PATCH 1/3] Changed port in playwright config file --- .../create-cloudflare/templates/svelte/c3.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/packages/create-cloudflare/templates/svelte/c3.ts b/packages/create-cloudflare/templates/svelte/c3.ts index c50d06b19c27..4b30a3cb46e2 100644 --- a/packages/create-cloudflare/templates/svelte/c3.ts +++ b/packages/create-cloudflare/templates/svelte/c3.ts @@ -9,6 +9,7 @@ import { installPackages } from "helpers/packages"; import * as recast from "recast"; import type { TemplateConfig } from "../../src/templates"; import type { C3Context, PackageJson } from "types"; +import { existsSync } from "node:fs"; const { npm } = detectPackageManager(); @@ -28,6 +29,7 @@ const configure = async (ctx: C3Context) => { }); updateSvelteConfig(); + updatePlaywrightConfig(usesTypescript(ctx)); updateTypeDefinitions(ctx); }; @@ -49,6 +51,34 @@ const updateSvelteConfig = () => { }); }; +const updatePlaywrightConfig = (shouldUseTypescript: boolean) => { + const filePath = `playwright.config.${shouldUseTypescript ? "ts" : "js"}`; + if (!existsSync(filePath)) { + return; + } + + updateStatus(`Changing webServer port in ${blue(filePath)}`); + + transformFile(filePath, { + visitObjectExpression: function(n) { + const portProp = n.node.properties.find(prop => { + if (!("key" in prop) || !("name" in prop.key)) { + return false; + } + + return prop.key.name === "port"; + }); + + if (!portProp || !("value" in portProp) || !("value" in portProp.value)) { + return this.traverse(n); + } + + portProp.value.value = 8788; + return false; + } + }); +}; + const updateTypeDefinitions = (ctx: C3Context) => { if (!usesTypescript(ctx)) { return; From 7ccd9593793fa589267115a08de579d1dedffa1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Somhairle=20MacLe=C3=B2id?= Date: Wed, 4 Dec 2024 12:47:07 +0000 Subject: [PATCH 2/3] Create lovely-kiwis-grab.md --- .changeset/lovely-kiwis-grab.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/lovely-kiwis-grab.md diff --git a/.changeset/lovely-kiwis-grab.md b/.changeset/lovely-kiwis-grab.md new file mode 100644 index 000000000000..44a38b5aa350 --- /dev/null +++ b/.changeset/lovely-kiwis-grab.md @@ -0,0 +1,5 @@ +--- +"create-cloudflare": patch +--- + +Use correct port in playwright config file for generated SvelteKit apps From 50dfca113cdf4b4e775728affecb84b06848bc4a Mon Sep 17 00:00:00 2001 From: Oreoezi Date: Thu, 5 Dec 2024 21:14:22 +0200 Subject: [PATCH 3/3] Fixed formatting issues --- packages/create-cloudflare/templates/svelte/c3.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/create-cloudflare/templates/svelte/c3.ts b/packages/create-cloudflare/templates/svelte/c3.ts index 4b30a3cb46e2..5e451134ac6a 100644 --- a/packages/create-cloudflare/templates/svelte/c3.ts +++ b/packages/create-cloudflare/templates/svelte/c3.ts @@ -1,3 +1,4 @@ +import { existsSync } from "node:fs"; import { platform } from "node:os"; import { logRaw, updateStatus } from "@cloudflare/cli"; import { blue, brandColor, dim } from "@cloudflare/cli/colors"; @@ -9,7 +10,6 @@ import { installPackages } from "helpers/packages"; import * as recast from "recast"; import type { TemplateConfig } from "../../src/templates"; import type { C3Context, PackageJson } from "types"; -import { existsSync } from "node:fs"; const { npm } = detectPackageManager(); @@ -60,8 +60,8 @@ const updatePlaywrightConfig = (shouldUseTypescript: boolean) => { updateStatus(`Changing webServer port in ${blue(filePath)}`); transformFile(filePath, { - visitObjectExpression: function(n) { - const portProp = n.node.properties.find(prop => { + visitObjectExpression: function (n) { + const portProp = n.node.properties.find((prop) => { if (!("key" in prop) || !("name" in prop.key)) { return false; } @@ -75,7 +75,7 @@ const updatePlaywrightConfig = (shouldUseTypescript: boolean) => { portProp.value.value = 8788; return false; - } + }, }); };