From 9771a050f8ddd7ff62aa4656a11169c7cf0779f3 Mon Sep 17 00:00:00 2001 From: Avi Vahl Date: Thu, 4 Oct 2018 23:49:54 +0300 Subject: [PATCH 1/2] [create-react-app] avoid copying cached yarn.lock for custom scripts per discussion in facebook/create-react-app#5270, do not copy cached `yarn.lock` file if `--scripts-version=[custom-package/version]` is provided. May this save us weird PRs ("your lockfile is breaking my package") in the future... :) --- packages/create-react-app/createReactApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index 5d837c60400..3f9d0d13c36 100755 --- a/packages/create-react-app/createReactApp.js +++ b/packages/create-react-app/createReactApp.js @@ -258,7 +258,7 @@ function createApp(name, verbose, version, useNpm, usePnp, template) { } } - if (useYarn) { + if (useYarn && !version) { fs.copySync( require.resolve('./yarn.lock.cached'), path.join(root, 'yarn.lock') From e57d1a97a88a81f2f5ea3539802985a6901f21f1 Mon Sep 17 00:00:00 2001 From: Avi Vahl Date: Fri, 5 Oct 2018 04:01:16 +0300 Subject: [PATCH 2/2] Avoid copying yarn.lock if custom package is used custom react-scripts versions still get cached lock file --- packages/create-react-app/createReactApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index 3f9d0d13c36..131a99b418e 100755 --- a/packages/create-react-app/createReactApp.js +++ b/packages/create-react-app/createReactApp.js @@ -258,7 +258,7 @@ function createApp(name, verbose, version, useNpm, usePnp, template) { } } - if (useYarn && !version) { + if (useYarn && !semver.valid(version)) { fs.copySync( require.resolve('./yarn.lock.cached'), path.join(root, 'yarn.lock')