From c58cea5a163cd5d7133e00fdf257325ce3807c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Sun, 28 May 2017 21:04:08 -0700 Subject: deps: upgrade npm to 5.0.0 PR-URL: https://github.com/nodejs/node/pull/13276 Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Jeremiah Senkpiel --- deps/npm/html/doc/misc/npm-coding-style.html | 2 +- deps/npm/html/doc/misc/npm-config.html | 26 +++++++++++++++++++++++--- deps/npm/html/doc/misc/npm-developers.html | 2 +- deps/npm/html/doc/misc/npm-disputes.html | 12 ++++++------ deps/npm/html/doc/misc/npm-index.html | 10 ++++++++-- deps/npm/html/doc/misc/npm-orgs.html | 2 +- deps/npm/html/doc/misc/npm-registry.html | 2 +- deps/npm/html/doc/misc/npm-scope.html | 2 +- deps/npm/html/doc/misc/npm-scripts.html | 18 ++++++++++++------ deps/npm/html/doc/misc/removing-npm.html | 2 +- deps/npm/html/doc/misc/semver.html | 2 +- 11 files changed, 56 insertions(+), 24 deletions(-) (limited to 'deps/npm/html/doc/misc') diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html index 77e6735e7d5..0048979e908 100644 --- a/deps/npm/html/doc/misc/npm-coding-style.html +++ b/deps/npm/html/doc/misc/npm-coding-style.html @@ -153,5 +153,5 @@ set to anything."

       - + diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html index 78e9569e5ba..bed7aa07367 100644 --- a/deps/npm/html/doc/misc/npm-config.html +++ b/deps/npm/html/doc/misc/npm-config.html @@ -61,6 +61,7 @@ internal to npm, and are defaults if nothing else is specified.

  • -f: --force
  • -desc: --description
  • -S: --save
    • +
  • -P: --save-prod
  • -D: --save-dev
  • -O: --save-optional
  • -B: --save-bundle
    • @@ -586,6 +587,14 @@ installed.

    Attempt to install packages in the optionalDependencies object. Note that if these packages fail to install, the overall installation process is not aborted.

    +

    package-lock

    +
      +
    • Default: true
      • +
    • Type: Boolean
      • +
    +

    If set to false, then ignore package-lock.json files when installing. This +will also prevent writing package-lock.json if save is true.

    +

    This option is an alias for --shrinkwrap.

    parseable

    • Default: false
      • @@ -689,6 +698,16 @@ object.

      bundleDependencies list.

      When used with the npm rm command, it removes it from the bundledDependencies list.

      +

      save-prod

      +
        +
      • Default: false
        • +
      • Type: Boolean
        • +
      +

      Makes sure that a package will be saved into dependencies specifically. This +is useful if a package already exists in devDependencies or +optionalDependencies, but you want to move it to be a production dep. This is +also the default behavior if --save is true, and neither --save-dev or +--save-optional are true.

      save-dev

      • Default: false
        • @@ -800,8 +819,9 @@ Windows
      • Default: true
      • Type: Boolean
      -

      If set to false, then ignore npm-shrinkwrap.json files when -installing.

      +

      If set to false, then ignore npm-shrinkwrap.json files when installing. This +will also prevent writing npm-shrinkwrap.json if save is true.

      +

      This option is an alias for --package-lock.

      sign-git-tag

      • Default: false
        • @@ -961,5 +981,5 @@ exit successfully.

               - + diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html index 52d1464490a..d87e8c05fcd 100644 --- a/deps/npm/html/doc/misc/npm-developers.html +++ b/deps/npm/html/doc/misc/npm-developers.html @@ -194,5 +194,5 @@ from a fresh checkout.

               - + diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html index f57404e375e..e5d95529e6b 100644 --- a/deps/npm/html/doc/misc/npm-disputes.html +++ b/deps/npm/html/doc/misc/npm-disputes.html @@ -20,7 +20,7 @@ Conduct.

        TL;DR

        1. Get the author email with npm owner ls <pkgname>
          2. -
        2. Email the author, CC support@npmjs.com
          3. +
        3. Email the author, CC support@npmjs.com
        4. After a few weeks, if there's no resolution, we'll sort it out.

        Don't squat on package names. Publish code or move out of the way.

        @@ -55,12 +55,12 @@ because Yusuf's foo is in the way.

      • Alice emails Yusuf, explaining the situation as respectfully as possible, and what she would like to do with the module name. She adds the npm support -staff support@npmjs.com to the CC list of the email. Mention in the email +staff support@npmjs.com to the CC list of the email. Mention in the email that Yusuf can run npm owner add alice foo to add Alice as an owner of the foo package.
      • After a reasonable amount of time, if Yusuf has not responded, or if Yusuf and Alice can't come to any sort of resolution, email support -support@npmjs.com and we'll sort it out. ("Reasonable" is usually at least +support@npmjs.com and we'll sort it out. ("Reasonable" is usually at least 4 weeks.)

        • REASONING

        @@ -96,12 +96,12 @@ application database or otherwise putting non-packagey things into it. Code of Conduct such as hateful language, pornographic content, or harassment. -

        If you see bad behavior like this, please report it to abuse@npmjs.com right +

        If you see bad behavior like this, please report it to abuse@npmjs.com right away. You are never expected to resolve abusive behavior on your own. We are here to help.

        TRADEMARKS

        If you think another npm publisher is infringing your trademark, such as by -using a confusingly similar package name, email abuse@npmjs.com with a link to +using a confusingly similar package name, email abuse@npmjs.com with a link to the package or user account on https://npmjs.com. Attach a copy of your trademark registration certificate.

        If we see that the package's publisher is intentionally misleading others by @@ -134,5 +134,5 @@ License.

               - + diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html index c2bd8c3574b..75956cc368a 100644 --- a/deps/npm/html/doc/misc/npm-index.html +++ b/deps/npm/html/doc/misc/npm-index.html @@ -91,7 +91,7 @@

        npm-search(1)

        Search for packages

        npm-shrinkwrap(1)

        -

        Lock down dependency versions

        +

        Lock down dependency versions for publication

        npm-star(1)

        Mark your favorite packages

        npm-stars(1)

        @@ -122,8 +122,14 @@

        File system structures npm uses

        npm-folders(5)

        Folder Structures Used by npm

        +

        npm-package-locks(5)

        +

        An explanation of npm lockfiles

        +

        npm-shrinkwrap.json(5)

        +

        A publishable lockfile

        npmrc(5)

        The npm config files

        +

        package-lock.json(5)

        +

        A manifestation of the manifest

        package.json(5)

        Specifics of npm's package.json handling

        Misc

        @@ -162,5 +168,5 @@        - + diff --git a/deps/npm/html/doc/misc/npm-orgs.html b/deps/npm/html/doc/misc/npm-orgs.html index 75c1850cc2c..1c769d1495d 100644 --- a/deps/npm/html/doc/misc/npm-orgs.html +++ b/deps/npm/html/doc/misc/npm-orgs.html @@ -86,5 +86,5 @@        - + diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html index 99e4d759263..aca3dc550c7 100644 --- a/deps/npm/html/doc/misc/npm-registry.html +++ b/deps/npm/html/doc/misc/npm-registry.html @@ -90,5 +90,5 @@ effectively implement the entire CouchDB API anyway.

               - + diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html index 481e367a0de..f15285ba784 100644 --- a/deps/npm/html/doc/misc/npm-scope.html +++ b/deps/npm/html/doc/misc/npm-scope.html @@ -99,5 +99,5 @@ that registry instead.

               - + diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html index be6269f081f..976695a05cc 100644 --- a/deps/npm/html/doc/misc/npm-scripts.html +++ b/deps/npm/html/doc/misc/npm-scripts.html @@ -15,14 +15,20 @@ following scripts:

        • prepublish: -Run BEFORE the package is published. (Also run on local npm -install without any arguments. See below.)
          • +Run BEFORE the package is packed and published, as well as on local npm +install without any arguments. (See below)
        • prepare: -Run both BEFORE the package is published, and on local npm -install without any arguments. (See below.) This is run +Run both BEFORE the package is packed and published, and on local npm +install without any arguments (See below). This is run AFTER prepublish, but BEFORE prepublishOnly.
        • prepublishOnly: -Run BEFORE the package is published. (See below.)
          • +Run BEFORE the package is prepared and packed, ONLY on npm publish. (See +below.) +
        • prepack: +run BEFORE a tarball is packed (on npm pack, npm publish, and when +installing git dependencies)
          • +
        • postpack: +Run AFTER the tarball has been generated and moved to its final destination.
        • publish, postpublish: Run AFTER the package is published.
        • preinstall: @@ -237,5 +243,5 @@ scripts is for compilation which must be done on the target architecture.
          •        - + diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html index 532c44588d3..8a7a51e4b06 100644 --- a/deps/npm/html/doc/misc/removing-npm.html +++ b/deps/npm/html/doc/misc/removing-npm.html @@ -57,5 +57,5 @@ modules. To track those down, you can do the following:

                 - + diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html index 80827586f16..5a8b556bcab 100644 --- a/deps/npm/html/doc/misc/semver.html +++ b/deps/npm/html/doc/misc/semver.html @@ -325,5 +325,5 @@ range, use the satisfies(version, range) function.

                 - + -- cgit v1.2.3