From 7cdc7ff7e9d046974cb0c8068d03e95a641200ec Mon Sep 17 00:00:00 2001
From: Gary Smith <argentiapparatus@gmail.com>
Date: Fri, 30 Oct 2015 16:24:59 -0400
Subject: [PATCH] Updated gitignore templates

* Make patterns for pub created directories non directory specific
* Move pubspec.lock pattern to pub group
* Add pubspec.lock pattern to all templates
* Add guidance comment for removing pubspec.lock pattern
---
 templates/console-full/.gitignore     |  7 ++++---
 templates/package-simple/.gitignore   | 10 ++++------
 templates/server-appengine/.gitignore |  7 ++++---
 templates/server-shelf/.gitignore     |  7 ++++---
 templates/web-polymer/.gitignore      |  7 ++++---
 templates/web-simple/.gitignore       |  7 ++++---
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/templates/console-full/.gitignore b/templates/console-full/.gitignore
index f7d69f6..3e3ef75 100644
--- a/templates/console-full/.gitignore
+++ b/templates/console-full/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
diff --git a/templates/package-simple/.gitignore b/templates/package-simple/.gitignore
index a425549..8f462e3 100644
--- a/templates/package-simple/.gitignore
+++ b/templates/package-simple/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock
 
 # Files created by dart2js
 *.dart.js
@@ -16,9 +17,6 @@ build/
 # Directory created by dartdoc
 doc/api/
 
-# This is a library package, so ignore pub lock file
-pubspec.lock
-
 # JetBrains IDEs (WebStorm and IDEA are the recomended Dart IDEs) 
 .idea/
 *.iml
diff --git a/templates/server-appengine/.gitignore b/templates/server-appengine/.gitignore
index f7d69f6..3e3ef75 100644
--- a/templates/server-appengine/.gitignore
+++ b/templates/server-appengine/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
diff --git a/templates/server-shelf/.gitignore b/templates/server-shelf/.gitignore
index f7d69f6..3e3ef75 100644
--- a/templates/server-shelf/.gitignore
+++ b/templates/server-shelf/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
diff --git a/templates/web-polymer/.gitignore b/templates/web-polymer/.gitignore
index f7d69f6..3e3ef75 100644
--- a/templates/web-polymer/.gitignore
+++ b/templates/web-polymer/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
diff --git a/templates/web-simple/.gitignore b/templates/web-simple/.gitignore
index f7d69f6..3e3ef75 100644
--- a/templates/web-simple/.gitignore
+++ b/templates/web-simple/.gitignore
@@ -2,9 +2,10 @@
 .buildlog
 .packages
 .project
-.pub/
-build/
-**/packages/
+.pub
+build
+packages
+pubspec.lock # (Remove this pattern if you wish to check in your lock file)
 
 # Files created by dart2js
 *.dart.js
-- 
GitLab