install - npm Package Compare versions

Comparing version 0.8.4 to 0.8.5

install.js

@@ -301,2 +301,3 @@ makeInstaller = function (options) {
   function fileResolve(file, id, seenDirFiles) {
+    var parentModule = file.m;
     var extensions = fileGetExtensions(file);
@@ -331,4 +332,4 @@
 
-        var pkgJsonFile = fileAppendIdPart(file, "package.json");
-        var pkg = pkgJsonFile && fileEvaluate(pkgJsonFile), main;
+        var pkgJsonFile = fileAppendIdPart(file, "package.json"), main;
+        var pkg = pkgJsonFile && fileEvaluate(pkgJsonFile, parentModule);
         if (pkg && (browser &&
@@ -335,0 +336,0 @@ isString(main = pkg.browser) ||

install.min.js

@@ -1,1 +0,1 @@
-makeInstaller=function(r){"use strict";function n(r,n){return o(r)&&(l(g,r,n),i(y)&&y(q)),q}function e(r){this.id=r,this.children=[]}function t(r,n){return A.call(r,n)&&r[n]}function o(r){return r&&"object"==typeof r}function i(r){return"function"==typeof r}function u(r){return"string"==typeof r}function f(r){function n(n){var e=h(r,n);if(e)return s(e,r.m);var t=new Error("Cannot find module '"+n+"'");if(i(b))return b(n,r.m.id,t);throw t}return i(x)&&(n=x(n,r.m.id)),n.extensions=d(r).slice(0),n.resolve=function(n){var e=h(r,n);if(e)return e.m.id;var t=new Error("Cannot find module '"+n+"'");if(b&&i(b.resolve))return b.resolve(n,r.m.id,t);throw t},n}function c(r,n){var t=this;t.p=n=n||null,t.m=new e(r)}function s(r,n){var e=r&&r.c,t=r.m;if(!A.call(t,"exports")){if(n){t.parent=n;var o=n.children;Array.isArray(o)&&o.push(t)}i(t.useNode)&&t.useNode()||e(t.require=t.require||f(r),t.exports={},t,r.m.id,r.p.m.id),t.loaded=!0}return i(t.runModuleSetters)&&t.runModuleSetters(),t.exports}function a(r){return r&&o(r.c)}function l(r,n,e){if(Array.isArray(n)){var f=[];n.forEach(function(r){u(r)?f.push(r):i(r)&&(n=r)}),i(n)?n.d=f:n=null}else i(n)?n.d=n.d||[]:u(n)||o(n)||(n=null);n&&(r.c=r.c||(o(n)?{}:n),o(n)&&a(r)&&Object.keys(n).forEach(function(o){if(".."===o)i=r.p;else{var i=t(r.c,o);i||(i=r.c[o]=new c(r.m.id.replace(/\/*$/,"/")+o,r),i.o=e)}l(i,n[o],e)}))}function d(r){return r.o&&r.o.extensions||w}function p(r,n,e){for(;r&&!a(r);)r=r.p;if(!r||!n||"."===n)return r;if(".."===n)return r.p;var o=t(r.c,n);if(e&&(!o||a(o)))for(var i=0;i<e.length;++i){var u=t(r.c,n+e[i]);if(u)return u}return o}function v(r,n,e){var t=n.split("/");return t.every(function(n,o){return r=o<t.length-1?p(r,n):p(r,n,e)}),r}function h(r,n,e){var t=d(r);for(r="/"===n.charAt(0)?v(g,n,t):"."===n.charAt(0)?v(r,n,t):m(r,n,t);a(r);){if(e=e||[],e.indexOf(r)<0){e.push(r);var o,i=p(r,"package.json"),f=i&&s(i);if(f&&(k&&u(o=f.browser)||u(o=f.main))&&(r=v(r,o,t)||h(r,o,e)))continue}r=p(r,"index.js")}return r&&u(r.c)&&(r=h(r,r.c,e)),r}function m(r,n,e){if(i(j)&&(n=j(n,r.m.id)),u(n)){for(var t;r&&!t;r=r.p)t=a(r)&&v(r,"node_modules/"+n,e);return t}}r=r||{};var w=r.extensions||[".js",".json"],y=r.onInstall,x=r.wrapRequire,j=r.override,b=r.fallback,k=r.browser,A={}.hasOwnProperty,g=new c("/",new c("/..")),q=f(g);return e.prototype.resolve=function(r){return this.require.resolve(r)},n.Module=e,n},"object"==typeof exports&&(exports.makeInstaller=makeInstaller);
+makeInstaller=function(r){"use strict";function n(r,n){return o(r)&&(l(g,r,n),i(y)&&y(q)),q}function e(r){this.id=r,this.children=[]}function t(r,n){return A.call(r,n)&&r[n]}function o(r){return r&&"object"==typeof r}function i(r){return"function"==typeof r}function u(r){return"string"==typeof r}function f(r){function n(n){var e=m(r,n);if(e)return s(e,r.m);var t=new Error("Cannot find module '"+n+"'");if(i(b))return b(n,r.m.id,t);throw t}return i(x)&&(n=x(n,r.m.id)),n.extensions=d(r).slice(0),n.resolve=function(n){var e=m(r,n);if(e)return e.m.id;var t=new Error("Cannot find module '"+n+"'");if(b&&i(b.resolve))return b.resolve(n,r.m.id,t);throw t},n}function c(r,n){var t=this;t.p=n=n||null,t.m=new e(r)}function s(r,n){var e=r&&r.c,t=r.m;if(!A.call(t,"exports")){if(n){t.parent=n;var o=n.children;Array.isArray(o)&&o.push(t)}i(t.useNode)&&t.useNode()||e(t.require=t.require||f(r),t.exports={},t,r.m.id,r.p.m.id),t.loaded=!0}return i(t.runModuleSetters)&&t.runModuleSetters(),t.exports}function a(r){return r&&o(r.c)}function l(r,n,e){if(Array.isArray(n)){var f=[];n.forEach(function(r){u(r)?f.push(r):i(r)&&(n=r)}),i(n)?n.d=f:n=null}else i(n)?n.d=n.d||[]:u(n)||o(n)||(n=null);n&&(r.c=r.c||(o(n)?{}:n),o(n)&&a(r)&&Object.keys(n).forEach(function(o){if(".."===o)i=r.p;else{var i=t(r.c,o);i||(i=r.c[o]=new c(r.m.id.replace(/\/*$/,"/")+o,r),i.o=e)}l(i,n[o],e)}))}function d(r){return r.o&&r.o.extensions||w}function p(r,n,e){for(;r&&!a(r);)r=r.p;if(!r||!n||"."===n)return r;if(".."===n)return r.p;var o=t(r.c,n);if(e&&(!o||a(o)))for(var i=0;i<e.length;++i){var u=t(r.c,n+e[i]);if(u)return u}return o}function v(r,n,e){var t=n.split("/");return t.every(function(n,o){return r=o<t.length-1?p(r,n):p(r,n,e)}),r}function m(r,n,e){var t=r.m,o=d(r);for(r="/"===n.charAt(0)?v(g,n,o):"."===n.charAt(0)?v(r,n,o):h(r,n,o);a(r);){if(e=e||[],e.indexOf(r)<0){e.push(r);var i,f=p(r,"package.json"),c=f&&s(f,t);if(c&&(k&&u(i=c.browser)||u(i=c.main))&&(r=v(r,i,o)||m(r,i,e)))continue}r=p(r,"index.js")}return r&&u(r.c)&&(r=m(r,r.c,e)),r}function h(r,n,e){if(i(j)&&(n=j(n,r.m.id)),u(n)){for(var t;r&&!t;r=r.p)t=a(r)&&v(r,"node_modules/"+n,e);return t}}r=r||{};var w=r.extensions||[".js",".json"],y=r.onInstall,x=r.wrapRequire,j=r.override,b=r.fallback,k=r.browser,A={}.hasOwnProperty,g=new c("/",new c("/..")),q=f(g);return e.prototype.resolve=function(r){return this.require.resolve(r)},n.Module=e,n},"object"==typeof exports&&(exports.makeInstaller=makeInstaller);

package.json

@@ -18,3 +18,3 @@ {
   ],
-  "version": "0.8.4",
+  "version": "0.8.5",
   "license": "MIT",
@@ -21,0 +21,0 @@ "homepage": "http://github.com/benjamn/install",

No alert changes

Improved metrics

Total package byte prevSize

422520

increased by0.01%

Lines of code

1063

increased by0.09%

No dependency changes