Comparing version 2.0.6 to 2.0.7
@@ -571,10 +571,4 @@ /* | ||
loadedPackages[location] = pkg; | ||
return Q.all(Object.keys(subconfig.mappings).map(function (prefix) { | ||
var dependency = subconfig.mappings[prefix]; | ||
return config.loadPackage(dependency, subconfig, loading); | ||
})) | ||
.then(function () { | ||
postConfigurePackage(subconfig, packageDescription); | ||
}) | ||
.thenResolve(pkg); | ||
postConfigurePackage(subconfig, packageDescription); | ||
return pkg; | ||
}); | ||
@@ -993,10 +987,3 @@ loadingPackages[location].done(); | ||
// using a regexp) | ||
Require.parseDependencies = parseDependencies; | ||
function parseDependencies(text) { | ||
var dependsUpon = {}; | ||
String(text).replace(/(?:^|[^\w\$_.])require\s*\(\s*["']([^"']*)["']\s*\)/g, function(_, id) { | ||
dependsUpon[id] = true; | ||
}); | ||
return Object.keys(dependsUpon); | ||
} | ||
Require.parseDependencies = require("./parse-dependencies"); | ||
@@ -1003,0 +990,0 @@ var has = Object.prototype.hasOwnProperty; |
@@ -46,1 +46,15 @@ | ||
exports.isRelative = isRelative; | ||
function isRelative(id) { | ||
return /^\.\.?[/]/.test(id); | ||
} | ||
exports.split = split; | ||
function split(id) { | ||
var match = /([^\/]+)\/(.*)/.exec(id); | ||
return { | ||
name: match[1], | ||
id: match[2] | ||
}; | ||
} | ||
{ | ||
"name": "mr", | ||
"version": "2.0.6", | ||
"version": "2.0.7", | ||
"publishConfig": { | ||
@@ -38,4 +38,3 @@ "tag": "future" | ||
"test:phantom": "(cd node_modules/mr && jasminum-phantom test)", | ||
"lint": "jshint .", | ||
"integration": "MOP_VERSION=^0.13 MR_VERSION=. mop-integration" | ||
"lint": "jshint ." | ||
}, | ||
@@ -55,6 +54,5 @@ "bin": { | ||
"devDependencies": { | ||
"jasminum": "^2.0.6", | ||
"jasminum": "^2.0.7", | ||
"joey": "^2.0.1", | ||
"jshint": "^2.6.0", | ||
"mop-integration": "git://github.com/montagejs/mop-integration.git#master", | ||
"q-io": "^2.0.6", | ||
@@ -61,0 +59,0 @@ "query-string": "^1.0.0", |
{ | ||
"name": "*", | ||
"version": "*", | ||
"compilers": { | ||
"text": "mr-text" | ||
}, | ||
"dependencies": { | ||
@@ -5,0 +8,0 @@ "mr-text": "*" |
{ | ||
"name": "*", | ||
"version": "*", | ||
"dependencies": { | ||
"mr-foo": "*" | ||
"redirect-patterns": { | ||
"^(.*)\\.foo$": "foo-$1" | ||
} | ||
} |
{ | ||
"name": "*", | ||
"version": "*", | ||
"translators": { | ||
"text": "mr-text" | ||
}, | ||
"dependencies": { | ||
@@ -5,0 +8,0 @@ "mr-text": "*" |
Sorry, the diff of this file is too big to display
257079
7
869
155
6336