diff --git a/AUTHORS b/AUTHORS index 98072c03286..6201980ed77 100644 --- a/AUTHORS +++ b/AUTHORS @@ -498,3 +498,11 @@ Jacob Groundwater Jackson Tian fengmk2 Tim Wood +Linus Unnebäck +Nikolai Vavilov +Michael Ridgway +Yazhong Liu +Gabriel Falkenberg +Kai Groner +Gabriel Farrell +Nicolas Kaiser diff --git a/ChangeLog b/ChangeLog index 1be6d2ad630..ed7d5d2c4a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2013.11.20, Version 0.11.9 (Unstable) +2013.11.20, Version 0.11.9 (Unstable), dcfd032bdd69dfb38c120e18438d6316ae522edc * uv: upgrade to v0.11.15 (Timothy J Fontaine) @@ -392,6 +392,39 @@ * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich) +2013.12.12, Version 0.10.23 (Stable), 0462bc23564e7e950a70ae4577a840b04db6c7c6 + +* uv: Upgrade to v0.10.20 (Timothy J Fontaine) + +* npm: Upgrade to 1.3.17 (isaacs) + +* gyp: update to 78b26f7 (Timothy J Fontaine) + +* build: include postmortem symbols on linux (Timothy J Fontaine) + +* crypto: Make Decipher._flush() emit errors. (Kai Groner) + +* dgram: fix abort when getting `fd` of closed dgram (Fedor Indutny) + +* events: do not accept NaN in setMaxListeners (Fedor Indutny) + +* events: avoid calling `once` functions twice (Tim Wood) + +* events: fix TypeError in removeAllListeners (Jeremy Martin) + +* fs: report correct path when EEXIST (Fedor Indutny) + +* process: enforce allowed signals for kill (Sam Roberts) + +* tls: emit 'end' on .receivedShutdown (Fedor Indutny) + +* tls: fix potential data corruption (Fedor Indutny) + +* tls: handle `ssl.start()` errors appropriately (Fedor Indutny) + +* tls: reset NPN callbacks after SNI (Fedor Indutny) + + 2013.11.12, Version 0.10.22 (Stable), cbff8f091c22fb1df6b238c7a1b9145db950fa65 * npm: Upgrade to 1.3.14 diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index f159ffae2d1..890b29f085c 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -113,3 +113,5 @@ Stuart Knightley Stuart P. Bentley Vaz Allen elisee +Evan You +Wil Moore III diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md index 4cbb1129e33..618ebab0f86 100644 --- a/deps/npm/doc/cli/npm-install.md +++ b/deps/npm/doc/cli/npm-install.md @@ -173,6 +173,9 @@ local space in some cases. The `--no-bin-links` argument will prevent npm from creating symlinks for any binaries the package might contain. +The `--no-optional` argument will prevent optional dependencies from +being installed. + The `--no-shrinkwrap` argument, which will ignore an available shrinkwrap file and use the package.json instead. diff --git a/deps/npm/doc/cli/npm-version.md b/deps/npm/doc/cli/npm-version.md index 18aaf747003..870bd492150 100644 --- a/deps/npm/doc/cli/npm-version.md +++ b/deps/npm/doc/cli/npm-version.md @@ -3,7 +3,7 @@ npm-version(1) -- Bump a package version ## SYNOPSIS - npm version [ | major | minor | patch | build] + npm version [ | major | minor | patch] ## DESCRIPTION @@ -11,7 +11,7 @@ Run this in a package directory to bump the version and write the new data back to the package.json file. The `newversion` argument should be a valid semver string, *or* a valid -second argument to semver.inc (one of "build", "patch", "minor", or +second argument to semver.inc (one of "patch", "minor", or "major"). In the second case, the existing version will be incremented by 1 in the specified field. diff --git a/deps/npm/doc/cli/repo.md b/deps/npm/doc/cli/repo.md index 5c281c28e11..12085c10156 100644 --- a/deps/npm/doc/cli/repo.md +++ b/deps/npm/doc/cli/repo.md @@ -4,12 +4,15 @@ npm-repo(1) -- Open package repository page in the browser ## SYNOPSIS npm repo + npm repo (with no args in a package dir) ## DESCRIPTION This command tries to guess at the likely location of a package's repository URL, and then tries to open it using the `--browser` -config param. +config param. If no package name is provided, it will search for +a `package.json` in the current folder and try to use the property +of the name field. ## CONFIGURATION diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index 5bb966ae3b2..86eb925e662 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -112,10 +112,15 @@ If a url is provided, it will be used by the `npm bugs` command. You should specify a license for your package so that people know how they are permitted to use it, and any restrictions you're placing on it. -The simplest way, assuming you're using a common license such as BSD or MIT, is -to just specify the name of the license you're using, like this: +The simplest way, assuming you're using a common license such as BSD-3-Clause +or MIT, is to just specify the standard SPDX ID of the license you're using, +like this: - { "license" : "BSD" } + { "license" : "BSD-3-Clause" } + +You can check [the full list of SPDX license IDs](https://spdx.org/licenses/). +Ideally you should pick one that is +[OSI](http://opensource.org/licenses/alphabetical) approved. If you have more complex licensing terms, or you want to provide more detail in your package.json file, you can use the more verbose plural form, like this: diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md index 750b80972c2..97822c136fb 100644 --- a/deps/npm/doc/misc/npm-config.md +++ b/deps/npm/doc/misc/npm-config.md @@ -406,6 +406,13 @@ The value `npm init` should use by default for the package author's email. The value `npm init` should use by default for the package author's homepage. +### init.license + +* Default: "BSD-2-Clause" +* Type: String + +The value `npm init` should use by default for the package license. + ### json * Default: false diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md index 32493d36e12..d27c7e73540 100644 --- a/deps/npm/doc/misc/npm-faq.md +++ b/deps/npm/doc/misc/npm-faq.md @@ -277,6 +277,7 @@ Windows: * * +* ## How can I use npm for development? diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index 9a34b83adb2..bf2a2737ad6 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -239,7 +239,7 @@ will no doubt tell you to put the output in a gist or email.

- +