]> source.dussan.org Git - gitignore.git/commitdiff
Comment out / add note about conflicting gitignore lines (#3204)
authorKarl Horky <karl.horky@gmail.com>
Thu, 24 Oct 2019 16:31:35 +0000 (18:31 +0200)
committerBrendan Forster <brendan@github.com>
Thu, 24 Oct 2019 16:31:35 +0000 (13:31 -0300)
* Remove conflicting gitignore lines, add reference

Ref (introduction of a new "public" folder in Next.js):
https://nextjs.org/blog/next-9-1#public-directory-support

* Improve solution to conflicting files

Node.gitignore
community/JavaScript/Nuxt.gitignore [deleted file]

index 6fb487aaa1eefd2a56bdd587e085e52912a6679f..67045665db202cf951f839a5f3e73efdcfd45021 100644 (file)
@@ -75,15 +75,18 @@ typings/
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 
-# next.js build output
+# Next.js build output
 .next
 
-# nuxt.js build output
+# Nuxt.js build / generate output
 .nuxt
+dist
 
-# gatsby files
+# Gatsby files
 .cache/
-public
+# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
 
 # vuepress build output
 .vuepress/dist
diff --git a/community/JavaScript/Nuxt.gitignore b/community/JavaScript/Nuxt.gitignore
deleted file mode 100644 (file)
index cd6c77a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# gitignore template for Nuxt.js projects
-#
-# Recommended template: Node.gitignore
-
-# Nuxt build
-.nuxt
-
- # Nuxt generate
-dist