updated module resolve

Author: Nako Sung

Examples/Content/Scripts/2048/game/application.js

@@ -3,10 +3,10 @@
 
     module.exports = function (widget, container, data) {
         require('animframe_polyfill')
-        var Actuator = require('actuator')(container, data)
-        var LocalStorageManager = require('local_storage_manager')
-        var KeyboardInputManager = require('keyboard_input_manager')(widget, container)
-        var GameManager = require('game_manager')
+        var Actuator = require('./actuator')(container, data)
+        var LocalStorageManager = require('./local_storage_manager')
+        var KeyboardInputManager = require('./keyboard_input_manager')(widget, container)
+        var GameManager = require('./game_manager')
 
         var game = new GameManager(data.Size, KeyboardInputManager, Actuator, LocalStorageManager)
 

Examples/Content/Scripts/2048/game/game_manager.js

@@ -1,5 +1,5 @@
-var Tile = require('tile')
-var Grid = require('grid')
+var Tile = require('./tile')
+var Grid = require('./grid')
 
 function GameManager(size, InputManager, Actuator, StorageManager) {
   this.size           = size; // Size of the grid

Examples/Content/Scripts/2048/game/grid.js

@@ -1,4 +1,4 @@
-var Tile = require('game/tile')
+var Tile = require('./game/tile')
 
 function Grid(size, previousState) {
   this.size = size;

Examples/Content/Scripts/2048/index.js

@@ -45,7 +45,7 @@
                 game()
             }
             try {
-                game = require('game/application')(widget, page, data)
+                game = require('./game/application')(widget, page, data)
             }
             catch (e) {
                 console.error("EXCEPTION",String(e),e.stack)

Plugins/UnrealJS/Content/Scripts/polyfill/timers.js

@@ -1,5 +1,5 @@
 (function (target) {
-    var makeWindowTimer = require('windowTimers')
+    var makeWindowTimer = require('./windowTimers')
     if (Root == undefined || Root.OnTick == undefined) return
 
     var timerLoop = makeWindowTimer(target);

Plugins/UnrealJS/Source/V8/Private/JavascriptContext_Private.cpp

@@ -1171,7 +1171,8 @@ class FJavascriptContextImplementation : public FJavascriptContext
 
 			auto inner = [&](const FString& script_path)
 			{				
-				auto it = Self->Modules.Find(script_path);
+				auto full_path = IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(*script_path);
+				auto it = Self->Modules.Find(full_path);
 				if (it)
 				{
 					info.GetReturnValue().Set(Local<Value>::New(isolate, *it));
@@ -1182,8 +1183,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
 				FString Text;
 				if (FFileHelper::LoadFileToString(Text, *script_path))
 				{
-					Text = FString::Printf(TEXT("(function (__dirname) {\nvar module = { exports : {}, filename : __dirname }, exports = module.exports;\n%s\n;return module.exports;}('%s'));"), *Text, *script_path);
-					auto full_path = IFileManager::Get().ConvertToAbsolutePathForExternalAppForRead(*script_path);
+					Text = FString::Printf(TEXT("(function (__dirname) {\nvar module = { exports : {}, filename : __dirname }, exports = module.exports;\n%s\n;return module.exports;}('%s'));"), *Text, *script_path);					
 #if PLATFORM_WINDOWS
 					full_path = full_path.Replace(TEXT("/"), TEXT("\\"));
 #endif
@@ -1192,7 +1192,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
 					{
 						UE_LOG(Javascript, Log, TEXT("Invalid script for require"));
 					}
-					Self->Modules.Add(script_path, UniquePersistent<Value>(isolate, exports));
+					Self->Modules.Add(full_path, UniquePersistent<Value>(isolate, exports));
 					info.GetReturnValue().Set(exports);
 					found = true;
 					return true;
@@ -1265,47 +1265,43 @@ class FJavascriptContextImplementation : public FJavascriptContext
 
 			auto inner2 = [&](FString base_path)
 			{
-				for (;;)
-				{
-					if (!FPaths::DirectoryExists(base_path)) return false;
-
-					auto script_path = base_path / required_module;
-					if (!script_path.EndsWith(TEXT(".js")))
-					{
-						if (script_path.EndsWith(TEXT(".json")))
-						{
-							if (inner_json(script_path)) return true;
-						}
-						else
-						{
-							if (inner(script_path + TEXT(".js"))) return true;
-							if (inner_json(script_path + TEXT(".json"))) return true;
-							if (inner(script_path / TEXT("index.js"))) return true;
+				if (!FPaths::DirectoryExists(base_path)) return false;
 
-							if (inner_package_json(script_path)) return true;
-						}						
-					}
-					else
-					{
-						if (inner(script_path)) return true;
-					}
-
-					base_path = base_path / TEXT("node_modules");
+				auto script_path = base_path / required_module;
+				if (script_path.EndsWith(TEXT(".js")))
+				{
+					if (inner(script_path)) return true;
 				}
+				else
+				{
+					if (inner(script_path + TEXT(".js"))) return true;
+				}
+				if (script_path.EndsWith(TEXT(".json")))
+				{
+					if (inner_json(script_path)) return true;
+				}
+				else
+				{
+					if (inner_json(script_path + TEXT(".json"))) return true;
+				}				
+				
+				if (inner(script_path / TEXT("index.js"))) return true;
+				if (inner_package_json(script_path)) return true;					
+
+				return false;
 			};
 
 			auto current_script_path = FPaths::GetPath(StringFromV8(StackTrace::CurrentStackTrace(isolate, 1, StackTrace::kScriptName)->GetFrame(0)->GetScriptName()));
 #if PLATFORM_WINDOWS
 			current_script_path = current_script_path.Replace(TEXT("\\"), TEXT("/"));
 #endif
-			if (!inner2(current_script_path))
+			if (!(required_module[0] == '.' && inner2(current_script_path)))
 			{
-				if (!inner2("."))
+				for (const auto& path : Self->Paths)
 				{
-					for (const auto& path : Self->Paths)
-					{
-						if (inner2(path)) break;
-					}
+					if (inner2(path)) break;
+
+					if (inner2(path / TEXT("node_modules"))) break;
 				}
 			}