add .json to default extensions list in Node resolver (fixes #333)

import-js · Jun 21, 2016 · 6c31d28 · 6c31d28
1 parent 1c2913b
commit 6c31d28
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 14 deletions.
diff --git a/resolvers/node/CHANGELOG.md b/resolvers/node/CHANGELOG.md
@@ -0,0 +1,8 @@
+# Change Log
+All notable changes to this resolver will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+This change log adheres to standards from [Keep a CHANGELOG](http://keepachangelog.com).
+
+## Unreleased
+### Fixed
+- find files with `.json` extensions (#333, thanks for noticing @jfmengels)
diff --git a/resolvers/node/index.js b/resolvers/node/index.js
@@ -14,7 +14,10 @@ exports.resolve = function (source, file, config) {
 }
 
 function opts(file, config) {
-  return assign({},
+  return assign({
+      // more closely matches Node (#333)
+      extensions: ['.js', '.json'],
+    },
     config,
     {
       // path.resolve will handle paths relative to CWD

diff --git a/resolvers/node/test/data.json b/resolvers/node/test/data.json
diff --git a/resolvers/node/test/paths.js b/resolvers/node/test/paths.js
@@ -10,3 +10,11 @@ describe("paths", function () {
       .equal(path.resolve(__dirname, '../index.js'))
   })
 })
+
+describe("default options", function () {
+  it("finds .json files", function () {
+        expect(node.resolve('./data', './test/file.js'))
+      .to.have.property('path')
+      .equal(path.resolve(__dirname, './data.json'))
+  })
+})
diff --git a/tests/src/rules/default.js b/tests/src/rules/default.js
@@ -1,4 +1,4 @@
-import { test } from '../utils'
+import { test, SYNTAX_CASES } from '../utils'
 import { RuleTester } from 'eslint'
 
 var ruleTester = new RuleTester()
@@ -66,11 +66,7 @@ ruleTester.run('default', rule, {
       parser: 'babel-eslint',
     }),
 
-    // JSON
-    test({
-      code: 'import foo from "./foobar.json";',
-      parser: 'babel-eslint',
-    }),
+    ...SYNTAX_CASES,
   ],
 
   invalid: [

diff --git a/tests/src/rules/namespace.js b/tests/src/rules/namespace.js
@@ -87,12 +87,6 @@ const valid = [
     parser: 'babel-eslint',
   }),
 
-  // JSON
-  test({
-    code: 'import foo from "./foobar.json";',
-    parser: 'babel-eslint',
-  }),
-
   ...SYNTAX_CASES,
 ]
 

diff --git a/tests/src/rules/no-unresolved.js b/tests/src/rules/no-unresolved.js
@@ -1,7 +1,7 @@
 import * as path from 'path'
 
 import assign from 'object-assign'
-import { test } from '../utils'
+import { test, SYNTAX_CASES } from '../utils'
 
 import { RuleTester } from 'eslint'
 
@@ -347,3 +347,8 @@ ruleTester.run('no-unresolved electron', rule, {
     }),
   ],
 })
+
+ruleTester.run('no-unresolved syntax verification', rule, {
+  valid: SYNTAX_CASES,
+  invalid:[],
+})
diff --git a/tests/src/utils.js b/tests/src/utils.js
@@ -63,6 +63,16 @@ export const SYNTAX_CASES = [
     settings: { 'import/extensions': ['.js'] }, // breaking: remove for v2
   }),
 
+  // JSON
+  test({
+    code: 'import foo from "./foobar.json";',
+    settings: { 'import/extensions': ['.js'] }, // breaking: remove for v2
+  }),
+  test({
+    code: 'import foo from "./foobar";',
+    settings: { 'import/extensions': ['.js'] }, // breaking: remove for v2
+  }),
+
   // issue #370: deep commonjs import
   test({
     code: 'import { foo } from "./issue-370-commonjs-namespace/bar"',