Skip to content

Commit 23c4ff0

Browse files
authored
Removed process-nexttick-args as it's not needed anymore (#354)
* Removed process-nexttick-args as it's not used anymore * Rmoeved process-nexttick-args everywhere, it's not needed
1 parent 3dc117e commit 23c4ff0

File tree

10 files changed

+23
-119
lines changed

10 files changed

+23
-119
lines changed

build/files.js

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -112,44 +112,11 @@ const headRegexp = /(^module.exports = \w+;?)/m
112112
, 'Buffer.isBuffer($1)'
113113
]
114114

115-
, processNextTickImport = [
116-
/^('use strict';)$/m
117-
, `$1
118-
119-
/*<replacement>*/
120-
var pna = require(\'process-nextick-args\');
121-
/*</replacement>*/
122-
`
123-
]
124-
125-
, processNextTickReplacement = [
126-
/process.nextTick\(/g
127-
, 'pna.nextTick('
128-
]
129-
130115
, internalUtilReplacement = [
131116
/^const internalUtil = require\('internal\/util'\);/m
132117
, '\n/*<replacement>*/\nconst internalUtil = {\n deprecate: require(\'util-deprecate\')\n};\n'
133118
+ '/*</replacement>*/\n'
134119
]
135-
, isNode10 = [
136-
headRegexp
137-
, `$1
138-
139-
/*<replacement>*/
140-
var asyncWrite = !process.browser && ['v0.10' , 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick;
141-
/*</replacement>*/
142-
`
143-
]
144-
, fixSyncWrite = [
145-
/if \(sync\) {\n\s+pna.nextTick\(afterWrite, stream, state, finished, cb\);\n\s+}/
146-
, `if (sync) {
147-
/*<replacement>*/
148-
asyncWrite(afterWrite, stream, state, finished, cb);
149-
/*</replacement>*/
150-
}
151-
`
152-
]
153120
, internalDirectory = [
154121
/require\('internal\/streams\/([a-zA-z]+)'\)/g,
155122
'require(\'./internal/streams/$1\')'
@@ -238,8 +205,6 @@ module.exports['_stream_duplex.js'] = [
238205
, stringDecoderReplacement
239206
, objectKeysReplacement
240207
, objectKeysDefine
241-
, processNextTickImport
242-
, processNextTickReplacement
243208
, errorsOneLevel
244209
]
245210

@@ -267,8 +232,6 @@ module.exports['_stream_readable.js'] = [
267232
, eventEmittterReplacement
268233
, requireStreamReplacement
269234
, isBufferReplacement
270-
, processNextTickImport
271-
, processNextTickReplacement
272235
, eventEmittterListenerCountReplacement
273236
, internalDirectory
274237
, fixUintStuff
@@ -302,11 +265,7 @@ module.exports['_stream_writable.js'] = [
302265
, [ /^var assert = require\('assert'\);$/m, '' ]
303266
, requireStreamReplacement
304267
, isBufferReplacement
305-
, isNode10
306-
, processNextTickImport
307-
, processNextTickReplacement
308268
, internalUtilReplacement
309-
, fixSyncWrite
310269
, fixInstanceCheck
311270
, removeOnWriteBind
312271
, internalDirectory
@@ -343,32 +302,22 @@ if (util && util.inspect && util.inspect.custom) {
343302

344303
]
345304
module.exports['internal/streams/destroy.js'] = [
346-
processNextTickImport
347-
, processNextTickReplacement
348-
, errorsTwoLevel
305+
errorsTwoLevel
349306
]
350307

351308
module.exports['internal/streams/state.js'] = [
352-
processNextTickImport
353-
, processNextTickReplacement
354309
, errorsTwoLevel
355310
]
356311

357312
module.exports['internal/streams/async_iterator.js'] = [
358-
processNextTickImport
359-
, processNextTickReplacement
360313
, errorsTwoLevel
361314
]
362315

363316
module.exports['internal/streams/end-of-stream.js'] = [
364-
processNextTickImport
365-
, processNextTickReplacement
366317
, errorsTwoLevel
367318
]
368319

369320
module.exports['internal/streams/pipeline.js'] = [
370-
processNextTickImport
371-
, processNextTickReplacement
372321
, errorsTwoLevel
373322
, [
374323
/require\('internal\/streams\/end-of-stream'\)/,

lib/_stream_duplex.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828

2929
/*<replacement>*/
3030

31-
var pna = require('process-nextick-args');
32-
/*</replacement>*/
33-
34-
/*<replacement>*/
3531
var objectKeys = Object.keys || function (obj) {
3632
var keys = [];
3733
for (var key in obj) {
@@ -112,7 +108,7 @@ function onend() {
112108

113109
// no more data can be written.
114110
// But allow more writes to happen in this tick.
115-
pna.nextTick(onEndNT, this);
111+
process.nextTick(onEndNT, this);
116112
}
117113

118114
function onEndNT(self) {

lib/_stream_readable.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121

2222
'use strict';
2323

24-
/*<replacement>*/
25-
26-
var pna = require('process-nextick-args');
27-
/*</replacement>*/
28-
2924
module.exports = Readable;
3025

3126
/*<replacement>*/
@@ -511,7 +506,7 @@ function emitReadable(stream) {
511506
if (!state.emittedReadable) {
512507
debug('emitReadable', state.flowing);
513508
state.emittedReadable = true;
514-
pna.nextTick(emitReadable_, stream);
509+
process.nextTick(emitReadable_, stream);
515510
}
516511
}
517512

@@ -541,7 +536,7 @@ function emitReadable_(stream) {
541536
function maybeReadMore(stream, state) {
542537
if (!state.readingMore) {
543538
state.readingMore = true;
544-
pna.nextTick(maybeReadMore_, stream, state);
539+
process.nextTick(maybeReadMore_, stream, state);
545540
}
546541
}
547542

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

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

591586
dest.on('unpipe', onunpipe);
592587
function onunpipe(readable, unpipeInfo) {
@@ -776,7 +771,7 @@ Readable.prototype.on = function (ev, fn) {
776771
if (state.length) {
777772
emitReadable(this);
778773
} else if (!state.reading) {
779-
pna.nextTick(nReadingNextTick, this);
774+
process.nextTick(nReadingNextTick, this);
780775
}
781776
}
782777
}
@@ -795,7 +790,7 @@ Readable.prototype.removeListener = function (ev, fn) {
795790
// support once('readable', fn) cycles. This means that calling
796791
// resume within the same tick will have no
797792
// effect.
798-
pna.nextTick(updateReadableListening, this);
793+
process.nextTick(updateReadableListening, this);
799794
}
800795

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

817812
return res;
@@ -843,7 +838,7 @@ Readable.prototype.resume = function () {
843838
function resume(stream, state) {
844839
if (!state.resumeScheduled) {
845840
state.resumeScheduled = true;
846-
pna.nextTick(resume_, stream, state);
841+
process.nextTick(resume_, stream, state);
847842
}
848843
}
849844

@@ -1019,7 +1014,7 @@ function endReadable(stream) {
10191014
debug('endReadable', state.endEmitted);
10201015
if (!state.endEmitted) {
10211016
state.ended = true;
1022-
pna.nextTick(endReadableNT, state, stream);
1017+
process.nextTick(endReadableNT, state, stream);
10231018
}
10241019
}
10251020

lib/_stream_writable.js

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525

2626
'use strict';
2727

28-
/*<replacement>*/
29-
30-
var pna = require('process-nextick-args');
31-
/*</replacement>*/
32-
3328
module.exports = Writable;
3429

3530
/* <replacement> */
@@ -53,10 +48,6 @@ function CorkedRequest(state) {
5348
}
5449
/* </replacement> */
5550

56-
/*<replacement>*/
57-
var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick;
58-
/*</replacement>*/
59-
6051
/*<replacement>*/
6152
var Duplex;
6253
/*</replacement>*/
@@ -291,7 +282,7 @@ function writeAfterEnd(stream, cb) {
291282
var er = new ERR_STREAM_WRITE_AFTER_END();
292283
// TODO: defer error events consistently everywhere, not just the cb
293284
stream.emit('error', er);
294-
pna.nextTick(cb, er);
285+
process.nextTick(cb, er);
295286
}
296287

297288
// Checks that a user-supplied chunk is valid, especially for the particular
@@ -307,7 +298,7 @@ function validChunk(stream, state, chunk, cb) {
307298
}
308299
if (er) {
309300
stream.emit('error', er);
310-
pna.nextTick(cb, er);
301+
process.nextTick(cb, er);
311302
return false;
312303
}
313304
return true;
@@ -445,10 +436,10 @@ function onwriteError(stream, state, sync, er, cb) {
445436
if (sync) {
446437
// defer the callback if we are being called synchronously
447438
// to avoid piling up things on the stack
448-
pna.nextTick(cb, er);
439+
process.nextTick(cb, er);
449440
// this can emit finish, and it will always happen
450441
// after error
451-
pna.nextTick(finishMaybe, stream, state);
442+
process.nextTick(finishMaybe, stream, state);
452443
stream._writableState.errorEmitted = true;
453444
stream.emit('error', er);
454445
} else {
@@ -488,9 +479,7 @@ function onwrite(stream, er) {
488479
}
489480

490481
if (sync) {
491-
/*<replacement>*/
492-
asyncWrite(afterWrite, stream, state, finished, cb);
493-
/*</replacement>*/
482+
process.nextTick(afterWrite, stream, state, finished, cb);
494483
} else {
495484
afterWrite(stream, state, finished, cb);
496485
}
@@ -637,7 +626,7 @@ function prefinish(stream, state) {
637626
if (typeof stream._final === 'function' && !state.destroyed) {
638627
state.pendingcb++;
639628
state.finalCalled = true;
640-
pna.nextTick(callFinal, stream, state);
629+
process.nextTick(callFinal, stream, state);
641630
} else {
642631
state.prefinished = true;
643632
stream.emit('prefinish');
@@ -661,7 +650,7 @@ function endWritable(stream, state, cb) {
661650
state.ending = true;
662651
finishMaybe(stream, state);
663652
if (cb) {
664-
if (state.finished) pna.nextTick(cb);else stream.once('finish', cb);
653+
if (state.finished) process.nextTick(cb);else stream.once('finish', cb);
665654
}
666655
state.ended = true;
667656
stream.writable = false;

lib/internal/streams/async_iterator.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
'use strict';
22

3-
/*<replacement>*/
4-
53
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; }; }();
64

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

9-
var pna = require('process-nextick-args');
10-
/*</replacement>*/
11-
127
var kLastResolve = Symbol('lastResolve');
138
var kLastReject = Symbol('lastReject');
149
var kError = Symbol('error');
@@ -43,7 +38,7 @@ function readAndResolve(iter) {
4338
function onReadable(iter) {
4439
// we wait for the next tick, because it might
4540
// emit an error with process.nextTick
46-
pna.nextTick(readAndResolve, iter);
41+
process.nextTick(readAndResolve, iter);
4742
}
4843

4944
function onEnd(iter) {

lib/internal/streams/destroy.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
'use strict';
22

3-
/*<replacement>*/
4-
5-
var pna = require('process-nextick-args');
6-
/*</replacement>*/
7-
83
// undocumented cb() API, needed for core, not for public API
4+
95
function destroy(err, cb) {
106
var _this = this;
117

@@ -16,7 +12,7 @@ function destroy(err, cb) {
1612
if (cb) {
1713
cb(err);
1814
} else if (err && (!this._writableState || !this._writableState.errorEmitted)) {
19-
pna.nextTick(emitErrorNT, this, err);
15+
process.nextTick(emitErrorNT, this, err);
2016
}
2117
return this;
2218
}
@@ -35,15 +31,15 @@ function destroy(err, cb) {
3531

3632
this._destroy(err || null, function (err) {
3733
if (!cb && err) {
38-
pna.nextTick(emitErrorAndCloseNT, _this, err);
34+
process.nextTick(emitErrorAndCloseNT, _this, err);
3935
if (_this._writableState) {
4036
_this._writableState.errorEmitted = true;
4137
}
4238
} else if (cb) {
43-
pna.nextTick(emitCloseNT, _this);
39+
process.nextTick(emitCloseNT, _this);
4440
cb(err);
4541
} else {
46-
pna.nextTick(emitCloseNT, _this);
42+
process.nextTick(emitCloseNT, _this);
4743
}
4844
});
4945

lib/internal/streams/end-of-stream.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
'use strict';
55

6-
/*<replacement>*/
7-
8-
var pna = require('process-nextick-args');
9-
/*</replacement>*/
10-
116
var ERR_STREAM_PREMATURE_CLOSE = require('../../../errors').codes.ERR_STREAM_PREMATURE_CLOSE;
127

138
function noop() {}

lib/internal/streams/pipeline.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
'use strict';
55

6-
/*<replacement>*/
7-
8-
var pna = require('process-nextick-args');
9-
/*</replacement>*/
10-
116
var eos = void 0;
127

138
var _require$codes = require('../../../errors').codes,

lib/internal/streams/state.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
'use strict';
22

3-
/*<replacement>*/
4-
5-
var pna = require('process-nextick-args');
6-
/*</replacement>*/
7-
83
var ERR_INVALID_OPT_VALUE = require('../../../errors').codes.ERR_INVALID_OPT_VALUE;
94

105
function highWaterMarkFrom(options, isDuplex, duplexKey) {

0 commit comments

Comments
 (0)