Skip to content

Fix #9542 (allow files under node_modules to be included in the compilation). #9607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
billti merged 7 commits into from
Jul 11, 2016
Merged

Fix #9542 (allow files under node_modules to be included in the compilation). #9607

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca874bd
Fix module tracking
billti Jul 10, 2016
db54bda
Updated test with relative import
billti Jul 10, 2016
2ab1143
Fixed the node tracking and a harness bug
billti Jul 11, 2016
a7467a1
fixed lint error
billti Jul 11, 2016
b75053c
Fixed implicit any
billti Jul 11, 2016
97025d0
Added missing test files
billti Jul 11, 2016
21bf801
Removed duplicate logic
billti Jul 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Removed duplicate logic
  • Loading branch information
@billti
billti committed Jul 11, 2016
commit 21bf801c6cd98063ebcbd7439a49c1152717188f
7 changes: 0 additions & 7 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,13 +2091,6 @@ namespace ts {
currentNodeModulesDepth++;
}

if (currentNodeModulesDepth > 0) {
// If its already present with false, its a root file also. Don't override this.
if (!hasProperty(sourceFilesFoundSearchingNodeModules, resolvedPath)) {
sourceFilesFoundSearchingNodeModules[resolvedPath] = true;
}
}

const elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModulesJsDepth;
const shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;

Expand Down