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.

Sign up for GitHub

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

Creating a new app in the current directory #368

Merged
merged 2 commits into from
Aug 8, 2016
Merged

Creating a new app in the current directory #368

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a52fa2e
Creating a new app in the current directory
torifat Aug 5, 2016
fe12b8d
Fixed style mistakes
torifat Aug 7, 2016
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
25 changes: 19 additions & 6 deletions global-cli/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ var spawn = require('cross-spawn');
var chalk = require('chalk');
var semver = require('semver');
var argv = require('minimist')(process.argv.slice(2));
var pathExists = require('path-exists');

/**
* Arguments:
Expand All @@ -67,21 +68,23 @@ if (commands.length === 0) {
createApp(commands[0], argv.verbose, argv['scripts-version']);

function createApp(name, verbose, version) {
if (fs.existsSync(name)) {
console.log('The directory `' + name + '` already exists. Aborting.');
var root = path.resolve(name);
if (!pathExists.sync(name)) {
fs.mkdirSync(root);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: put } before else if. Otherwise skimming through the file we may read as if that's the only condition

// Check if GitHub boilerplate compatible
// https://github.com/facebookincubator/create-react-app/pull/368#issuecomment-237875655
else if (!isGitHubBoilerplate(root)) {
console.log('The directory `' + name + '` contains file(s) that could conflict. Aborting.');
process.exit(1);
}

var root = path.resolve(name);
var appName = path.basename(root);

console.log(
'Creating a new React app in ' + root + '.'
);
console.log();

fs.mkdirSync(root);

var packageJson = {
name: appName,
version: '0.0.1',
Expand Down Expand Up @@ -166,3 +169,13 @@ function checkNodeVersion() {
process.exit(1);
}
}

function isGitHubBoilerplate(root) {
var validFiles = [
'.DS_Store', 'Thumbs.db', '.git', '.gitignore', 'README.md', 'LICENSE'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add 'CNAME' to the the validFiles array? https://help.github.com/articles/adding-or-removing-a-custom-domain-for-your-github-pages-site/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you open a new issue with this request please? It's a little difficult to track in an issue like this.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this essentially makes it impossible to use another collaboration/versioning product eg subversion, or some other IDE such as eclipse to register the project. I am trying to co-locate my project in eclipse and use subversion for collaboration. Eclipse creates a ".project" file, and subversion creates ".svn" directories.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please open another issue to discuss this. Comments on old issues aren't very actionable.

];
return fs.readdirSync(root)
.every(function (file) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: no space after function

return validFiles.indexOf(file) >= 0;
});
}
1 change: 1 addition & 0 deletions global-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"chalk": "^1.1.1",
"cross-spawn": "^4.0.0",
"minimist": "^1.2.0",
"path-exists": "^3.0.0",
"semver": "^5.0.3"
}
}
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"jest": "14.1.0",
"json-loader": "0.5.4",
"opn": "4.0.2",
"path-exists": "^3.0.0",
"postcss-loader": "0.9.1",
"promise": "7.1.1",
"recursive-readdir": "2.0.0",
Expand Down
27 changes: 26 additions & 1 deletion scripts/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
var fs = require('fs-extra');
var path = require('path');
var spawn = require('cross-spawn');
var pathExists = require('path-exists');
var chalk = require('chalk');

module.exports = function(appPath, appName, verbose, originalDirectory) {
var ownPath = path.join(appPath, 'node_modules', 'react-scripts');
Expand Down Expand Up @@ -43,12 +45,31 @@ module.exports = function(appPath, appName, verbose, originalDirectory) {
JSON.stringify(appPackage, null, 2)
);

var readmeExists = pathExists.sync(path.join(appPath, 'README.md'));
if (readmeExists) {
fs.renameSync(path.join(appPath, 'README.md'), path.join(appPath, 'README.old.md'));
}

// Copy the files for the user
fs.copySync(path.join(ownPath, 'template'), appPath);

// Rename gitignore after the fact to prevent npm from renaming it to .npmignore
// See: https://github.com/npm/npm/issues/1862
fs.move(path.join(appPath, 'gitignore'), path.join(appPath, '.gitignore'), []);
fs.move(path.join(appPath, 'gitignore'), path.join(appPath, '.gitignore'), [], function (err) {
if (err) {
// Append if there's already a `.gitignore` file there
if (err.code === 'EEXIST') {
fs.readFile(path.join(appPath, 'gitignore'), (err, data) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use readFileSync, otherwise we may run into race conditions as the rest of the file is going to run concurrently

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we do nothing with that file later, so I thought it would be ok. Changing it.

if (err) throw err;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: always use {} and put the throw on its own line

fs.appendFileSync(path.join(appPath, '.gitignore'), data);
fs.unlinkSync(path.join(appPath, 'gitignore'));
});
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: } on the same line as else {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sigh! sorry for these silly mistakes. I thought eslint had those covered. Didn't bother checking coding style since there's a .eslintrc.js in the root.

else {
throw err;
}
}
});

// Run another npm install for react and react-dom
console.log('Installing react and react-dom from npm...');
Expand Down Expand Up @@ -88,6 +109,10 @@ module.exports = function(appPath, appName, verbose, originalDirectory) {
console.log();
console.log(' cd', cdpath);
console.log(' npm start');
if (readmeExists) {
console.log();
console.log(chalk.yellow('You had a `README.md` file, we renamed it to `README.old.md`'));
}
console.log();
console.log('Happy hacking!');
});
Expand Down