Merge branch 'main' into renovate/node-20.x

vercel · Nov 8, 2023 · 01e3d58 · 01e3d58
2 parents c48ed41 + 2175fe5
commit 01e3d58
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 14 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+[*]
+charset = utf-8
+insert_final_newline = true
+end_of_line = lf
+indent_style = space
+indent_size = 2
+max_line_length = 80
diff --git a/package.json b/package.json
@@ -46,4 +46,4 @@
   "engines": {
     "node": ">=18"
   }
-}
+}
diff --git a/packages/blob/package.json b/packages/blob/package.json
@@ -74,4 +74,4 @@
   "engines": {
     "node": ">=16.14"
   }
-}
+}
diff --git a/packages/edge-config-fs/package.json b/packages/edge-config-fs/package.json
@@ -26,4 +26,4 @@
     }
   },
   "types": "./types.d.ts"
-}
+}
diff --git a/packages/edge-config/package.json b/packages/edge-config/package.json
@@ -63,4 +63,4 @@
   "engines": {
     "node": ">=14.6"
   }
-}
+}
diff --git a/packages/kv/package.json b/packages/kv/package.json
@@ -65,4 +65,4 @@
   "engines": {
     "node": ">=14.6"
   }
-}
+}
diff --git a/packages/postgres-kysely/package.json b/packages/postgres-kysely/package.json
@@ -72,4 +72,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}
diff --git a/packages/postgres/package.json b/packages/postgres/package.json
@@ -68,4 +68,4 @@
   "engines": {
     "node": ">=14.6"
   }
-}
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/next/package.json b/test/next/package.json
@@ -42,4 +42,4 @@
     "@types/json-stable-stringify": "1.0.35",
     "json-stable-stringify": "1.0.2"
   }
-}
+}
diff --git a/tooling/eslint-config-custom/package.json b/tooling/eslint-config-custom/package.json
@@ -7,11 +7,10 @@
   "dependencies": {
     "@vercel/style-guide": "5.0.1",
     "eslint": "8.52.0",
-    "eslint-config-prettier": "^9.0.0",
     "eslint-config-turbo": "1.10.16",
     "typescript": "5.2.2"
   },
   "publishConfig": {
     "access": "public"
   }
-}
+}
diff --git a/tooling/tsconfig/package.json b/tooling/tsconfig/package.json
@@ -11,4 +11,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,4 +46,4 @@ @@
       "engines": {
         "node": ">=18"
       }
-    }
+    }