diff --git a/.gitignore b/.gitignore
index b5d471c14..047b48e81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,19 @@
-built/
-node_modules/
-selenium/
-testapp/inbrowsertest/
-typings/
-website/bower_components/
-website/build/
-website/docgen/build/
+# Shared between .npmignore and .gitignore
 
 chromedriver.log
 libpeerconnection.log
 xmloutput*
 npm-debug.log
 .idea/
-
+.vscode/
 *.DS_Store
 *.swp
+selenium/
+
+# Build artifacts
 
+built/
+node_modules/
+website/bower_components/
+website/build/
+website/docgen/build/
diff --git a/.npmignore b/.npmignore
index fe815389d..4b770f132 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,27 +1,35 @@
+# Shared between .npmignore and .gitignore
+
+chromedriver.log
+libpeerconnection.log
+xmloutput*
+npm-debug.log
+.idea/
+.vscode/
+*.DS_Store
+*.swp
+selenium/
+
+# Development folders
+
+.github/
+built/spec/
 debugging/
 docs/
 lib/
 scripts/
 spec/
 stress/
-selenium/
 testapp/
-typings/
 website/
 
-built/spec/
+# Development files
 
 .clang-format
 .gitattributes
-.github/
 .gitignore
-.idea/
 .jshintrc
 .npmignore
 .travis.yml
-chromedriver.log
 circle.yml
-libpeerconnection.log
-npm-debug.log
-xmloutput*
 release.md