mirror of
https://github.com/meteor/meteor.git
synced 2026-05-02 03:01:46 -04:00
971d2b1272
Ever since Meteor 1.3 first introduced a module system based on something other than `Npm.require`, we've continued throwing missing module exceptions that refer to `Npm.depends` and/or `Npm.require`, even if the developer called `require` or used an `import` declaration. This commit fixes that, so that all missing module exceptions look like 'Cannot find module "module/name"'. I also noticed recently that `Npm.require` is capable of returning modules installed in `node_modules` directories completely outside the app, which is bad news for development/production reproducibility. Fixed that too. CC @hwillson who has spoken of deprecating `Npm.require` entirely, and just using `require` everywhere, instead.
68 lines
2.0 KiB
JavaScript
68 lines
2.0 KiB
JavaScript
// RegExp matching strings that don't start with a `.` or a `/`.
|
|
var topLevelIdPattern = /^[^./]/;
|
|
|
|
// This function will be called whenever a module identifier that hasn't
|
|
// been installed is required. For backwards compatibility, and so that we
|
|
// can require binary dependencies on the server, we implement the
|
|
// fallback in terms of Npm.require.
|
|
makeInstallerOptions.fallback = function (id, parentId, error) {
|
|
// For simplicity, we honor only top-level module identifiers here.
|
|
// We could try to honor relative and absolute module identifiers by
|
|
// somehow combining `id` with `dir`, but we'd have to be really careful
|
|
// that the resulting modules were located in a known directory (not
|
|
// some arbitrary location on the file system), and we only really need
|
|
// the fallback for dependencies installed in node_modules directories.
|
|
if (topLevelIdPattern.test(id)) {
|
|
if (typeof Npm === "object" &&
|
|
typeof Npm.require === "function") {
|
|
return Npm.require(id, error);
|
|
}
|
|
}
|
|
|
|
throw error;
|
|
};
|
|
|
|
makeInstallerOptions.fallback.resolve = function (id, parentId, error) {
|
|
if (topLevelIdPattern.test(id)) {
|
|
// Allow any top-level identifier to resolve to itself on the server,
|
|
// so that makeInstallerOptions.fallback has a chance to handle it.
|
|
return id;
|
|
}
|
|
|
|
throw error;
|
|
};
|
|
|
|
meteorInstall = makeInstaller(makeInstallerOptions);
|
|
var Module = meteorInstall.Module;
|
|
|
|
Module.prototype.useNode = function () {
|
|
if (typeof npmRequire !== "function") {
|
|
// Can't use Node if npmRequire is not defined.
|
|
return false;
|
|
}
|
|
|
|
var parts = this.id.split("/");
|
|
var start = 0;
|
|
if (parts[start] === "") ++start;
|
|
if (parts[start] === "node_modules" &&
|
|
parts[start + 1] === "meteor") {
|
|
start += 2;
|
|
}
|
|
|
|
if (parts.indexOf("node_modules", start) < 0) {
|
|
// Don't try to use Node for modules that aren't in node_modules
|
|
// directories.
|
|
return false;
|
|
}
|
|
|
|
try {
|
|
npmRequire.resolve(this.id);
|
|
} catch (e) {
|
|
return false;
|
|
}
|
|
|
|
this.exports = npmRequire(this.id);
|
|
|
|
return true;
|
|
};
|