Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly extract package name for installing tgz of scoped packages #1706

Merged
merged 8 commits into from
Mar 5, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Download package if need be ...
  • Loading branch information
Timer authored and gaearon committed Mar 5, 2017
commit 290174aa547dc79cd2c2eca815026588cb47b009
70 changes: 47 additions & 23 deletions packages/create-react-app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ var semver = require('semver');
var dns = require('dns');
var tmp = require('tmp');
var unpack = require('tar-pack').unpack;
var hyperquest = require('hyperquest');

var projectName;

Expand Down Expand Up @@ -292,34 +293,57 @@ function getInstallPackage(version) {
return packageToInstall;
}

function getTemporaryDirectory() {
return new Promise(function(resolve, reject) {
// Unsafe cleanup lets us recursively delete the directory if it contains
// contents; by default it only allows removal if it's empty
tmp.dir({ unsafeCleanup: true }, function(err, tmpdir, callback) {
if (err) {
reject(err);
} else {
resolve({
tmpdir: tmpdir,
cleanup: function() {
try {
// Callback might throw and fail, since it's a temp directory the
// OS will clean it up eventually...
callback();
} catch (ignored) {}
}
});
}
});
});
}

function extractStream(stream, dest) {
return new Promise(function(resolve, reject) {
stream.pipe(unpack(dest, function(err) {
if (err) {
reject(err);
} else {
resolve(dest);
}
}));
});
}

// Extract package name from tarball url or path.
function getPackageName(installPackage) {
if (installPackage.indexOf('.tgz') > -1) {
return new Promise(function(resolve, reject) {
tmp.dir({ unsafeCleanup: true }, function(err, tmpdir, callback) {
if (err) {
reject(err);
} else {
resolve({
tmpdir: tmpdir,
callback: callback
});
}
return getTemporaryDirectory().then(function(obj) {
if (installPackage.test(/^http/)) {
var stream = hyperquest(installPackage);
} else {
var stream = fs.createReadStream(installPackage);
}
return extractStream(stream).then(function() {
return obj;
});
}).then(function(obj) {
return new Promise(function(resolve, reject) {
fs.createReadStream(installPackage).pipe(unpack(obj.tmpdir, function(err) {
if (err) {
reject(err);
} else {
var packageName = require(path.join(obj.tmpdir, 'package.json')).name;
try {
obj.callback();
} catch (ignored) {}
resolve(packageName);
}
}));
});
var packageName = require(path.join(obj.tmpdir, 'package.json')).name;
obj.cleanup();
return packageName;
}).catch(function(err) {
// The package name could be with or without semver version, e.g. react-scripts-0.2.0-alpha.1.tgz
// However, this function returns package name only without semver version.
Expand Down
1 change: 1 addition & 0 deletions packages/create-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"commander": "^2.9.0",
"cross-spawn": "^4.0.0",
"fs-extra": "^1.0.0",
"hyperquest": "^2.1.2",
"semver": "^5.0.3",
"tar-pack": "^3.4.0",
"tmp": "0.0.31",
Expand Down