Skip to content

fix: don't create src/ files during --mode migrate #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 19, 2023
Merged

fix: don't create src/ files during --mode migrate #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7b6534
fix: don't create src/ files during --mode migrate
JoshuaKGoldberg Sep 19, 2023
2d83ae2
Forgot the src key
JoshuaKGoldberg Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/create/createWithOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export async function createWithOptions({ github, options }: GitHubAndOptions) {
[
"Writing structure",
async () => {
await writeStructure(options);
await writeStructure(options, "create");
},
],
[
Expand Down
2 changes: 1 addition & 1 deletion src/migrate/migrateWithOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export async function migrateWithOptions({
[
"Writing structure",
async () => {
await writeStructure(options);
await writeStructure(options, "migrate");
},
],
[
Expand Down
8 changes: 6 additions & 2 deletions src/steps/writing/creation/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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<Structure> {
export async function createStructure(
options: Options,
mode: Mode,
): Promise<Structure> {
return {
".github": await createDotGitHub(options),
".husky": createDotHusky(),
".vscode": await createDotVSCode(options),
src: await createSrc(options),
...(mode !== "migrate" && { src: await createSrc(options) }),
...(await createRootFiles(options)),
};
}
5 changes: 3 additions & 2 deletions src/steps/writing/writeStructure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`;
Expand Down