From e24523a29e292dd667580628676fa455ff349528 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Fri, 11 May 2018 01:48:13 +0200 Subject: [PATCH 1/5] updated eslint config to be more sorted and complete --- .eslintrc.js | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5667a04984..ddcc03055a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,34 +6,45 @@ module.exports = { }, "globals": { "Account": false, + "Agent": false, "AnimationCache": false, "Assets": false, "Audio": false, "AudioDevice": false, "AudioEffectOptions": false, + "Avatar": false, "AvatarList": false, "AvatarManager": false, "Camera": false, "Clipboard": false, + "console": false, + "ContextOverlay": false, "Controller": false, - "DialogsManager": false, "DebugDraw": false, + "DialogsManager": false, "Entities": false, + "EntityViewer": false, "FaceTracker": false, "GlobalServices": false, "HMD": false, + "LaserPointers": false, + "location": true, "LODManager": false, "Mat4": false, "Menu": false, "Messages": false, "ModelCache": false, + "module": false, "MyAvatar": false, "Overlays": false, "OverlayWebWindow": false, "Paths": false, + "print": false, "Quat": false, "Rates": false, + "RayPick": false, "Recording": false, + "Render": false, "Resource": false, "Reticle": false, "Scene": false, @@ -45,40 +56,36 @@ module.exports = { "Tablet": false, "TextureCache": false, "Toolbars": false, - "Uuid": false, "UndoStack": false, + "Users": false, "UserActivityLogger": false, + "Uuid": false, "Vec3": false, "WebSocket": false, "WebWindow": false, "Window": false, - "XMLHttpRequest": false, - "location": false, - "print": false, - "RayPick": false, - "LaserPointers": false, - "ContextOverlay": false, - "module": false + "XMLHttpRequest": false }, "rules": { - "brace-style": ["error", "1tbs", { "allowSingleLine": false }], - "comma-dangle": ["error", "never"], + "brace-style": ["error", "1tbs", {"allowSingleLine": false}], "camelcase": ["error"], + "comma-dangle": ["error", "never"], "curly": ["error", "all"], "eqeqeq": ["error", "always"], - "indent": ["error", 4, { "SwitchCase": 1 }], - "keyword-spacing": ["error", { "before": true, "after": true }], + "indent": ["error", 4, {"SwitchCase": 1}], + "key-spacing": ["error", {"beforeColon": false, "afterColon": true, "mode": "strict"}], + "keyword-spacing": ["error", {"before": true, "after": true}], "max-len": ["error", 128, 4], "new-cap": ["error"], + "no-console": ["off"], "no-floating-decimal": ["error"], - //"no-magic-numbers": ["error", { "ignore": [0, 1], "ignoreArrayIndexes": true }], - "no-multiple-empty-lines": ["error"], + // "no-magic-numbers": ["error", {"ignore": [0, 1], "ignoreArrayIndexes": true}], "no-multi-spaces": ["error"], - "no-unused-vars": ["error", { "args": "none", "vars": "local" }], + "no-multiple-empty-lines": ["error"], + "no-unused-vars": ["error", {"args": "none", "vars": "local"}], "semi": ["error", "always"], - "spaced-comment": ["error", "always", { - "line": { "markers": ["/"] } - }], - "space-before-function-paren": ["error", {"anonymous": "ignore", "named": "never"}] + "space-before-blocks": ["error"], + "space-before-function-paren": ["error", {"anonymous": "ignore", "named": "never"}], + "spaced-comment": ["error", "always", {"line": {"markers": ["/"]}}] } }; From 20fb9034f8bb1727d7df603cd14d812af4c6c5fd Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Mon, 14 May 2018 20:11:55 +0200 Subject: [PATCH 2/5] no magic numbers, except -1, 0, 1 --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index ddcc03055a..804e2bc928 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -79,7 +79,7 @@ module.exports = { "new-cap": ["error"], "no-console": ["off"], "no-floating-decimal": ["error"], - // "no-magic-numbers": ["error", {"ignore": [0, 1], "ignoreArrayIndexes": true}], + "no-magic-numbers": ["error", {"ignore": [-1, 0, 1], "ignoreArrayIndexes": true}], "no-multi-spaces": ["error"], "no-multiple-empty-lines": ["error"], "no-unused-vars": ["error", {"args": "none", "vars": "local"}], From 50f76dd4df4db78e3644d6328e19405bfcb87184 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Tue, 15 May 2018 00:11:34 +0200 Subject: [PATCH 3/5] added more missing globals --- .eslintrc.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 804e2bc928..04d4a820d8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,7 +12,11 @@ module.exports = { "Audio": false, "AudioDevice": false, "AudioEffectOptions": false, + "AudioScope": false, + "AudioStats": false, "Avatar": false, + "AvatarBookmarks": false, + "AvatarInputs": false, "AvatarList": false, "AvatarManager": false, "Camera": false, @@ -21,25 +25,38 @@ module.exports = { "ContextOverlay": false, "Controller": false, "DebugDraw": false, + "Desktop": false, + "DesktopPreviewProvider": false, "DialogsManager": false, "Entities": false, "EntityViewer": false, "FaceTracker": false, "GlobalServices": false, + "GooglePoly": false, + "Graphics": false, "HMD": false, "LaserPointers": false, "location": true, + "LocationBookmarks": false, "LODManager": false, "Mat4": false, "Menu": false, "Messages": false, + "Midi": false, "ModelCache": false, "module": false, "MyAvatar": false, + "OffscreenFlags": false, "Overlays": false, "OverlayWebWindow": false, + "OverlayWindow": false, "Paths": false, + "Picks": false, + "PickType": false, + "PointerEvent": false, + "Pointers": false, "print": false, + "QmlFragment": false, "Quat": false, "Rates": false, "RayPick": false, @@ -50,17 +67,22 @@ module.exports = { "Scene": false, "Script": false, "ScriptDiscoveryService": false, + "Selection": false, "Settings": false, + "Snapshot": false, "SoundCache": false, + "SpeechRecognizer": false, "Stats": false, + "Steam": false, "Tablet": false, "TextureCache": false, "Toolbars": false, "UndoStack": false, - "Users": false, "UserActivityLogger": false, + "Users": false, "Uuid": false, "Vec3": false, + "Wallet": false, "WebSocket": false, "WebWindow": false, "Window": false, From 82befc88628738b9ebde348601b28d5d6789fb2f Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Tue, 15 May 2018 06:21:26 +0200 Subject: [PATCH 4/5] ignore 0.5 and 2 as magic-numbers --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 04d4a820d8..7409893020 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -101,7 +101,7 @@ module.exports = { "new-cap": ["error"], "no-console": ["off"], "no-floating-decimal": ["error"], - "no-magic-numbers": ["error", {"ignore": [-1, 0, 1], "ignoreArrayIndexes": true}], + "no-magic-numbers": ["error", {"ignore": [0.5, -1, 0, 1, 2], "ignoreArrayIndexes": true}], "no-multi-spaces": ["error"], "no-multiple-empty-lines": ["error"], "no-unused-vars": ["error", {"args": "none", "vars": "local"}], From b20741baba03870f67cb36200f6ff5f1efadecf3 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Tue, 15 May 2018 06:36:01 +0200 Subject: [PATCH 5/5] web-scripting globals --- .eslintrc.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.eslintrc.js b/.eslintrc.js index 7409893020..67921be395 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,8 +28,10 @@ module.exports = { "Desktop": false, "DesktopPreviewProvider": false, "DialogsManager": false, + "document": false, "Entities": false, "EntityViewer": false, + "EventBridge": false, "FaceTracker": false, "GlobalServices": false, "GooglePoly": false,