DataType
/
omi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add isSafeToCreateProjectIn function to verify which is valid folder to create a project

This commit is contained in:
LeeHyungGeun 2018-10-30 02:21:00 +11:00
parent e4cafb951e
commit 9c313c0c12
4 changed files with 93 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/omi-cli/lib/init-pr.js
View File

@ -12,6 +12,7 @@ var error = logger.error;
var success = logger.success;
var isCnFun = require("./utils").isCnFuc;
var emptyFs = require("./utils").emptyFs;
var isSafeToCreateProjectIn = require("./utils").isSafeToCreateProjectIn;
function initPr(args) {
var omiCli = chalk.bold.cyan("Omi-Cli");
@ -30,32 +31,13 @@ function initPr(args) {
? " will execute init-pr command... "
: " 即将执行 init-pr 命令...")
);
if (existsSync(dest) && !emptyDir.sync(dest)) {
console.log();
process.stdout.write(
!isCn
? "This directory isn't empty, empty it? [Y/N] "
: "此文件夹不为空，是否需要清空？ [Y/N]: "
);
process.stdin.resume();
process.stdin.setEncoding("utf-8");
process.stdin.on("data", chunk => {
chunk = chunk.replace(/\s\n|\r\n/g, "");
if (chunk !== "y" && chunk !== "Y") {
process.exit(0);
} else {
console.log(
chalk.bold.cyan("Omi-Cli") +
(!isCn ? " is emptying this directory..." : " 正在清空此文件夹...")
);
emptyFs(dest);
createPr();
}
});
} else {
createPr();
if (!isSafeToCreateProjectIn(dest, projectName)) {
process.exit(1);
}
}
createPr();
function createPr() {
console.log();

30
packages/omi-cli/lib/init-ts.js
View File

@ -13,6 +13,7 @@ var error = require("./logger").error;
var success = require("./logger").success;
var isCnFun = require("./utils").isCnFuc;
var emptyFs = require("./utils").emptyFs;
var isSafeToCreateProjectIn = require("./utils").isSafeToCreateProjectIn;
function init(args) {
var omiCli = chalk.bold.cyan("Omi-Cli");
@ -29,32 +30,13 @@ function init(args) {
omiCli +
(!isCn ? " will execute init command... " : " 即将执行 init 命令...")
);
if (existsSync(dest) && !emptyDir.sync(dest)) {
console.log();
process.stdout.write(
!isCn
? "This directory isn't empty, empty it? [Y/N] "
: "此文件夹不为空，是否需要清空？ [Y/N]: "
);
process.stdin.resume();
process.stdin.setEncoding("utf-8");
process.stdin.on("data", chunk => {
chunk = chunk.replace(/\s\n|\r\n/g, "");
if (chunk !== "y" && chunk !== "Y") {
process.exit(0);
} else {
console.log(
chalk.bold.cyan("Omi-Cli") +
(!isCn ? " is emptying this directory..." : " 正在清空此文件夹...")
);
emptyFs(dest);
createApp();
}
});
} else {
createApp();
if (!isSafeToCreateProjectIn(dest, projectName)) {
process.exit(1);
}
}
createApp();
function createApp() {
console.log();

30
packages/omi-cli/lib/init.js
View File

@ -13,6 +13,7 @@ var error = require("./logger").error;
var success = require("./logger").success;
var isCnFun = require("./utils").isCnFuc;
var emptyFs = require("./utils").emptyFs;
var isSafeToCreateProjectIn = require("./utils").isSafeToCreateProjectIn;
function init(args) {
var omiCli = chalk.bold.cyan("Omi-Cli");
@ -29,32 +30,13 @@ function init(args) {
omiCli +
(!isCn ? " will execute init command... " : " 即将执行 init 命令...")
);
if (existsSync(dest) && !emptyDir.sync(dest)) {
console.log();
process.stdout.write(
!isCn
? "This directory isn't empty, empty it? [Y/N] "
: "此文件夹不为空，是否需要清空？ [Y/N]: "
);
process.stdin.resume();
process.stdin.setEncoding("utf-8");
process.stdin.on("data", chunk => {
chunk = chunk.replace(/\s\n|\r\n|\n/g, "");
if (chunk !== "y" && chunk !== "Y") {
process.exit(0);
} else {
console.log(
chalk.bold.cyan("Omi-Cli") +
(!isCn ? " is emptying this directory..." : " 正在清空此文件夹...")
);
emptyFs(dest);
createApp();
}
});
} else {
createApp();
if (!isSafeToCreateProjectIn(dest, projectName)) {
process.exit(1);
}
}
createApp();
function createApp() {
console.log();

76
packages/omi-cli/lib/utils.js
View File

@ -1,4 +1,6 @@
var fs = require("fs");
var chalk = require('chalk');
var path = require('path');
var existsSync = fs.existsSync;
var readdirSync = fs.readdirSync;
var rmdirSync = fs.rmdirSync;
@ -29,7 +31,79 @@ function emptyFs(path) {
}
}
/**
* isSafeToCreateProjectIn function is created from `create-react-app`
* which is on create-react-app/packages/create-react-app/createReactApp.js line 740 of version 2.0.4
*/
function isSafeToCreateProjectIn(root, name) {
// These files should be allowed to remain on a failed install,
// but then silently removed during the next create.
const errorLogFilePatterns = [
'npm-debug.log',
'yarn-error.log',
'yarn-debug.log',
];
const validFiles = [
'.DS_Store',
'Thumbs.db',
'.git',
'.gitignore',
'.idea',
'README.md',
'LICENSE',
'web.iml',
'.hg',
'.hgignore',
'.hgcheck',
'.npmignore',
'mkdocs.yml',
'docs',
'.travis.yml',
'.gitlab-ci.yml',
'.gitattributes',
];
console.log();
const conflicts = fs
.readdirSync(root)
.filter(file => !validFiles.includes(file))
// Don't treat log files from previous installation as conflicts
.filter(
file => !errorLogFilePatterns.some(pattern => file.indexOf(pattern) === 0)
);
if (conflicts.length > 0) {
console.log(
`The directory ${chalk.green(name)} contains files that could conflict:`
);
console.log();
for (const file of conflicts) {
console.log(` ${file}`);
}
console.log();
console.log(
'Either try using a new directory name, or remove the files listed above.'
);
return false;
}
// Remove any remnant files from a previous installation
const currentFiles = fs.readdirSync(path.join(root));
currentFiles.forEach(file => {
errorLogFilePatterns.forEach(errorLogFilePattern => {
// This will catch `(npm-debug|yarn-error|yarn-debug).log*` files
if (file.indexOf(errorLogFilePattern) === 0) {
unlinkSync(path.join(root, file));
}
});
});
return true;
}
module.exports = {
isCnFuc: isCnFuc,
emptyFs: emptyFs
emptyFs: emptyFs,
isSafeToCreateProjectIn: isSafeToCreateProjectIn
};