Browse Source

Close #1357 Load json files with require()

Signed off by everybody.
v0.7.4-release
isaacs 13 years ago
parent
commit
588d885e81
  1. 7
      lib/module.js
  2. 7
      test/simple/test-module-loading.js

7
lib/module.js

@ -466,6 +466,13 @@ Module._extensions['.node'] = function(module, filename) {
};
// Native extension for .json
Module._extensions['.json'] = function (module, filename) {
var content = NativeModule.require('fs').readFileSync(filename, 'utf8');
module.exports = JSON.parse(content);
};
// bootstrap main module.
Module.runMain = function() {
// Load the main module--the command line argument.

7
test/simple/test-module-loading.js

@ -213,6 +213,13 @@ var child = require('../fixtures/module-require/child/');
assert.equal(child.loaded, parent.loaded);
// #1357 Loading JSON files with require()
var json = require('../fixtures/packages/main/package.json');
assert.deepEqual(json, { name: 'package-name',
version: '1.2.3',
main: 'package-main-module' });
process.addListener('exit', function() {
assert.ok(common.indirectInstanceOf(a.A, Function));
assert.equal('A done', a.A());

Loading…
Cancel
Save