github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixing the plugin dependency handling

Browse Source
This commit is contained in:
ekatek
2014-05-09 17:21:19 -07:00
parent 0b98b86164
commit 90a5b87a00
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/catalog.js
View File

@@ -185,15 +185,19 @@ _.extend(Catalog.prototype, {
if (!constraint.weak) {
deps.push(constraint.packageName);
}
constr.push(constraint);
if (constraint.version) {
constr.push(constraint);
}
});
} else {
_.each(constraints, function (constraint, packageName) {
deps.push(packageName);
var utils = require('./utils.js');
var vers = utils.parseConstraint(constraint);
vers['packageName'] = packageName;
constr.push(vers);
if (constraint) {
var utils = require('./utils.js');
var vers = utils.parseConstraint(constraint);
vers['packageName'] = packageName;
constr.push(vers);
}
});
}
// The constraint solver has been initialized, so we can just call it.

2
tools/compiler.js
View File

@@ -937,7 +937,7 @@ compiler.checkUpToDate = function (packageSource, unipackage) {
// For each plugin, check that the resolved build-time deps for
// that plugin match the unipackage's build time deps for it.
var packageLoaderForPlugin = new PackageLoader({
versions: buildTimeDeps.pluginDependencies
versions: buildTimeDeps.pluginDependencies[pluginName]
});
var unipackagePluginDeps = unipackage.buildTimePluginDependencies[pluginName];
if (! unipackagePluginDeps ||