From f7b6534d73856c307060b816f0455084149c9847 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Tue, 19 Sep 2023 15:19:13 -0400 Subject: [PATCH 1/2] fix: don't create src/ files during --mode migrate --- src/create/createWithOptions.ts | 2 +- src/migrate/migrateWithOptions.ts | 2 +- src/steps/writing/creation/index.ts | 8 ++++++-- src/steps/writing/writeStructure.ts | 5 +++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/create/createWithOptions.ts b/src/create/createWithOptions.ts index 48df817bc..aad196a57 100644 --- a/src/create/createWithOptions.ts +++ b/src/create/createWithOptions.ts @@ -16,7 +16,7 @@ export async function createWithOptions({ github, options }: GitHubAndOptions) { [ "Writing structure", async () => { - await writeStructure(options); + await writeStructure(options, "create"); }, ], [ diff --git a/src/migrate/migrateWithOptions.ts b/src/migrate/migrateWithOptions.ts index a7ddeb074..803f8a5cb 100644 --- a/src/migrate/migrateWithOptions.ts +++ b/src/migrate/migrateWithOptions.ts @@ -19,7 +19,7 @@ export async function migrateWithOptions({ [ "Writing structure", async () => { - await writeStructure(options); + await writeStructure(options, "migrate"); }, ], [ diff --git a/src/steps/writing/creation/index.ts b/src/steps/writing/creation/index.ts index 7fb3040a7..d2d846ccd 100644 --- a/src/steps/writing/creation/index.ts +++ b/src/steps/writing/creation/index.ts @@ -1,3 +1,4 @@ +import { Mode } from "../../../bin/mode.js"; import { Options } from "../../../shared/types.js"; import { Structure } from "../types.js"; import { createDotGitHub } from "./dotGitHub/index.js"; @@ -6,12 +7,15 @@ import { createDotVSCode } from "./dotVSCode.js"; import { createRootFiles } from "./rootFiles.js"; import { createSrc } from "./src.js"; -export async function createStructure(options: Options): Promise { +export async function createStructure( + options: Options, + mode: Mode, +): Promise { return { ".github": await createDotGitHub(options), ".husky": createDotHusky(), ".vscode": await createDotVSCode(options), - src: await createSrc(options), + ...(mode !== "migrate" && (await createSrc(options))), ...(await createRootFiles(options)), }; } diff --git a/src/steps/writing/writeStructure.ts b/src/steps/writing/writeStructure.ts index 6ac110464..71d2ab1ac 100644 --- a/src/steps/writing/writeStructure.ts +++ b/src/steps/writing/writeStructure.ts @@ -1,11 +1,12 @@ import { $ } from "execa"; +import { Mode } from "../../bin/mode.js"; import { Options } from "../../shared/types.js"; import { createStructure } from "./creation/index.js"; import { writeStructureWorker } from "./writeStructureWorker.js"; -export async function writeStructure(options: Options) { - await writeStructureWorker(await createStructure(options), "."); +export async function writeStructure(options: Options, mode: Mode) { + await writeStructureWorker(await createStructure(options, mode), "."); // https://github.com/JoshuaKGoldberg/create-typescript-app/issues/718 await $`chmod ug+x .husky/pre-commit`; From 2d83ae2fa985ca467a1764fcd520825801776115 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Tue, 19 Sep 2023 15:29:15 -0400 Subject: [PATCH 2/2] Forgot the src key --- src/steps/writing/creation/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/steps/writing/creation/index.ts b/src/steps/writing/creation/index.ts index d2d846ccd..4b2ac3f71 100644 --- a/src/steps/writing/creation/index.ts +++ b/src/steps/writing/creation/index.ts @@ -15,7 +15,7 @@ export async function createStructure( ".github": await createDotGitHub(options), ".husky": createDotHusky(), ".vscode": await createDotVSCode(options), - ...(mode !== "migrate" && (await createSrc(options))), + ...(mode !== "migrate" && { src: await createSrc(options) }), ...(await createRootFiles(options)), }; }