Merge branch 'main' into ruleset-job-names

JoshuaKGoldberg · Jan 16, 2025 · e94cca1 · e94cca1
2 parents c08ffa9 + 5ac2ebe
commit e94cca1
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
 		"@prettier/sync": "^0.5.2",
 		"chalk": "^5.4.1",
 		"create": "^0.1.0-alpha.15",
+		"create-fs": "^0.1.1",
 		"cspell-populate-words": "^0.3.0",
 		"execa": "^9.5.2",
 		"git-remote-origin-url": "^4.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/next/blocks/blockContributorCovenant.ts b/src/next/blocks/blockContributorCovenant.ts
@@ -9,7 +9,6 @@ export const blockContributorCovenant = base.createBlock({
 		return {
 			scripts: [
 				{
-					silent: true,
 					commands: ["rm CODE_OF_CONDUCT.md"],
 					phase: CommandPhase.Migrations,
 					silent: true,

diff --git a/src/next/blocks/blockDevelopmentDocs.ts b/src/next/blocks/blockDevelopmentDocs.ts
@@ -68,7 +68,6 @@ export const blockDevelopmentDocs = base.createBlock({
 		return {
 			scripts: [
 				{
-					silent: true,
 					commands: ["rm DEVELOPMENT.md"],
 					phase: CommandPhase.Migrations,
 					silent: true,

diff --git a/src/next/blocks/blockESLint.ts b/src/next/blocks/blockESLint.ts
@@ -68,7 +68,6 @@ export const blockESLint = base.createBlock({
 		return {
 			scripts: [
 				{
-					silent: true,
 					commands: ["rm .eslintrc* .eslintignore eslint.config.*"],
 					phase: CommandPhase.Migrations,
 					silent: true,

diff --git a/src/next/blocks/blockKnip.ts b/src/next/blocks/blockKnip.ts
@@ -18,7 +18,6 @@ export const blockKnip = base.createBlock({
 		return {
 			scripts: [
 				{
-					silent: true,
 					commands: ["rm .knip* knip.*"],
 					phase: CommandPhase.Migrations,
 					silent: true,

diff --git a/src/next/blocks/blockPackageJson.ts b/src/next/blocks/blockPackageJson.ts
@@ -30,7 +30,6 @@ export const blockPackageJson = base.createBlock({
 		return {
 			scripts: [
 				{
-					silent: true,
 					commands: ["rm package-lock.json yarn.lock"],
 					phase: CommandPhase.Migrations,
 					silent: true,

diff --git a/src/next/blocks/blockTSup.ts b/src/next/blocks/blockTSup.ts
@@ -20,7 +20,6 @@ export const blockTSup = base.createBlock({
 		return {
 			scripts: [
 				{
-					silent: true,
 					commands: ["rm -rf .babelrc* babel.config.* dist lib"],
 					phase: CommandPhase.Migrations,
 					silent: true,

diff --git a/src/next/blocks/blockVitest.ts b/src/next/blocks/blockVitest.ts
@@ -33,7 +33,6 @@ export const blockVitest = base.createBlock({
 		return {
 			scripts: [
 				{
-					silent: true,
 					commands: ["rm .mocha* jest.config.* vitest.config.*"],
 					phase: CommandPhase.Migrations,
 					silent: true,

diff --git a/src/steps/writing/creation/index.ts b/src/steps/writing/creation/index.ts
@@ -1,9 +1,5 @@
-import {
-	CreatedFiles,
-	produceBase,
-	producePreset,
-	SystemFetchers,
-} from "create";
+import { produceBase, producePreset, SystemFetchers } from "create";
+import { CreatedDirectory } from "create-fs";
 import prettier from "prettier";
 
 import { presetCommon } from "../../../next/presets/presetCommon.js";
@@ -62,7 +58,7 @@ export async function createStructure(
 	};
 }
 
-async function recursivelyFormat(files: CreatedFiles): Promise<Structure> {
+async function recursivelyFormat(files: CreatedDirectory): Promise<Structure> {
 	const result: Structure = {};
 
 	for (const [key, value] of Object.entries(files)) {

diff --git a/src/steps/writing/writeStructure.ts b/src/steps/writing/writeStructure.ts
@@ -1,4 +1,5 @@
-import { applyFilesToSystem, createWritingFileSystem } from "create";
+import { applyFilesToSystem } from "create";
+import { createWritingFileSystem } from "create-fs";
 import { $ } from "execa";
 
 import { isUsingCreateEngine } from "../../shared/isUsingCreateEngine.js";