Prefer registered modules in builder and component-builder.

Avoid breakage in bundled scenarios.

tns-core-modules/ui/builder/builder.ts

@@ -60,6 +60,7 @@ function parseInternal(value: string, context: any, uri?: string): ComponentModu
 function loadCustomComponent(componentPath: string, componentName?: string, attributes?: Object, context?: Object, parentPage?: Page): ComponentModule {
     var result: ComponentModule;
     componentPath = componentPath.replace("~/", "");
+    const moduleName = componentPath + "/" + componentName;
 
     var fullComponentPathFilePathWithoutExt = componentPath;
 
@@ -74,10 +75,15 @@ function loadCustomComponent(componentPath: string, componentName?: string, attr
         var jsFilePath = resolveFileName(fullComponentPathFilePathWithoutExt, "js");
 
         var subExports = context;
+        if (global.moduleExists(moduleName)) {
+            // Component has registered code module.
+            subExports = global.loadModule(moduleName);
+        } else {
             if (jsFilePath) {
-            // Custom components with XML and code
+                // Component has code file.
                 subExports = global.loadModule(jsFilePath)
             }
+        }
 
         result = loadInternal(xmlFilePath, subExports);
 

tns-core-modules/ui/builder/component-builder.ts

@@ -50,18 +50,26 @@ export function getComponentModule(elementName: string, namespace: string, attri
 
     try {
         if (isString(namespace)) {
+            if (global.moduleExists(namespace)) {
+                moduleId = namespace;
+            } else {
                 var pathInsideTNSModules = path.join(knownFolders.currentApp().path, "tns_modules", namespace);
 
-            if (Folder.exists(pathInsideTNSModules)) {
+                try {
+                    // module inside tns_modules
+                    instanceModule = require(pathInsideTNSModules);
                     moduleId = pathInsideTNSModules;
-            } else {
+                } catch (e) {
-                // We expect module at root level in the app.
+                    // module at root level in the app.
                     moduleId = path.join(knownFolders.currentApp().path, namespace);
                 }
             }
+        }
 
+        if (!instanceModule) {
             // Require module by module id.
             instanceModule = global.loadModule(moduleId);
+        }
 
         // Get the component type from module.
         var instanceType = instanceModule[elementName] || Object;