-
-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[New] add default support for
paths to include `$HOME/.node_{module…
…s,libraries}` Note, this is a rarely used feature that should be aggressively avoided, but it‘s important to minimize gaps between node and this package. Fixes #163
- Loading branch information
Showing
7 changed files
with
292 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| 'use strict'; | ||
|
|
||
| var os = require('os'); | ||
|
|
||
| // adapted from https://github.com/sindresorhus/os-homedir/blob/11e089f4754db38bb535e5a8416320c4446e8cfd/index.js | ||
|
|
||
| module.exports = os.homedir || function homedir() { | ||
| var home = process.env.HOME; | ||
| var user = process.env.LOGNAME || process.env.USER || process.env.LNAME || process.env.USERNAME; | ||
|
|
||
| if (process.platform === 'win32') { | ||
| return process.env.USERPROFILE || process.env.HOMEDRIVE + process.env.HOMEPATH || home || null; | ||
| } | ||
|
|
||
| if (process.platform === 'darwin') { | ||
| return home || (user ? '/Users/' + user : null); | ||
| } | ||
|
|
||
| if (process.platform === 'linux') { | ||
| return home || (process.getuid() === 0 ? '/root' : (user ? '/home/' + user : null)); // eslint-disable-line no-extra-parens | ||
| } | ||
|
|
||
| return home || null; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| 'use strict'; | ||
|
|
||
| var fs = require('fs'); | ||
| var homedir = require('../lib/homedir'); | ||
| var path = require('path'); | ||
|
|
||
| var test = require('tape'); | ||
| var mkdirp = require('mkdirp'); | ||
| var rimraf = require('rimraf'); | ||
| var mv = require('mv'); | ||
| var copyDir = require('copy-dir'); | ||
| var tmp = require('tmp'); | ||
|
|
||
| var HOME = homedir(); | ||
|
|
||
| var hnm = path.join(HOME, '.node_modules'); | ||
| var hnl = path.join(HOME, '.node_libraries'); | ||
|
|
||
| var resolve = require('../async'); | ||
|
|
||
| function makeDir(t, dir, cb) { | ||
| mkdirp(dir, function (err) { | ||
| if (err) { | ||
| cb(err); | ||
| } else { | ||
| t.teardown(function cleanup() { | ||
| rimraf.sync(dir); | ||
| }); | ||
| cb(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function makeTempDir(t, dir, cb) { | ||
| if (fs.existsSync(dir)) { | ||
| var tmpResult = tmp.dirSync(); | ||
| t.teardown(tmpResult.removeCallback); | ||
| var backup = path.join(tmpResult.name, path.basename(dir)); | ||
| mv(dir, backup, function (err) { | ||
| if (err) { | ||
| cb(err); | ||
| } else { | ||
| t.teardown(function () { | ||
| mv(backup, dir, cb); | ||
| }); | ||
| makeDir(t, dir, cb); | ||
| } | ||
| }); | ||
| } else { | ||
| makeDir(t, dir, cb); | ||
| } | ||
| } | ||
|
|
||
| test('homedir module paths', function (t) { | ||
| t.plan(7); | ||
|
|
||
| makeTempDir(t, hnm, function (err) { | ||
| t.error(err, 'no error with HNM temp dir'); | ||
| if (err) { | ||
| return t.end(); | ||
| } | ||
|
|
||
| var bazHNMDir = path.join(hnm, 'baz'); | ||
| var dotMainDir = path.join(hnm, 'dot_main'); | ||
| copyDir.sync(path.join(__dirname, 'resolver/baz'), bazHNMDir); | ||
| copyDir.sync(path.join(__dirname, 'resolver/dot_main'), dotMainDir); | ||
|
|
||
| var bazPkg = { name: 'baz', main: 'quux.js' }; | ||
| var dotMainPkg = { main: 'index' }; | ||
|
|
||
| var bazHNMmain = path.join(bazHNMDir, 'quux.js'); | ||
| t.equal(require.resolve('baz'), bazHNMmain, 'sanity check: require.resolve finds HNM `baz`'); | ||
| var dotMainMain = path.join(dotMainDir, 'index.js'); | ||
| t.equal(require.resolve('dot_main'), dotMainMain, 'sanity check: require.resolve finds `dot_main`'); | ||
|
|
||
| makeTempDir(t, hnl, function (err) { | ||
| t.error(err, 'no error with HNL temp dir'); | ||
| if (err) { | ||
| return t.end(); | ||
| } | ||
| var bazHNLDir = path.join(hnl, 'baz'); | ||
| copyDir.sync(path.join(__dirname, 'resolver/baz'), bazHNLDir); | ||
|
|
||
| var dotSlashMainDir = path.join(hnl, 'dot_slash_main'); | ||
| var dotSlashMainMain = path.join(dotSlashMainDir, 'index.js'); | ||
| var dotSlashMainPkg = { main: 'index' }; | ||
| copyDir.sync(path.join(__dirname, 'resolver/dot_slash_main'), dotSlashMainDir); | ||
|
|
||
| t.equal(require.resolve('baz'), bazHNMmain, 'sanity check: require.resolve finds HNM `baz`'); | ||
| t.equal(require.resolve('dot_slash_main'), dotSlashMainMain, 'sanity check: require.resolve finds HNL `dot_slash_main`'); | ||
|
|
||
| t.test('with temp dirs', function (st) { | ||
| st.plan(3); | ||
|
|
||
| st.test('just in `$HOME/.node_modules`', function (s2t) { | ||
| s2t.plan(3); | ||
|
|
||
| resolve('dot_main', function (err, res, pkg) { | ||
| s2t.error(err, 'no error resolving `dot_main`'); | ||
| s2t.equal(res, dotMainMain, '`dot_main` resolves in `$HOME/.node_modules`'); | ||
| s2t.deepEqual(pkg, dotMainPkg); | ||
| }); | ||
| }); | ||
|
|
||
| st.test('just in `$HOME/.node_libraries`', function (s2t) { | ||
| s2t.plan(3); | ||
|
|
||
| resolve('dot_slash_main', function (err, res, pkg) { | ||
| s2t.error(err, 'no error resolving `dot_slash_main`'); | ||
| s2t.equal(res, dotSlashMainMain, '`dot_slash_main` resolves in `$HOME/.node_libraries`'); | ||
| s2t.deepEqual(pkg, dotSlashMainPkg); | ||
| }); | ||
| }); | ||
|
|
||
| st.test('in `$HOME/.node_libraries` and `$HOME/.node_modules`', function (s2t) { | ||
| s2t.plan(3); | ||
|
|
||
| resolve('baz', function (err, res, pkg) { | ||
| s2t.error(err, 'no error resolving `baz`'); | ||
| s2t.equal(res, bazHNMmain, '`baz` resolves in `$HOME/.node_modules` when in both'); | ||
| s2t.deepEqual(pkg, bazPkg); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| 'use strict'; | ||
|
|
||
| var fs = require('fs'); | ||
| var homedir = require('../lib/homedir'); | ||
| var path = require('path'); | ||
|
|
||
| var test = require('tape'); | ||
| var mkdirp = require('mkdirp'); | ||
| var rimraf = require('rimraf'); | ||
| var mv = require('mv'); | ||
| var copyDir = require('copy-dir'); | ||
| var tmp = require('tmp'); | ||
|
|
||
| var HOME = homedir(); | ||
|
|
||
| var hnm = path.join(HOME, '.node_modules'); | ||
| var hnl = path.join(HOME, '.node_libraries'); | ||
|
|
||
| var resolve = require('../sync'); | ||
|
|
||
| function makeDir(t, dir, cb) { | ||
| mkdirp(dir, function (err) { | ||
| if (err) { | ||
| cb(err); | ||
| } else { | ||
| t.teardown(function cleanup() { | ||
| rimraf.sync(dir); | ||
| }); | ||
| cb(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function makeTempDir(t, dir, cb) { | ||
| if (fs.existsSync(dir)) { | ||
| var tmpResult = tmp.dirSync(); | ||
| t.teardown(tmpResult.removeCallback); | ||
| var backup = path.join(tmpResult.name, path.basename(dir)); | ||
| mv(dir, backup, function (err) { | ||
| if (err) { | ||
| cb(err); | ||
| } else { | ||
| t.teardown(function () { | ||
| mv(backup, dir, cb); | ||
| }); | ||
| makeDir(t, dir, cb); | ||
| } | ||
| }); | ||
| } else { | ||
| makeDir(t, dir, cb); | ||
| } | ||
| } | ||
|
|
||
| test('homedir module paths', function (t) { | ||
| t.plan(7); | ||
|
|
||
| makeTempDir(t, hnm, function (err) { | ||
| t.error(err, 'no error with HNM temp dir'); | ||
| if (err) { | ||
| return t.end(); | ||
| } | ||
|
|
||
| var bazHNMDir = path.join(hnm, 'baz'); | ||
| var dotMainDir = path.join(hnm, 'dot_main'); | ||
| copyDir.sync(path.join(__dirname, 'resolver/baz'), bazHNMDir); | ||
| copyDir.sync(path.join(__dirname, 'resolver/dot_main'), dotMainDir); | ||
|
|
||
| var bazHNMmain = path.join(bazHNMDir, 'quux.js'); | ||
| t.equal(require.resolve('baz'), bazHNMmain, 'sanity check: require.resolve finds HNM `baz`'); | ||
| var dotMainMain = path.join(dotMainDir, 'index.js'); | ||
| t.equal(require.resolve('dot_main'), dotMainMain, 'sanity check: require.resolve finds `dot_main`'); | ||
|
|
||
| makeTempDir(t, hnl, function (err) { | ||
| t.error(err, 'no error with HNL temp dir'); | ||
| if (err) { | ||
| return t.end(); | ||
| } | ||
| var bazHNLDir = path.join(hnl, 'baz'); | ||
| copyDir.sync(path.join(__dirname, 'resolver/baz'), bazHNLDir); | ||
|
|
||
| var dotSlashMainDir = path.join(hnl, 'dot_slash_main'); | ||
| var dotSlashMainMain = path.join(dotSlashMainDir, 'index.js'); | ||
| copyDir.sync(path.join(__dirname, 'resolver/dot_slash_main'), dotSlashMainDir); | ||
|
|
||
| t.equal(require.resolve('baz'), bazHNMmain, 'sanity check: require.resolve finds HNM `baz`'); | ||
| t.equal(require.resolve('dot_slash_main'), dotSlashMainMain, 'sanity check: require.resolve finds HNL `dot_slash_main`'); | ||
|
|
||
| t.test('with temp dirs', function (st) { | ||
| st.plan(3); | ||
|
|
||
| st.test('just in `$HOME/.node_modules`', function (s2t) { | ||
| s2t.plan(1); | ||
|
|
||
| var res = resolve('dot_main'); | ||
| s2t.equal(res, dotMainMain, '`dot_main` resolves in `$HOME/.node_modules`'); | ||
| }); | ||
|
|
||
| st.test('just in `$HOME/.node_libraries`', function (s2t) { | ||
| s2t.plan(1); | ||
|
|
||
| var res = resolve('dot_slash_main'); | ||
| s2t.equal(res, dotSlashMainMain, '`dot_slash_main` resolves in `$HOME/.node_libraries`'); | ||
| }); | ||
|
|
||
| st.test('in `$HOME/.node_libraries` and `$HOME/.node_modules`', function (s2t) { | ||
| s2t.plan(1); | ||
|
|
||
| var res = resolve('baz'); | ||
| s2t.equal(res, bazHNMmain, '`baz` resolves in `$HOME/.node_modules` when in both'); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); |