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

Commit

Permalink
Merge nodejs/master
Browse files Browse the repository at this point in the history
Merge eef94a8 as of 2017-06-07.
This is an automatically created merge. For any problems please
contact @kunalspathak.
  • Loading branch information
chakrabot committed Jun 13, 2017
2 parents 453242b + eef94a8 commit 00a6407
Show file tree
Hide file tree
Showing 1,909 changed files with 117,320 additions and 71,305 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,8 @@ icu_config.gypi
# Xcode workspaces and project folders
*.xcodeproj
*.xcworkspace

# libuv book and GitHub template
deps/uv/.github/
deps/uv/docs/code/
deps/uv/docs/src/guide/
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Support is divided into three tiers:

| System | Support type | Version | Architectures | Notes |
|--------------|--------------|----------------------------------|----------------------|------------------|
| GNU/Linux | Tier 1 | kernel >= 2.6.18, glibc >= 2.5 | x86, x64, arm, arm64 | |
| GNU/Linux | Tier 1 | kernel >= 2.6.32, glibc >= 2.12 | x86, x64, arm, arm64 | |
| macOS | Tier 1 | >= 10.10 | x64 | |
| Windows | Tier 1 | >= Windows 7 / 2008 R2 | x86, x64 | vs2015 or vs2017 |
| SmartOS | Tier 2 | >= 15 < 16.4 | x86, x64 | see note1 |
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ release.
<a href="doc/changelogs/CHANGELOG_V7.md#7.0.0">7.0.0</a><br/>
</td>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V6.md#6.10.3">6.10.3</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V6.md#6.11.0">6.11.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V6.md#6.10.3">6.10.3</a><br/>
<a href="doc/changelogs/CHANGELOG_V6.md#6.10.2">6.10.2</a><br/>
<a href="doc/changelogs/CHANGELOG_V6.md#6.10.1">6.10.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V6.md#6.10.0">6.10.0</a><br/>
Expand Down
6 changes: 3 additions & 3 deletions deps/chakrashim/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
// NOTE these macros are used by some of the tool scripts and the build
// system so their names cannot be changed without changing the scripts.
#define V8_MAJOR_VERSION 5
#define V8_MINOR_VERSION 8
#define V8_BUILD_NUMBER 283
#define V8_PATCH_LEVEL 41
#define V8_MINOR_VERSION 9
#define V8_BUILD_NUMBER 211
#define V8_PATCH_LEVEL 32

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
4 changes: 3 additions & 1 deletion deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ matrix:
# previous LTS is next most important
- node_js: "4"
env: DEPLOY_VERSION=testing
# then master
- node_js: "7"
env: DEPLOY_VERSION=testing
# then master
- node_js: "8"
env: DEPLOY_VERSION=testing
before_install:
# required by test/tap/registry.js
- "mkdir -p /var/run/couchdb"
Expand Down
11 changes: 11 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -464,3 +464,14 @@ J F <git@twopointzero.us>
Pavlo Liulia <pavloblack@hotmail.com>
Ján Dzurek <famousgarkin@outlook.com>
Lucas Theisen <ltheisen@mitre.org>
Mike Sherov <mike.sherov@gmail.com>
薛定谔的猫 <hh_2013@foxmail.com>
Paweł Lula <pavloblack@hotmail.com>
Jakob Krigovsky <jakob@krigovsky.com>
George Rawlinson <george@rawlinson.net.nz>
Jack Nagel <jacknagel@users.noreply.github.com>
Andreas Kohn <andreas.kohn@gmail.com>
Jason Wohlgemuth <jhwohlgemuth@users.noreply.github.com>
Ryan Graham <r.m.graham@gmail.com>
Hirse <jan.pilzer@gmx.de>
Colin Rotherham <work@colinr.com>
235 changes: 235 additions & 0 deletions deps/npm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,238 @@
## v5.0.3 (2017-06-05)

Happy Monday, y'all! We've got another npm release for you with the fruits of
our ongoing bugsquashing efforts. You can expect at least one more this week,
but probably more -- and as we announced last week, we'll be merging fixes more
rapidly into the `npmc` canary so you can get everything as soon as possible!

Hope y'all are enjoying npm5 in the meantime, and don't hesitate to file issues
for anything you find! The goal is to get this release rock-solid as soon as we
can. 💚

* [`6e12a5cc0`](https://github.com/npm/npm/commit/6e12a5cc022cb5a157a37df7283b6d7b3d49bdab)
Bump several dependencies to get improvements and bugfixes:
* `cacache`: content files (the tarballs) are now read-only.
* `pacote`: fix failing clones with bad heads, send extra TLS-related opts to proxy, enable global auth configurations and `_auth`-based auth.
* `ssri`: stop crashing with `can't call method find of undefined` when running into a weird `opts.integrity`/`opts.algorithms` conflict during verification.
([@zkat](https://github.com/zkat))
* [`89cc8e3e1`](https://github.com/npm/npm/commit/89cc8e3e12dad67fd9844accf4d41deb4c180c5c)
[#16917](https://github.com/npm/npm/pull/16917)
Send `ca`, `cert` and `key` config through to network layer.
([@colinrotherham](https://github.com/colinrotherham))
* [`6a9b51c67`](https://github.com/npm/npm/commit/6a9b51c67ba3df0372991631992748329b84f2e7)
[#16929](https://github.com/npm/npm/pull/16929)
Send `npm-session` header value with registry requests again.
([@zarenner](https://github.com/zarenner))
* [`662a15ab7`](https://github.com/npm/npm/commit/662a15ab7e790e87f5e5a35252f05d5a4a0724a1)
Fix `npm doctor` so it stop complaining about read-only content files in the
cache.
([@zkat](https://github.com/zkat))
* [`191d10a66`](https://github.com/npm/npm/commit/191d10a6616d72e26d89fd00f5a4f6158bfbc526)
[#16918](https://github.com/npm/npm/pull/16918)
Clarify prepublish deprecation message.
([@Hirse](https://github.com/Hirse))

## v5.0.2 (2017-06-02)

Here's another patch release, soon after the other!

This particular release includes a slew of fixes to npm's git support, which was
causing some issues for a chunk of people, specially those who were using
self-hosted/Enterprise repos. All of those should be back in working condition
now.

There's another shiny thing you might wanna know about: npm has a Canary release
now! The `npm5` experiment we did during our beta proved to be incredibly
successful: users were able to have a tight feedback loop between reports and
getting the bugfixes they needed, and the CLI team was able to roll out
experimental patches and have the community try them out right away. So we want
to keep doing that.

From now on, you'll be able to install the 'npm canary' with `npm i -g npmc`.
This release will be a separate binary (`npmc`. Because canary. Get it?), which
will update independently of the main CLI. Most of the time, this will track
`release-next` or something close to it. We might occasionally toss experimental
branches in there to see if our more adventurous users run into anything
interesting with it. For example, the current canary (`npmc@5.0.1-canary.6`)
includes an [experimental multiproc
branch](https://github.com/npm/npm/pull/16633) that parallelizes tarball
extraction across multiple processes.

If you find any issues while running the canary version, please report them and
let us know it came from `npmc`! It would be tremendously helpful, and finding
things early is a huge reason to have it there. Happy hacking!

### A NOTE ABOUT THE ISSUE TRACKER

Just a heads up: We're preparing to do a massive cleanup of the issue tracker.
It's been a long time since it was something we could really keep up with, and
we didn't have a process for dealing with it that could actually be sustainable.

We're still sussing the details out, and we'll talk about it more when we're
about to do it, but the plan is essentially to close old, abandoned issues and
start over. We will also [add some automation](https://github.com/probot) around
issue management so that things that we can't keep up with don't just stay
around forever.

Stay tuned!

### GIT YOLO

* [`1f26e9567`](https://github.com/npm/npm/commit/1f26e9567a6d14088704e121ebe787c38b6849a4)
`pacote@2.7.27`: Fixes installing committishes that look like semver, even
though they're not using the required `#semver:` syntax.
([@zkat](https://github.com/zkat))
* [`85ea1e0b9`](https://github.com/npm/npm/commit/85ea1e0b9478551265d03d545e7dc750b9edf547)
`npm-package-arg@5.1.1`: This includes the npa git-parsing patch to make it so
non-hosted SCP-style identifiers are correctly handled. Previously, npa would
mangle them (even though hosted-git-info is doing the right thing for them).
([@zkat](https://github.com/zkat))

### COOL NEW OUTPUT

The new summary output has been really well received! One downside that reared
its head as more people used it, though, is that it doesn't really tell you
anything about the toplevel versions it installed. So, if you did `npm i -g
foo`, it would just say "added 1 package". This patch by
[@rmg](https://github.com/rmg) keeps things concise while still telling you
what you got! So now, you'll see something like this:

```
$ npm i -g foo bar
+ foo@1.2.3
+ bar@3.2.1
added 234 packages in .005ms
```

* [`362f9fd5b`](https://github.com/npm/npm/commit/362f9fd5bec65301082416b4292b8fe3eb7f824a)
[#16899](https://github.com/npm/npm/pull/16899)
For every package that is given as an argument to install, print the name and
version that was actually installed.
([@rmg](https://github.com/rmg))

### OTHER BUGFIXES

* [`a47593a98`](https://github.com/npm/npm/commit/a47593a98a402143081d7077d2ac677d13083010)
[#16835](https://github.com/npm/npm/pull/16835)
Fix a crash while installing with `--no-shrinkwrap`.
([@jacknagel](https://github.com/jacknagel))

### DOC UPATES

* [`89e0cb816`](https://github.com/npm/npm/commit/89e0cb8165dd9c3c7ac74d531617f367099608f4)
[#16818](https://github.com/npm/npm/pull/16818)
Fixes a spelling error in the docs. Because the CLI team has trouble spelling
"package", I guess.
([@ankon](https://github.com/ankon))
* [`c01fbc46e`](https://github.com/npm/npm/commit/c01fbc46e151bcfb359fd68dd7faa392789b4f55)
[#16895](https://github.com/npm/npm/pull/16895)
Remove `--save` from `npm init` instructions, since it's now the default.
([@jhwohlgemuth](https://github.com/jhwohlgemuth))
* [`80c42d218`](https://github.com/npm/npm/commit/80c42d2181dd4d1b79fcee4e9233df268dfb30b7)
Guard against cycles when inflating bundles, as symlinks are bundles now.
([@iarna](https://github.com/iarna))
* [`7fe7f8665`](https://github.com/npm/npm/commit/7fe7f86658798db6667df89afc75588c0e43bc94)
[#16674](https://github.com/npm/npm/issues/16674)
Write the builtin config for `npmc`, not just `npm`. This is hardcoded for npm
self-installations and is needed for Canary to work right.
([@zkat](https://github.com/zkat))

### DEP UPDATES

* [`63df4fcdd`](https://github.com/npm/npm/commit/63df4fcddc7445efb50cc7d8e09cdd45146d3e39)
[#16894](https://github.com/npm/npm/pull/16894)
[`node-gyp@3.6.2`](https://github.com/nodejs/node-gyp/blob/master/CHANGELOG.md#v362-2017-06-01):
Fixes an issue parsing SDK versions on Windows, among other things.
([@refack](https://github.com/refack))
* [`5bb15c3c4`](https://github.com/npm/npm/commit/5bb15c3c4f0d7d77c73fd6dafa38ac36549b6e00)
`read-package-tree@5.1.6`: Fixes some racyness while reading the tree.
([@iarna](https://github.com/iarna))
* [`a6f7a52e7`](https://github.com/npm/npm/commit/a6f7a52e7)
`aproba@1.1.2`: Remove nested function declaration for speed up
([@mikesherov](https://github.com/mikesherov))

## v5.0.1 (2017-05-31):

Hey y'all! Hope you're enjoying the new npm!

As you all know, fresh software that's gone through major overhauls tends to
miss a lot of spots the old one used to handle well enough, and `npm@5` is no
exception. The CLI team will be doing faster release cycles that go directly to
the `latest` tag for a couple of weeks while 5 stabilizes a bit and we're
confident the common low-hanging fruit people are running into are all taken
care of.

With that said: this is our first patch release! The biggest focus is fixing up
a number of git-related issues that folks ran into right out the door. It also
fixes other things, like some proxy/auth-related issues, and even has a neat
speed boost! (You can expect more speed bumps in the coming releases as pending
work starts landing, too!)

Thanks everyone who's been reporting issues and submitting patches!

### BUGFIXES

* [`e61e68dac`](https://github.com/npm/npm/commit/e61e68dac4fa51c0540a064204a75b19f8052e58)
[#16762](https://github.com/npm/npm/pull/16762)
Make `npm publish` obey the `--tag` flag again.
([@zkat](https://github.com/zkat))
* [`923fd58d3`](https://github.com/npm/npm/commit/923fd58d312f40f8c17b232ad1dfc8e2ff622dbd)
[#16749](https://github.com/npm/npm/pull/16749)
Speed up installations by nearly 20% by... removing one line of code. (hah)
([@mikesherov](https://github.com/mikesherov))
* [`9aac984cb`](https://github.com/npm/npm/commit/9aac984cbbfef22182ee42b51a193c0b47146ad6)
Guard against a particular failure mode for a bug still being hunted down.
([@iarna](https://github.com/iarna))
* [`80ab521f1`](https://github.com/npm/npm/commit/80ab521f18d34df109de0c5dc9eb1cde5ff6d7e8)
Pull in dependency updates for various core deps:
* New `pacote` fixes several git-related bugs.
* `ssri` update fixes crash on early node@4 versions.
* `make-fetch-happen` update fixes proxy authentication issue.
* `npm-user-validate` adds regex for blocking usernames with illegal chars.
([@zkat](https://github.com/zkat))
* [`7e5ce87b8`](https://github.com/npm/npm/commit/7e5ce87b84880c7433ee4c07d2dd6ce8806df436)
`pacote@2.7.26`:
Fixes various other git issues related to commit hashes.
([@zkat](https://github.com/zkat))
* [`acbe85bfc`](https://github.com/npm/npm/commit/acbe85bfc1a68d19ca339a3fb71da0cffbf58926)
[#16791](https://github.com/npm/npm/pull/16791)
`npm view` was calling `cb` prematurely and giving partial output when called
in a child process.
([@zkat](https://github.com/zkat))
* [`ebafe48af`](https://github.com/npm/npm/commit/ebafe48af91f702ccefc8c619d52fed3b8dfd3c7)
[#16750](https://github.com/npm/npm/pull/16750)
Hamilpatch the Musical: Talk less, complete more.
([@aredridel](https://github.com/aredridel))

### DOCUMENTATION

* [`dc2823a6c`](https://github.com/npm/npm/commit/dc2823a6c5fc098041e61515c643570819d059d2)
[#16799](https://github.com/npm/npm/pull/16799)
Document that `package-lock.json` is never allowed in tarballs.
([@sonicdoe](https://github.com/sonicdoe))
* [`f3cb84b44`](https://github.com/npm/npm/commit/f3cb84b446c51d628ee0033cdf13752c15b31a29)
[#16771](https://github.com/npm/npm/pull/16771)
Fix `npm -l` usage information for the `test` command.
([@grawlinson](https://github.com/grawlinson))

### OTHER CHANGES

* [`661262309`](https://github.com/npm/npm/commit/66126230912ab5ab35287b40a9908e036fa73994)
[#16756](https://github.com/npm/npm/pull/16756)
remove unused argument
([@Aladdin-ADD](https://github.com/Aladdin-ADD))
* [`c3e0b4287`](https://github.com/npm/npm/commit/c3e0b4287ea69735cc367aa7bb7e7aa9a6d9804b)
[#16296](https://github.com/npm/npm/pull/16296)
preserve same name convention for command
([@desfero](https://github.com/desfero))
* [`9f814831d`](https://github.com/npm/npm/commit/9f814831d330dde7702973186aea06caaa77ff31)
[#16757](https://github.com/npm/npm/pull/16757)
remove unused argument
([@Aladdin-ADD](https://github.com/Aladdin-ADD))
* [`3cb843239`](https://github.com/npm/npm/commit/3cb8432397b3666d88c31131dbb4599016a983ff)
minor linter fix
([@zkat](https://github.com/zkat))

## v5.0.0 (2017-05-25)

Wowowowowow npm@5!
Expand Down
3 changes: 2 additions & 1 deletion deps/npm/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ environment:
- nodejs_version: "6"
# previous LTS is next most important
- nodejs_version: "4"
# then master
- nodejs_version: "7"
# then master
- nodejs_version: "8"
COVERALLS_REPO_TOKEN:
secure: XdC0aySefK0HLh1GNk6aKrzZPbCfPQLyA4mYtFGEp4DrTuZA/iuCUS0LDqFYO8JQ
platform:
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/bin/npm-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
if (er) return errorHandler(er)
npm.commands[npm.command](npm.argv, function (err) {
// https://www.youtube.com/watch?v=7nfPu8qTiQU
if (!err && npm.config.get('ham-it-up') && !npm.config.get('json') && !npm.config.get('parseable')) {
if (!err && npm.config.get('ham-it-up') && !npm.config.get('json') && !npm.config.get('parseable') && npm.command !== 'completion') {
output('\n 🎵 I Have the Honour to Be Your Obedient Servant,🎵 ~ npm 📜🖋\n')
}
errorHandler.apply(this, arguments)
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/files/package-lock.json.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions deps/npm/doc/files/package.json.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ Conversely, some files are always ignored:
* `node_modules`
* `config.gypi`
* `*.orig`
* `package-lock.json` (use shrinkwrap instead)

## main

Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/doc/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
</table>
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@5.0.0</p>
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@5.0.3</p>

2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm-access.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
</table>
<p id="footer">npm-access &mdash; npm@5.0.0</p>
<p id="footer">npm-access &mdash; npm@5.0.3</p>

2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm-adduser.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
</table>
<p id="footer">npm-adduser &mdash; npm@5.0.0</p>
<p id="footer">npm-adduser &mdash; npm@5.0.3</p>

2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm-bin.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
</table>
<p id="footer">npm-bin &mdash; npm@5.0.0</p>
<p id="footer">npm-bin &mdash; npm@5.0.3</p>

2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm-bugs.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
</table>
<p id="footer">npm-bugs &mdash; npm@5.0.0</p>
<p id="footer">npm-bugs &mdash; npm@5.0.3</p>

2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm-build.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ <h2 id="description">DESCRIPTION</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
</table>
<p id="footer">npm-build &mdash; npm@5.0.0</p>
<p id="footer">npm-build &mdash; npm@5.0.3</p>

Loading

0 comments on commit 00a6407

Please sign in to comment.