Merge remote-tracking branch 'ninja-internal/master' into timeline-local

4 files changed, 351 insertions, 15 deletions

diff --git a/node_modules/montage/require/browser.js b/node_modules/montage/require/browser.js
index a6a8af5a..1b4029ad 100755
--- a/node_modules/montage/require/browser.js
+++ b/node_modules/montage/require/browser.js
@@ -17,7 +17,7 @@ Require.getLocation = function() {
     return URL.resolve(window.location, ".");
 };
 
-Require.overlays = ["browser", "montage"];
+Require.overlays = ["window", "browser", "montage"];
 
 // Due to crazy variabile availability of new and old XHR APIs across
 // platforms, this implementation registers every known name for the event
@@ -116,8 +116,6 @@ Require.Compiler = function (config) {
         // module.factory = new Function("require", "exports", "module", module.text + "\n//*/"+sourceURLComment);
 
         module.factory.displayName = displayName;
-
-        return module;
     }
 };
 
diff --git a/node_modules/montage/require/require.js b/node_modules/montage/require/require.js
index eaa2d9fc..36372053 100755
--- a/node_modules/montage/require/require.js
+++ b/node_modules/montage/require/require.js
@@ -8,12 +8,24 @@
 
     // Boostrapping Browser
     if (typeof bootstrap !== "undefined") {
-        bootstrap("require/require", function (require, exports) {
-            var Promise = require("core/promise").Promise;
-            var URL = require("core/mini-url");
-            definition(exports, Promise, URL);
-            require("require/browser");
-        });
+
+        // Window
+        if (typeof window !== "undefined") {
+            bootstrap("require/require", function (require, exports) {
+                var Promise = require("core/promise").Promise;
+                var URL = require("core/mini-url");
+                definition(exports, Promise, URL);
+                require("require/browser");
+            });
+
+        // Worker
+        } else {
+            bootstrap("require/require", function (require, exports) {
+                var Promise = require("core/promise").Promise;
+                var URL = require("core/url");
+                definition(exports, Promise, URL);
+            });
+        }
 
     // Node Server
     } else if (typeof process !== "undefined") {
@@ -183,8 +195,8 @@
             // Modules should never have a return value.
             if (returnValue !== void 0) {
                 console.warn(
-                    'require: module ' + JSON.stringify(topId) +
-                    ' returned a value.'
+                    "require: module " + JSON.stringify(topId) +
+                    " returned a value."
                 );
             }
 
@@ -258,6 +270,8 @@
                 return resolve(id, viaId);
             };
 
+            require.getModule = getModule;
+
             require.load = load;
             require.deepLoad = deepLoad;
 
@@ -269,10 +283,18 @@
                 }
             };
 
+            require.getPackage = function (dependency) {
+                return config.getPackage(dependency, config);
+            };
+
             require.injectPackageDescription = function (location, description) {
                 Require.injectPackageDescription(location, description, config);
             };
 
+            require.injectPackageDescriptionLocation = function (location, descriptionLocation) {
+                Require.injectPackageDescriptionLocation(location, descriptionLocation, config);
+            };
+
             require.identify = identify;
             require.inject = inject;
             require.progress = Require.progress;
@@ -283,6 +305,8 @@
 
             require.config = config;
 
+            require.read = Require.read;
+
             return require;
         }
 
@@ -297,17 +321,35 @@
     };
 
     Require.injectPackageDescription = function (location, description, config) {
-        var descriptions = config.descriptions = config.descriptions || {};
+        var descriptions =
+            config.descriptions =
+                config.descriptions || {};
         descriptions[location] = Promise.call(function () {
             return description;
         });
     };
 
+    Require.injectPackageDescriptionLocation = function (location, descriptionLocation, config) {
+        var descriptionLocations =
+            config.descriptionLocations =
+                config.descriptionLocations || {};
+        descriptionLocations[location] = descriptionLocation;
+    };
+
     Require.loadPackageDescription = function (location, config) {
-        var descriptions = config.descriptions = config.descriptions || {};
+        var descriptions =
+            config.descriptions =
+                config.descriptions || {};
         if (descriptions[location] === void 0) {
-            var jsonPath = URL.resolve(location, 'package.json');
-            descriptions[location] = Require.read(jsonPath)
+            var descriptionLocations =
+                config.descriptionLocations =
+                    config.descriptionLocations || {};
+            if (descriptionLocations[location]) {
+                descriptionLocation = descriptionLocations[location];
+            } else {
+                descriptionLocation = URL.resolve(location, "package.json");
+            }
+            descriptions[location] = Require.read(descriptionLocation)
             .then(function (json) {
                 try {
                     return JSON.parse(json);
@@ -447,6 +489,7 @@
 
         // overlay
         var overlay = description.overlay || {};
+        var layer;
         Require.overlays.forEach(function (engine) {
             if (overlay[engine]) {
                 var layer = overlay[engine];
diff --git a/node_modules/montage/require/worker-script.js b/node_modules/montage/require/worker-script.js
new file mode 100644
index 00000000..58a3da7f
--- /dev/null
+++ b/node_modules/montage/require/worker-script.js
@@ -0,0 +1,233 @@
+(function (global) {
+
+var postMessage = global.postMessage.bind(global);
+var addEventListener = global.addEventListener.bind(global);
+var removeEventListener = global.removeEventListener.bind(global);
+
+console = {
+    log: function () {
+        postMessage({
+            type: "console",
+            method: "log",
+            args: Array.prototype.map.call(arguments, function (value) {
+                if (typeof value === "string") {
+                    return value;
+                } else {
+                    return JSON.stringify(value);
+                }
+            })
+        });
+    },
+    error: function () {
+        postMessage({
+            type: "console",
+            method: "error",
+            args: Array.prototype.map.call(arguments, function (value) {
+                if (typeof value === "string") {
+                    return value;
+                } else {
+                    return JSON.stringify(value);
+                }
+            })
+        });
+    }
+};
+
+var factories = {};
+bootstrap = function (id, factory) {
+    factories[id] = factory;
+};
+
+importScripts(
+    "require.js",
+    "../core/promise.js",
+    "../core/next-tick.js",
+    "../core/url.js"
+);