Merge pull request #817 from thelounge/pr/640

Webpack

.eslintignore

@@ -1,9 +1,8 @@
 # built by tools
-client/js/libs.min.js
-client/js/lounge.templates.js
+client/js/bundle.js
+client/js/bundle.vendor.js
 
 # third party
 client/js/libs/jquery/*.js
-client/js/libs/*.js
 
 coverage/

.eslintrc.yml

@@ -44,10 +44,5 @@ rules:
 
 globals:
   log: false
-  $: false
-  Favico: false
-  Handlebars: false
-  io: false
-  Mousetrap: false
 
 extends: eslint:recommended

.gitignore

@@ -6,6 +6,7 @@ coverage/
 # Built assets created at npm install/prepublish time
 # See https://docs.npmjs.com/misc/scripts
 client/fonts/
-client/js/libs.min.js.map
-client/js/libs.min.js
-client/js/lounge.templates.js
+client/js/bundle.js
+client/js/bundle.js.map
+client/js/bundle.vendor.js
+client/js/bundle.vendor.js.map

.istanbul.yml

@@ -1,8 +1,6 @@
 instrumentation:
   include-all-sources: true
   excludes:
-    - Gruntfile.js
-    - client/js/libs/*.js
-    - client/js/libs/jquery/*.js
-    - client/js/libs.min.js
+    - client/js/bundle.js
+    - client/js/bundle.vendor.js
     - client/js/lounge.js

.npmignore

@@ -2,6 +2,7 @@
 # npm-debug.log and node_modules/ are ignored by default.
 # See https://docs.npmjs.com/misc/developers#keeping-files-out-of-your-package
 
+client/js/bundle.vendor.js.map
 client/views/
 coverage/
 scripts/
@@ -16,4 +17,3 @@ test/
 .stylelintrc
 .travis.yml
 appveyor.yml
-Gruntfile.js

client/.eslintrc.yml

@@ -0,0 +1,3 @@
+---
+parserOptions:
+  sourceType: module

client/index.html

@@ -386,10 +386,8 @@ <h2>About The Lounge</h2>
 		<ul id="context-menu"></ul>
 	</div>
 
-	<script src="socket.io/socket.io.js"></script>
-	<script src="js/libs.min.js"></script>
-	<script src="js/lounge.templates.js"></script>
-	<script src="js/lounge.js"></script>
+	<script src="js/bundle.vendor.js"></script>
+	<script src="js/bundle.js"></script>
 
 	</body>
 </html>