[Pkg-javascript-commits] [sockjs-client] 185/350: envify debug
tonnerre at ancient-solutions.com
tonnerre at ancient-solutions.com
Fri Aug 5 01:04:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
tonnerre-guest pushed a commit to branch upstream
in repository sockjs-client.
commit f29dda1b52cd867ed4a7f8d083d85725cf9b5e07
Author: Bryce Kahle <bkahle at gmail.com>
Date: Sun Oct 19 23:49:03 2014 -0400
envify debug
---
gulpfile.js | 50 ++++++++++++++---------------------
lib/info-receiver.js | 6 ++++-
lib/main.js | 9 ++++---
lib/transport/browser/abstract-xhr.js | 6 ++++-
lib/transport/driver/xhr.js | 6 ++++-
lib/transport/iframe.js | 6 ++++-
lib/transport/lib/ajax-based.js | 6 ++++-
lib/transport/lib/buffered-sender.js | 6 ++++-
lib/transport/lib/polling.js | 6 ++++-
lib/transport/lib/sender-receiver.js | 6 ++++-
lib/transport/receiver/eventsource.js | 6 ++++-
lib/transport/receiver/htmlfile.js | 6 ++++-
lib/transport/receiver/jsonp.js | 6 ++++-
lib/transport/receiver/xhr.js | 6 ++++-
lib/transport/sender/jsonp.js | 6 ++++-
lib/transport/sender/xdr.js | 6 ++++-
lib/transport/websocket.js | 6 ++++-
lib/utils/iframe.js | 6 ++++-
lib/utils/transport.js | 5 +++-
lib/utils/url.js | 6 ++++-
package.json | 7 ++---
21 files changed, 119 insertions(+), 54 deletions(-)
diff --git a/gulpfile.js b/gulpfile.js
index 0055658..dd9d653 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,17 +2,17 @@
var gulp = require('gulp')
, browserify = require('browserify')
- , exorcist = require('exorcist')
- , mold = require('mold-source-map')
+ , uglify = require('gulp-uglify')
+ , sourcemaps = require('gulp-sourcemaps')
, source = require('vinyl-source-stream')
- , path = require('path')
+ , buffer = require('vinyl-buffer')
+ , envify = require('envify/custom')
, mocha = require('gulp-mocha')
, eslint = require('gulp-eslint')
, pkg = require('./package.json')
;
-var jsRoot = path.join(__dirname, 'lib')
- , libName = 'sockjs-' + pkg.version
+var libName = 'sockjs-' + pkg.version
;
gulp.task('test', function () {
@@ -30,46 +30,36 @@ gulp.task('watch', function () {
gulp.watch('tests/*.js', ['test']);
});
-gulp.task('testbundle', function() {
- return browserify('./lib/entry.js', {
- standalone: 'SockJS'
- , debug: true
- })
- .ignore('querystring')
- .bundle()
- .pipe(mold.transformSourcesRelativeTo(jsRoot))
- .pipe(exorcist(path.join(__dirname, 'tests/html/lib/sockjs.js.map')))
- .pipe(source('sockjs.js'))
- .pipe(gulp.dest('./tests/html/lib/'))
- ;
-});
-
gulp.task('browserify', function () {
- return browserify('./lib/entry.js', {
- standalone: 'SockJS'
+ return browserify({
+ entries: './lib/entry.js'
+ , standalone: 'SockJS'
, debug: true
})
.ignore('querystring')
.bundle()
- .pipe(mold.transformSourcesRelativeTo(jsRoot))
- .pipe(exorcist(path.join(__dirname, 'build/sockjs.js.map')))
.pipe(source('sockjs.js'))
+ .pipe(buffer())
+ .pipe(sourcemaps.init({ loadMaps: true }))
+ .pipe(sourcemaps.write('./'))
.pipe(gulp.dest('./build/'))
;
});
gulp.task('browserify:min', function () {
- return browserify('./lib/entry.js', {
- standalone: 'SockJS'
+ return browserify({
+ entries: './lib/entry.js'
+ , standalone: 'SockJS'
})
.ignore('querystring')
- .plugin('minifyify', {
- map: libName + '.min.js.map'
- , compressPath: jsRoot
- , output: './build/' + libName + '.min.js.map'
- })
+ .exclude('debug')
+ .transform(envify({
+ NODE_ENV: 'production'
+ }))
.bundle()
.pipe(source(libName + '.min.js'))
+ .pipe(buffer())
+ .pipe(uglify())
.pipe(gulp.dest('./build/'))
;
});
diff --git a/lib/info-receiver.js b/lib/info-receiver.js
index 84004fb..ca9a18a 100644
--- a/lib/info-receiver.js
+++ b/lib/info-receiver.js
@@ -8,9 +8,13 @@ var EventEmitter = require('events').EventEmitter
, XHRFake = require('./transport/sender/xhr-fake')
, InfoIframe = require('./info-iframe')
, InfoAjax = require('./info-ajax')
- , debug = require('debug')('sockjs-client:info')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:info-receiver');
+}
+
function InfoReceiver(baseUrl, urlInfo) {
debug(baseUrl);
var self = this;
diff --git a/lib/main.js b/lib/main.js
index 39b7771..c51d552 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -5,7 +5,6 @@ require('./shims');
var u = require('url')
, util = require('util')
, JSON3 = require('json3')
- , debug = require('debug')
, random = require('./utils/random')
, escape = require('./utils/escape')
, urlUtils = require('./utils/url')
@@ -23,8 +22,12 @@ var u = require('url')
, InfoReceiver = require('./info-receiver')
;
-global.dbg = debug;
-debug = debug('sockjs-client:main');
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ // Make debug module available globally so you can enable via the console easily
+ global.dbg = require('debug');
+ debug = global.dbg('sockjs-client:main');
+}
var transports;
diff --git a/lib/transport/browser/abstract-xhr.js b/lib/transport/browser/abstract-xhr.js
index 2824cbd..ba0f234 100644
--- a/lib/transport/browser/abstract-xhr.js
+++ b/lib/transport/browser/abstract-xhr.js
@@ -3,10 +3,14 @@
var EventEmitter = require('events').EventEmitter
, util = require('util')
, utils = require('../../utils/event')
- , debug = require('debug')('sockjs-client:browser:xhr')
, XHR = global.XMLHttpRequest
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:browser:xhr');
+}
+
function AbstractXHRObject(method, url, payload, opts) {
debug(method, url);
var self = this;
diff --git a/lib/transport/driver/xhr.js b/lib/transport/driver/xhr.js
index a407a1e..54a32cd 100644
--- a/lib/transport/driver/xhr.js
+++ b/lib/transport/driver/xhr.js
@@ -4,9 +4,13 @@ var EventEmitter = require('events').EventEmitter
, util = require('util')
, http = require('http')
, u = require('url')
- , debug = require('debug')('sockjs-client:driver:xhr')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:driver:xhr');
+}
+
function XhrDriver(method, url, payload, opts) {
debug(method, url, payload);
var self = this;
diff --git a/lib/transport/iframe.js b/lib/transport/iframe.js
index 80d56b4..8847ce0 100644
--- a/lib/transport/iframe.js
+++ b/lib/transport/iframe.js
@@ -16,9 +16,13 @@ var util = require('util')
, iframeUtils = require('../utils/iframe')
, eventUtils = require('../utils/event')
, random = require('../utils/random')
- , debug = require('debug')('sockjs-client:transport:iframe')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:transport:iframe');
+}
+
function IframeTransport(transport, transUrl, baseUrl) {
debug(transport, transUrl, baseUrl);
EventEmitter.call(this);
diff --git a/lib/transport/lib/ajax-based.js b/lib/transport/lib/ajax-based.js
index 53008d3..1f514ac 100644
--- a/lib/transport/lib/ajax-based.js
+++ b/lib/transport/lib/ajax-based.js
@@ -2,9 +2,13 @@
var util = require('util')
, SenderReceiver = require('./sender-receiver')
- , debug = require('debug')('sockjs-client:ajax-based')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:ajax-based');
+}
+
function createAjaxSender(AjaxObject) {
return function(url, payload, callback) {
debug('create ajax sender', url, payload);
diff --git a/lib/transport/lib/buffered-sender.js b/lib/transport/lib/buffered-sender.js
index bb031dc..e7f1c4a 100644
--- a/lib/transport/lib/buffered-sender.js
+++ b/lib/transport/lib/buffered-sender.js
@@ -2,9 +2,13 @@
var util = require('util')
, EventEmitter = require('events').EventEmitter
- , debug = require('debug')('sockjs-client:buffered-sender')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:buffered-sender');
+}
+
function BufferedSender(url, sender) {
debug(url);
EventEmitter.call(this);
diff --git a/lib/transport/lib/polling.js b/lib/transport/lib/polling.js
index b6f0739..a2595e7 100644
--- a/lib/transport/lib/polling.js
+++ b/lib/transport/lib/polling.js
@@ -2,9 +2,13 @@
var util = require('util')
, EventEmitter = require('events').EventEmitter
- , debug = require('debug')('sockjs-client:polling')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:polling');
+}
+
function Polling(Receiver, receiveUrl, AjaxObject) {
debug(receiveUrl);
EventEmitter.call(this);
diff --git a/lib/transport/lib/sender-receiver.js b/lib/transport/lib/sender-receiver.js
index 8b834df..6cb07ff 100644
--- a/lib/transport/lib/sender-receiver.js
+++ b/lib/transport/lib/sender-receiver.js
@@ -3,9 +3,13 @@
var util = require('util')
, BufferedSender = require('./buffered-sender')
, Polling = require('./polling')
- , debug = require('debug')('sockjs-client:sender-receiver')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:sender-receiver');
+}
+
function SenderReceiver(transUrl, urlSuffix, senderFunc, Receiver, AjaxObject) {
debug(transUrl, urlSuffix);
var self = this;
diff --git a/lib/transport/receiver/eventsource.js b/lib/transport/receiver/eventsource.js
index 6ac372b..0a4112e 100644
--- a/lib/transport/receiver/eventsource.js
+++ b/lib/transport/receiver/eventsource.js
@@ -2,10 +2,14 @@
var util = require('util')
, EventEmitter = require('events').EventEmitter
- , debug = require('debug')('sockjs-client:receiver:eventsource')
, EventSourceDriver = require('eventsource')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:receiver:eventsource');
+}
+
function EventSourceReceiver(url) {
debug(url);
EventEmitter.call(this);
diff --git a/lib/transport/receiver/htmlfile.js b/lib/transport/receiver/htmlfile.js
index f1edf97..bf173d7 100644
--- a/lib/transport/receiver/htmlfile.js
+++ b/lib/transport/receiver/htmlfile.js
@@ -4,9 +4,13 @@ var util = require('util')
, iframeUtils = require('../../utils/iframe')
, EventEmitter = require('events').EventEmitter
, random = require('../../utils/random')
- , debug = require('debug')('sockjs-client:receiver:htmlfile')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:receiver:htmlfile');
+}
+
function HtmlfileReceiver(url) {
debug(url);
EventEmitter.call(this);
diff --git a/lib/transport/receiver/jsonp.js b/lib/transport/receiver/jsonp.js
index c7bebfe..d5cf1fd 100644
--- a/lib/transport/receiver/jsonp.js
+++ b/lib/transport/receiver/jsonp.js
@@ -5,9 +5,13 @@ var utils = require('../../utils/iframe')
, browser = require('../../utils/browser')
, util = require('util')
, EventEmitter = require('events').EventEmitter
- , debug = require('debug')('sockjs-client:receiver:jsonp')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:receiver:jsonp');
+}
+
function JsonpReceiver(url) {
debug(url);
var self = this;
diff --git a/lib/transport/receiver/xhr.js b/lib/transport/receiver/xhr.js
index dce50a3..da6984d 100644
--- a/lib/transport/receiver/xhr.js
+++ b/lib/transport/receiver/xhr.js
@@ -2,9 +2,13 @@
var util = require('util')
, EventEmitter = require('events').EventEmitter
- , debug = require('debug')('sockjs-client:receiver:xhr')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:receiver:xhr');
+}
+
function XhrReceiver(url, AjaxObject) {
debug(url);
EventEmitter.call(this);
diff --git a/lib/transport/sender/jsonp.js b/lib/transport/sender/jsonp.js
index b4ca510..631f1f4 100644
--- a/lib/transport/sender/jsonp.js
+++ b/lib/transport/sender/jsonp.js
@@ -1,9 +1,13 @@
'use strict';
var random = require('../../utils/random')
- , debug = require('debug')('sockjs-client:sender:jsonp')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:sender:jsonp');
+}
+
var form, area;
function createIframe (id) {
diff --git a/lib/transport/sender/xdr.js b/lib/transport/sender/xdr.js
index 4761d1c..6a59749 100644
--- a/lib/transport/sender/xdr.js
+++ b/lib/transport/sender/xdr.js
@@ -3,9 +3,13 @@
var EventEmitter = require('events').EventEmitter
, util = require('util')
, eventUtils = require('../../utils/event')
- , debug = require('debug')('sockjs-client:sender:xdr')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:sender:xdr');
+}
+
// References:
// http://ajaxian.com/archives/100-line-ajax-wrapper
// http://msdn.microsoft.com/en-us/library/cc288060(v=VS.85).aspx
diff --git a/lib/transport/websocket.js b/lib/transport/websocket.js
index c4d2ab9..4e0cd2c 100644
--- a/lib/transport/websocket.js
+++ b/lib/transport/websocket.js
@@ -2,11 +2,15 @@
var utils = require('../utils/event')
, util = require('util')
- , debug = require('debug')('sockjs-client:websocket')
, EventEmitter = require('events').EventEmitter
, WebsocketDriver = require('./driver/websocket')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:websocket');
+}
+
function WebSocketTransport(transUrl) {
EventEmitter.call(this);
debug('constructor', transUrl);
diff --git a/lib/utils/iframe.js b/lib/utils/iframe.js
index 6514eab..16ccec6 100644
--- a/lib/utils/iframe.js
+++ b/lib/utils/iframe.js
@@ -3,9 +3,13 @@
var eventUtils = require('./event')
, JSON3 = require('json3')
, browser = require('./browser')
- , debug = require('debug')('sockjs-client:utils:iframe')
;
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:utils:iframe');
+}
+
module.exports = {
WPrefix: '_jp'
, currentWindowId: null
diff --git a/lib/utils/transport.js b/lib/utils/transport.js
index 74d2578..c4f5ef4 100644
--- a/lib/utils/transport.js
+++ b/lib/utils/transport.js
@@ -1,6 +1,9 @@
'use strict';
-var debug = require('debug')('sockjs-client:utils:transport');
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:utils:transport');
+}
module.exports = function (availableTransports) {
return {
diff --git a/lib/utils/url.js b/lib/utils/url.js
index 13fdad8..e7696d4 100644
--- a/lib/utils/url.js
+++ b/lib/utils/url.js
@@ -1,7 +1,11 @@
'use strict';
var u = require('url');
-var debug = require('debug')('sockjs-client:utils:url');
+
+var debug = function () {};
+if (process.env.NODE_ENV !== 'production') {
+ debug = require('debug')('sockjs-client:utils:url');
+}
module.exports = {
getOrigin: function (url) {
diff --git a/package.json b/package.json
index a46d856..e2166cd 100644
--- a/package.json
+++ b/package.json
@@ -30,17 +30,18 @@
"devDependencies": {
"browserify": "^6.1.0",
"debug": "^2.1.0",
- "exorcist": "^0.1.6",
+ "envify": "~3.0.0",
"expect.js": "~0.3.1",
"gulp": "^3.8.8",
"gulp-eslint": "~0.1.8",
"gulp-mocha": "~1.1.1",
- "minifyify": "^4.4.0",
+ "gulp-sourcemaps": "~1.2.4",
+ "gulp-uglify": "~1.0.1",
"mocha": "^1.21.5",
- "mold-source-map": "^0.3.0",
"node-static": "^0.7.6",
"proxyquire": "~1.0.1",
"sockjs": "^0.3.9",
+ "vinyl-buffer": "~1.0.0",
"vinyl-source-stream": "^1.0.0",
"zuul": "git://github.com/brycekahle/zuul#ngrok"
},
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/sockjs-client.git
More information about the Pkg-javascript-commits
mailing list