Merge branch 'main' of github.com:vercel/vercel into update/vc-build-…

…repo-link
vercel · Jun 7, 2023 · 22e1c7c · 22e1c7c
2 parents f5c1e65 + 709c950
commit 22e1c7c
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 16 deletions.
diff --git a/.changeset/chatty-flowers-sniff.md b/.changeset/chatty-flowers-sniff.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml
@@ -22,7 +22,7 @@ jobs:
   enforce-changeset:
     name: Enforce Changeset
     runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && github.event.pull_request.title != 'Version Packages'
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # vercel
 
+## 30.2.1
+
+### Patch Changes
+
+- Updated dependencies [[`a04bf557f`](https://github.com/vercel/vercel/commit/a04bf557fc6e1080a117428977d0993dec78b004)]:
+  - @vercel/node@2.15.1
+  - @vercel/static-build@1.3.36
+
 ## 30.2.0
 
 ### Minor Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "30.2.0",
+  "version": "30.2.1",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -36,12 +36,12 @@
     "@vercel/go": "2.5.1",
     "@vercel/hydrogen": "0.0.64",
     "@vercel/next": "3.8.6",
-    "@vercel/node": "2.15.0",
+    "@vercel/node": "2.15.1",
     "@vercel/python": "3.1.60",
     "@vercel/redwood": "1.1.15",
     "@vercel/remix-builder": "1.8.13",
     "@vercel/ruby": "1.3.76",
-    "@vercel/static-build": "1.3.35"
+    "@vercel/static-build": "1.3.36"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",

diff --git a/packages/cli/src/util/link/repo.ts b/packages/cli/src/util/link/repo.ts
@@ -195,7 +195,10 @@ export async function ensureRepoLink(
 
     await writeFile(
       join(rootPath, VERCEL_DIR, VERCEL_DIR_README),
-      await readFile(join(__dirname, 'VERCEL_DIR_README.txt'), 'utf8')
+      await readFile(
+        join(__dirname, '..', 'projects', 'VERCEL_DIR_README.txt'),
+        'utf8'
+      )
     );
 
     // update .gitignore

diff --git a/packages/gatsby-plugin-vercel-builder/CHANGELOG.md b/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @vercel/gatsby-plugin-vercel-builder
 
+## 1.3.9
+
+### Patch Changes
+
+- Updated dependencies [[`a04bf557f`](https://github.com/vercel/vercel/commit/a04bf557fc6e1080a117428977d0993dec78b004)]:
+  - @vercel/node@2.15.1
+
 ## 1.3.8
 
 ### Patch Changes

diff --git a/packages/gatsby-plugin-vercel-builder/package.json b/packages/gatsby-plugin-vercel-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@sinclair/typebox": "0.25.24",
     "@vercel/build-utils": "6.7.5",
-    "@vercel/node": "2.15.0",
+    "@vercel/node": "2.15.1",
     "@vercel/routing-utils": "2.2.1",
     "esbuild": "0.14.47",
     "etag": "1.8.1",

diff --git a/packages/node/CHANGELOG.md b/packages/node/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @vercel/node
 
+## 2.15.1
+
+### Patch Changes
+
+- handle undefined content type in `vc dev` ([#10077](https://github.com/vercel/vercel/pull/10077))
+
 ## 2.15.0
 
 ### Minor Changes

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",

diff --git a/packages/node/src/serverless-functions/helpers.ts b/packages/node/src/serverless-functions/helpers.ts
@@ -27,10 +27,19 @@ class ApiError extends Error {
   }
 }
 
+function normalizeContentType(contentType: string | undefined) {
+  if (!contentType) {
+    return 'text/plain';
+  }
+
+  const { parse: parseContentType } = require('content-type');
+  const { type } = parseContentType(contentType);
+  return type;
+}
+
 function getBodyParser(body: Buffer, contentType: string | undefined) {
   return function parseBody(): VercelRequestBody {
-    const { parse: parseContentType } = require('content-type');
-    const { type } = parseContentType(contentType);
+    const type = normalizeContentType(contentType);
 
     if (type === 'application/json') {
       try {

diff --git a/packages/static-build/CHANGELOG.md b/packages/static-build/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @vercel/static-build
 
+## 1.3.36
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @vercel/gatsby-plugin-vercel-builder@1.3.9
+
 ## 1.3.35
 
 ### Patch Changes

diff --git a/packages/static-build/package.json b/packages/static-build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "1.3.35",
+  "version": "1.3.36",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.10",
-    "@vercel/gatsby-plugin-vercel-builder": "1.3.8"
+    "@vercel/gatsby-plugin-vercel-builder": "1.3.9"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml