diff options
| author | Oleg Gaidarenko <markelog@gmail.com> | 2016-07-29 22:18:58 +0300 |
|---|---|---|
| committer | Oleg Gaidarenko <markelog@gmail.com> | 2016-08-02 21:16:20 +0300 |
| commit | 6acf4a79467a5aea5bc1eb7d552d72366718635d (patch) | |
| tree | 595a026a2f06f22dbc5ad23641c13edf1058dd7b | |
| parent | 308e4b534b8b8bddff85b6327481d0cee6f70a2a (diff) | |
| download | jquery-6acf4a79467a5aea5bc1eb7d552d72366718635d.tar.gz jquery-6acf4a79467a5aea5bc1eb7d552d72366718635d.zip | |
Build: .eslintrc -> .eslintrc.json
`.eslintrc` format is deprecated -
http://eslint.org/docs/user-guide/configuring#configuration-file-formats
Fixes gh-3248
Closes gh-3247
| -rw-r--r-- | .eslintrc.json (renamed from .eslintrc) | 0 | ||||
| -rw-r--r-- | dist/.eslintrc.json (renamed from dist/.eslintrc) | 2 | ||||
| -rw-r--r-- | src/.eslintrc.json (renamed from src/.eslintrc) | 0 | ||||
| -rw-r--r-- | src/core.js | 2 | ||||
| -rw-r--r-- | test/.eslintrc.json (renamed from test/.eslintrc) | 0 | ||||
| -rw-r--r-- | test/node_smoke_tests/.eslintrc.json (renamed from test/node_smoke_tests/.eslintrc) | 2 | ||||
| -rw-r--r-- | test/promises_aplus_adapters/.eslintrc | 4 | ||||
| -rw-r--r-- | test/promises_aplus_adapters/.eslintrc.json | 4 |
8 files changed, 7 insertions, 7 deletions
diff --git a/.eslintrc b/.eslintrc.json index 6dcb6353a..6dcb6353a 100644 --- a/.eslintrc +++ b/.eslintrc.json diff --git a/dist/.eslintrc b/dist/.eslintrc.json index ac4ec2fef..b99e682f4 100644 --- a/dist/.eslintrc +++ b/dist/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": "../src/.eslintrc", + "extends": "../src/.eslintrc.json", "rules": { // That is okay for the built version "no-multiple-empty-lines": "off", diff --git a/src/.eslintrc b/src/.eslintrc.json index dbf16c584..dbf16c584 100644 --- a/src/.eslintrc +++ b/src/.eslintrc.json diff --git a/src/core.js b/src/core.js index 68ba9a5c2..f3983b4a8 100644 --- a/src/core.js +++ b/src/core.js @@ -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.json index 744de89ec..744de89ec 100644 --- a/test/.eslintrc +++ b/test/.eslintrc.json diff --git a/test/node_smoke_tests/.eslintrc b/test/node_smoke_tests/.eslintrc.json index 0d1d554d1..0877d24af 100644 --- a/test/node_smoke_tests/.eslintrc +++ b/test/node_smoke_tests/.eslintrc.json @@ -2,6 +2,6 @@ "env": { "es6": true }, - "extends" : "../../.eslintrc", + "extends" : "../../.eslintrc.json", "root": true } diff --git a/test/promises_aplus_adapters/.eslintrc b/test/promises_aplus_adapters/.eslintrc deleted file mode 100644 index 7acfff35a..000000000 --- a/test/promises_aplus_adapters/.eslintrc +++ /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 index 000000000..d11775710 --- /dev/null +++ b/test/promises_aplus_adapters/.eslintrc.json @@ -0,0 +1,4 @@ +{ + "extends": "../../.eslintrc.json", + "root": true +} |