diff --git a/assets/.babelrc b/assets/.babelrc
index 0639bf7643..ce33b24d4d 100644
--- a/assets/.babelrc
+++ b/assets/.babelrc
@@ -2,4 +2,4 @@
     "presets": [
         "@babel/preset-env"
     ]
-}
\ No newline at end of file
+}
diff --git a/assets/.eslintrc.js b/assets/.eslintrc.js
index 07077b1157..891a15d8fa 100644
--- a/assets/.eslintrc.js
+++ b/assets/.eslintrc.js
@@ -65,6 +65,7 @@ module.exports = {
         
             }
         ],
+        "eol-last": ["error", "always"],
         "no-unused-vars": [
             "error",
             {
diff --git a/assets/js/phoenix/channel.js b/assets/js/phoenix/channel.js
index b4f06a8f95..3be29fa62e 100644
--- a/assets/js/phoenix/channel.js
+++ b/assets/js/phoenix/channel.js
@@ -314,4 +314,4 @@ export default class Channel {
    * @private
    */
   isLeaving(){ return this.state === CHANNEL_STATES.leaving }
-}
\ No newline at end of file
+}
diff --git a/assets/js/phoenix/constants.js b/assets/js/phoenix/constants.js
index d59f593778..6da9db4fe3 100644
--- a/assets/js/phoenix/constants.js
+++ b/assets/js/phoenix/constants.js
@@ -29,4 +29,4 @@ export const CHANNEL_LIFECYCLE_EVENTS = [
 export const TRANSPORTS = {
   longpoll: "longpoll",
   websocket: "websocket"
-}
\ No newline at end of file
+}
diff --git a/assets/js/phoenix/longpoll.js b/assets/js/phoenix/longpoll.js
index 3de68a96c9..3dda985fe4 100644
--- a/assets/js/phoenix/longpoll.js
+++ b/assets/js/phoenix/longpoll.js
@@ -115,4 +115,4 @@ export default class LongPoll {
     this.readyState = SOCKET_STATES.closed
     this.onclose()
   }
-}
\ No newline at end of file
+}
diff --git a/assets/js/phoenix/push.js b/assets/js/phoenix/push.js
index cbc290b3da..2e497a2dc6 100644
--- a/assets/js/phoenix/push.js
+++ b/assets/js/phoenix/push.js
@@ -125,4 +125,4 @@ export default class Push {
   trigger(status, response){
     this.channel.trigger(this.refEvent, {status, response})
   }
-}
\ No newline at end of file
+}
diff --git a/assets/js/phoenix/serializer.js b/assets/js/phoenix/serializer.js
index 7c623f5902..ef88ba4fca 100644
--- a/assets/js/phoenix/serializer.js
+++ b/assets/js/phoenix/serializer.js
@@ -109,4 +109,4 @@ export default {
 
     return {join_ref: null, ref: null, topic: topic, event: event, payload: data}
   }
-}
\ No newline at end of file
+}
diff --git a/assets/js/phoenix/socket.js b/assets/js/phoenix/socket.js
index 73b5dc6992..b6dd493644 100644
--- a/assets/js/phoenix/socket.js
+++ b/assets/js/phoenix/socket.js
@@ -505,4 +505,4 @@ export default class Socket {
       dupChannel.leave()
     }
   }
-}
\ No newline at end of file
+}
diff --git a/assets/js/phoenix/timer.js b/assets/js/phoenix/timer.js
index 5253eb5c83..5784ce5042 100644
--- a/assets/js/phoenix/timer.js
+++ b/assets/js/phoenix/timer.js
@@ -39,4 +39,4 @@ export default class Timer {
       this.callback()
     }, this.timerCalc(this.tries + 1))
   }
-}
\ No newline at end of file
+}
diff --git a/assets/js/phoenix/utils.js b/assets/js/phoenix/utils.js
index 1080cb06e8..b3a701a828 100644
--- a/assets/js/phoenix/utils.js
+++ b/assets/js/phoenix/utils.js
@@ -6,4 +6,4 @@ export let closure = (value) => {
     let closure = function (){ return value }
     return closure
   }
-}
\ No newline at end of file
+}
diff --git a/assets/test/presence_test.js b/assets/test/presence_test.js
index 6425f215c1..e9facf4871 100644
--- a/assets/test/presence_test.js
+++ b/assets/test/presence_test.js
@@ -236,4 +236,4 @@ describe("instance", function(){
     channelStub.trigger("the_diff", {joins: {}, leaves: {user1: user1}})
     assert.deepEqual(presence.list(listByFirst), [])
   })
-})
\ No newline at end of file
+})
diff --git a/assets/test/serializer.js b/assets/test/serializer.js
index 111fc44823..6a34a0e63a 100644
--- a/assets/test/serializer.js
+++ b/assets/test/serializer.js
@@ -10,4 +10,4 @@ export const decode = (rawPayload) => {
   let [join_ref, ref, topic, event, payload] = JSON.parse(rawPayload)
 
   return {join_ref, ref, topic, event, payload}
-}
\ No newline at end of file
+}
diff --git a/assets/test/socket_test.js b/assets/test/socket_test.js
index 3402fdf245..cdf252b089 100644
--- a/assets/test/socket_test.js
+++ b/assets/test/socket_test.js
@@ -8,7 +8,7 @@ import {Socket, LongPoll} from "../js/phoenix"
 
 let socket
 
-describe("with transports", function(done){
+describe("with transports", function(){
   before(function(){
     window.WebSocket = WebSocket
     window.XMLHttpRequest = sinon.useFakeXMLHttpRequest()
diff --git a/assets/webpack.config.js b/assets/webpack.config.js
index d0e239632c..b33506270b 100644
--- a/assets/webpack.config.js
+++ b/assets/webpack.config.js
@@ -28,4 +28,4 @@ module.exports = (env, options) => {
     },
     plugins: []
   }
-}
\ No newline at end of file
+}