vercel 32.0.2 → 32.1.0

package/dist/index.js

@@ -110501,6 +110501,52 @@ module.exports = new Type('tag:yaml.org,2002:timestamp', {
 }).call(this);
 
 
+/***/ }),
+
+/***/ 43144:
+/***/ ((module) => {
+
+"use strict";
+
+
+module.exports = parseJson
+function parseJson (txt, reviver, context) {
+  context = context || 20
+  try {
+    return JSON.parse(txt, reviver)
+  } catch (e) {
+    if (typeof txt !== 'string') {
+      const isEmptyArray = Array.isArray(txt) && txt.length === 0
+      const errorMessage = 'Cannot parse ' +
+      (isEmptyArray ? 'an empty array' : String(txt))
+      throw new TypeError(errorMessage)
+    }
+    const syntaxErr = e.message.match(/^Unexpected token.*position\s+(\d+)/i)
+    const errIdx = syntaxErr
+    ? +syntaxErr[1]
+    : e.message.match(/^Unexpected end of JSON.*/i)
+    ? txt.length - 1
+    : null
+    if (errIdx != null) {
+      const start = errIdx <= context
+      ? 0
+      : errIdx - context
+      const end = errIdx + context >= txt.length
+      ? txt.length
+      : errIdx + context
+      e.message += ` while parsing near '${
+        start === 0 ? '' : '...'
+      }${txt.slice(start, end)}${
+        end === txt.length ? '' : '...'
+      }'`
+    } else {
+      e.message += ` while parsing '${txt.slice(0, context * 2)}'`
+    }
+    throw e
+  }
+}
+
+
 /***/ }),
 
 /***/ 8933:
@@ -222918,7 +222964,7 @@ async function main(client) {
     if (!vercelConfig || !hasBuilds) {
         const pkg = await (0, read_json_file_1.default)(path_1.default.join(dir, 'package.json'));
         if (pkg instanceof errors_ts_1.CantParseJSONFile) {
-            client.output.error('Could not parse package.json');
+            client.output.error(pkg.message);
             return 1;
         }
         if (/\b(now|vercel)\b\W+\bdev\b/.test(pkg?.scripts?.dev || '')) {
@@ -224833,6 +224879,7 @@ const get_env_records_1 = __webpack_require__(72913);
 const diff_env_files_1 = __webpack_require__(65117);
 const error_utils_1 = __webpack_require__(39799);
 const add_to_gitignore_1 = __webpack_require__(19159);
+const json_parse_better_errors_1 = __importDefault(__webpack_require__(43144));
 const CONTENTS_PREFIX = '# Created by Vercel CLI\n';
 function readHeadSync(path, length) {
     const buffer = Buffer.alloc(length);
@@ -224892,7 +224939,7 @@ async function pull(client, link, project, environment, opts, args, output, cwd,
             // We need this because double quotes are stripped from the local .env file,
             // but `records` is already in the form of a JSON object that doesn't filter
             // double quotes.
-            const newEnv = JSON.parse(JSON.stringify(records).replace(/\\"/g, ''));
+            const newEnv = (0, json_parse_better_errors_1.default)(JSON.stringify(records).replace(/\\"/g, ''));
             deltaString = (0, diff_env_files_1.buildDeltaString)(oldEnv, newEnv);
         }
     }
@@ -230662,7 +230709,7 @@ async function initCorepack({ repoRootPath, }) {
     }
     const pkg = await (0, read_json_file_1.default)((0, path_1.join)(repoRootPath, 'package.json'));
     if (pkg instanceof errors_ts_1.CantParseJSONFile) {
-        console.warn('Warning: Could not enable corepack because package.json is invalid JSON');
+        console.warn('Warning: Could not enable corepack because package.json is invalid JSON', pkg.meta.parseErrorLocation);
     }
     else if (!pkg?.packageManager) {
         console.warn('Warning: Could not enable corepack because package.json is missing "packageManager" property');
@@ -234650,6 +234697,7 @@ const get_port_1 = __importDefault(__webpack_require__(10360));
 const is_port_reachable_1 = __importDefault(__webpack_require__(27225));
 const fast_deep_equal_1 = __importDefault(__webpack_require__(45088));
 const npm_package_arg_1 = __importDefault(__webpack_require__(74599));
+const json_parse_better_errors_1 = __importDefault(__webpack_require__(43144));
 const client_1 = __webpack_require__(40521);
 const routing_utils_1 = __webpack_require__(679);
 const build_utils_1 = __webpack_require__(63445);
@@ -235695,7 +235743,7 @@ class DevServer {
         this.output.debug(`Reading \`${rel}\` file`);
         try {
             const raw = await fs_extra_1.default.readFile(abs, 'utf8');
-            const parsed = JSON.parse(raw);
+            const parsed = (0, json_parse_better_errors_1.default)(raw);
             parsed[client_1.fileNameSymbol] = rel;
             return parsed;
         }
@@ -238723,11 +238771,12 @@ class CertMissing extends now_error_1.NowError {
 }
 exports.CertMissing = CertMissing;
 class CantParseJSONFile extends now_error_1.NowError {
-    constructor(file) {
+    constructor(file, parseErrorLocation) {
+        const message = `Can't parse json file ${file}: ${parseErrorLocation}`;
         super({
             code: 'CANT_PARSE_JSON_FILE',
-            meta: { file },
-            message: `Can't parse json file`,
+            meta: { file, parseErrorLocation },
+            message,
         });
     }
 }
@@ -245051,17 +245100,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const fs_extra_1 = __importDefault(__webpack_require__(36365));
 const errors_ts_1 = __webpack_require__(39240);
+const json_parse_better_errors_1 = __importDefault(__webpack_require__(43144));
+const error_utils_1 = __webpack_require__(39799);
 async function readJSONFile(file) {
     const content = await readFileSafe(file);
     if (content === null) {
         return content;
     }
     try {
-        const json = JSON.parse(content);
+        const json = (0, json_parse_better_errors_1.default)(content);
         return json;
     }
     catch (error) {
-        return new errors_ts_1.CantParseJSONFile(file);
+        return new errors_ts_1.CantParseJSONFile(file, (0, error_utils_1.errorToString)(error));
     }
 }
 exports.default = readJSONFile;
@@ -246063,7 +246114,7 @@ module.exports = JSON.parse("[[[0,44],\"disallowed_STD3_valid\"],[[45,46],\"vali
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse("{\"name\":\"@vercel/client\",\"version\":\"13.0.0\",\"main\":\"dist/index.js\",\"typings\":\"dist/index.d.ts\",\"homepage\":\"https://vercel.com\",\"license\":\"Apache-2.0\",\"files\":[\"dist\"],\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/vercel/vercel.git\",\"directory\":\"packages/client\"},\"scripts\":{\"build\":\"tsc\",\"test-e2e\":\"pnpm test tests/create-deployment.test.ts tests/create-legacy-deployment.test.ts tests/paths.test.ts\",\"test\":\"jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail\",\"test-unit\":\"pnpm test tests/unit.*test.*\"},\"engines\":{\"node\":\">= 16\"},\"devDependencies\":{\"@types/async-retry\":\"1.4.5\",\"@types/fs-extra\":\"7.0.0\",\"@types/jest\":\"27.4.1\",\"@types/minimatch\":\"3.0.5\",\"@types/ms\":\"0.7.30\",\"@types/node\":\"14.18.33\",\"@types/node-fetch\":\"2.5.4\",\"@types/recursive-readdir\":\"2.2.0\",\"@types/tar-fs\":\"1.16.1\",\"jest-junit\":\"16.0.0\",\"typescript\":\"4.9.5\"},\"dependencies\":{\"@vercel/build-utils\":\"7.0.0\",\"@vercel/routing-utils\":\"3.0.0\",\"@zeit/fetch\":\"5.2.0\",\"async-retry\":\"1.2.3\",\"async-sema\":\"3.0.0\",\"fs-extra\":\"8.0.1\",\"ignore\":\"4.0.6\",\"minimatch\":\"5.0.1\",\"ms\":\"2.1.2\",\"node-fetch\":\"2.6.7\",\"querystring\":\"^0.2.0\",\"sleep-promise\":\"8.0.1\",\"tar-fs\":\"1.16.3\"}}");
+module.exports = JSON.parse("{\"name\":\"@vercel/client\",\"version\":\"13.0.1\",\"main\":\"dist/index.js\",\"typings\":\"dist/index.d.ts\",\"homepage\":\"https://vercel.com\",\"license\":\"Apache-2.0\",\"files\":[\"dist\"],\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/vercel/vercel.git\",\"directory\":\"packages/client\"},\"scripts\":{\"build\":\"tsc\",\"test-e2e\":\"pnpm test tests/create-deployment.test.ts tests/create-legacy-deployment.test.ts tests/paths.test.ts\",\"test\":\"jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail\",\"test-unit\":\"pnpm test tests/unit.*test.*\"},\"engines\":{\"node\":\">= 16\"},\"devDependencies\":{\"@types/async-retry\":\"1.4.5\",\"@types/fs-extra\":\"7.0.0\",\"@types/jest\":\"27.4.1\",\"@types/minimatch\":\"3.0.5\",\"@types/ms\":\"0.7.30\",\"@types/node\":\"14.18.33\",\"@types/node-fetch\":\"2.5.4\",\"@types/recursive-readdir\":\"2.2.0\",\"@types/tar-fs\":\"1.16.1\",\"jest-junit\":\"16.0.0\",\"typescript\":\"4.9.5\"},\"dependencies\":{\"@vercel/build-utils\":\"7.1.0\",\"@vercel/routing-utils\":\"3.0.0\",\"@zeit/fetch\":\"5.2.0\",\"async-retry\":\"1.2.3\",\"async-sema\":\"3.0.0\",\"fs-extra\":\"8.0.1\",\"ignore\":\"4.0.6\",\"minimatch\":\"5.0.1\",\"ms\":\"2.1.2\",\"node-fetch\":\"2.6.7\",\"querystring\":\"^0.2.0\",\"sleep-promise\":\"8.0.1\",\"tar-fs\":\"1.16.3\"}}");
 
 /***/ }),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "32.0.2",
+  "version": "32.1.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -22,16 +22,16 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.0.0",
+    "@vercel/build-utils": "7.1.0",
     "@vercel/go": "3.0.0",
     "@vercel/hydrogen": "1.0.0",
     "@vercel/next": "4.0.1",
-    "@vercel/node": "3.0.2",
+    "@vercel/node": "3.0.3",
     "@vercel/python": "4.0.0",
     "@vercel/redwood": "2.0.0",
-    "@vercel/remix-builder": "2.0.1",
+    "@vercel/remix-builder": "2.0.2",
     "@vercel/ruby": "2.0.0",
-    "@vercel/static-build": "2.0.2"
+    "@vercel/static-build": "2.0.3"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
@@ -55,6 +55,7 @@
     "@types/inquirer": "7.3.1",
     "@types/jest": "27.4.1",
     "@types/jest-expect-message": "1.0.3",
+    "@types/json-parse-better-errors": "1.0.0",
     "@types/load-json-file": "2.0.7",
     "@types/mime-types": "2.1.0",
     "@types/minimatch": "3.0.3",
@@ -76,8 +77,8 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.7",
-    "@vercel/client": "13.0.0",
+    "@vercel-internals/types": "1.0.8",
+    "@vercel/client": "13.0.1",
     "@vercel/error-utils": "2.0.1",
     "@vercel/frameworks": "2.0.1",
     "@vercel/fs-detectors": "5.0.1",
@@ -126,6 +127,7 @@
     "jaro-winkler": "0.2.8",
     "jest-junit": "16.0.0",
     "jest-matcher-utils": "29.3.1",
+    "json-parse-better-errors": "1.0.2",
     "jsonlines": "0.1.1",
     "line-async-iterator": "3.0.0",
     "load-json-file": "3.0.0",