Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V7.8.0 proposal #12104

Merged
merged 67 commits into from
Mar 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
d22346d
deps: fix async await desugaring in V8
targos Mar 23, 2017
17d16e8
buffer: remove unneeded eslint-disable comment
Trott Mar 17, 2017
8ab26cf
readline: add option to stop duplicates in history
DannyNemer Sep 21, 2015
c51d925
url: restrict setting protocol to "file"
watilde Mar 20, 2017
169f187
test: synchronize WPT url setters tests data
watilde Mar 20, 2017
68b23be
doc: add missing word in stream.md
jyotman Mar 18, 2017
d6da170
src: ensure that fd 0-2 are valid on windows
bzoz Mar 14, 2017
04fa28e
doc: fix gitter badge in README
silverwind Mar 20, 2017
114f9d6
test: add hasCrypto check to tls-socket-close
danbev Mar 8, 2017
85eb1bc
benchmark: remove v8ForceOptimization calls
lucaslago Mar 17, 2017
d62ddbe
benchmark: fix fs\bench-realpathSync.js
vsemozhetbyt Mar 17, 2017
019a20a
src: make PercentDecode return void
TimothyGu Mar 16, 2017
9ba551f
test: fix flaky test-tls-socket-close
Trott Mar 19, 2017
55a1126
test: add test for child_process.execFile()
Trott Mar 19, 2017
59f71f5
src, buffer: do not segfault on out-of-range index
TimothyGu Mar 19, 2017
2f4ad6f
benchmark: harmonize progress bar + stderr output
vsemozhetbyt Mar 19, 2017
3e4ecca
build: don't create directory for NDK toolchain
diastremskii Mar 21, 2017
486bd1b
doc: require uses fs root for '/' prefix
bmeck Mar 17, 2017
0f2642e
errors: remove needless lazyAssert
DavidCai1111 Mar 17, 2017
96ad336
doc: remove superfluous sample assert code
Trott Mar 20, 2017
d0c2d67
src: add native URL class
jasnell Mar 11, 2017
91a2700
readline: rename `deDupeHistory` option
DannyNemer Mar 20, 2017
41bec5c
doc: correct info in child_process.md
vsemozhetbyt Mar 20, 2017
6a6c431
src: use persistent strings from node::Environment
bnoordhuis Mar 20, 2017
90acb77
benchmark: allow multiple values for same config
seishun Mar 12, 2017
4b1b6b8
timers: fix not to close reused timer handle
shigeki Feb 20, 2017
2767e2d
deps: upgrade npm to 4.2.0
zkat Feb 14, 2017
924f346
doc: update collaborator email address
Trott Mar 22, 2017
bb2de4a
test: do not use `more` command on Windows
vsemozhetbyt Mar 21, 2017
f675518
url: show input in parse error message
joyeecheung Mar 20, 2017
1f7fe55
doc: add richardlau to collaborators
richardlau Mar 24, 2017
fb41ee3
build: add lint option to vcbuild.bat help
brennemo Mar 22, 2017
764a00e
test: add test for url
hiroppy Mar 23, 2017
b48f13a
test: add minimal test for net benchmarks
Trott Mar 22, 2017
e70ed3c
test: improve test-vm-cached-data.js
mpelekh Mar 21, 2017
3d21bfe
test: invalid chars in http client path
lucamaraschi Mar 21, 2017
6c803db
lib: fix event race condition with -e
bnoordhuis Mar 21, 2017
ade64e6
test: refactor test-cluster-disconnect
Trott Mar 22, 2017
7aeeee3
benchmark: repair the fs/readfile benchmark
Jul 21, 2016
2462fd8
process: maintain constructor descriptor
bengl Oct 26, 2016
2102504
benchmark: update obsolete information pointer
Trott Mar 24, 2017
837ff4b
lib: remove an unnecessary coverage check
Fishrock123 Mar 24, 2017
a73dea9
test: add second argument to assert.throws()
rjbernaldo Mar 24, 2017
1c0435b
test: add regex for expected error message
jfmercer Mar 23, 2017
414df6c
test: test validity of prefix in mkdtempSync
lucamaraschi Mar 23, 2017
ac92d02
net: refactor net module to module.exports
claudiorodriguez Mar 5, 2017
7347860
lib: clarify the usage of 'else'
JacksonTian Feb 3, 2017
41284fb
test: cover thrown errors from exec() kill
cjihrig Jan 27, 2017
126dcb7
url: name anonymous functions in url
pvsousalima Oct 21, 2016
d112aad
test: replace throw with common.fail
itsmed Nov 19, 2016
4051184
stream_base,tls_wrap: notify on destruct
trevnorris Oct 31, 2016
51c8d80
Partial revert "tls: keep track of stream that is closed"
trevnorris Mar 20, 2017
7f6b03f
doc: fix process.stdout fd number
fmy Mar 27, 2017
5e3d429
doc: stdout/err/in are all Duplex streams
seppevs Feb 6, 2017
18a586a
doc: edit the benchmark guide
Trott Mar 25, 2017
948b99d
test: fix broken tests in test-buffer-includes
aqrln Mar 25, 2017
af051f6
doc: fix http properties documented as methods
Mar 25, 2017
4b5f177
doc: fix https.timeout docs
Mar 25, 2017
63a19c7
doc: update and modernize examples in fs.ms
vsemozhetbyt Mar 25, 2017
8b2b93f
test: mark child-process-exec-kill-throws flaky
gibfahn Mar 26, 2017
751c115
benchmark: check end() argument to be > 0
vsemozhetbyt Mar 24, 2017
fade55b
doc: clarify out-of-bounds behavior of buf[index]
seishun Feb 10, 2017
d8b71be
test: fix misleading comment
fhinkel Mar 26, 2017
a64aa44
crypto: fix memory leak if certificate is revoked
Mar 28, 2017
fd93622
tls: fix SecurePair external memory reporting
bnoordhuis Mar 17, 2017
5bdd549
lib: add comment to script eval _tickCallback
gibfahn Mar 26, 2017
f04524e
2017-03-28, Version 7.8.0 (Current)
MylesBorins Mar 28, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ San-Tai Hsu <v@fatpipi.com>
Scott Blomquist <github@scott.blomqui.st> <sblom@microsoft.com>
Sergey Kryzhanovsky <skryzhanovsky@gmail.com> <another@dhcp199-223-red.yandex.net>
Shannen Saez <shannenlaptop@gmail.com>
Shigeki Ohtsu <ohtsu@d.jp> <ohtsu@iij.ad.jp>
Shigeki Ohtsu <ohtsu@d.jp> <ohtsu@iij.ad.jp> <ohtsu@ohtsu.org>
Siddharth Mahendraker <siddharth_mahen@hotmail.com> <siddharth_mahen@me.com>
Simon Willison <simon@simonwillison.net>
Stanislav Opichal <opichals@gmail.com>
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V7.md#7.7.4">7.7.4</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V7.md#7.8.0">7.8.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V7.md#7.7.4">7.7.4</a><br/>
<a href="doc/changelogs/CHANGELOG_V7.md#7.7.3">7.7.3</a><br/>
<a href="doc/changelogs/CHANGELOG_V7.md#7.7.2">7.7.2</a><br/>
<a href="doc/changelogs/CHANGELOG_V7.md#7.7.1">7.7.1</a><br/>
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Node.js

[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/nodejs/node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/29/badge)](https://bestpractices.coreinfrastructure.org/projects/29)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nodejs/node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/29/badge)](https://bestpractices.coreinfrastructure.org/projects/29)

Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js
uses an event-driven, non-blocking I/O model that makes it lightweight and
Expand Down Expand Up @@ -185,7 +185,7 @@ more information about the governance of the Node.js project, see
* [rvagg](https://github.com/rvagg) -
**Rod Vagg** &lt;rod@vagg.org&gt;
* [shigeki](https://github.com/shigeki) -
**Shigeki Ohtsu** &lt;ohtsu@iij.ad.jp&gt; (he/him)
**Shigeki Ohtsu** &lt;ohtsu@ohtsu.org&gt; (he/him)
* [targos](https://github.com/targos) -
**Michaël Zasso** &lt;targos@protonmail.com&gt; (he/him)
* [thefourtheye](https://github.com/thefourtheye) -
Expand Down Expand Up @@ -299,6 +299,8 @@ more information about the governance of the Node.js project, see
**Prince John Wesley** &lt;princejohnwesley@gmail.com&gt;
* [qard](https://github.com/qard) -
**Stephen Belanger** &lt;admin@stephenbelanger.com&gt; (he/him)
* [richardlau](https://github.com/richardlau) -
**Richard Lau** &lt;riclau@uk.ibm.com&gt;
* [rlidwka](https://github.com/rlidwka) -
**Alex Kocharin** &lt;alex@kocharin.ru&gt;
* [rmg](https://github.com/rmg) -
Expand Down
25 changes: 19 additions & 6 deletions android-configure
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,26 @@ case $ARCH in
;;
esac

NDK_PATH=$1
function make_toolchain {
$NDK_PATH/build/tools/make-standalone-toolchain.sh \
--toolchain=$TOOLCHAIN_NAME-$CC_VER \
--arch=$ARCH \
--install-dir=$TOOLCHAIN \
--platform=android-21
}

export TOOLCHAIN=$PWD/android-toolchain
mkdir -p $TOOLCHAIN
$1/build/tools/make-standalone-toolchain.sh \
--toolchain=$TOOLCHAIN_NAME-$CC_VER \
--arch=$ARCH \
--install-dir=$TOOLCHAIN \
--platform=android-21
if [ -d "$TOOLCHAIN" ]; then
read -r -p "NDK toolchain already exists. Replace it? [y/N]" response
case "$response" in
[Yy])
rm -rf "$TOOLCHAIN"
make_toolchain
esac
else
make_toolchain
fi
export PATH=$TOOLCHAIN/bin:$PATH
export AR=$TOOLCHAIN/bin/$SUFFIX-ar
export CC=$TOOLCHAIN/bin/$SUFFIX-gcc
Expand Down
2 changes: 1 addition & 1 deletion benchmark/_benchmark_progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class BenchmarkProgress {
`| ${fraction(completedFiles, scheduledFiles)} files ` +
`| ${fraction(completedRunsForFile, runsPerFile)} runs ` +
`| ${fraction(completedConfig, scheduledConfig)} configs]` +
`: ${caption}`;
`: ${caption} `;
}

updateProgress(finished) {
Expand Down
8 changes: 5 additions & 3 deletions benchmark/_http-benchmarkers.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,11 @@ exports.run = function(options, callback) {
benchmarker: exports.default_http_benchmarker
}, options);
if (!options.benchmarker) {
callback(new Error('Could not locate any of the required http ' +
'benchmarkers. Check benchmark/README.md for further ' +
'instructions.'));
callback(new Error('Could not locate required http benchmarker. See ' +
'https://github.com/nodejs/node/blob/master/doc/' +
'guides/writing-and-running-benchmarks.md##http-' +
'benchmark-requirements ' +
'for further instructions.'));
return;
}
const benchmarker = benchmarkers[options.benchmarker];
Expand Down
18 changes: 12 additions & 6 deletions benchmark/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function Benchmark(fn, configs, options) {
}

Benchmark.prototype._parseArgs = function(argv, configs) {
const cliOptions = Object.assign({}, configs);
const cliOptions = {};
const extraOptions = {};
// Parse configuration arguments
for (const arg of argv) {
Expand All @@ -47,17 +47,20 @@ Benchmark.prototype._parseArgs = function(argv, configs) {
console.error('bad argument: ' + arg);
process.exit(1);
}
const config = match[1];

if (configs[match[1]]) {
if (configs[config]) {
// Infer the type from the config object and parse accordingly
const isNumber = typeof configs[match[1]][0] === 'number';
const isNumber = typeof configs[config][0] === 'number';
const value = isNumber ? +match[2] : match[2];
cliOptions[match[1]] = [value];
if (!cliOptions[config])
cliOptions[config] = [];
cliOptions[config].push(value);
} else {
extraOptions[match[1]] = match[2];
extraOptions[config] = match[2];
}
}
return { cli: cliOptions, extra: extraOptions };
return { cli: Object.assign({}, configs, cliOptions), extra: extraOptions };
};

Benchmark.prototype._queue = function(options) {
Expand Down Expand Up @@ -190,6 +193,9 @@ Benchmark.prototype.end = function(operations) {
if (typeof operations !== 'number') {
throw new Error('called end() without specifying operation count');
}
if (!process.env.NODEJS_BENCHMARK_ZERO_ALLOWED && operations <= 0) {
throw new Error('called end() with operation count <= 0');
}

const time = elapsed[0] + elapsed[1] / 1e9;
const rate = operations / time;
Expand Down
2 changes: 2 additions & 0 deletions benchmark/fs/bench-realpathSync.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
const common = require('../common');
const fs = require('fs');
const path = require('path');

process.chdir(__dirname);
const resolved_path = path.resolve(__dirname, '../../lib/');
const relative_path = path.relative(__dirname, '../../lib/');

Expand Down
5 changes: 4 additions & 1 deletion benchmark/fs/readfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ function main(conf) {
data = null;

var reads = 0;
var bench_ended = false;
bench.start();
setTimeout(function() {
bench_ended = true;
bench.end(reads);
try { fs.unlinkSync(filename); } catch (e) {}
process.exit(0);
Expand All @@ -41,7 +43,8 @@ function main(conf) {
throw new Error('wrong number of bytes returned');

reads++;
read();
if (!bench_ended)
read();
}

var cur = +conf.concurrent;
Expand Down
2 changes: 0 additions & 2 deletions benchmark/url/whatwg-url-idna.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ function main(conf) {
const input = inputs[conf.input][to];
const method = to === 'ascii' ? domainToASCII : domainToUnicode;

common.v8ForceOptimization(method, input);

bench.start();
for (var i = 0; i < n; i++) {
method(input);
Expand Down
2 changes: 0 additions & 2 deletions benchmark/vm/run-in-context.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ function main(conf) {

const contextifiedSandbox = vm.createContext();

common.v8ForceOptimization(vm.runInContext,
'0', contextifiedSandbox, options);
bench.start();
for (; i < n; i++)
vm.runInContext('0', contextifiedSandbox, options);
Expand Down
1 change: 0 additions & 1 deletion benchmark/vm/run-in-this-context.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ function main(conf) {

var i = 0;

common.v8ForceOptimization(vm.runInThisContext, '0', options);
bench.start();
for (; i < n; i++)
vm.runInThisContext('0', options);
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/.mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Evan Lucas <evan@btc.com> <evan.lucas@hattiesburgclinic.com>
Evan Lucas <evan@btc.com> <evanlucas@me.com>
Faiq Raza <faiqrazarizvi@gmail.com>
Forbes Lindesay <forbes@lindesay.co.uk>
Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com> <othiym23@gmail.com>
Gabriel Barros <descartavel1@gmail.com>
Geoff Flarity <geoff.flarity@gmail.com> <gflarity@raptvm-x02.(none)>
Gregers Gram Rygg <gregers.gram.rygg@finn.no>
Expand Down
4 changes: 4 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -446,3 +446,7 @@ Ville Lahdenvuo <tuhoojabotti@gmail.com>
Natalie Wolfe <nwolfe@newrelic.com>
Andrew Schmadel <aschmadel@learningobjects.com>
Jonah Moses <jonahkmoses@gmail.com>
Daijirō Wachi <daijiro.wachi@gmail.com>
Dmitry Litvinchenko <karaliti@gmail.com>
chocolateboy <chocolate@cpan.org>
Henry Zhu <hi@henryzoo.com>
114 changes: 114 additions & 0 deletions deps/npm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,117 @@
### v4.2.0 (2017-01-26):

Hi all! I'm Kat, and I'm currently sitting in a train traveling at ~300km/h
through Spain. So clearly, this release should have *something* to do with
speed. And it does! Heck, with this release, you could say we're really
_blazing_, even. 🌲🔥😏

#### IMPROVED CLI SEARCH~

You might recall if you've been keeping up that one of the reasons for a
semver-major bump to `npm@4` was an improved CLI search (read: no longer blowing
up Node). The work done for that new search system, while still relying on a
full metadata download and local search, was also meant to act as groundwork for
then-ongoing work on a brand-new, smarter search system for npm. Shortly after
`npm@4` came out, the bulk of the server-side work was done, and with this
release, the npm CLI has integrated use of the new endpoint for high-quality,
fast-turnaround searches.

No, seriously, it's *fast*. And *relevant*:

[![GOTTA GO FAST! This is a gif of the new npm search returning results in around a second for `npm search web framework`.](https://cloud.githubusercontent.com/assets/17535/21954136/f007e8be-d9fd-11e6-9231-f899c12790e0.gif)](https://github.com/npm/npm/pull/15481)

Give it a shot! And remember to check out the new website version of the search,
too, which uses the same backend as the CLI now. 🎉

Incidentally, the backend is a public service, so you can write your own search
tools, be they web-based, CLI, or GUI-based. You can read up on the [full
documentation for the search
endpoint](https://github.com/npm/registry/blob/master/docs/REGISTRY-API.md#get-v1search),
and let us know about the cool things you come up with!

* [`ce3ca51`](https://github.com/npm/npm/commit/ce3ca51ca2d60e15e901c8bf6256338e53e1eca2)
[#15481](https://github.com/npm/npm/pull/15481)
Add an internal `gunzip-maybe` utility for optional gunzipping.
([@zkat](https://github.com/zkat))
* [`e322932`](https://github.com/npm/npm/commit/e3229324d507fda10ea9e94fd4de8a4ae5025c75) [`a53055e`](https://github.com/npm/npm/commit/a53055e423f1fe168f05047aa0dfec6d963cb211) [`a1f4365`](https://github.com/npm/npm/commit/a1f436570730c6e4a173ca92d1967a87c29b7f2d) [`c56618c`](https://github.com/npm/npm/commit/c56618c62854ea61f6f716dffe7bcac80b5f4144)
[#15481](https://github.com/npm/npm/pull/15481)
Add support for using the new npm search endpoint for fast, quality search
results. Includes a fallback to "classic" search.
([@zkat](https://github.com/zkat))

#### WHERE DID THE DEBUG LOGS GO

This is another pretty significant change: Usually, when the npm process
crashed, you would get an `npm-debug.log` in your current working directory.
This debug log would get cleared out as soon as you ran npm again. This was a
bit annoying because 1) you would get a random file in your `git status` that
you might accidentally commit, and 2) if you hit a hard-to-reproduce bug and
instinctually tried again, you would no longer have access to the repro
`npm-debug.log`.

So now, any time a crash happens, we'll save your debug logs to your cache
folder, under `_logs` (`~/.npm` on *nix, by default -- use `npm config get
cache` to see what your current value is). The cache will now hold a
(configurable) number of `npm-debug.log` files, which you can access in the
future. Hopefully this will help clean stuff up and reduce frustration from
missed repros! In the future, this will also be used by `npm report` to make it
super easy to put up issues about crashes you run into with npm. 💃🕺🏿👯‍♂️

* [`04fca22`](https://github.com/npm/npm/commit/04fca223a0f704b69340c5f81b26907238fad878)
[#11439](https://github.com/npm/npm/pull/11439)
Put debug logs in `$(npm get cache)/_logs` and store multiple log files.
([@KenanY](https://github.com/KenanY))
([@othiym23](https://github.com/othiym23))
([@isaacs](https://github.com/isaacs))
([@iarna](https://github.com/iarna))

#### DOCS

* [`ae8e71c`](https://github.com/npm/npm/commit/ae8e71c2b7d64d782af287a21e146d7cea6e5273)
[#15402](https://github.com/npm/npm/pull/15402)
Add missing backtick in one of the `npm doctor` messages.
([@watilde](https://github.com/watilde), [@charlotteis](https://github.com/charlotteis))
* [`821fee6`](https://github.com/npm/npm/commit/821fee6d0b12a324e035c397ae73904db97d07d2)
[#15480](https://github.com/npm/npm/pull/15480)
Clarify that unscoped packages can depend on scoped packages and vice-versa.
([@chocolateboy](https://github.com/chocolateboy))
* [`2ee45a8`](https://github.com/npm/npm/commit/2ee45a884137ae0706b7c741c671fef2cb3bac96)
[#15515](https://github.com/npm/npm/pull/15515)
Update minimum supported Node version number in the README to `node@>=4`.
([@watilde](https://github.com/watilde))
* [`af06aa9`](https://github.com/npm/npm/commit/af06aa9a357578a8fd58c575f3dbe55bc65fc376)
[#15520](https://github.com/npm/npm/pull/15520)
Add section to `npm-scope` docs to explain that scope owners will own scoped
packages with that scope. That is, user `@alice` is not allowed to publish to
`@bob/my-package` unless explicitly made an owner by user (or org) `@bob`.
([@hzoo](https://github.com/hzoo))
* [`bc892e6`](https://github.com/npm/npm/commit/bc892e6d07a4c6646480703641a4d71129c38b6d)
[#15539](https://github.com/npm/npm/pull/15539)
Replace `http` with `https` and fix typos in some docs.
([@watilde](https://github.com/watilde))
* [`1dfe875`](https://github.com/npm/npm/commit/1dfe875b9ac61a0ab9f61a2eab02bacf6cce583c)
[#15545](https://github.com/npm/npm/pull/15545)
Update Node.js download link to point to the right place.
([@watilde](https://github.com/watilde))

#### DEPENDENCIES

* [`b824bfb`](https://github.com/npm/npm/commit/b824bfbeb2d89c92762e9170b026af98b5a3668a)
`ansi-regex@2.1.1`
* [`81ea3e8`](https://github.com/npm/npm/commit/81ea3e8e4ea34cd9c2b418512dcb508abcee1380)
`mississippi@1.3.0`

#### MISC

* [`98df212`](https://github.com/npm/npm/commit/98df212a91fd6ff4a02b9cd247f4166f93d3977a)
[#15492](https://github.com/npm/npm/pull/15492)
Update the "master" node version used for AppVeyor to `node@7`.
([@watilde](https://github.com/watilde))
* [`d75fc03`](https://github.com/npm/npm/commit/d75fc03eda5364f12ac266fa4f66e31c2e44e864)
[#15413](https://github.com/npm/npm/pull/15413)
`npm run-script` now exits with the child process' exit code on exit.
([@kapals](https://github.com/kapals))

### v4.1.2 (2017-01-12)

We have a twee little release this week as we come back from the holidays.
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Much more info available via `npm help` once it's installed.

## IMPORTANT

**You need node v0.10 or higher to run this program.**
**You need node v4 or higher to run this program.**

To install an old **and unsupported** version of npm that works on node 0.3
To install an old **and unsupported** version of npm that works on node v0.12
and prior, clone the git repo and dig through the old tags and branches.

**npm is configured to use npm, Inc.'s public package registry at
Expand Down Expand Up @@ -84,7 +84,7 @@ for testing, or running stuff without actually installing npm itself.)
Many improvements for Windows users have been made in npm 3 - you will have a better
experience if you run a recent version of npm. To upgrade, either use [Microsoft's
upgrade tool](https://github.com/felixrieseberg/npm-windows-upgrade),
[download a new version of Node](http://nodejs.org/download/),
[download a new version of Node](https://nodejs.org/en/download/),
or follow the Windows upgrade instructions in the
[npm Troubleshooting Guide](https://github.com/npm/npm/wiki/Troubleshooting#upgrading-on-windows).

Expand Down
2 changes: 1 addition & 1 deletion deps/npm/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ environment:
# previous LTS is next most important
- nodejs_version: "4"
# then master
- nodejs_version: "5"
- nodejs_version: "7"
COVERALLS_REPO_TOKEN:
secure: XdC0aySefK0HLh1GNk6aKrzZPbCfPQLyA4mYtFGEp4DrTuZA/iuCUS0LDqFYO8JQ
platform:
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/doc/files/package.json.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,18 @@ array of license objects:
// Not valid metadata
{ "license" :
{ "type" : "ISC"
, "url" : "http://opensource.org/licenses/ISC"
, "url" : "https://opensource.org/licenses/ISC"
}
}

// Not valid metadata
{ "licenses" :
[
{ "type": "MIT"
, "url": "http://www.opensource.org/licenses/mit-license.php"
, "url": "https://www.opensource.org/licenses/mit-license.php"
}
, { "type": "Apache-2.0"
, "url": "http://opensource.org/licenses/apache2.0.php"
, "url": "https://opensource.org/licenses/apache2.0.php"
}
]
}
Expand Down
Loading