Generalise package main resolving issue

CHANGELOG.md

@@ -87,6 +87,8 @@
   ([#5914](https://github.com/facebook/jest/pull/5914))
 * `[jest-regex-util]` Fix handling regex symbols in tests path on Windows
   ([#5941](https://github.com/facebook/jest/pull/5941))
+* `[jest-resolve]` Generalise test for package main entries equivalent to ".".
+  ([#5968)](https://github.com/facebook/jest/pull/5968)
 
 ### Chore & Maintenance
 

docs/ExpectAPI.md

@@ -335,8 +335,8 @@ describe('not.stringContaining', () => {
 
 ### `expect.not.stringMatching(string | regexp)`
 
-`expect.not.stringMatching(string | regexp)` matches the received string that does not
-match the expected regexp.
+`expect.not.stringMatching(string | regexp)` matches the received string that
+does not match the expected regexp.
 
 It is the inverse of `expect.stringMatching`.
 
@@ -384,8 +384,8 @@ exact expected string.
 
 ### `expect.stringMatching(string | regexp)`
 
-`expect.stringMatching(string | regexp)` matches the received string that matches the
-expected regexp.
+`expect.stringMatching(string | regexp)` matches the received string that
+matches the expected regexp.
 
 You can use it instead of a literal value:
 

integration-tests/resolve-node-module/__mocks__/mock-module-alt/index.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+module.exports = 'test';

integration-tests/resolve-node-module/__mocks__/mock-module-alt/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "mock-module-alt",
+  "main": "./"
+}

integration-tests/resolve-node-module/__tests__/resolve-node-module.test.js

@@ -8,14 +8,20 @@
 'use strict';
 
 jest.mock('mock-module');
+jest.mock('mock-module-alt');
 jest.mock('mock-jsx-module');
 
 it('should resolve entry as index.js when package main is "."', () => {
   const mockModule = require('mock-module');
   expect(mockModule).toEqual('test');
 });
 
-it('should resolve entry as index with other configured module file extention when package main is "."', () => {
+it('should resolve entry as index.js when package main is "./"', () => {
+  const mockModule = require('mock-module-alt');
+  expect(mockModule).toEqual('test');
+});
+
+it('should resolve entry as index with other configured module file extension when package main is "."', () => {
   const mockJsxModule = require('mock-jsx-module');
   expect(mockJsxModule).toEqual('test jsx');
 });

packages/jest-resolve/src/default_resolver.js

@@ -129,7 +129,7 @@ function resolveSync(target: Path, options: ResolverOptions): Path {
       pkgmain = JSON.parse(body).main;
     } catch (e) {}
 
-    if (pkgmain && pkgmain !== '.') {
+    if (pkgmain && !isCurrentDirectory(pkgmain)) {
       const resolveTarget = path.resolve(name, pkgmain);
       const result = tryResolve(resolveTarget);
       if (result) {
@@ -175,3 +175,7 @@ function isDirectory(dir: Path): boolean {
 
   return result;
 }
+
+function isCurrentDirectory(testPath: Path): boolean {
+  return path.resolve('.') === path.resolve(testPath);
+}