From eeeb74602bf1ae490ead5a3d209a589cc2b4a691 Mon Sep 17 00:00:00 2001
From: "Michael Bradley, Jr" <michaelsbradleyjr@gmail.com>
Date: Sat, 27 Oct 2018 17:36:09 +0200
Subject: [PATCH] cleanup, consolidate .gitignore files

---
 .gitignore                          | 42 +++++++----------------------
 templates/.gitignore                |  8 ++++++
 templates/boilerplate/dot.gitignore |  7 ++---
 templates/demo/dot.gitignore        |  7 ++---
 templates/simple/dot.gitignore      |  7 ++---
 test_apps/.gitignore                |  7 +++++
 test_apps/contracts_app/.gitignore  |  6 -----
 test_apps/coverage_app/.gitignore   |  7 -----
 test_apps/embark_demo/.gitignore    |  5 ----
 test_apps/test_app/.gitignore       |  6 -----
 10 files changed, 37 insertions(+), 65 deletions(-)
 create mode 100644 templates/.gitignore
 create mode 100644 test_apps/.gitignore
 delete mode 100644 test_apps/contracts_app/.gitignore
 delete mode 100644 test_apps/coverage_app/.gitignore
 delete mode 100644 test_apps/embark_demo/.gitignore
 delete mode 100644 test_apps/test_app/.gitignore

diff --git a/.gitignore b/.gitignore
index b51cf0da3..81925da57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,12 @@
-node_modules
-TODO
-NOTES
-.node-xmlhttprequest-sync-*
-templates/demo/dist/
-templates/demo/.embark/development/
-templates/demo/config/production/password
-templates/demo/node_modules/
-templates/boilerplate/dist/
-docs/_build
-docs/utils/__pycache_
-test/cli_shim/.cid
-test_apps/test_app/dist/
-test_apps/test_app/.embark/development/
-test_apps/test_app/config/production/password
-test_apps/test_app/node_modules/
-test_apps/test_app/chains.json
-test_apps/contracts_app/build/
-test_apps/contracts_app/.embark/development/
-test_apps/contracts_app/config/production/password
-test_apps/contracts_app/node_modules/
-test_apps/contracts_app/chains.json
-test_apps/embark_demo/dist/
-test_apps/embark_demo/.embark/development/
-test_apps/embark_demo/config/production/password
-test_apps/embark_demo/node_modules/
-test_apps/embark_demo/chains.json
 .idea
-.vscode
-.eslintrc.json
-.embark/
-NOTES
-npm-debug.log
+.node-xmlhttprequest-sync-*
 .tern-port
+.vscode
+NOTES
+TODO
+dist
+embark-*.tgz
+node_modules
+npm-debug.log
+package
+src/test/cli_shim/.cid
diff --git a/templates/.gitignore b/templates/.gitignore
new file mode 100644
index 000000000..70df2fcd4
--- /dev/null
+++ b/templates/.gitignore
@@ -0,0 +1,8 @@
+**/.embark
+**/chains.json
+**/config/production/password
+**/config/livenet/password
+**/coverage
+**/dist
+**/package-lock.json
+**/node_modules
diff --git a/templates/boilerplate/dot.gitignore b/templates/boilerplate/dot.gitignore
index 77bcafb1a..641862673 100644
--- a/templates/boilerplate/dot.gitignore
+++ b/templates/boilerplate/dot.gitignore
@@ -1,5 +1,6 @@
-.embark/
-node_modules/
-dist/
+.embark
 config/production/password
 config/livenet/password
+coverage
+dist
+node_modules
diff --git a/templates/demo/dot.gitignore b/templates/demo/dot.gitignore
index 77bcafb1a..641862673 100644
--- a/templates/demo/dot.gitignore
+++ b/templates/demo/dot.gitignore
@@ -1,5 +1,6 @@
-.embark/
-node_modules/
-dist/
+.embark
 config/production/password
 config/livenet/password
+coverage
+dist
+node_modules
diff --git a/templates/simple/dot.gitignore b/templates/simple/dot.gitignore
index 77bcafb1a..641862673 100644
--- a/templates/simple/dot.gitignore
+++ b/templates/simple/dot.gitignore
@@ -1,5 +1,6 @@
-.embark/
-node_modules/
-dist/
+.embark
 config/production/password
 config/livenet/password
+coverage
+dist
+node_modules
diff --git a/test_apps/.gitignore b/test_apps/.gitignore
new file mode 100644
index 000000000..786d576e2
--- /dev/null
+++ b/test_apps/.gitignore
@@ -0,0 +1,7 @@
+**/.embark
+**/chains.json
+**/config/production/password
+**/config/livenet/password
+**/coverage
+**/dist
+**/node_modules
diff --git a/test_apps/contracts_app/.gitignore b/test_apps/contracts_app/.gitignore
deleted file mode 100644
index b335e859e..000000000
--- a/test_apps/contracts_app/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.embark/
-node_modules/
-dist/
-config/production/password
-config/livenet/password
-build/
diff --git a/test_apps/coverage_app/.gitignore b/test_apps/coverage_app/.gitignore
deleted file mode 100644
index e8460e731..000000000
--- a/test_apps/coverage_app/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.embark/
-node_modules/
-dist/
-config/production/password
-config/livenet/password
-coverage/
-chains.json
diff --git a/test_apps/embark_demo/.gitignore b/test_apps/embark_demo/.gitignore
deleted file mode 100644
index 77bcafb1a..000000000
--- a/test_apps/embark_demo/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.embark/
-node_modules/
-dist/
-config/production/password
-config/livenet/password
diff --git a/test_apps/test_app/.gitignore b/test_apps/test_app/.gitignore
deleted file mode 100644
index 9fb2a32c1..000000000
--- a/test_apps/test_app/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.embark/
-node_modules/
-dist/
-config/production/password
-config/livenet/password
-coverage/