From cb99d85c7c828d1126ee37fec33481d4293d4594 Mon Sep 17 00:00:00 2001 From: Sicarius Date: Thu, 4 Nov 2021 01:59:35 -0500 Subject: [PATCH 1/2] added yarn 2 based files/dirs to valid files --- packages/create-next-app/helpers/is-folder-empty.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/create-next-app/helpers/is-folder-empty.ts b/packages/create-next-app/helpers/is-folder-empty.ts index 838ddeb02797..7d82d76d9cff 100644 --- a/packages/create-next-app/helpers/is-folder-empty.ts +++ b/packages/create-next-app/helpers/is-folder-empty.ts @@ -23,6 +23,9 @@ export function isFolderEmpty(root: string, name: string): boolean { 'npm-debug.log', 'yarn-debug.log', 'yarn-error.log', + 'yarnrc.yml', + '.yarn', + 'package.json', ] const conflicts = fs From 80e5ec74571b865253685956dbd4d7eb33e4c74b Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Sun, 7 Aug 2022 21:48:55 -0500 Subject: [PATCH 2/2] remove package.json --- packages/create-next-app/helpers/is-folder-empty.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/create-next-app/helpers/is-folder-empty.ts b/packages/create-next-app/helpers/is-folder-empty.ts index 7d82d76d9cff..ab4a565e0b03 100644 --- a/packages/create-next-app/helpers/is-folder-empty.ts +++ b/packages/create-next-app/helpers/is-folder-empty.ts @@ -25,7 +25,6 @@ export function isFolderEmpty(root: string, name: string): boolean { 'yarn-error.log', 'yarnrc.yml', '.yarn', - 'package.json', ] const conflicts = fs