Skip to content

Check for module with .js in the name before attempting to resolve file #667

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
petekanev merged 1 commit into from
Jan 3, 2017
Merged

Check for module with .js in the name before attempting to resolve file #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion runtime/src/main/java/com/tns/Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ private static File resolveFromFileOrDirectory(String baseDir, String path, File
File foundModule = null;

foundModule = loadAsFile(fileOrDirectory);

if(foundModule != null) {
return foundModule;
}
Expand All @@ -198,6 +199,8 @@ private static File resolveFromFileOrDirectory(String baseDir, String path, File
//cache resolved directory
if(foundModule != null) {
folderAsModuleCache.put(fileOrDirectory.getCanonicalPath(), foundModule.getCanonicalPath());

return foundModule;
}

return foundModule;
Expand All @@ -222,7 +225,8 @@ private static File loadAsFile(File path) {

File foundFile = new File(path.getAbsolutePath() + fallbackExtension);
try {
if(foundFile.getCanonicalFile().exists()) {
File canonicalFile = foundFile.getCanonicalFile();
if (canonicalFile.exists() && canonicalFile.isFile()) {
return foundFile;
}
} catch (IOException e) {
Expand Down
2 changes: 1 addition & 1 deletion test-app/app/src/main/assets/app/shared
Open in desktop
Submodule shared updated 2 files
+1 −0 Require/ModuleWith.js/index.js
+6 −0 Require/index.js