diff --git a/.eslintignore b/.eslintignore index 512bdec8..c0557f7d 100644 --- a/.eslintignore +++ b/.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/ diff --git a/.eslintrc.yml b/.eslintrc.yml index 1f4469f2..016b18a4 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -44,10 +44,5 @@ rules: globals: log: false - $: false - Favico: false - Handlebars: false - io: false - Mousetrap: false extends: eslint:recommended diff --git a/.gitignore b/.gitignore index 082fcf7b..205dd543 100644 --- a/.gitignore +++ b/.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 diff --git a/.istanbul.yml b/.istanbul.yml index e6e79229..f5671bc8 100644 --- a/.istanbul.yml +++ b/.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 diff --git a/.npmignore b/.npmignore index 6115c65f..3ae7e661 100644 --- a/.npmignore +++ b/.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 diff --git a/client/.eslintrc.yml b/client/.eslintrc.yml new file mode 100644 index 00000000..cb4e55ff --- /dev/null +++ b/client/.eslintrc.yml @@ -0,0 +1,3 @@ +--- +parserOptions: + sourceType: module diff --git a/client/index.html b/client/index.html index 4a0ea14b..de9311d7 100644 --- a/client/index.html +++ b/client/index.html @@ -386,10 +386,8 @@
- - - - + +