Merge branch 'feature/npm-modules' into devel

js/common/bootstrap/modules.js

@@ -647,7 +647,7 @@ function stop_color_print () {
       else {
         return null;
       }
-  }
+    }
 
     // first check: we are talking about module within a package
     description = internal.loadPackageFile(path, this._package);
@@ -661,6 +661,18 @@ function stop_color_print () {
       }
     }
 
+    // check if already know a module with that name
+    module = GlobalPackage.module(path);
+
+    if (module) {
+      if (module.type !== 'package') {
+        return module;
+      }
+      else {
+        return null;
+      }
+    }
+
     // second check: we are talking about a global module
     description = internal.loadModuleFile(path);
 
@@ -668,7 +680,7 @@ function stop_color_print () {
       module = this.createModule(description, 'module', GlobalPackage);
 
       if (module !== null) {
-        this._package.defineModule(path, module);
+        GlobalPackage.defineModule(path, module);
         return module;
       }
     }

js/common/test-data/modules/node_modules/TestA/node_modules/TestB/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "B",
+  "name": "TestB",
   "description": "B",
   "main": "index",
   "version": "2.0.0"

js/common/test-data/modules/node_modules/TestA/node_modules/TestC/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "C",
+  "name": "TestC",
   "description": "C",
   "main": "index",
   "version": "1.0.0"

js/common/test-data/modules/node_modules/TestA/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "A",
+  "name": "TestA",
   "description": "A",
   "main": "index",
   "version": "1.0.0"

js/common/test-data/modules/node_modules/TestB/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "B",
+  "name": "TestB",
   "description": "B",
   "main": "index",
   "version": "1.0.0"

js/common/test-data/modules/node_modules/TestD/index.js

@@ -1 +1,2 @@
 exports.version = "D 1.0.0";
+exports.fs = require("fs");

js/common/test-data/modules/node_modules/TestD/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "D",
+  "name": "TestD",
   "description": "D",
   "main": "index",
   "version": "1.0.0"