From 44655528eb86253e87326fb76b4ab008c5c47d63 Mon Sep 17 00:00:00 2001 From: SaschaDens Date: Tue, 9 Jan 2018 16:45:11 +0100 Subject: [PATCH 1/2] Extend --scripts-version to include .tar.gz format --- packages/create-react-app/createReactApp.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index e7dbbb35842..a0043f6d6d6 100755 --- a/packages/create-react-app/createReactApp.js +++ b/packages/create-react-app/createReactApp.js @@ -83,6 +83,11 @@ const program = new commander.Command(packageJson.name) 'https://mysite.com/my-react-scripts-0.8.2.tgz' )}` ); + console.log( + ` - a .tar.gz archive: ${chalk.green( + 'https://mysite.com/my-react-scripts-0.8.2.tar.gz' + )}` + ); console.log( ` It is not needed unless you specifically want to use a fork.` ); @@ -417,7 +422,7 @@ function extractStream(stream, dest) { // Extract package name from tarball url or path. function getPackageName(installPackage) { - if (installPackage.indexOf('.tgz') > -1) { + if (installPackage.match(/^.+\.(tgz|tar\.gz)$/)) { return getTemporaryDirectory() .then(obj => { let stream; @@ -440,7 +445,7 @@ function getPackageName(installPackage) { `Could not extract the package name from the archive: ${err.message}` ); const assumedProjectName = installPackage.match( - /^.+\/(.+?)(?:-\d+.+)?\.tgz$/ + /^.+\/(.+?)(?:-\d+.+)?\.(tgz|tar\.gz)$/ )[1]; console.log( `Based on the filename, assuming it is "${chalk.cyan( @@ -487,6 +492,7 @@ function checkNodeVersion(packageName) { packageName, 'package.json' ); + console.log(packageJsonPath); const packageJson = require(packageJsonPath); if (!packageJson.engines || !packageJson.engines.node) { return; From 582e5006996a6f3b08656d24681673601486920f Mon Sep 17 00:00:00 2001 From: SaschaDens Date: Tue, 9 Jan 2018 17:36:00 +0100 Subject: [PATCH 2/2] Removal of debug console.log --- packages/create-react-app/createReactApp.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index a0043f6d6d6..7a9afed2f78 100755 --- a/packages/create-react-app/createReactApp.js +++ b/packages/create-react-app/createReactApp.js @@ -492,7 +492,6 @@ function checkNodeVersion(packageName) { packageName, 'package.json' ); - console.log(packageJsonPath); const packageJson = require(packageJsonPath); if (!packageJson.engines || !packageJson.engines.node) { return;