From 12e0275f1ad549ee4e62de87b3ef6aed08ecc194 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Wed, 21 Dec 2016 16:40:30 -0800 Subject: [PATCH] Remove invalid trace --- src/compiler/moduleNameResolver.ts | 8 +------- .../moduleResolutionWithExtensions_unexpected.trace.json | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index e158a4b7980..0d3db5362c1 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -76,13 +76,7 @@ namespace ts { return tryReadFromField("typings") || tryReadFromField("types"); case Extensions.JavaScript: - if (typeof jsonContent.main === "string") { - if (state.traceEnabled) { - trace(state.host, Diagnostics.No_types_specified_in_package_json_so_returning_main_value_of_0, jsonContent.main); - } - return normalizePath(combinePaths(baseDirectory, jsonContent.main)); - } - return undefined; + return tryReadFromField("main"); } function tryReadFromField(fieldName: string) { diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json index 8ee33a5286a..c4489ac057d 100644 --- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json +++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.trace.json @@ -17,7 +17,7 @@ "File '/node_modules/normalize.css.js' does not exist.", "File '/node_modules/normalize.css.jsx' does not exist.", "Found 'package.json' at '/node_modules/normalize.css/package.json'.", - "No types specified in 'package.json', so returning 'main' value of 'normalize.css'", + "'package.json' has 'main' field 'normalize.css' that references '/node_modules/normalize.css/normalize.css'.", "File '/node_modules/normalize.css/normalize.css' exist - use it as a name resolution result.", "File '/node_modules/normalize.css/normalize.css' has an unsupported extension, so skipping it.", "File '/node_modules/normalize.css/normalize.css.ts' does not exist.",