From e676d93c83ad042001950dd59e4f40239be9c0f4 Mon Sep 17 00:00:00 2001 From: Ottavio Hartman Date: Wed, 7 Jun 2017 13:40:31 -0400 Subject: [PATCH] Add --- .idea/jsLibraryMappings.xml | 4 ++-- Tools/eslint-config-cesium/.eslintrc.json | 3 --- Tools/eslint-config-cesium/browser-test.js | 5 ++++- Tools/eslint-config-cesium/browser.js | 6 ++++++ Tools/eslint-config-cesium/index.js | 6 +++--- Tools/eslint-config-cesium/node-test.js | 9 +++++++++ Tools/eslint-config-cesium/node.js | 5 ++++- 7 files changed, 28 insertions(+), 10 deletions(-) delete mode 100644 Tools/eslint-config-cesium/.eslintrc.json diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml index 4bb85da06f3..13a58bed92c 100644 --- a/.idea/jsLibraryMappings.xml +++ b/.idea/jsLibraryMappings.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/Tools/eslint-config-cesium/.eslintrc.json b/Tools/eslint-config-cesium/.eslintrc.json deleted file mode 100644 index 9ef3669f573..00000000000 --- a/Tools/eslint-config-cesium/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends" : "cesium/node" -} diff --git a/Tools/eslint-config-cesium/browser-test.js b/Tools/eslint-config-cesium/browser-test.js index 4a71150a4e6..52525700106 100644 --- a/Tools/eslint-config-cesium/browser-test.js +++ b/Tools/eslint-config-cesium/browser-test.js @@ -1,5 +1,8 @@ +/*eslint-env node*/ +'use strict'; + module.exports = { - "extends": "cesium", + "extends": "cesium/browser", "env": { "jasmine": true } diff --git a/Tools/eslint-config-cesium/browser.js b/Tools/eslint-config-cesium/browser.js index d188d4d6d54..612f1ce3ef4 100644 --- a/Tools/eslint-config-cesium/browser.js +++ b/Tools/eslint-config-cesium/browser.js @@ -1,3 +1,6 @@ +/*eslint-env node*/ +'use strict'; + module.exports = { "extends": "eslint-config-cesium", "globals": { @@ -7,6 +10,9 @@ module.exports = { "Sandcastle": true, "Cesium": true }, + "plugins": [ + "html" + ], "rules": { "no-unused-vars": ["off"] } diff --git a/Tools/eslint-config-cesium/index.js b/Tools/eslint-config-cesium/index.js index 9a1dd95d3e8..24973379399 100644 --- a/Tools/eslint-config-cesium/index.js +++ b/Tools/eslint-config-cesium/index.js @@ -1,3 +1,6 @@ +/*eslint-env node*/ +'use strict'; + module.exports = { "extends": "eslint:recommended", "env": { @@ -16,9 +19,6 @@ module.exports = { "Uint8Array": false, "Uint8ClampedArray": false }, - "plugins": [ - "html" - ], "rules": { "curly": ["error"], "eqeqeq": ["error"], diff --git a/Tools/eslint-config-cesium/node-test.js b/Tools/eslint-config-cesium/node-test.js index e69de29bb2d..384e89a223a 100644 --- a/Tools/eslint-config-cesium/node-test.js +++ b/Tools/eslint-config-cesium/node-test.js @@ -0,0 +1,9 @@ +/*eslint-env node*/ +'use strict'; + +module.exports = { + "extends": "cesium/node", + "env": { + "jasmine": true + } +}; diff --git a/Tools/eslint-config-cesium/node.js b/Tools/eslint-config-cesium/node.js index 632862ea8bb..7068bc155c5 100644 --- a/Tools/eslint-config-cesium/node.js +++ b/Tools/eslint-config-cesium/node.js @@ -1,9 +1,12 @@ +/*eslint-env node*/ +'use strict'; + module.exports = { "extends": "cesium", "env": { "node": true }, "rules": { - "strict": ["off"] + "strict": [2, "safe"] } };