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

make references to packageloader consistent

Browse Source
This commit is contained in:
David Glasser
2014-06-23 19:54:13 -07:00
parent 98bd2895fa
commit e0852a5928
9 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/bundler.js
View File

@@ -1997,9 +1997,9 @@ exports.readJsImage = function (controlFilePath) {
// Given an array of unipackage names, invokes the callback with each
// corresponding Unipackage object, plus all of their transitive dependencies,
// with a topological sort.
exports.iterateOverAllUsedUnipackages = function (packageLoader, arch,
exports.iterateOverAllUsedUnipackages = function (loader, arch,
packageNames, callback) {
var target = new Target({packageLoader: packageLoader,
var target = new Target({packageLoader: loader,
arch: arch});
target._determineLoadOrder({packages: packageNames});
_.each(target.unibuilds, function (unibuild) {

1
tools/commands-packages.js
View File

@@ -19,7 +19,6 @@ var httpHelpers = require('./http-helpers.js');
var archinfo = require('./archinfo.js');
var tropohouse = require('./tropohouse.js');
var packageCache = require('./package-cache.js');
var PackageLoader = require('./package-loader.js').PackageLoader;
var PackageSource = require('./package-source.js');
var compiler = require('./compiler.js');
var catalog = require('./catalog.js');

2
tools/commands.js
View File

@@ -19,7 +19,7 @@ var httpHelpers = require('./http-helpers.js');
var archinfo = require('./archinfo.js');
var tropohouse = require('./tropohouse.js');
var packageCache = require('./package-cache.js');
var PackageLoader = require('./package-loader.js').PackageLoader;
var packageLoader = require('./package-loader.js');
var PackageSource = require('./package-source.js');
var compiler = require('./compiler.js');
var catalog = require('./catalog.js');

14
tools/compiler.js
View File

@@ -5,7 +5,7 @@ var buildmessage = require('./buildmessage.js');
var archinfo = require(path.join(__dirname, 'archinfo.js'));
var linker = require('./linker.js');
var Unipackage = require('./unipackage.js').Unipackage;
var packageLoaderModule = require('./package-loader.js');
var packageLoader = require('./package-loader.js');
var uniload = require('./uniload.js');
var bundler = require('./bundler.js');
var catalog = require('./catalog.js');
@@ -733,13 +733,13 @@ compiler.compile = function (packageSource, options) {
rootPath: packageSource.sourceRoot
}, function () {
var packageLoader = new packageLoaderModule.PackageLoader({
var loader = new packageLoader.PackageLoader({
versions: buildTimeDeps.pluginDependencies[info.name]
});
var buildResult = bundler.buildJsImage({
name: info.name,
packageLoader: packageLoader,
packageLoader: loader,
use: info.use,
sourceRoot: packageSource.sourceRoot,
sources: info.sources,
@@ -811,12 +811,12 @@ compiler.compile = function (packageSource, options) {
});
// Compile unibuilds. Might use our plugins, so needs to happen second.
var packageLoader = new packageLoaderModule.PackageLoader({
var loader = new packageLoader.PackageLoader({
versions: buildTimeDeps.packageDependencies
});
_.each(packageSource.architectures, function (unibuild) {
var unibuildSources = compileUnibuild(unipackage, unibuild, packageLoader,
var unibuildSources = compileUnibuild(unipackage, unibuild, loader,
nodeModulesPath, isPortable);
sources.push.apply(sources, unibuildSources);
});
@@ -945,7 +945,7 @@ compiler.checkUpToDate = function (packageSource, unipackage) {
return false;
}
var directDepsPackageLoader = new packageLoaderModule.PackageLoader({
var directDepsPackageLoader = new packageLoader.PackageLoader({
versions: buildTimeDeps.directDependencies
});
var directDepsMatch = _.all(
@@ -978,7 +978,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 packageLoaderModule.PackageLoader({
var packageLoaderForPlugin = new packageLoader.PackageLoader({
versions: buildTimeDeps.pluginDependencies[pluginName]
});
var unipackagePluginDeps = unipackage.buildTimePluginDependencies[pluginName];

4
tools/project.js
View File

@@ -9,6 +9,7 @@ var release = require('./release.js');
var watch = require('./watch.js');
var catalog = require('./catalog.js');
var buildmessage = require('./buildmessage.js');
var packageLoader = require('./package-loader.js');
var project = exports;
@@ -181,8 +182,7 @@ _.extend(Project.prototype, {
};
// Finally, initialize the package loader.
var PackageLoader = require('./package-loader.js').PackageLoader;
self.packageLoader = new PackageLoader({
self.packageLoader = new packageLoader.PackageLoader({
versions: newVersions
});

1
tools/run-app.js
View File

@@ -13,7 +13,6 @@ var inFiber = require('./fiber-helpers.js').inFiber;
var runLog = require('./run-log.js');
var catalog = require('./catalog.js');
var packageCache = require('./package-cache.js');
var PackageLoader = require('./package-loader.js').PackageLoader;
var stats = require('./stats.js');
// Parse out s as if it were a bash command line.

4
tools/selftest.js
View File

@@ -7,6 +7,7 @@ var parseStack = require('./parse-stack.js');
var release = require('./release.js');
var catalog = require('./catalog.js');
var archinfo = require('./archinfo.js');
var packageLoader = require('./package-loader.js');
var Future = require('fibers/future');
// Exception representing a test failure
@@ -491,8 +492,7 @@ _.extend(Sandbox.prototype, {
if (catalog.complete.rebuildLocalPackages([toolPackageName]) !== 1) {
throw Error("didn't rebuild meteor-tool?");
}
var loader = new (require('./package-loader.js').PackageLoader)({
versions: null});
var loader = new packageLoader.PackageLoader({versions: null});
var toolPackage = loader.getPackage(toolPackageName);
var toolPackageDirectory =
'.' + toolPackage.version + '.XXX++'

4
tools/uniload.js
View File

@@ -2,7 +2,7 @@ var _ = require('underscore');
var bundler = require('./bundler.js');
var buildmessage = require('./buildmessage.js');
var release = require('./release.js');
var PackageLoader = require("./package-loader.js").PackageLoader;
var packageLoader = require("./package-loader.js");
var packageCache = require("./package-cache.js");
var files = require('./files.js');
@@ -72,7 +72,7 @@ var load = function (options) {
// Load the code. The uniloader does not call the constraint solver. But
// keep in mind, that it does use the catalog to build these packages when
// it gets around to it.
var loader = new PackageLoader({
var loader = new packageLoader.PackageLoader({
versions: null,
uniloadDir: files.getUniloadDir()
});

15
tools/unipackage.js
View File

@@ -8,7 +8,7 @@ var path = require('path');
var Builder = require('./builder.js');
var bundler = require('./bundler.js');
var watch = require('./watch.js');
var PackageLoader = require('./package-loader.js').PackageLoader;
var packageLoader = require('./package-loader.js');
var catalog = require('./catalog.js');
var files = require('./files.js');
var Future = require('fibers/future');
@@ -117,9 +117,9 @@ _.extend(Unibuild.prototype, {
// the extension handlers we'll use, we previously commited to those
// versions at package build ('compile') time.)
//
// packageLoader is the PackageLoader that should be used to resolve
// loader is the PackageLoader that should be used to resolve
// the package's bundle-time dependencies.
getResources: function (bundleArch, packageLoader) {
getResources: function (bundleArch, loader) {
var self = this;
if (! archinfo.matches(bundleArch, self.arch))
@@ -137,7 +137,7 @@ _.extend(Unibuild.prototype, {
var imports = {}; // map from symbol to supplying package name
compiler.eachUsedUnibuild(
self.uses,
bundleArch, packageLoader,
bundleArch, loader,
{skipUnordered: true}, function (depUnibuild) {
_.each(depUnibuild.packageVariables, function (symbol) {
// Slightly hacky implementation of test-only exports.
@@ -187,12 +187,11 @@ _.extend(Unibuild.prototype, {
// packages for which `filter(packageName, version)` returns truthy.
var getLoadedPackageVersions = function (versions, filter) {
var result = {};
var PLoader = require("./package-loader.js").PackageLoader;
var packageLoader = new PLoader({ versions: versions });
var loader = new packageLoader.PackageLoader({ versions: versions });
_.each(versions, function (version, packageName) {
if (! filter || filter(packageName, version)) {
var unipackage = packageLoader.getPackage(packageName);
var unipackage = loader.getPackage(packageName);
result[packageName] = unipackage.version;
}
});
@@ -938,7 +937,7 @@ _.extend(Unipackage.prototype, {
});
// We only want to load local packages.
var localPackageLoader = new PackageLoader({versions: null});
var localPackageLoader = new packageLoader.PackageLoader({versions: null});
bundler.iterateOverAllUsedUnipackages(
localPackageLoader, archinfo.host(), self.includeTool,
function (unipkg) {