diff --git a/.eslintignore b/.eslintignore index 66a729cb..c97c7797 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,3 @@ -src/jquery.uls.data.js \ No newline at end of file +src/jquery.uls.data.js +dist/ +node_modules/ \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index b71c91aa..116a0c33 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -4,8 +4,19 @@ "wikimedia/client", "wikimedia/jquery" ], + "parserOptions": { + "ecmaVersion": 12, + "sourceType": "module" + }, + "env": { + "es6": true, + "browser": true, + "jquery": true, + "qunit": true, + "node": true + }, "globals": { "jQuery": "readonly", - "$": "off" + "$": "readonly" } } diff --git a/Gruntfile.js b/Gruntfile.js index 71d014b1..5e75908a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -14,11 +14,9 @@ module.exports = function ( grunt ) { }, all: [ '**/*.{js,json,html}', - '!src/jquery.uls.data.js', - '!scripts/jquery.uls.data.template.js', '!examples/resources/*.min.js', '!node_modules/**', - '!vendor/**' + '!dist/**' ] }, stylelint: { @@ -27,7 +25,8 @@ module.exports = function ( grunt ) { }, src: [ '**/*.css', - '!node_modules/**' + '!node_modules/**', + '!dist/**' ] }, qunit: { diff --git a/examples/index-i18n.html b/examples/index-i18n.html index 1254cd42..0ad1b4a0 100644 --- a/examples/index-i18n.html +++ b/examples/index-i18n.html @@ -4,20 +4,13 @@ Universal Language Selector - - - + - - - - - - + - - - - - + - - - - - + - - - - - + - - - - - + - - - - - + + - - - - - + - - + +