arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #278 from MrVoltz/patch-1

Browse source 
Allow loading json using require()
This commit is contained in:
Walter Higgins 2015-12-31 12:07:45 +00:00
commit eef507fdfe
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/js/lib/require.js
View file

@ -165,20 +165,14 @@ When resolving module names to file paths, ScriptCraft uses the following rules.
if ( file.exists() ) { if ( file.exists() ) {
return fileExists(file); return fileExists(file);
} else { } else {
// try appending a .js to the end if ((file = new File(parentDir, moduleName)).exists()) {
pathWithJSExt = file.canonicalPath + '.js'; return fileExists(file);
file = new File( parentDir, pathWithJSExt ); } else if ((file = new File(parentDir, moduleName + ".js")).exists()) { // try .js extension
if (file.exists()) {
return file; return file;
} else { } else if ((file = new File(parentDir, moduleName + ".json")).exists()) { // try .json extension
file = new File(pathWithJSExt);
if ( file.exists() ) {
return file; return file;
} }
} }
}
}
return null; return null;
} }
/* /*
@ -250,6 +244,9 @@ When resolving module names to file paths, ScriptCraft uses the following rules.
} }
buffered.close(); // close the stream so there's no file locks buffered.close(); // close the stream so there's no file locks
if(canonizedFilename.substring(canonizedFilename.length - 5) === ".json") // patch code when it is json
code = "module.exports = (" + code + ");";
moduleInfo = { moduleInfo = {
loaded: false, loaded: false,
id: canonizedFilename, id: canonizedFilename,