Skip to content

Support NODE_PATH in forked process #531

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

Closed
wants to merge 17 commits into from
Closed

Support NODE_PATH in forked process #531

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c2aab4f
Support NODE_PATH in forked process
ingro Feb 9, 2016
3704a07
Reworked how to pass the project path to the forked process
ingro Feb 9, 2016
33dd8f6
Reworked how to pass the project path to the forked process
ingro Feb 9, 2016
669be7c
Fix linting
ingro Feb 9, 2016
d37a356
Update logic to generate an array of additional paths from the NODE_P…
ingro Feb 9, 2016
082708b
Changed options name and added test to support NODE_PATH
ingro Feb 9, 2016
d4bf3ee
Partially fixed tests
ingro Feb 9, 2016
1e2d8ad
Fix cli test for NODE_PATH support
ingro Feb 10, 2016
eecfebb
Fix test for NODE_PATH on all os
ingro Feb 10, 2016
c42afed
Use path.delimiter instead of check os
ingro Feb 10, 2016
581e776
Removed unnecessarily call to process.cwd()
ingro Feb 10, 2016
5dc109e
New approach to retrieve NODE_PATH from forked process
ingro Feb 12, 2016
f947eb0
Linting
ingro Feb 12, 2016
f932f07
Merge to resolve conflicts
ingro Feb 15, 2016
d2fa2a2
Linting
ingro Feb 15, 2016
efdc4c2
Fix build APPVEYOR
ingro Feb 15, 2016
75b0de0
Moved env generation for fork process outside
ingro Feb 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/fork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ module.exports = function (file, opts) {
tty: process.stdout.isTTY ? {
columns: process.stdout.columns,
rows: process.stdout.rows
} : false
} : false,
projectRoot: process.cwd()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't necessarily the project root. Perhaps parentWorkingDirectory? Bit verbose though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about parentCwd?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

}, opts);

var ps = childProcess.fork(path.join(__dirname, 'test-worker.js'), [JSON.stringify(opts)], {
Expand Down
6 changes: 6 additions & 0 deletions lib/test-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ var oldNodeModulesPaths = module.constructor._nodeModulePaths;
module.constructor._nodeModulePaths = function () {
var ret = oldNodeModulesPaths.apply(this, arguments);
ret.push(nodeModulesDir);
if (process.env.NODE_PATH) {
var osSplitChar = /^win/.test(process.platform) ? ';' : ',';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps use is-windows. A separate package is likely preferable over inline regex fu.

If the NODE_PATH environment variable is set to a colon-delimited list of absolute paths, then Node.js will search those paths for modules if they are not found elsewhere. (Note: On Windows, NODE_PATH is delimited by semicolons instead of colons.)

(source)

The non-Windows separators are colons, not commas.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't want to add another dependency, but if it's fine for you I think too that this would be a better solution.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is, but I don't have final say ;-)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to use is-windows, since all of its logic is 1 line (https://github.com/jonschlinkert/is-windows/blob/master/index.js#L20):

process.platform === 'win32'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh yea, fair enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I guess I could leave the test as it is (except for the wrong separators).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use process.platform === 'win32' though rather than a regular expression.

process.env.NODE_PATH.split(osSplitChar).forEach(function (additionalPath) {
ret.push(path.join(opts.projectRoot, additionalPath));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use path.resolve in case additionalPath is already absolute.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah you're right, I'm really bad at this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries! This stuff is maddeningly difficult.

});
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could replace with:

return ret.concat(nodeModulesDir, additionalPaths);

return ret;
};

Expand Down