Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 47d5430

Browse files
MSLaguanaMSLaguana
committed
meta: merge node/master into node-chakracore/master
Merge 26ce1ae as of 2018-01-31 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Jimmy Thomson <jithomso@microsoft.com> Conflicts: src/node_contextify.cc
2 parents 4a4520e + 26ce1ae commit 47d5430

39 files changed

+2178
-795
lines changed

‎COLLABORATOR_GUIDE.md‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,10 @@ Node.js uses three Deprecation levels:
368368
being staged for deprecation in a future Node.js major release. An explicit
369369
notice indicating the deprecated status is added to the API documentation
370370
but no functional changes are implemented in the code. There will be no
371-
runtime deprecation warnings emitted for such deprecations.
371+
runtime deprecation warnings emitted for such deprecations by default.
372+
Documentation-only deprecations may trigger a runtime warning when launched
373+
with [`--pending-deprecation`][] flag (or its alternative,
374+
`NODE_PENDING_DEPRECATION=1` environment variable).
372375

373376
* *Runtime Deprecation* refers to the use of process warnings emitted at
374377
runtime the first time that a deprecated API is used. A command-line
@@ -593,20 +596,20 @@ Validate that the commit message is properly formatted using
593596
$ git rev-list upstream/master...HEAD | xargs core-validate-commit
594597
```
595598

599+
Optional: When landing your own commits, force push the amended commit to the
600+
branch you used to open the pull request. If your branch is called `bugfix`,
601+
then the command would be `git push --force-with-lease origin master:bugfix`.
602+
When the pull request is closed, this will cause the pull request to
603+
show the purple merged status rather than the red closed status that is
604+
usually used for pull requests that weren't merged.
605+
596606
Time to push it:
597607

598608
```text
599609
$ git push upstream master
600610
```
601-
* Optional: Force push the amended commit to the branch you used to
602-
open the pull request. If your branch is called `bugfix`, then the
603-
command would be `git push --force-with-lease origin master:bugfix`.
604-
When the pull request is closed, this will cause the pull request to
605-
show the purple merged status rather than the red closed status that is
606-
usually used for pull requests that weren't merged. Only do this when
607-
landing your own contributions.
608611

609-
* Close the pull request with a "Landed in `<commit hash>`" comment. If
612+
Close the pull request with a "Landed in `<commit hash>`" comment. If
610613
your pull request shows the purple merged status then you should still
611614
add the "Landed in <commit hash>..<commit hash>" comment if you added
612615
multiple commits.
@@ -744,6 +747,7 @@ LTS working group and the Release team.
744747
[backporting guide]: doc/guides/backporting-to-release-lines.md
745748
[Stability Index]: doc/api/documentation.md#stability-index
746749
[Enhancement Proposal]: https://github.com/nodejs/node-eps
750+
[`--pending-deprecation`]: doc/api/cli.md#--pending-deprecation
747751
[git-username]: https://help.github.com/articles/setting-your-username-in-git/
748752
[`node-core-utils`]: https://github.com/nodejs/node-core-utils
749753
[TSC]: https://github.com/nodejs/TSC

‎deps/v8/test/inspector/debugger/async-stack-for-promise-expected.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,4 @@ foo1 (test.js:9:2)
130130
-- Promise.finally --
131131
finally2 (test.js:225:34)
132132
(anonymous) (testFinally2.js:0:0)
133+

‎deps/v8/test/inspector/debugger/external-stack-trace-expected.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Running test: testInstrumentation
1515
callFrames : [
1616
[0] : {
1717
columnNumber : 15
18-
functionName :
18+
functionName :
1919
lineNumber : 0
2020
scriptId : <scriptId>
21-
url :
21+
url :
2222
}
2323
]
2424
description : stack

‎deps/v8/test/inspector/debugger/pause-on-async-call-expected.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,3 +205,4 @@ paused at:
205205
debugger;
206206
createPromise().then(#v => v * 2);
207207
}
208+

‎deps/v8/test/inspector/debugger/promise-chain-when-limit-hit-expected.txt‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Run expression 'console.trace()' with async chain len: 3
1919
functionName : asyncCall
2020
lineNumber : 2
2121
scriptId : <scriptId>
22-
url :
22+
url :
2323
}
2424
[1] : {
2525
columnNumber : 33
@@ -36,7 +36,7 @@ Run expression 'console.trace()' with async chain len: 3
3636
functionName : asyncCall
3737
lineNumber : 5
3838
scriptId : <scriptId>
39-
url :
39+
url :
4040
}
4141
[1] : {
4242
columnNumber : 33
@@ -54,14 +54,14 @@ Run expression 'console.trace()' with async chain len: 3
5454
functionName : asyncCall
5555
lineNumber : 5
5656
scriptId : <scriptId>
57-
url :
57+
url :
5858
}
5959
[1] : {
6060
columnNumber : 33
6161
functionName : Promise.resolve.then
6262
lineNumber : 5
6363
scriptId : <scriptId>
64-
url :
64+
url :
6565
}
6666
]
6767
description : Promise.then
@@ -72,14 +72,14 @@ Run expression 'console.trace()' with async chain len: 3
7272
functionName : asyncCall
7373
lineNumber : 5
7474
scriptId : <scriptId>
75-
url :
75+
url :
7676
}
7777
[1] : {
7878
columnNumber : 4
79-
functionName :
79+
functionName :
8080
lineNumber : 6
8181
scriptId : <scriptId>
82-
url :
82+
url :
8383
}
8484
]
8585
description : Promise.then
@@ -110,7 +110,7 @@ Run expression 'console.trace()' with async chain len: 3
110110
functionName : asyncCall
111111
lineNumber : 2
112112
scriptId : <scriptId>
113-
url :
113+
url :
114114
}
115115
[1] : {
116116
columnNumber : 33
@@ -127,7 +127,7 @@ Run expression 'console.trace()' with async chain len: 3
127127
functionName : asyncCall
128128
lineNumber : 5
129129
scriptId : <scriptId>
130-
url :
130+
url :
131131
}
132132
[1] : {
133133
columnNumber : 33
@@ -145,14 +145,14 @@ Run expression 'console.trace()' with async chain len: 3
145145
functionName : asyncCall
146146
lineNumber : 5
147147
scriptId : <scriptId>
148-
url :
148+
url :
149149
}
150150
[1] : {
151151
columnNumber : 33
152152
functionName : Promise.resolve.then
153153
lineNumber : 5
154154
scriptId : <scriptId>
155-
url :
155+
url :
156156
}
157157
]
158158
description : Promise.then
@@ -163,14 +163,14 @@ Run expression 'console.trace()' with async chain len: 3
163163
functionName : asyncCall
164164
lineNumber : 5
165165
scriptId : <scriptId>
166-
url :
166+
url :
167167
}
168168
[1] : {
169169
columnNumber : 4
170-
functionName :
170+
functionName :
171171
lineNumber : 6
172172
scriptId : <scriptId>
173-
url :
173+
url :
174174
}
175175
]
176176
description : Promise.then
@@ -201,7 +201,7 @@ Run expression 'console.trace()' with async chain len: 3
201201
functionName : asyncCall
202202
lineNumber : 2
203203
scriptId : <scriptId>
204-
url :
204+
url :
205205
}
206206
[1] : {
207207
columnNumber : 33
@@ -218,7 +218,7 @@ Run expression 'console.trace()' with async chain len: 3
218218
functionName : asyncCall
219219
lineNumber : 5
220220
scriptId : <scriptId>
221-
url :
221+
url :
222222
}
223223
[1] : {
224224
columnNumber : 33
@@ -236,14 +236,14 @@ Run expression 'console.trace()' with async chain len: 3
236236
functionName : asyncCall
237237
lineNumber : 5
238238
scriptId : <scriptId>
239-
url :
239+
url :
240240
}
241241
[1] : {
242242
columnNumber : 33
243243
functionName : Promise.resolve.then
244244
lineNumber : 5
245245
scriptId : <scriptId>
246-
url :
246+
url :
247247
}
248248
]
249249
description : Promise.then
@@ -254,14 +254,14 @@ Run expression 'console.trace()' with async chain len: 3
254254
functionName : asyncCall
255255
lineNumber : 5
256256
scriptId : <scriptId>
257-
url :
257+
url :
258258
}
259259
[1] : {
260260
columnNumber : 4
261-
functionName :
261+
functionName :
262262
lineNumber : 6
263263
scriptId : <scriptId>
264-
url :
264+
url :
265265
}
266266
]
267267
description : Promise.then
@@ -292,7 +292,7 @@ Run expression 'console.trace()' with async chain len: 3
292292
functionName : asyncCall
293293
lineNumber : 2
294294
scriptId : <scriptId>
295-
url :
295+
url :
296296
}
297297
[1] : {
298298
columnNumber : 33
@@ -309,7 +309,7 @@ Run expression 'console.trace()' with async chain len: 3
309309
functionName : asyncCall
310310
lineNumber : 5
311311
scriptId : <scriptId>
312-
url :
312+
url :
313313
}
314314
[1] : {
315315
columnNumber : 33
@@ -327,14 +327,14 @@ Run expression 'console.trace()' with async chain len: 3
327327
functionName : asyncCall
328328
lineNumber : 5
329329
scriptId : <scriptId>
330-
url :
330+
url :
331331
}
332332
[1] : {
333333
columnNumber : 33
334334
functionName : Promise.resolve.then
335335
lineNumber : 5
336336
scriptId : <scriptId>
337-
url :
337+
url :
338338
}
339339
]
340340
description : Promise.then
@@ -345,14 +345,14 @@ Run expression 'console.trace()' with async chain len: 3
345345
functionName : asyncCall
346346
lineNumber : 5
347347
scriptId : <scriptId>
348-
url :
348+
url :
349349
}
350350
[1] : {
351351
columnNumber : 4
352-
functionName :
352+
functionName :
353353
lineNumber : 6
354354
scriptId : <scriptId>
355-
url :
355+
url :
356356
}
357357
]
358358
description : Promise.then
@@ -383,7 +383,7 @@ Run expression 'console.trace()' with async chain len: 3
383383
functionName : asyncCall
384384
lineNumber : 2
385385
scriptId : <scriptId>
386-
url :
386+
url :
387387
}
388388
[1] : {
389389
columnNumber : 33
@@ -400,7 +400,7 @@ Run expression 'console.trace()' with async chain len: 3
400400
functionName : asyncCall
401401
lineNumber : 5
402402
scriptId : <scriptId>
403-
url :
403+
url :
404404
}
405405
[1] : {
406406
columnNumber : 33
@@ -418,14 +418,14 @@ Run expression 'console.trace()' with async chain len: 3
418418
functionName : asyncCall
419419
lineNumber : 5
420420
scriptId : <scriptId>
421-
url :
421+
url :
422422
}
423423
[1] : {
424424
columnNumber : 33
425425
functionName : Promise.resolve.then
426426
lineNumber : 5
427427
scriptId : <scriptId>
428-
url :
428+
url :
429429
}
430430
]
431431
description : Promise.then
@@ -436,14 +436,14 @@ Run expression 'console.trace()' with async chain len: 3
436436
functionName : asyncCall
437437
lineNumber : 5
438438
scriptId : <scriptId>
439-
url :
439+
url :
440440
}
441441
[1] : {
442442
columnNumber : 4
443-
functionName :
443+
functionName :
444444
lineNumber : 6
445445
scriptId : <scriptId>
446-
url :
446+
url :
447447
}
448448
]
449449
description : Promise.then
@@ -474,7 +474,7 @@ Run expression 'console.trace()' with async chain len: 3
474474
functionName : asyncCall
475475
lineNumber : 2
476476
scriptId : <scriptId>
477-
url :
477+
url :
478478
}
479479
[1] : {
480480
columnNumber : 33
@@ -491,7 +491,7 @@ Run expression 'console.trace()' with async chain len: 3
491491
functionName : asyncCall
492492
lineNumber : 5
493493
scriptId : <scriptId>
494-
url :
494+
url :
495495
}
496496
[1] : {
497497
columnNumber : 33
@@ -509,14 +509,14 @@ Run expression 'console.trace()' with async chain len: 3
509509
functionName : asyncCall
510510
lineNumber : 5
511511
scriptId : <scriptId>
512-
url :
512+
url :
513513
}
514514
[1] : {
515515
columnNumber : 33
516516
functionName : Promise.resolve.then
517517
lineNumber : 5
518518
scriptId : <scriptId>
519-
url :
519+
url :
520520
}
521521
]
522522
description : Promise.then
@@ -527,14 +527,14 @@ Run expression 'console.trace()' with async chain len: 3
527527
functionName : asyncCall
528528
lineNumber : 5
529529
scriptId : <scriptId>
530-
url :
530+
url :
531531
}
532532
[1] : {
533533
columnNumber : 4
534-
functionName :
534+
functionName :
535535
lineNumber : 6
536536
scriptId : <scriptId>
537-
url :
537+
url :
538538
}
539539
]
540540
description : Promise.then

‎deps/v8/test/inspector/debugger/this-in-arrow-function-expected.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,4 @@ This in evaluateOnCallFrame:
104104
type : object
105105
}
106106
Values equal: false
107+

‎deps/v8/test/message/fail/console.out‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ Error: exception
1313
at Object.toString (*%(basename)s:24:39)
1414
at console.info (<anonymous>)
1515
at *%(basename)s:24:9
16+

0 commit comments

Comments
 (0)