]> source.dussan.org Git - jquery.git/commitdiff
Build: .eslintrc -> .eslintrc.json
authorOleg Gaidarenko <markelog@gmail.com>
Fri, 29 Jul 2016 19:18:58 +0000 (22:18 +0300)
committerOleg Gaidarenko <markelog@gmail.com>
Tue, 2 Aug 2016 18:16:20 +0000 (21:16 +0300)
`.eslintrc` format is deprecated -
http://eslint.org/docs/user-guide/configuring#configuration-file-formats

Fixes gh-3248
Closes gh-3247

13 files changed:
.eslintrc [deleted file]
.eslintrc.json [new file with mode: 0644]
dist/.eslintrc [deleted file]
dist/.eslintrc.json [new file with mode: 0644]
src/.eslintrc [deleted file]
src/.eslintrc.json [new file with mode: 0644]
src/core.js
test/.eslintrc [deleted file]
test/.eslintrc.json [new file with mode: 0644]
test/node_smoke_tests/.eslintrc [deleted file]
test/node_smoke_tests/.eslintrc.json [new file with mode: 0644]
test/promises_aplus_adapters/.eslintrc [deleted file]
test/promises_aplus_adapters/.eslintrc.json [new file with mode: 0644]

diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644 (file)
index 6dcb635..0000000
--- a/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-       "extends": "eslint-config-jquery",
-       "root": true,
-       "env": {
-               "node": true
-       }
-}
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644 (file)
index 0000000..6dcb635
--- /dev/null
@@ -0,0 +1,7 @@
+{
+       "extends": "eslint-config-jquery",
+       "root": true,
+       "env": {
+               "node": true
+       }
+}
diff --git a/dist/.eslintrc b/dist/.eslintrc
deleted file mode 100644 (file)
index ac4ec2f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-       "extends": "../src/.eslintrc",
-       "rules": {
-               // That is okay for the built version
-               "no-multiple-empty-lines": "off",
-
-               // Because sizze is not compatible to jquery code style
-               "no-nested-ternary": "off",
-               "no-unused-expressions": "off",
-               "lines-around-comment": "off",
-               "space-in-parens": "off",
-               "camelcase": "off",
-               "computed-property-spacing": "off",
-               "max-len": "off",
-               "dot-notation": "off",
-               "semi-spacing": "off",
-               "brace-style": "off"
-       }
-}
diff --git a/dist/.eslintrc.json b/dist/.eslintrc.json
new file mode 100644 (file)
index 0000000..b99e682
--- /dev/null
@@ -0,0 +1,19 @@
+{
+       "extends": "../src/.eslintrc.json",
+       "rules": {
+               // That is okay for the built version
+               "no-multiple-empty-lines": "off",
+
+               // Because sizze is not compatible to jquery code style
+               "no-nested-ternary": "off",
+               "no-unused-expressions": "off",
+               "lines-around-comment": "off",
+               "space-in-parens": "off",
+               "camelcase": "off",
+               "computed-property-spacing": "off",
+               "max-len": "off",
+               "dot-notation": "off",
+               "semi-spacing": "off",
+               "brace-style": "off"
+       }
+}
diff --git a/src/.eslintrc b/src/.eslintrc
deleted file mode 100644 (file)
index dbf16c5..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-       // Support: IE <=9 only, Android <=4.0 only
-       // The above browsers are failing a lot of tests in the ES5
-       // test suite at http://test262.ecmascript.org.
-       "parserOptions": {
-               "ecmaVersion": 3
-       },
-       "globals": {
-               "window": true,
-               "jQuery": true,
-               "define": true,
-               "module": true,
-               "noGlobal": true
-       },
-       "rules": {
-               "strict": ["error", "function"]
-       }
-}
diff --git a/src/.eslintrc.json b/src/.eslintrc.json
new file mode 100644 (file)
index 0000000..dbf16c5
--- /dev/null
@@ -0,0 +1,18 @@
+{
+       // Support: IE <=9 only, Android <=4.0 only
+       // The above browsers are failing a lot of tests in the ES5
+       // test suite at http://test262.ecmascript.org.
+       "parserOptions": {
+               "ecmaVersion": 3
+       },
+       "globals": {
+               "window": true,
+               "jQuery": true,
+               "define": true,
+               "module": true,
+               "noGlobal": true
+       },
+       "rules": {
+               "strict": ["error", "function"]
+       }
+}
index 68ba9a5c24d18c9f70ed14efbcaacabf07139c4d..f3983b4a83ab502a209a6fef73cf9292d314b13c 100644 (file)
@@ -1,5 +1,5 @@
 /* global Symbol */
-// Defining this global in .eslintrc would create a danger of using the global
+// Defining this global in .eslintrc.json would create a danger of using the global
 // unguarded in another place, it seems safer to define global only for this module
 
 define( [
diff --git a/test/.eslintrc b/test/.eslintrc
deleted file mode 100644 (file)
index 744de89..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-       "env": {
-               "browser": true
-       },
-       // Support: IE <=9 only, Android <=4.0 only
-       // The above browsers are failing a lot of tests in the ES5
-       // test suite at http://test262.ecmascript.org.
-       "parserOptions": {
-               "ecmaVersion": 3
-       },
-       "globals": {
-               "require": false,
-               "define": false,
-               "DOMParser": false,
-               "JSON": false,
-               "Promise": false,
-               "Symbol": false,
-               "QUnit": false,
-               "ajaxTest": false,
-               "testIframe": false,
-               "testIframeWithCallback": false,
-               "iframeCallback": true,
-               "createDashboardXML": false,
-               "createXMLFragment": false,
-               "moduleTeardown": false,
-               "testFoo": false,
-               "url": false,
-               "t": false,
-               "q": false,
-               "jQuery": true,
-               "sinon": true,
-               "amdDefined": true,
-               "fireNative": true,
-               "Globals": true,
-               "hasPHP": true,
-               "isLocal": true,
-               "supportjQuery": true,
-               "originaljQuery": true,
-               "$": true,
-               "original$": true,
-               "baseURL": true,
-               "externalHost": true
-       },
-       "rules": {
-               // See https://github.com/eslint/eslint/issues/2342
-               "no-unused-vars": "off",
-
-               // Too much errors
-               "max-len": "off",
-               "brace-style": "off",
-               "key-spacing": "off",
-               "camelcase": "off",
-
-               // Not really too much - waiting autofix features for these rules
-               "lines-around-comment": "off",
-               "dot-notation": "off"
-       }
-}
diff --git a/test/.eslintrc.json b/test/.eslintrc.json
new file mode 100644 (file)
index 0000000..744de89
--- /dev/null
@@ -0,0 +1,58 @@
+{
+       "env": {
+               "browser": true
+       },
+       // Support: IE <=9 only, Android <=4.0 only
+       // The above browsers are failing a lot of tests in the ES5
+       // test suite at http://test262.ecmascript.org.
+       "parserOptions": {
+               "ecmaVersion": 3
+       },
+       "globals": {
+               "require": false,
+               "define": false,
+               "DOMParser": false,
+               "JSON": false,
+               "Promise": false,
+               "Symbol": false,
+               "QUnit": false,
+               "ajaxTest": false,
+               "testIframe": false,
+               "testIframeWithCallback": false,
+               "iframeCallback": true,
+               "createDashboardXML": false,
+               "createXMLFragment": false,
+               "moduleTeardown": false,
+               "testFoo": false,
+               "url": false,
+               "t": false,
+               "q": false,
+               "jQuery": true,
+               "sinon": true,
+               "amdDefined": true,
+               "fireNative": true,
+               "Globals": true,
+               "hasPHP": true,
+               "isLocal": true,
+               "supportjQuery": true,
+               "originaljQuery": true,
+               "$": true,
+               "original$": true,
+               "baseURL": true,
+               "externalHost": true
+       },
+       "rules": {
+               // See https://github.com/eslint/eslint/issues/2342
+               "no-unused-vars": "off",
+
+               // Too much errors
+               "max-len": "off",
+               "brace-style": "off",
+               "key-spacing": "off",
+               "camelcase": "off",
+
+               // Not really too much - waiting autofix features for these rules
+               "lines-around-comment": "off",
+               "dot-notation": "off"
+       }
+}
diff --git a/test/node_smoke_tests/.eslintrc b/test/node_smoke_tests/.eslintrc
deleted file mode 100644 (file)
index 0d1d554..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-       "env": {
-               "es6": true
-       },
-       "extends" : "../../.eslintrc",
-       "root": true
-}
diff --git a/test/node_smoke_tests/.eslintrc.json b/test/node_smoke_tests/.eslintrc.json
new file mode 100644 (file)
index 0000000..0877d24
--- /dev/null
@@ -0,0 +1,7 @@
+{
+       "env": {
+               "es6": true
+       },
+       "extends" : "../../.eslintrc.json",
+       "root": true
+}
diff --git a/test/promises_aplus_adapters/.eslintrc b/test/promises_aplus_adapters/.eslintrc
deleted file mode 100644 (file)
index 7acfff3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-       "extends": "../../.eslintrc",
-       "root": true
-}
diff --git a/test/promises_aplus_adapters/.eslintrc.json b/test/promises_aplus_adapters/.eslintrc.json
new file mode 100644 (file)
index 0000000..d117757
--- /dev/null
@@ -0,0 +1,4 @@
+{
+       "extends": "../../.eslintrc.json",
+       "root": true
+}