Skip to content

Commit e7e7b87

Browse files
Merge pull request #699 from embark-framework/3_1_0_templates-gitignore-2
3_1_0 template .gitignore — round 2
2 parents 74d6904 + a8f8acb commit e7e7b87

File tree

6 files changed

+8
-1
lines changed

6 files changed

+8
-1
lines changed

.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
!templates/**/.gitignore

lib/cmds/template_generator.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ class TemplateGenerator {
1414
fs.copySync(templatePath, fspath);
1515
utils.cd(fspath);
1616
utils.sed('package.json', '%APP_NAME%', name);
17+
if (fs.existsSync('dot.gitignore')) {
18+
fs.moveSync('dot.gitignore', '.gitignore');
19+
}
1720

1821
if (name === 'embark_demo') {
1922
console.log(__('Installing packages...').green);

lib/core/fs.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ function move(){
2323
return fs.move.apply(fs.move, arguments);
2424
}
2525

26+
function moveSync() {
27+
return fs.moveSync.apply(fs.moveSync, arguments);
28+
}
29+
2630
function appendFileSync() {
2731
return fs.appendFileSync.apply(fs.writeFileSync, arguments);
2832
}
@@ -92,6 +96,7 @@ module.exports = {
9296
copy,
9397
copySync,
9498
move,
99+
moveSync,
95100
readFile,
96101
readFileSync,
97102
appendFileSync,
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)