1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

module: replace NativeModule.require

Browse Source 
The NativeModule system passes NativeModule.require transparently and so
is unnecessary to call explicitly.

The only one which should have the prefix is the in line 295, where
actually implements a big fs-based module system and actually requires a
native module. That is left unchanged.

PR-URL: https://github.com/joyent/node/pull/9201
Ref: https://github.com/joyent/node/issues/2009
Reviewed-by: Trevor Norris <trev.norris@gmail.com>

Conflicts:
	lib/module.js
This commit is contained in:
Herbert Vojčík 2015-02-12 14:50:47 +01:00 committed by cjihrig
parent 8c1df7a8a8
commit 6a2b204bbc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/module.js
View File

@ -1,11 +1,12 @@
'use strict';
const NativeModule = require('native_module');
const util = NativeModule.require('util');
const util = require('util');
const runInThisContext = require('vm').runInThisContext;
const runInNewContext = require('vm').runInNewContext;
const assert = require('assert').ok;
const fs = NativeModule.require('fs');
const fs = require('fs');
const path = require('path');
// If obj.hasOwnProperty has been overridden, then calling
@ -41,9 +42,6 @@ Module.globalPaths = [];
Module.wrapper = NativeModule.wrapper;
Module.wrap = NativeModule.wrap;
const path = NativeModule.require('path');
Module._debug = util.debuglog('module');