Adds Webpack support and removes the use for Grunt

[github/wallabag/wallabag.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3b2dc462f6a12f63173bda028a5851e7ed5051eb..709f78cf248708646b86c8bae907360722184e54 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,13 @@
 /vendor/
 
 # Assets and user uploads
-/web/bundles/
-/web/uploads/
+web/uploads/
+!web/bundles
+web/bundles/*
+!web/bundles/wallabagcore
+/web/assets/images/*
+!web/assets/images/.gitkeep
+web/bundles/wallabagcore/*.dev.js
 
 # Build
 /app/build
@@ -32,7 +37,6 @@
 /composer.phar
 
 # Data for wallabag
-data/assets/*
 data/db/wallabag*.sqlite
 
 # Docker container logs and data
@@ -43,9 +47,12 @@ docker/data/
 composer.lock
 
 # assets stuff
-/node_modules/
-!app/Resources/static/lib
-app/Resources/static/lib/*
-/bin
+node_modules/
+bin
+app/Resources/build/
 !/src/Wallabag/CoreBundle/Resources/public
-/src/Wallabag/CoreBundle/Resources/public/*
\ No newline at end of file
+/src/Wallabag/CoreBundle/Resources/public/*
+
+# Test-generated files
+admin-export.json
+specialexport.json