137 lines
4.0 KiB
Diff
137 lines
4.0 KiB
Diff
From b12f1c217b958a826c222de2a08765924636618b Mon Sep 17 00:00:00 2001
|
|
From: Jamie Nguyen <j@jamielinux.com>
|
|
Date: Sun, 23 Feb 2014 15:38:12 +0000
|
|
Subject: [PATCH] Load system modules
|
|
|
|
---
|
|
bin/nodeunit | 2 +-
|
|
examples/browser/nodeunit.js | 4 ++--
|
|
lib/core.js | 2 +-
|
|
lib/nodeunit.js | 2 +-
|
|
lib/reporters/junit.js | 4 ++--
|
|
lib/types.js | 2 +-
|
|
lib/utils.js | 2 +-
|
|
test/test-base.js | 2 +-
|
|
8 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/bin/nodeunit b/bin/nodeunit
|
|
index 4b3f4d5..f2c79ba 100755
|
|
--- a/bin/nodeunit
|
|
+++ b/bin/nodeunit
|
|
@@ -8,7 +8,7 @@ var
|
|
// lands in core.
|
|
//
|
|
// Until then, use console.log from npm (https://gist.github.com/1077544)
|
|
-require('../deps/console.log');
|
|
+require('console.log');
|
|
|
|
//require.paths.push(process.cwd());
|
|
var args = (process.ARGV || process.argv).slice(2);
|
|
diff --git a/examples/browser/nodeunit.js b/examples/browser/nodeunit.js
|
|
index af7fd0b..bca5d1f 100644
|
|
--- a/examples/browser/nodeunit.js
|
|
+++ b/examples/browser/nodeunit.js
|
|
@@ -1457,7 +1457,7 @@ assert.ifError = function (err) { if (err) {throw err;}};
|
|
*/
|
|
|
|
//var assert = require('./assert'), //@REMOVE_LINE_FOR_BROWSER
|
|
-// async = require('../deps/async'); //@REMOVE_LINE_FOR_BROWSER
|
|
+// async = require('async'); //@REMOVE_LINE_FOR_BROWSER
|
|
|
|
|
|
/**
|
|
@@ -1647,7 +1647,7 @@ exports.options = function (opt) {
|
|
* Module dependencies
|
|
*/
|
|
|
|
-//var async = require('../deps/async'), //@REMOVE_LINE_FOR_BROWSER
|
|
+//var async = require('async'), //@REMOVE_LINE_FOR_BROWSER
|
|
// types = require('./types'); //@REMOVE_LINE_FOR_BROWSER
|
|
|
|
|
|
diff --git a/lib/core.js b/lib/core.js
|
|
index 8ff031b..483a662 100644
|
|
--- a/lib/core.js
|
|
+++ b/lib/core.js
|
|
@@ -13,7 +13,7 @@
|
|
* Module dependencies
|
|
*/
|
|
|
|
-var async = require('../deps/async'), //@REMOVE_LINE_FOR_BROWSER
|
|
+var async = require('async'), //@REMOVE_LINE_FOR_BROWSER
|
|
nodeunit = require('./nodeunit'), //@REMOVE_LINE_FOR_BROWSER
|
|
types = require('./types'); //@REMOVE_LINE_FOR_BROWSER
|
|
|
|
diff --git a/lib/nodeunit.js b/lib/nodeunit.js
|
|
index 7d33c7b..7212ade 100644
|
|
--- a/lib/nodeunit.js
|
|
+++ b/lib/nodeunit.js
|
|
@@ -8,7 +8,7 @@
|
|
* Module dependencies
|
|
*/
|
|
|
|
-var async = require('../deps/async'),
|
|
+var async = require('async'),
|
|
types = require('./types'),
|
|
utils = require('./utils'),
|
|
core = require('./core'),
|
|
diff --git a/lib/reporters/junit.js b/lib/reporters/junit.js
|
|
index 5400526..ac6d545 100644
|
|
--- a/lib/reporters/junit.js
|
|
+++ b/lib/reporters/junit.js
|
|
@@ -12,10 +12,10 @@ var nodeunit = require('../nodeunit'),
|
|
utils = require('../utils'),
|
|
fs = require('fs'),
|
|
path = require('path'),
|
|
- async = require('../../deps/async'),
|
|
+ async = require('async'),
|
|
AssertionError = require('assert').AssertionError,
|
|
child_process = require('child_process'),
|
|
- ejs = require('../../deps/ejs');
|
|
+ ejs = require('ejs');
|
|
|
|
|
|
/**
|
|
diff --git a/lib/types.js b/lib/types.js
|
|
index 879edd8..65956f5 100644
|
|
--- a/lib/types.js
|
|
+++ b/lib/types.js
|
|
@@ -14,7 +14,7 @@
|
|
*/
|
|
|
|
var assert = require('./assert'), //@REMOVE_LINE_FOR_BROWSER
|
|
- async = require('../deps/async'); //@REMOVE_LINE_FOR_BROWSER
|
|
+ async = require('async'); //@REMOVE_LINE_FOR_BROWSER
|
|
|
|
|
|
/**
|
|
diff --git a/lib/utils.js b/lib/utils.js
|
|
index 898820f..dc8b736 100644
|
|
--- a/lib/utils.js
|
|
+++ b/lib/utils.js
|
|
@@ -8,7 +8,7 @@
|
|
* Module dependencies
|
|
*/
|
|
|
|
-var async = require('../deps/async'),
|
|
+var async = require('async'),
|
|
fs = require('fs'),
|
|
util = require('util'),
|
|
Script = require('vm').Script,
|
|
diff --git a/test/test-base.js b/test/test-base.js
|
|
index 5335046..b6ff611 100644
|
|
--- a/test/test-base.js
|
|
+++ b/test/test-base.js
|
|
@@ -10,7 +10,7 @@
|
|
*/
|
|
|
|
var assert = require('assert'), // @REMOVE_LINE_FOR_BROWSER
|
|
- async = require('../deps/async'), // @REMOVE_LINE_FOR_BROWSER
|
|
+ async = require('async'), // @REMOVE_LINE_FOR_BROWSER
|
|
nodeunit = require('../lib/nodeunit'); // @REMOVE_LINE_FOR_BROWSER
|
|
|
|
|
|
--
|
|
1.8.5.3
|
|
|