diff --git a/.gitattributes b/.gitattributes
index eba1110b5794..b29479ecf36d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 # Auto detect text files and perform LF normalization
-* text=auto
\ No newline at end of file
+* text=auto
+package.json text eol=lf
diff --git a/.gitignore b/.gitignore
index 3028e8e0b71a..f55a016948ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ Thumbs.db
 /node_modules
 npm-debug.log
 npm-debug.log.*
+package-lock.json
 
 # WebStorm user-specific
 .idea/workspace.xml
diff --git a/.travis.yml b/.travis.yml
index 42139a1752fe..ba2f838c45bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "6"
+  - "8"
 sudo: false
 before_script:
   - export DISPLAY=:99.0