Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

return cached instance when requiring aliased module #261

Closed
wants to merge 1 commit into from
Closed

return cached instance when requiring aliased module #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion test/alias.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ var browserify = require('../');
var test = require('tap').test; var test = require('tap').test;


test('alias', function (t) { test('alias', function (t) {
t.plan(5); t.plan(8);
var port = 10000 + Math.floor(Math.random() * (Math.pow(2,16) - 10000)); var port = 10000 + Math.floor(Math.random() * (Math.pow(2,16) - 10000));
var server = connect.createServer(); var server = connect.createServer();


Expand Down Expand Up @@ -38,6 +38,9 @@ test('alias', function (t) {
vm.runInNewContext(src, context); vm.runInNewContext(src, context);
t.ok(context.require('moo')); t.ok(context.require('moo'));
t.ok(context.require('seq')); t.ok(context.require('seq'));
t.ok(context.require('seq') === context.require('seq'), 'returns the same instance for the same module');
t.ok(context.require('moo') === context.require('moo'), 'returns the same instance for the same module alias');
t.ok(context.require('seq') === context.require('moo'), 'returns the same instance for an aliased module and the original');
t.equal( t.equal(
String(context.require('seq')), String(context.require('seq')),
String(context.require('moo')) String(context.require('moo'))
Expand Down
8 changes: 7 additions & 1 deletion wrappers/prelude.js
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ var require = function (file, cwd) {
require.paths = []; require.paths = [];
require.modules = {}; require.modules = {};
require.cache = {}; require.cache = {};
require.aliases = {};
require.extensions = $extensions; require.extensions = $extensions;


require._core = { require._core = {
Expand All @@ -38,7 +39,10 @@ require.resolve = (function () {
} }


var n = loadNodeModulesSync(x, y); var n = loadNodeModulesSync(x, y);
if (n) return n; if (n) {
if (require.aliases[n]) return require.aliases[n];
return n;
}


throw new Error("Cannot find module '" + x + "'"); throw new Error("Cannot find module '" + x + "'");


Expand Down Expand Up @@ -130,9 +134,11 @@ require.alias = function (from, to) {
if (key.slice(0, basedir.length + 1) === basedir + '/') { if (key.slice(0, basedir.length + 1) === basedir + '/') {
var f = key.slice(basedir.length); var f = key.slice(basedir.length);
require.modules[to + f] = require.modules[basedir + f]; require.modules[to + f] = require.modules[basedir + f];
require.aliases[to + f] = basedir + f;
} }
else if (key === basedir) { else if (key === basedir) {
require.modules[to] = require.modules[basedir]; require.modules[to] = require.modules[basedir];
require.aliases[to] = basedir;
} }
} }
}; };
Expand Down