Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 1 addition & 52 deletions build/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,44 +112,11 @@ const headRegexp = /(^module.exports = \w+;?)/m
, 'Buffer.isBuffer($1)'
]

, processNextTickImport = [
/^('use strict';)$/m
, `$1

/*<replacement>*/
var pna = require(\'process-nextick-args\');
/*</replacement>*/
`
]

, processNextTickReplacement = [
/process.nextTick\(/g
, 'pna.nextTick('
]

, internalUtilReplacement = [
/^const internalUtil = require\('internal\/util'\);/m
, '\n/*<replacement>*/\nconst internalUtil = {\n deprecate: require(\'util-deprecate\')\n};\n'
+ '/*</replacement>*/\n'
]
, isNode10 = [
headRegexp
, `$1

/*<replacement>*/
var asyncWrite = !process.browser && ['v0.10' , 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick;
/*</replacement>*/
`
]
, fixSyncWrite = [
/if \(sync\) {\n\s+pna.nextTick\(afterWrite, stream, state, finished, cb\);\n\s+}/
, `if (sync) {
/*<replacement>*/
asyncWrite(afterWrite, stream, state, finished, cb);
/*</replacement>*/
}
`
]
, internalDirectory = [
/require\('internal\/streams\/([a-zA-z]+)'\)/g,
'require(\'./internal/streams/$1\')'
Expand Down Expand Up @@ -238,8 +205,6 @@ module.exports['_stream_duplex.js'] = [
, stringDecoderReplacement
, objectKeysReplacement
, objectKeysDefine
, processNextTickImport
, processNextTickReplacement
, errorsOneLevel
]

Expand Down Expand Up @@ -267,8 +232,6 @@ module.exports['_stream_readable.js'] = [
, eventEmittterReplacement
, requireStreamReplacement
, isBufferReplacement
, processNextTickImport
, processNextTickReplacement
, eventEmittterListenerCountReplacement
, internalDirectory
, fixUintStuff
Expand Down Expand Up @@ -302,11 +265,7 @@ module.exports['_stream_writable.js'] = [
, [ /^var assert = require\('assert'\);$/m, '' ]
, requireStreamReplacement
, isBufferReplacement
, isNode10
, processNextTickImport
, processNextTickReplacement
, internalUtilReplacement
, fixSyncWrite
, fixInstanceCheck
, removeOnWriteBind
, internalDirectory
Expand Down Expand Up @@ -343,32 +302,22 @@ if (util && util.inspect && util.inspect.custom) {

]
module.exports['internal/streams/destroy.js'] = [
processNextTickImport
, processNextTickReplacement
, errorsTwoLevel
errorsTwoLevel
]

module.exports['internal/streams/state.js'] = [
processNextTickImport
, processNextTickReplacement
, errorsTwoLevel
]

module.exports['internal/streams/async_iterator.js'] = [
processNextTickImport
, processNextTickReplacement
, errorsTwoLevel
]

module.exports['internal/streams/end-of-stream.js'] = [
processNextTickImport
, processNextTickReplacement
, errorsTwoLevel
]

module.exports['internal/streams/pipeline.js'] = [
processNextTickImport
, processNextTickReplacement
, errorsTwoLevel
, [
/require\('internal\/streams\/end-of-stream'\)/,
Expand Down
6 changes: 1 addition & 5 deletions lib/_stream_duplex.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@

/*<replacement>*/

var pna = require('process-nextick-args');
/*</replacement>*/

/*<replacement>*/
var objectKeys = Object.keys || function (obj) {
var keys = [];
for (var key in obj) {
Expand Down Expand Up @@ -112,7 +108,7 @@ function onend() {

// no more data can be written.
// But allow more writes to happen in this tick.
pna.nextTick(onEndNT, this);
process.nextTick(onEndNT, this);
}

function onEndNT(self) {
Expand Down
21 changes: 8 additions & 13 deletions lib/_stream_readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@

'use strict';

/*<replacement>*/

var pna = require('process-nextick-args');
/*</replacement>*/

module.exports = Readable;

/*<replacement>*/
Expand Down Expand Up @@ -511,7 +506,7 @@ function emitReadable(stream) {
if (!state.emittedReadable) {
debug('emitReadable', state.flowing);
state.emittedReadable = true;
pna.nextTick(emitReadable_, stream);
process.nextTick(emitReadable_, stream);
}
}

Expand Down Expand Up @@ -541,7 +536,7 @@ function emitReadable_(stream) {
function maybeReadMore(stream, state) {
if (!state.readingMore) {
state.readingMore = true;
pna.nextTick(maybeReadMore_, stream, state);
process.nextTick(maybeReadMore_, stream, state);
}
}

Expand Down Expand Up @@ -586,7 +581,7 @@ Readable.prototype.pipe = function (dest, pipeOpts) {
var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr;

var endFn = doEnd ? onend : unpipe;
if (state.endEmitted) pna.nextTick(endFn);else src.once('end', endFn);
if (state.endEmitted) process.nextTick(endFn);else src.once('end', endFn);

dest.on('unpipe', onunpipe);
function onunpipe(readable, unpipeInfo) {
Expand Down Expand Up @@ -776,7 +771,7 @@ Readable.prototype.on = function (ev, fn) {
if (state.length) {
emitReadable(this);
} else if (!state.reading) {
pna.nextTick(nReadingNextTick, this);
process.nextTick(nReadingNextTick, this);
}
}
}
Expand All @@ -795,7 +790,7 @@ Readable.prototype.removeListener = function (ev, fn) {
// support once('readable', fn) cycles. This means that calling
// resume within the same tick will have no
// effect.
pna.nextTick(updateReadableListening, this);
process.nextTick(updateReadableListening, this);
}

return res;
Expand All @@ -811,7 +806,7 @@ Readable.prototype.removeAllListeners = function (ev) {
// support once('readable', fn) cycles. This means that calling
// resume within the same tick will have no
// effect.
pna.nextTick(updateReadableListening, this);
process.nextTick(updateReadableListening, this);
}

return res;
Expand Down Expand Up @@ -843,7 +838,7 @@ Readable.prototype.resume = function () {
function resume(stream, state) {
if (!state.resumeScheduled) {
state.resumeScheduled = true;
pna.nextTick(resume_, stream, state);
process.nextTick(resume_, stream, state);
}
}

Expand Down Expand Up @@ -1019,7 +1014,7 @@ function endReadable(stream) {
debug('endReadable', state.endEmitted);
if (!state.endEmitted) {
state.ended = true;
pna.nextTick(endReadableNT, state, stream);
process.nextTick(endReadableNT, state, stream);
}
}

Expand Down
25 changes: 7 additions & 18 deletions lib/_stream_writable.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@

'use strict';

/*<replacement>*/

var pna = require('process-nextick-args');
/*</replacement>*/

module.exports = Writable;

/* <replacement> */
Expand All @@ -53,10 +48,6 @@ function CorkedRequest(state) {
}
/* </replacement> */

/*<replacement>*/
var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick;
/*</replacement>*/

/*<replacement>*/
var Duplex;
/*</replacement>*/
Expand Down Expand Up @@ -291,7 +282,7 @@ function writeAfterEnd(stream, cb) {
var er = new ERR_STREAM_WRITE_AFTER_END();
// TODO: defer error events consistently everywhere, not just the cb
stream.emit('error', er);
pna.nextTick(cb, er);
process.nextTick(cb, er);
}

// Checks that a user-supplied chunk is valid, especially for the particular
Expand All @@ -307,7 +298,7 @@ function validChunk(stream, state, chunk, cb) {
}
if (er) {
stream.emit('error', er);
pna.nextTick(cb, er);
process.nextTick(cb, er);
return false;
}
return true;
Expand Down Expand Up @@ -445,10 +436,10 @@ function onwriteError(stream, state, sync, er, cb) {
if (sync) {
// defer the callback if we are being called synchronously
// to avoid piling up things on the stack
pna.nextTick(cb, er);
process.nextTick(cb, er);
// this can emit finish, and it will always happen
// after error
pna.nextTick(finishMaybe, stream, state);
process.nextTick(finishMaybe, stream, state);
stream._writableState.errorEmitted = true;
stream.emit('error', er);
} else {
Expand Down Expand Up @@ -488,9 +479,7 @@ function onwrite(stream, er) {
}

if (sync) {
/*<replacement>*/
asyncWrite(afterWrite, stream, state, finished, cb);
/*</replacement>*/
process.nextTick(afterWrite, stream, state, finished, cb);
} else {
afterWrite(stream, state, finished, cb);
}
Expand Down Expand Up @@ -637,7 +626,7 @@ function prefinish(stream, state) {
if (typeof stream._final === 'function' && !state.destroyed) {
state.pendingcb++;
state.finalCalled = true;
pna.nextTick(callFinal, stream, state);
process.nextTick(callFinal, stream, state);
} else {
state.prefinished = true;
stream.emit('prefinish');
Expand All @@ -661,7 +650,7 @@ function endWritable(stream, state, cb) {
state.ending = true;
finishMaybe(stream, state);
if (cb) {
if (state.finished) pna.nextTick(cb);else stream.once('finish', cb);
if (state.finished) process.nextTick(cb);else stream.once('finish', cb);
}
state.ended = true;
stream.writable = false;
Expand Down
7 changes: 1 addition & 6 deletions lib/internal/streams/async_iterator.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
'use strict';

/*<replacement>*/

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

var pna = require('process-nextick-args');
/*</replacement>*/

var kLastResolve = Symbol('lastResolve');
var kLastReject = Symbol('lastReject');
var kError = Symbol('error');
Expand Down Expand Up @@ -43,7 +38,7 @@ function readAndResolve(iter) {
function onReadable(iter) {
// we wait for the next tick, because it might
// emit an error with process.nextTick
pna.nextTick(readAndResolve, iter);
process.nextTick(readAndResolve, iter);
}

function onEnd(iter) {
Expand Down
14 changes: 5 additions & 9 deletions lib/internal/streams/destroy.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
'use strict';

/*<replacement>*/

var pna = require('process-nextick-args');
/*</replacement>*/

// undocumented cb() API, needed for core, not for public API

function destroy(err, cb) {
var _this = this;

Expand All @@ -16,7 +12,7 @@ function destroy(err, cb) {
if (cb) {
cb(err);
} else if (err && (!this._writableState || !this._writableState.errorEmitted)) {
pna.nextTick(emitErrorNT, this, err);
process.nextTick(emitErrorNT, this, err);
}
return this;
}
Expand All @@ -35,15 +31,15 @@ function destroy(err, cb) {

this._destroy(err || null, function (err) {
if (!cb && err) {
pna.nextTick(emitErrorAndCloseNT, _this, err);
process.nextTick(emitErrorAndCloseNT, _this, err);
if (_this._writableState) {
_this._writableState.errorEmitted = true;
}
} else if (cb) {
pna.nextTick(emitCloseNT, _this);
process.nextTick(emitCloseNT, _this);
cb(err);
} else {
pna.nextTick(emitCloseNT, _this);
process.nextTick(emitCloseNT, _this);
}
});

Expand Down
5 changes: 0 additions & 5 deletions lib/internal/streams/end-of-stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

'use strict';

/*<replacement>*/

var pna = require('process-nextick-args');
/*</replacement>*/

var ERR_STREAM_PREMATURE_CLOSE = require('../../../errors').codes.ERR_STREAM_PREMATURE_CLOSE;

function noop() {}
Expand Down
5 changes: 0 additions & 5 deletions lib/internal/streams/pipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

'use strict';

/*<replacement>*/

var pna = require('process-nextick-args');
/*</replacement>*/

var eos = void 0;

var _require$codes = require('../../../errors').codes,
Expand Down
5 changes: 0 additions & 5 deletions lib/internal/streams/state.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
'use strict';

/*<replacement>*/

var pna = require('process-nextick-args');
/*</replacement>*/

var ERR_INVALID_OPT_VALUE = require('../../../errors').codes.ERR_INVALID_OPT_VALUE;

function highWaterMarkFrom(options, isDuplex, duplexKey) {
Expand Down
Loading