mr - npm Package Compare versions

Comparing version 17.0.12 to 17.0.13

bootstrap.js

@@ -92,3 +92,3 @@ /*global module: false, define, callbackApplication */
             if (script.parentNode) {
-                script.parentNode.removeChild(script);   
+                script.parentNode.removeChild(script);
             }
@@ -118,3 +118,3 @@ }
             finallyHandler();
-        }   
+        }
     }
@@ -229,6 +229,6 @@
                 promiseLocation = params.promiseLocation || resolve(mrLocation, pending.promise);
-                
+
             // Special Case bluebird for now:
             load(promiseLocation, function() {
-                
+
                 //global.bootstrap cleans itself from window once all known are loaded. "bluebird" is not known, so needs to do it first
@@ -248,6 +248,6 @@ global.bootstrap("bluebird", function (mrRequire, exports) {
                     if (id !== 'promise') {
-                        load(resolve(mrLocation, pending[id]));   
+                        load(resolve(mrLocation, pending[id]));
                     }
                 }
-            }       
+            }
         }
@@ -322,8 +322,13 @@
                 };
-                
+
                 global.bundleLoaded = function (name) {
                     return getDefinition(name).resolve();
                 };
-                
-                var preloading = Promise.resolve();
+
+                var preloading = {
+                    promise: new Promise(function (resolve, reject) {
+                        preloading.resolve = resolve;
+                        preloading.reject = reject;
+                    })
+                };
                 config.preloaded = preloading.promise;
@@ -354,3 +359,3 @@ // preload bundles sequentially
                 mrRequire.inject("mini-url", URL);
-                mrRequire.inject("promise", Promise); 
+                mrRequire.inject("promise", Promise);
                 mrRequire.inject("require", mrRequire);
@@ -369,3 +374,3 @@
                     global.require = global.mr = pkg;
-                    
+
                     return pkg.async(applicationModuleId);
@@ -372,0 +377,0 @@ });

browser.js

@@ -18,3 +18,3 @@ /* <copyright>
     var JAVASCRIPT = "javascript";
-    
+
     // By using a named "eval" most browsers will execute in the global scope.
@@ -79,4 +79,4 @@ // http://www.davidflanagan.com/2010/12/global-eval-in.html
         if (
-            url.indexOf(jsPreffix) !== -1 && // is .js
-                url.indexOf(jsIndexPrefix) === -1 // is not /index.js
+            url.indexOf(jsPreffix) === url.length - 3 && // ends in .js
+            url.indexOf(jsIndexPrefix) !== url.length - 9 // does not end in /index.js
         ) {
@@ -87,5 +87,3 @@ xhr.url = xhr.url.replace(jsPreffix, jsIndexPrefix);
             xhr.send(null);
-
         } else {
-
             xhr.reject(new Error("Can't XHR " + JSON.stringify(url)));
@@ -96,5 +94,4 @@ onerror.xhrPool.push(xhr);
             xhr.url = null;
-            xhr.module = null;   
+            xhr.module = null;
         }
-
     }
@@ -168,9 +165,9 @@ onerror.xhrPool = xhrPool;
 
-            // Prevent method to start with number to avoid Unexpected number 
+            // Prevent method to start with number to avoid Unexpected number
             var displayName = [DoubleUnderscore, module.require.config.name, Underscore, module.id].join('').replace(nameRegex, Underscore);
-            
+
             globalConcatenator[1] = displayName;
             globalConcatenator[3] = module.text;
             globalConcatenator[5] = module.location;
-           
+
             module.factory = globalEval(globalConcatenator.join(''));
@@ -294,3 +291,3 @@ module.factory.displayName = displayName;
     };
-    
+
     Require.makeLoader = function (config) {
@@ -297,0 +294,0 @@ var Loader;

package.json

 {
   "name": "mr",
-  "version": "17.0.12",
+  "version": "17.0.13",
   "description": "A refresh-only CommonJS module system for browsers, used in Montage",
@@ -15,4 +15,4 @@ "license": "BSD-3-Clause",
   "engines": {
-    "node": "4.8.0",
-    "npm": "2.15.11"
+    "node": "<=4.9.1",
+    "npm": "<=2.15.11"
   },
@@ -28,3 +28,2 @@ "repository": {
     "integration": "mop-integration",
-    "test:nsp": "nsp check",
     "test:karma": "karma start --no-auto-watch --single-run",
@@ -40,3 +39,3 @@ "test:karma-dev": "karma start --auto-watch --no-single-run",
   "dependencies": {
-    "bluebird": "~3.4.7"
+    "bluebird": "~3.5.0"
   },
@@ -49,3 +48,2 @@ "devDependencies": {
     "jshint": "^2.9.5",
-    "nsp": "^2.8.1",
     "karma": "^1.5.0",
@@ -52,0 +50,0 @@ "karma-chrome-launcher": "^2.0.0",

require.js

@@ -419,2 +419,3 @@ /*
         config.makeCompiler = config.makeCompiler || Require.makeCompiler;
+        config.executeCompiler = config.executeCompiler || Require.executeCompiler;
         config.compile = config.compile || config.makeCompiler(config);
@@ -633,7 +634,3 @@ config.parseDependencies = config.parseDependencies || Require.parseDependencies;
                 // Execute the factory function:
-                returnValue = module.factory(
-                    makeRequire(topId), // require
-                    module.exports, // exports
-                    module // module
-                );
+                returnValue = config.executeCompiler(module.factory, makeRequire(topId), module.exports, module);
             } catch (_error) {
@@ -1058,5 +1055,5 @@ // Delete the exports so that the factory is run again if this
     ];
-            
-    var syncCompilerChain;    
 
+    var syncCompilerChain;
+
     //The ShebangCompiler doesn't make sense on the client side
@@ -1105,4 +1102,4 @@ if (typeof window !== "undefined") {
         };
-    }    
-    
+    }
+
     Require.makeCompiler = function (config) {
@@ -1253,2 +1250,24 @@ return function (module) {
 
+    Require.executeCompiler = function (factory, require, exports, module) {
+        var returnValue;
+
+        module.directory = URL.resolve(module.location, "./");
+        module.filename = URL.resolve(module.location, module.location);
+        module.exports = exports || {};
+
+        // Execute the factory function:
+        // TODO use config.scope
+        returnValue = factory.call(global,
+            require,            // require
+            exports,     // exports
+            module,             // module
+            global,
+            module.filename,     // __filename
+            module.directory     // __dirname
+        );
+
+        return returnValue;
+    };
+
+
     Require.SerializationCompiler = function(config, compile) {
@@ -1265,3 +1284,3 @@ return function(module) {
                 try {
-                    moduleExports = defaultFactory.call(this, require, exports, module, global);
+                    moduleExports = config.executeCompiler(defaultFactory, require, exports, module);
                 } catch (e) {
@@ -1268,0 +1287,0 @@ if (e instanceof SyntaxError) {

New alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

103282

increased by0.66%

Dev dependency count

13

decreased by-7.14%

Lines of code

2228

increased by0.86%

Worsened metrics

Number of package files

14

decreased by-6.67%

Number of medium supply chain risk alerts

5

increased by25%

Dependency changes

• + Addedbluebird@3.5.5(transitive)

• - Removedbluebird@3.4.7(transitive)

• Updatedbluebird@~3.5.0