pnpm 6.20.3 → 6.20.4

package/dist/node_modules/node-gyp/.github/workflows/visual-studio.yml

@@ -0,0 +1,25 @@
+name: Tests on Windows
+on: [push, pull_request]
+jobs:
+  Tests:
+    strategy:
+      fail-fast: false
+      max-parallel: 15
+      matrix:
+        os: [windows-2022]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Install Dependencies
+        run: |
+          npm install --no-progress
+      - name: Set Windows environment
+        if: matrix.os == 'windows-latest'
+        run: |
+          echo 'GYP_MSVS_VERSION=2015' >> $Env:GITHUB_ENV
+          echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
+      - name: Environment Information
+        run: npx envinfo
+      - name: Run Node tests
+        run: npm test

package/dist/node_modules/node-gyp/lib/configure.js

@@ -97,17 +97,15 @@ function configure (gyp, argv, callback) {
       process.env.GYP_MSVS_VERSION = Math.min(vsInfo.versionYear, 2015)
       process.env.GYP_MSVS_OVERRIDE_PATH = vsInfo.path
     }
-    createConfigGypi({ gyp, buildDir, nodeDir, vsInfo }, (err, configPath) => {
+    createConfigGypi({ gyp, buildDir, nodeDir, vsInfo }).then(configPath => {
       configs.push(configPath)
-      findConfigs(err)
+      findConfigs()
+    }).catch(err => {
+      callback(err)
     })
   }
 
-  function findConfigs (err) {
-    if (err) {
-      return callback(err)
-    }
-
+  function findConfigs () {
     var name = configNames.shift()
     if (!name) {
       return runGyp()

package/dist/node_modules/node-gyp/lib/create-config-gypi.js

@@ -4,19 +4,45 @@ const fs = require('graceful-fs')
 const log = require('npmlog')
 const path = require('path')
 
-function getBaseConfigGypi () {
-  const config = JSON.parse(JSON.stringify(process.config))
+function parseConfigGypi (config) {
+  // translated from tools/js2c.py of Node.js
+  // 1. string comments
+  config = config.replace(/#.*/g, '')
+  // 2. join multiline strings
+  config = config.replace(/'$\s+'/mg, '')
+  // 3. normalize string literals from ' into "
+  config = config.replace(/'/g, '"')
+  return JSON.parse(config)
+}
+
+async function getBaseConfigGypi ({ gyp, nodeDir }) {
+  // try reading $nodeDir/include/node/config.gypi first when:
+  // 1. --dist-url or --nodedir is specified
+  // 2. and --force-process-config is not specified
+  const shouldReadConfigGypi = (gyp.opts.nodedir || gyp.opts['dist-url']) && !gyp.opts['force-process-config']
+  if (shouldReadConfigGypi && nodeDir) {
+    try {
+      const baseConfigGypiPath = path.resolve(nodeDir, 'include/node/config.gypi')
+      const baseConfigGypi = await fs.promises.readFile(baseConfigGypiPath)
+      return parseConfigGypi(baseConfigGypi.toString())
+    } catch (err) {
+      log.warn('read config.gypi', err.message)
+    }
+  }
+
+  // fallback to process.config if it is invalid
+  return JSON.parse(JSON.stringify(process.config))
+}
+
+async function getCurrentConfigGypi ({ gyp, nodeDir, vsInfo }) {
+  const config = await getBaseConfigGypi({ gyp, nodeDir })
   if (!config.target_defaults) {
     config.target_defaults = {}
   }
   if (!config.variables) {
     config.variables = {}
   }
-  return config
-}
 
-function getCurrentConfigGypi ({ gyp, nodeDir, vsInfo }) {
-  const config = getBaseConfigGypi()
   const defaults = config.target_defaults
   const variables = config.variables
 
@@ -85,13 +111,13 @@ function getCurrentConfigGypi ({ gyp, nodeDir, vsInfo }) {
   return config
 }
 
-function createConfigGypi ({ gyp, buildDir, nodeDir, vsInfo }, callback) {
+async function createConfigGypi ({ gyp, buildDir, nodeDir, vsInfo }) {
   const configFilename = 'config.gypi'
   const configPath = path.resolve(buildDir, configFilename)
 
   log.verbose('build/' + configFilename, 'creating config file')
 
-  const config = getCurrentConfigGypi({ gyp, nodeDir, vsInfo })
+  const config = await getCurrentConfigGypi({ gyp, nodeDir, vsInfo })
 
   // ensures that any boolean values in config.gypi get stringified
   function boolsToString (k, v) {
@@ -108,12 +134,13 @@ function createConfigGypi ({ gyp, buildDir, nodeDir, vsInfo }, callback) {
 
   const json = JSON.stringify(config, boolsToString, 2)
   log.verbose('build/' + configFilename, 'writing out config file: %s', configPath)
-  fs.writeFile(configPath, [prefix, json, ''].join('\n'), (err) => {
-    callback(err, configPath)
-  })
+  await fs.promises.writeFile(configPath, [prefix, json, ''].join('\n'))
+
+  return configPath
 }
 
 module.exports = createConfigGypi
 module.exports.test = {
+  parseConfigGypi: parseConfigGypi,
   getCurrentConfigGypi: getCurrentConfigGypi
 }

package/dist/node_modules/node-gyp/lib/find-visualstudio.js

@@ -2,6 +2,7 @@
 
 const log = require('npmlog')
 const execFile = require('child_process').execFile
+const fs = require('fs')
 const path = require('path').win32
 const logWithPrefix = require('./util').logWithPrefix
 const regSearchKeys = require('./util').regSearchKeys
@@ -257,6 +258,10 @@ VisualStudioFinder.prototype = {
       ret.versionYear = 2019
       return ret
     }
+    if (ret.versionMajor === 17) {
+      ret.versionYear = 2022
+      return ret
+    }
     this.log.silly('- unsupported version:', ret.versionMajor)
     return {}
   },
@@ -264,15 +269,20 @@ VisualStudioFinder.prototype = {
   // Helper - process MSBuild information
   getMSBuild: function getMSBuild (info, versionYear) {
     const pkg = 'Microsoft.VisualStudio.VC.MSBuild.Base'
+    const msbuildPath = path.join(info.path, 'MSBuild', 'Current', 'Bin', 'MSBuild.exe')
     if (info.packages.indexOf(pkg) !== -1) {
       this.log.silly('- found VC.MSBuild.Base')
       if (versionYear === 2017) {
         return path.join(info.path, 'MSBuild', '15.0', 'Bin', 'MSBuild.exe')
       }
       if (versionYear === 2019) {
-        return path.join(info.path, 'MSBuild', 'Current', 'Bin', 'MSBuild.exe')
+        return msbuildPath
       }
     }
+    // visual studio 2022 don't has msbuild pkg
+    if (fs.existsSync(msbuildPath)) {
+      return msbuildPath
+    }
     return null
   },
 
@@ -293,6 +303,8 @@ VisualStudioFinder.prototype = {
       return 'v141'
     } else if (versionYear === 2019) {
       return 'v142'
+    } else if (versionYear === 2022) {
+      return 'v143'
     }
     this.log.silly('- invalid versionYear:', versionYear)
     return null

package/dist/node_modules/node-gyp/lib/node-gyp.js

@@ -75,7 +75,8 @@ proto.configDefs = {
   'dist-url': String, // 'install'
   tarball: String, // 'install'
   jobs: String, // 'build'
-  thin: String // 'configure'
+  thin: String, // 'configure'
+  'force-process-config': Boolean // 'configure'
 }
 
 /**

package/dist/node_modules/node-gyp/package.json

@@ -11,7 +11,7 @@
     "bindings",
     "gyp"
   ],
-  "version": "8.3.0",
+  "version": "8.4.0",
   "installVersion": 9,
   "author": "Nathan Rajlich <nathan@tootallnate.net> (http://tootallnate.net)",
   "repository": {

package/dist/pnpm.cjs

@@ -3165,7 +3165,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault(require_load_json_file());
     var defaultManifest = {
       name: "pnpm" != null && true ? "pnpm" : "pnpm",
-      version: "6.20.3" != null && true ? "6.20.3" : "0.0.0"
+      version: "6.20.4" != null && true ? "6.20.4" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -12427,10 +12427,12 @@ var require_err = __commonJS({
     function err(error) {
       if (!global["reporterInitialized"]) {
         console.log(error);
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
       if (global["reporterInitialized"] === "silent") {
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
       if (error.name != null && error.name !== "pnpm" && !error.name.startsWith("pnpm:")) {
         error.name = "pnpm";
@@ -103609,7 +103611,7 @@ var require_runLifecycleHooksConcurrently = __commonJS({
               continue;
             await (0, runLifecycleHook_1.default)(stage, manifest, runLifecycleHookOpts);
           }
-          if (targetDirs == null)
+          if (targetDirs == null || targetDirs.length === 0)
             return;
           const filesResponse = await (0, directory_fetcher_1.fetchFromDir)(rootDir, {});
           await Promise.all(targetDirs.map((targetDir) => opts.storeController.importPackage(targetDir, {
@@ -129065,7 +129067,7 @@ var require_publish2 = __commonJS({
         await (0, rimraf_1.default)(localNpmrc);
       }
       if (status != null && status !== 0) {
-        process.exit(status);
+        return { exitCode: status };
       }
       if (!opts.ignoreScripts) {
         await _runScriptsIfPresent([
@@ -129987,7 +129989,9 @@ var require_exec = __commonJS({
             result.passes++;
           } catch (err) {
             if (!opts.recursive && typeof err.exitCode === "number") {
-              process.exit(err.exitCode);
+              return {
+                exitCode: err.exitCode
+              };
             }
             logger_1.default.info(err);
             if (!opts.bail) {
@@ -130002,6 +130006,7 @@ var require_exec = __commonJS({
             err["prefix"] = prefix;
             throw err;
           }
+          return { exitCode: 0 };
         })));
       }
       (0, cli_utils_1.throwOnCommandFail)("pnpm recursive exec", result);
@@ -133774,12 +133779,14 @@ var require_main2 = __commonJS({
         parsedCliArgs = await (0, parseCliArgs_1.default)(inputArgv);
       } catch (err) {
         printError(err.message, err["hint"]);
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
       const { argv: argv2, params: cliParams, options: cliOptions, cmd, fallbackCommandUsed, unknownOptions, workspaceDir } = parsedCliArgs;
       if (cmd !== null && !cmd_1.default[cmd]) {
         printError(`Unknown command '${cmd}'`, "For help, run: pnpm help");
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
       if (unknownOptions.size > 0 && !fallbackCommandUsed) {
         const unknownOptionsArray = Array.from(unknownOptions.keys());
@@ -133793,7 +133800,8 @@ var require_main2 = __commonJS({
           console.log(deprecationMsg);
         } else {
           printError((0, formatError_1.formatUnknownOptionsError)(unknownOptions), `For help, run: pnpm help${cmd ? ` ${cmd}` : ""}`);
-          process.exit(1);
+          process.exitCode = 1;
+          return;
         }
       }
       process.env["npm_config_argv"] = JSON.stringify(argv2);
@@ -133813,7 +133821,8 @@ var require_main2 = __commonJS({
       } catch (err) {
         const hint = err["hint"] ? err["hint"] : `For help, run: pnpm help${cmd ? ` ${cmd}` : ""}`;
         printError(err.message, hint);
-        process.exit(1);
+        process.exitCode = 1;
+        return;
       }
       let write = process.stdout.write.bind(process.stdout);
       if (config.color === "always") {
@@ -133864,7 +133873,8 @@ var require_main2 = __commonJS({
           if (printLogs) {
             console.log(`No projects found in "${wsDir}"`);
           }
-          process.exit(0);
+          process.exitCode = 0;
+          return;
         }
         config.filter = (_a = config.filter) !== null && _a !== void 0 ? _a : [];
         config.filterProd = (_b = config.filterProd) !== null && _b !== void 0 ? _b : [];
@@ -133891,7 +133901,8 @@ var require_main2 = __commonJS({
           if (printLogs) {
             console.log(`No projects matched the filters in "${wsDir}"`);
           }
-          process.exit(0);
+          process.exitCode = 0;
+          return;
         }
         if (filterResults.unmatchedFilters.length !== 0 && printLogs) {
           console.log(`No projects matched the filters "${filterResults.unmatchedFilters.join(", ")}" in "${wsDir}"`);
@@ -133946,7 +133957,7 @@ var require_main2 = __commonJS({
       }
       if (exitCode) {
         global["writeDebugLogFile"] = false;
-        process.exit(exitCode);
+        process.exitCode = exitCode;
       }
     }
     exports2.default = run;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "6.20.3",
+  "version": "6.20.4",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -42,12 +42,12 @@
     "@pnpm/pick-registry-for-package": "workspace:2.0.5",
     "@pnpm/plugin-commands-audit": "workspace:5.1.19",
     "@pnpm/plugin-commands-env": "workspace:1.2.4",
-    "@pnpm/plugin-commands-installation": "workspace:7.2.1",
+    "@pnpm/plugin-commands-installation": "workspace:7.2.2",
     "@pnpm/plugin-commands-listing": "workspace:4.0.20",
     "@pnpm/plugin-commands-outdated": "workspace:5.0.26",
-    "@pnpm/plugin-commands-publishing": "workspace:4.2.22",
-    "@pnpm/plugin-commands-rebuild": "workspace:5.2.1",
-    "@pnpm/plugin-commands-script-runners": "workspace:4.3.6",
+    "@pnpm/plugin-commands-publishing": "workspace:4.2.23",
+    "@pnpm/plugin-commands-rebuild": "workspace:5.2.2",
+    "@pnpm/plugin-commands-script-runners": "workspace:4.3.7",
     "@pnpm/plugin-commands-server": "workspace:3.0.43",
     "@pnpm/plugin-commands-setup": "workspace:1.1.13",
     "@pnpm/plugin-commands-store": "workspace:4.0.27",