From 774ac903ca8e90c6f7117a7f632ac9336ce5c1fe Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Sun, 2 Oct 2016 23:18:00 -0400 Subject: [PATCH 1/3] Support passing scoped package names to --scripts-version arg --- packages/create-react-app/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-react-app/index.js b/packages/create-react-app/index.js index 02f9de254a0..113b85355fb 100644 --- a/packages/create-react-app/index.js +++ b/packages/create-react-app/index.js @@ -154,8 +154,8 @@ function getInstallPackage(version) { function getPackageName(installPackage) { if (~installPackage.indexOf('.tgz')) { return installPackage.match(/^.+\/(.+)-.+\.tgz$/)[1]; - } else if (~installPackage.indexOf('@')) { - return installPackage.split('@')[0]; + } else if (installPackage.indexOf('@') > 0) { + return installPackage.charAt(0) + installPackage.substr(1).split('@')[0]; } return installPackage; } From 33f9731a7078d87d123a0cb3965d5c19397cd30d Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Mon, 3 Oct 2016 08:46:22 -0400 Subject: [PATCH 2/3] Factor out bitwise operator in indexOf test --- packages/create-react-app/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-react-app/index.js b/packages/create-react-app/index.js index 113b85355fb..33dfb1eba09 100644 --- a/packages/create-react-app/index.js +++ b/packages/create-react-app/index.js @@ -152,7 +152,7 @@ function getInstallPackage(version) { // Extract package name from tarball url or path. function getPackageName(installPackage) { - if (~installPackage.indexOf('.tgz')) { + if (installPackage.indexOf('.tgz') > 0) { return installPackage.match(/^.+\/(.+)-.+\.tgz$/)[1]; } else if (installPackage.indexOf('@') > 0) { return installPackage.charAt(0) + installPackage.substr(1).split('@')[0]; From d9ed89615525806084a7d73b80152ab0b99efe6e Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Mon, 3 Oct 2016 10:00:03 -0400 Subject: [PATCH 3/3] Comment on stripping only version or tag from package name arg --- packages/create-react-app/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/create-react-app/index.js b/packages/create-react-app/index.js index 33dfb1eba09..1ea4f108cc0 100644 --- a/packages/create-react-app/index.js +++ b/packages/create-react-app/index.js @@ -152,9 +152,10 @@ function getInstallPackage(version) { // Extract package name from tarball url or path. function getPackageName(installPackage) { - if (installPackage.indexOf('.tgz') > 0) { + if (installPackage.indexOf('.tgz') > -1) { return installPackage.match(/^.+\/(.+)-.+\.tgz$/)[1]; } else if (installPackage.indexOf('@') > 0) { + // Do not match @scope/ when stripping off @version or @tag return installPackage.charAt(0) + installPackage.substr(1).split('@')[0]; } return installPackage;