Skip to content

Commit 7455f62

Browse files
committed
deps: upgrade npm to 3.5.0
1 parent 459b106 commit 7455f62

File tree

468 files changed

+28696
-6867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

468 files changed

+28696
-6867
lines changed

deps/npm/.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Alex K. Wolfe <[email protected]>
22
Andrew Bradley <[email protected]>
33
Andrew Lunny <[email protected]>
44
Arlo Breault <[email protected]>
5+
56
Benjamin Coe <[email protected]>
67
78

deps/npm/.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
node_js:
3-
- "4.1"
4-
- "4.0"
3+
- "5"
4+
- "4"
55
- iojs
66
- "0.12"
77
- "0.10"

deps/npm/AUTHORS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,3 +324,7 @@ Jason Kurian <[email protected]>
324324
Sebastiaan Deckers <[email protected]>
325325
lady3bean <[email protected]>
326326
Tomi Carr <[email protected]>
327+
Juan Caicedo <[email protected]>
328+
Ashley Williams <[email protected]>
329+
Andrew Marcinkevičius <[email protected]>
330+
Jorrit Schippers <[email protected]>

deps/npm/CHANGELOG.md

Lines changed: 289 additions & 4405 deletions
Large diffs are not rendered by default.

deps/npm/LICENSE

Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,29 @@
1+
The npm application
12
Copyright (c) npm, Inc. and Contributors
2-
All rights reserved.
3+
Licensed on the terms of The Artistic License 2.0
34

4-
npm is released under the Artistic License 2.0, subject to additional terms
5-
that are listed below.
5+
Node package dependencies of the npm application
6+
Copyright (c) their respective copyright owners
7+
Licensed on their respective license terms
68

7-
The text of the npm License follows and the text of the additional terms
8-
follows the Artistic License 2.0 terms:
9+
The npm public registry at https://registry.npmjs.com
10+
and the npm website at https://www.npmjs.com
11+
Operated by npm, Inc.
12+
Use governed by terms published on https://www.npmjs.com
13+
14+
"Node.js"
15+
Trademark Joyent, Inc., https://joyent.com
16+
Neither npm nor npm, Inc. are affiliated with Joyent, Inc.
17+
18+
The Node.js application
19+
Project of Node Foundation, https://nodejs.org
20+
21+
The npm Logo
22+
Copyright (c) Mathias Pettersson and Brian Hammond
23+
24+
"Gubblebum Blocky" typeface
25+
Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
26+
Used with permission
927

1028

1129
--------
@@ -215,49 +233,3 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
215233

216234

217235
--------
218-
219-
220-
The following additional terms shall apply to use of the npm software, the npm
221-
website, the npm repository and any other services or products offered by npm,
222-
Inc.:
223-
224-
"Node.js" trademark Joyent, Inc. npm is not officially part of the Node.js
225-
project, and is neither owned by nor affiliated with Joyent, Inc.
226-
227-
"npm" and "The npm Registry" are owned by npm, Inc. All rights reserved.
228-
229-
Modules published on the npm registry are not officially endorsed by npm, Inc.
230-
or the Node.js project.
231-
232-
Data published to the npm registry is not part of npm itself, and is the sole
233-
property of the publisher. While every effort is made to ensure accountability,
234-
there is absolutely no guarantee, warrantee, or assertion expressed or implied
235-
as to the quality, fitness for a specific purpose, or lack of malice in any
236-
given npm package. Packages downloaded through the npm registry are
237-
independently licensed and are not covered by this license.
238-
239-
Additional policies relating to, and restrictions on use of, npm products and
240-
services are available on the npm website. All such policies and restrictions,
241-
as updated from time to time, are hereby incorporated into this license
242-
agreement. By using npm, you acknowledge your agreement to all such policies
243-
and restrictions.
244-
245-
If you have a complaint about a package in the public npm registry, and cannot
246-
resolve it with the package owner, please email [email protected] and explain
247-
the situation. See the [npm Dispute Resolution
248-
policy](https://github.com/npm/policies/blob/master/disputes.md) for more
249-
details.
250-
251-
Any data published to The npm Registry (including user account information) may
252-
be removed or modified at the sole discretion of the npm server administrators.
253-
254-
"npm Logo" contributed by Mathias Pettersson and Brian Hammond,
255-
use is subject to https://www.npmjs.com/policies/trademark
256-
257-
"Gubblebum Blocky" font
258-
Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com
259-
included for use in the npm website and documentation,
260-
used with permission.
261-
262-
This program uses several Node modules contained in the node_modules/
263-
subdirectory, according to the terms of their respective licenses.

0 commit comments

Comments
 (0)