From 0454543b5c0e9ebf827d3991d5f4231cd55bfc44 Mon Sep 17 00:00:00 2001 From: Tim Snadden Date: Thu, 8 Nov 2018 07:07:03 +1300 Subject: [PATCH 1/3] Only use cached yarn.lock if using the default yarn registry --- packages/create-react-app/createReactApp.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index 50bf9befd39..075799054b1 100755 --- a/packages/create-react-app/createReactApp.js +++ b/packages/create-react-app/createReactApp.js @@ -217,6 +217,10 @@ function createApp( ); const useYarn = useNpm ? false : shouldUseYarn(); + const yarnUsesDefaultRegistry = + execSync('yarn config get registry').toString() === + 'https://registry.yarnpkg.com'; + const originalDirectory = process.cwd(); process.chdir(root); if (!useYarn && !checkThatNpmCanReadCwd()) { @@ -268,7 +272,7 @@ function createApp( } } - if (useYarn) { + if (useYarn && yarnUsesDefaultRegistry) { fs.copySync( require.resolve('./yarn.lock.cached'), path.join(root, 'yarn.lock') From abc2e59dd24182bf93a17c25ba5f0a30f25757d6 Mon Sep 17 00:00:00 2001 From: Minh Nguyen Date: Fri, 18 Jan 2019 06:36:26 +1300 Subject: [PATCH 2/3] Update packages/create-react-app/createReactApp.js Co-Authored-By: timsnadden --- packages/create-react-app/createReactApp.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index 67d54064f09..589c3198cf7 100755 --- a/packages/create-react-app/createReactApp.js +++ b/packages/create-react-app/createReactApp.js @@ -271,7 +271,17 @@ function createApp( } } - if (useYarn && yarnUsesDefaultRegistry) { + if (useYarn) { + const yarnUsesDefaultRegistry = + execSync('yarnpkg config get registry') + .toString() + .trim() === 'https://registry.yarnpkg.com'; + if (yarnUsesDefaultRegistry) { + fs.copySync( + require.resolve('./yarn.lock.cached'), + path.join(root, 'yarn.lock') + ); + } fs.copySync( require.resolve('./yarn.lock.cached'), path.join(root, 'yarn.lock') From 8c48bfa7862c489455ec9f7d025d0b286d9dd2c9 Mon Sep 17 00:00:00 2001 From: Tim Snadden Date: Mon, 28 Jan 2019 22:16:19 +1300 Subject: [PATCH 3/3] Remove duplicate declaration from incorrect merge --- packages/create-react-app/createReactApp.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index 589c3198cf7..8194b2ba7e9 100755 --- a/packages/create-react-app/createReactApp.js +++ b/packages/create-react-app/createReactApp.js @@ -216,10 +216,6 @@ function createApp( ); const useYarn = useNpm ? false : shouldUseYarn(); - const yarnUsesDefaultRegistry = - execSync('yarn config get registry').toString() === - 'https://registry.yarnpkg.com'; - const originalDirectory = process.cwd(); process.chdir(root); if (!useYarn && !checkThatNpmCanReadCwd()) {