pnpm 6.17.2 → 6.20.0

package/dist/pnpmrc

@@ -0,0 +1,2 @@
+# DO NOT MODIFY THIS FILE UNLESS YOU KNOW WHAT WILL HAPPEN
+# This file is intended for changing pnpm's default settings by the package manager that install pnpm

package/dist/pnpx.cjs

@@ -1,3 +1,5 @@
+var __reflectGet = Reflect.get;
+var __reflectSet = Reflect.set;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -369,7 +371,7 @@ var require_lib2 = __commonJS({
     async function findWorkspaceDir(cwd) {
       var _a;
       const workspaceManifestDirEnvVar = (_a = process.env[WORKSPACE_DIR_ENV_VAR]) !== null && _a !== void 0 ? _a : process.env[WORKSPACE_DIR_ENV_VAR.toLowerCase()];
-      const workspaceManifestLocation = workspaceManifestDirEnvVar ? path_12.default.join(workspaceManifestDirEnvVar, "pnpm-workspace.yaml") : await find_up_1.default([WORKSPACE_MANIFEST_FILENAME, "pnpm-workspace.yml"], { cwd });
+      const workspaceManifestLocation = workspaceManifestDirEnvVar ? path_12.default.join(workspaceManifestDirEnvVar, "pnpm-workspace.yaml") : await (0, find_up_1.default)([WORKSPACE_MANIFEST_FILENAME, "pnpm-workspace.yml"], { cwd });
       if (workspaceManifestLocation === null || workspaceManifestLocation === void 0 ? void 0 : workspaceManifestLocation.endsWith(".yml")) {
         throw new error_1.default("BAD_WORKSPACE_MANIFEST_NAME", `The workspace manifest file should be named "pnpm-workspace.yaml". File found: ${workspaceManifestLocation}`);
       }
@@ -15343,13 +15345,13 @@ var path_name_1 = __importDefault(require_path_name());
 var PNPM_PATH = path_1.default.join(__dirname, "pnpm.cjs");
 (async () => {
   var _a;
-  const workspaceRoot = await find_workspace_dir_1.default(process.cwd());
+  const workspaceRoot = await (0, find_workspace_dir_1.default)(process.cwd());
   if (workspaceRoot) {
     process.env[path_name_1.default] = `${path_1.default.join(workspaceRoot, "node_modules/.bin")}${path_1.default.delimiter}${(_a = process.env[path_name_1.default]) !== null && _a !== void 0 ? _a : ""}`;
   }
-  index_1.default({
+  (0, index_1.default)({
     ...index_1.default.parseArgs(process.argv, PNPM_PATH),
-    cache: path_1.default.join(await store_path_1.default(process.cwd(), "~/.pnpm-store"), "tmp"),
+    cache: path_1.default.join(await (0, store_path_1.default)(process.cwd(), "~/.pnpm-store"), "tmp"),
     installerStdio: "inherit"
   });
 })();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "6.17.2",
+  "version": "6.20.0",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -20,50 +20,52 @@
   },
   "__devDependencies": {
     "@pnpm/assert-project": "workspace:*",
+    "@pnpm/byline": "^1.0.0",
     "@pnpm/cli-meta": "workspace:2.0.0",
-    "@pnpm/cli-utils": "workspace:0.6.26",
-    "@pnpm/client": "workspace:5.0.7",
+    "@pnpm/cli-utils": "workspace:0.6.29",
+    "@pnpm/client": "workspace:6.0.0",
     "@pnpm/command": "workspace:2.0.0",
     "@pnpm/common-cli-options-help": "workspace:0.7.1",
-    "@pnpm/config": "workspace:13.2.0",
+    "@pnpm/config": "workspace:13.4.1",
     "@pnpm/constants": "workspace:5.0.0",
-    "@pnpm/core-loggers": "workspace:6.0.4",
-    "@pnpm/default-reporter": "workspace:8.3.2",
+    "@pnpm/core-loggers": "workspace:6.0.5",
+    "@pnpm/default-reporter": "workspace:8.3.5",
     "@pnpm/file-reporter": "workspace:2.0.0",
-    "@pnpm/filter-workspace-packages": "workspace:4.3.2",
+    "@pnpm/filter-workspace-packages": "workspace:4.4.1",
     "@pnpm/find-workspace-dir": "workspace:3.0.1",
-    "@pnpm/find-workspace-packages": "workspace:3.1.18",
-    "@pnpm/lockfile-types": "workspace:3.0.0",
+    "@pnpm/find-workspace-packages": "workspace:3.1.21",
+    "@pnpm/lockfile-types": "workspace:3.1.0",
     "@pnpm/logger": "^4.0.0",
-    "@pnpm/modules-yaml": "workspace:9.0.4",
+    "@pnpm/modules-yaml": "workspace:9.0.5",
     "@pnpm/nopt": "^0.2.1",
     "@pnpm/parse-cli-args": "workspace:4.3.0",
-    "@pnpm/pick-registry-for-package": "workspace:2.0.4",
-    "@pnpm/plugin-commands-audit": "workspace:5.1.15",
-    "@pnpm/plugin-commands-env": "workspace:1.1.0",
-    "@pnpm/plugin-commands-import": "workspace:3.1.13",
-    "@pnpm/plugin-commands-installation": "workspace:7.0.2",
-    "@pnpm/plugin-commands-listing": "workspace:4.0.17",
-    "@pnpm/plugin-commands-outdated": "workspace:5.0.21",
-    "@pnpm/plugin-commands-publishing": "workspace:4.2.17",
-    "@pnpm/plugin-commands-rebuild": "workspace:5.1.2",
-    "@pnpm/plugin-commands-script-runners": "workspace:4.3.2",
-    "@pnpm/plugin-commands-server": "workspace:3.0.38",
-    "@pnpm/plugin-commands-setup": "workspace:1.1.10",
-    "@pnpm/plugin-commands-store": "workspace:4.0.22",
-    "@pnpm/prepare": "workspace:0.0.26",
-    "@pnpm/read-package-json": "workspace:5.0.4",
-    "@pnpm/read-project-manifest": "workspace:2.0.5",
+    "@pnpm/pick-registry-for-package": "workspace:2.0.5",
+    "@pnpm/plugin-commands-audit": "workspace:5.1.19",
+    "@pnpm/plugin-commands-env": "workspace:1.2.3",
+    "@pnpm/plugin-commands-import": "workspace:3.1.17",
+    "@pnpm/plugin-commands-installation": "workspace:7.1.0",
+    "@pnpm/plugin-commands-listing": "workspace:4.0.20",
+    "@pnpm/plugin-commands-outdated": "workspace:5.0.25",
+    "@pnpm/plugin-commands-publishing": "workspace:4.2.21",
+    "@pnpm/plugin-commands-rebuild": "workspace:5.2.0",
+    "@pnpm/plugin-commands-script-runners": "workspace:4.3.5",
+    "@pnpm/plugin-commands-server": "workspace:3.0.42",
+    "@pnpm/plugin-commands-setup": "workspace:1.1.13",
+    "@pnpm/plugin-commands-store": "workspace:4.0.26",
+    "@pnpm/prepare": "workspace:0.0.27",
+    "@pnpm/read-package-json": "workspace:5.0.5",
+    "@pnpm/read-project-manifest": "workspace:2.0.6",
     "@pnpm/run-npm": "workspace:3.1.0",
     "@pnpm/store-path": "^5.0.0",
     "@pnpm/tabtab": "^0.1.2",
-    "@pnpm/types": "workspace:7.4.0",
-    "@pnpm/write-project-manifest": "workspace:2.0.4",
-    "@types/byline": "^4.2.32",
+    "@pnpm/ts-execution-runtime": "workspace:1.0.0",
+    "@pnpm/types": "workspace:7.5.0",
+    "@pnpm/write-project-manifest": "workspace:2.0.5",
     "@types/cross-spawn": "^6.0.2",
     "@types/is-ci": "^3.0.0",
     "@types/is-windows": "^1.0.0",
     "@types/ncp": "^2.0.4",
+    "@types/pnpm__byline": "npm:@types/byline@^4.2.32",
     "@types/ramda": "0.27.39",
     "@types/semver": "^7.3.4",
     "@types/which": "^2.0.0",
@@ -71,14 +73,13 @@
     "@zkochan/retry": "^0.2.0",
     "@zkochan/rimraf": "^2.1.1",
     "anonymous-npm-registry-client": "0.1.2",
-    "byline": "5.0.0",
     "chalk": "^4.1.0",
     "cross-spawn": "^7.0.3",
     "cross-var-no-babel": "^1.2.0",
     "deep-require-cwd": "1.0.0",
     "delay": "^5.0.0",
     "dir-is-case-sensitive": "^2.0.0",
-    "esbuild": "^0.12.0",
+    "esbuild": "^0.13.7",
     "execa": "npm:safe-execa@^0.1.1",
     "exists-link": "2.0.0",
     "is-ci": "^3.0.0",
@@ -161,13 +162,13 @@
     "bundle:pnpx": "esbuild lib/pnpx.js --bundle --platform=node --outfile=dist/pnpx.cjs",
     "bundle": "pnpm bundle:pnpm && pnpm bundle:pnpx",
     "start": "pnpm tsc --watch",
-    "lint": "eslint -c ../../eslint.json src/**/*.ts test/**/*.ts",
+    "lint": "eslint src/**/*.ts test/**/*.ts",
     "registry-mock": "registry-mock",
     "test:jest": "jest",
     "pretest:e2e": "rimraf node_modules/.bin/pnpm",
     "test:e2e": "registry-mock prepare && run-p -r registry-mock test:jest",
     "_test": "cross-env PNPM_REGISTRY_MOCK_PORT=7781 pnpm run test:e2e",
     "test": "pnpm run compile && pnpm run _test",
-    "compile": "rimraf lib tsconfig.tsbuildinfo && tsc --build && pnpm run lint -- --fix && rimraf dist bin/nodes && pnpm run bundle && shx cp -r node-gyp-bin dist/node-gyp-bin && shx cp -r node_modules/@pnpm/tabtab/lib/scripts dist/scripts && shx cp -r node_modules/ps-list/vendor dist/vendor"
+    "compile": "rimraf lib tsconfig.tsbuildinfo && tsc --build && pnpm run lint -- --fix && rimraf dist bin/nodes && pnpm run bundle && shx cp -r node-gyp-bin dist/node-gyp-bin && shx cp -r node_modules/@pnpm/tabtab/lib/scripts dist/scripts && shx cp -r node_modules/ps-list/vendor dist/vendor && shx cp pnpmrc dist/pnpmrc"
   }
 }

package/dist/node_modules/make-fetch-happen/cache.js

@@ -1,260 +0,0 @@
-'use strict'
-
-const fetch = require('minipass-fetch')
-const cacache = require('cacache')
-const ssri = require('ssri')
-const url = require('url')
-
-const Minipass = require('minipass')
-const MinipassFlush = require('minipass-flush')
-const MinipassCollect = require('minipass-collect')
-const MinipassPipeline = require('minipass-pipeline')
-
-const MAX_MEM_SIZE = 5 * 1024 * 1024 // 5MB
-
-// some headers should never be stored in the cache, either because
-// they're a security footgun to leave lying around, or because we
-// just don't need them taking up space.
-// set to undefined so they're omitted from the JSON.stringify
-const pruneHeaders = {
-  authorization: undefined,
-  'npm-session': undefined,
-  'set-cookie': undefined,
-  'cf-ray': undefined,
-  'cf-cache-status': undefined,
-  'cf-request-id': undefined,
-  'x-fetch-attempts': undefined,
-}
-
-function cacheKey (req) {
-  const parsed = new url.URL(req.url)
-  return `make-fetch-happen:request-cache:${
-    url.format({
-      protocol: parsed.protocol,
-      slashes: true,
-      port: parsed.port,
-      hostname: parsed.hostname,
-      pathname: parsed.pathname,
-      search: parsed.search,
-    })
-  }`
-}
-
-// This is a cacache-based implementation of the Cache standard,
-// using node-fetch.
-// docs: https://developer.mozilla.org/en-US/docs/Web/API/Cache
-//
-module.exports = class Cache {
-  constructor (path, opts) {
-    this._path = path
-    this.Promise = (opts && opts.Promise) || Promise
-  }
-
-  static get pruneHeaders () {
-    // exposed for testing, not modifiable
-    return { ...pruneHeaders }
-  }
-
-  // Returns a Promise that resolves to the response associated with the first
-  // matching request in the Cache object.
-  match (req, opts) {
-    const key = cacheKey(req)
-    return cacache.get.info(this._path, key).then(info => {
-      return info && cacache.get.hasContent(
-        this._path, info.integrity, opts
-      ).then(exists => exists && info)
-    }).then(info => {
-      if (info && info.metadata && matchDetails(req, {
-        url: info.metadata.url,
-        reqHeaders: new fetch.Headers(info.metadata.reqHeaders),
-        resHeaders: new fetch.Headers(info.metadata.resHeaders),
-        cacheIntegrity: info.integrity,
-        integrity: opts && opts.integrity,
-      })) {
-        const resHeaders = new fetch.Headers(info.metadata.resHeaders)
-        addCacheHeaders(resHeaders, this._path, key, info.integrity, info.time)
-        if (req.method === 'HEAD') {
-          return new fetch.Response(null, {
-            url: req.url,
-            headers: resHeaders,
-            status: 200,
-          })
-        }
-        const cachePath = this._path
-        // avoid opening cache file handles until a user actually tries to
-        // read from it.
-        const body = new Minipass()
-        const fitInMemory = info.size < MAX_MEM_SIZE
-        const removeOnResume = () => body.removeListener('resume', onResume)
-        const onResume =
-          opts.memoize !== false && fitInMemory
-            ? () => {
-              const c = cacache.get.stream.byDigest(cachePath, info.integrity, {
-                memoize: opts.memoize,
-              })
-              c.on('error', /* istanbul ignore next */ err => {
-                body.emit('error', err)
-              })
-              c.pipe(body)
-            }
-            : () => {
-              removeOnResume()
-              cacache.get.byDigest(cachePath, info.integrity, {
-                memoize: opts.memoize,
-              })
-                .then(data => body.end(data))
-                .catch(/* istanbul ignore next */ err => {
-                  body.emit('error', err)
-                })
-            }
-        body.once('resume', onResume)
-        body.once('end', () => removeOnResume)
-        return this.Promise.resolve(new fetch.Response(body, {
-          url: req.url,
-          headers: resHeaders,
-          status: 200,
-          size: info.size,
-        }))
-      }
-    })
-  }
-
-  // Takes both a request and its response and adds it to the given cache.
-  put (req, response, opts) {
-    opts = opts || {}
-    const size = response.headers.get('content-length')
-    const fitInMemory = !!size && opts.memoize !== false && size < MAX_MEM_SIZE
-    const ckey = cacheKey(req)
-    const cacheOpts = {
-      algorithms: opts.algorithms,
-      metadata: {
-        url: req.url,
-        reqHeaders: {
-          ...req.headers.raw(),
-          ...pruneHeaders,
-        },
-        resHeaders: {
-          ...response.headers.raw(),
-          ...pruneHeaders,
-        },
-      },
-      size,
-      memoize: fitInMemory && opts.memoize,
-    }
-    if (req.method === 'HEAD' || response.status === 304) {
-      // Update metadata without writing
-      return cacache.get.info(this._path, ckey).then(info => {
-        // Providing these will bypass content write
-        cacheOpts.integrity = info.integrity
-        addCacheHeaders(
-          response.headers, this._path, ckey, info.integrity, info.time
-        )
-
-        return new MinipassPipeline(
-          cacache.get.stream.byDigest(this._path, info.integrity, cacheOpts),
-          cacache.put.stream(this._path, ckey, cacheOpts)
-        ).promise().then(() => {
-          return response
-        })
-      })
-    }
-    const oldBody = response.body
-    // the flush is the last thing in the pipeline.  Build the pipeline
-    // back-to-front so we don't consume the data before we use it!
-    // We unshift in either a tee-stream to the cache put stream,
-    // or a collecter that dumps it to cache in one go, then the
-    // old body to bring in the data.
-    const newBody = new MinipassPipeline(new MinipassFlush({
-      flush () {
-        return cacheWritePromise
-      },
-    }))
-
-    let cacheWriteResolve, cacheWriteReject
-    const cacheWritePromise = new Promise((resolve, reject) => {
-      cacheWriteResolve = resolve
-      cacheWriteReject = reject
-    })
-    const cachePath = this._path
-
-    if (fitInMemory) {
-      const collecter = new MinipassCollect.PassThrough()
-      collecter.on('collect', data => {
-        cacache.put(
-          cachePath,
-          ckey,
-          data,
-          cacheOpts
-        ).then(cacheWriteResolve, cacheWriteReject)
-      })
-      newBody.unshift(collecter)
-    } else {
-      const tee = new Minipass()
-      const cacheStream = cacache.put.stream(
-        cachePath,
-        ckey,
-        cacheOpts
-      )
-      tee.pipe(cacheStream)
-      cacheStream.promise().then(cacheWriteResolve, cacheWriteReject)
-      newBody.unshift(tee)
-    }
-
-    newBody.unshift(oldBody)
-    return Promise.resolve(new fetch.Response(newBody, response))
-  }
-
-  // Finds the Cache entry whose key is the request, and if found, deletes the
-  // Cache entry and returns a Promise that resolves to true. If no Cache entry
-  // is found, it returns false.
-  'delete' (req, opts) {
-    opts = opts || {}
-    if (typeof opts.memoize === 'object') {
-      if (opts.memoize.reset)
-        opts.memoize.reset()
-      else if (opts.memoize.clear)
-        opts.memoize.clear()
-      else {
-        Object.keys(opts.memoize).forEach(k => {
-          opts.memoize[k] = null
-        })
-      }
-    }
-    return cacache.rm.entry(
-      this._path,
-      cacheKey(req)
-    // TODO - true/false
-    ).then(() => false)
-  }
-}
-
-function matchDetails (req, cached) {
-  const reqUrl = new url.URL(req.url)
-  const cacheUrl = new url.URL(cached.url)
-  const vary = cached.resHeaders.get('Vary')
-  // https://tools.ietf.org/html/rfc7234#section-4.1
-  if (vary) {
-    if (vary.match(/\*/))
-      return false
-    else {
-      const fieldsMatch = vary.split(/\s*,\s*/).every(field => {
-        return cached.reqHeaders.get(field) === req.headers.get(field)
-      })
-      if (!fieldsMatch)
-        return false
-    }
-  }
-  if (cached.integrity)
-    return ssri.parse(cached.integrity).match(cached.cacheIntegrity)
-
-  reqUrl.hash = null
-  cacheUrl.hash = null
-  return url.format(reqUrl) === url.format(cacheUrl)
-}
-
-function addCacheHeaders (resHeaders, path, key, hash, time) {
-  resHeaders.set('X-Local-Cache', encodeURIComponent(path))
-  resHeaders.set('X-Local-Cache-Key', encodeURIComponent(key))
-  resHeaders.set('X-Local-Cache-Hash', encodeURIComponent(hash))
-  resHeaders.set('X-Local-Cache-Time', new Date(time).toUTCString())
-}