Merge remote-tracking branch 'origin/main' into sk/update-deps

Signed-off-by: Sri Krishna Paritala <skrishna@buf.build>

package.json

@@ -45,6 +45,6 @@
     "eslint-plugin-n": "^17.15.1",
     "turbo": "^2.3.3",
     "prettier": "^3.4.2",
-    "typescript": "5.6.3"
+    "typescript": "5.7.2"
   }
 }

packages/connect-cloudflare/package.json

@@ -10,7 +10,7 @@
     "lint": "eslint --max-warnings 0 ."
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protobuf": "^2.2.0",
     "@connectrpc/connect": "2.0.0",
     "@connectrpc/connect-node": "2.0.0"
   },

packages/connect-conformance/bin/connectconformance.cjs

@@ -14,6 +14,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const { run } = require("../dist/cjs/src/conformance.js");
+const { run } = require("../dist/cjs/conformance.js");
+const { scripts } = require("../package.json");
 
-run();
+// Extract conformance runner version from the `generate` script
+const [, version] = /conformance:(v\d+\.\d+\.\d+)/.exec(scripts.generate) ?? [
+  "?",
+];
+
+run(version);

packages/connect-conformance/package.json

@@ -3,11 +3,11 @@
   "version": "2.0.0",
   "private": true,
   "type": "module",
-  "main": "./dist/cjs/src/index.js",
+  "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
-      "import": "./dist/esm/src/index.js",
-      "require": "./dist/cjs/src/index.js"
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
     }
   },
   "bin": {
@@ -19,15 +19,15 @@
     "prebuild": "rm -rf ./dist/*",
     "build": "npm run build:cjs && npm run build:esm",
     "postbuild": "connectconformance --version",
-    "build:cjs": "tsc --project tsconfig.json --module commonjs --verbatimModuleSyntax false --moduleResolution node10 --outDir ./dist/cjs && echo >./dist/cjs/src/package.json '{\"type\":\"commonjs\"}'",
+    "build:cjs": "tsc --project tsconfig.json --module commonjs --verbatimModuleSyntax false --moduleResolution node10 --outDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
     "build:esm": "tsc --project tsconfig.json --outDir ./dist/esm",
     "format": "prettier --write --ignore-unknown '.' '!dist' '!src/gen'",
     "license-header": "license-header",
     "lint": "eslint --max-warnings 0 .",
     "attw": "attw --pack"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protobuf": "^2.2.0",
     "@connectrpc/connect": "2.0.0",
     "fflate": "^0.8.2",
     "tar-stream": "^3.1.7"

packages/connect-conformance/src/conformance.ts

@@ -26,13 +26,8 @@ import * as tar from "tar-stream";
 import { pipeline } from "node:stream/promises";
 import { Readable } from "node:stream";
 import { execFileSync } from "node:child_process";
-import { scripts } from "../package.json";
 
-export async function run() {
-  // Extract conformance runner version from the `generate` script
-  const [, version] = /conformance:(v\d+\.\d+\.\d+)/.exec(scripts.generate) ?? [
-    "?",
-  ];
+export async function run(version: string) {
   const { archive, bin } = getArtifactNameForEnv(version);
   const tempDir = getTempDir(version);
   const binPath = joinPath(tempDir, bin);

packages/connect-express/package.json

@@ -41,7 +41,7 @@
   },
   "peerDependencies": {
     "express": "^4.18.2 || ^5.0.1",
-    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protobuf": "^2.2.0",
     "@connectrpc/connect": "2.0.0",
     "@connectrpc/connect-node": "2.0.0"
   }

packages/connect-fastify/package.json

@@ -36,7 +36,7 @@
     "@connectrpc/connect-node": "2.0.0"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protobuf": "^2.2.0",
     "fastify": "^4.22.1 || ^5.1.0",
     "@connectrpc/connect": "2.0.0",
     "@connectrpc/connect-node": "2.0.0"

packages/connect-next/package.json

@@ -30,7 +30,7 @@
     "node": ">=18.14.1"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protobuf": "^2.2.0",
     "next": "^13.2.4 || ^14.2.5 || ^15.0.2",
     "@connectrpc/connect": "2.0.0",
     "@connectrpc/connect-node": "2.0.0"

packages/connect-web-bench/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@bufbuild/buf": "^1.48.0",
-    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protobuf": "^2.2.0",
     "@bufbuild/protoc-gen-es": "^2.2.3",
     "@connectrpc/connect-web": "2.0.0",
     "@types/brotli": "^1.3.4",

packages/connect/package.json

@@ -64,7 +64,7 @@
     }
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "^2.2.3"
+    "@bufbuild/protobuf": "^2.2.0"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.48.0",

packages/example/package.json

@@ -15,7 +15,7 @@
     "node": ">=18.14.1"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protobuf": "^2.2.0",
     "@connectrpc/connect-node": "^2.0.0",
     "@connectrpc/connect-web": "^2.0.0",
     "tsx": "^4.19.2"
@@ -24,6 +24,6 @@
     "@bufbuild/buf": "^1.48.0",
     "@bufbuild/protoc-gen-es": "^2.2.3",
     "esbuild": "^0.19.8",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   }
 }

packages/typescript-compat/v5.6.x/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "ts5.6",
+  "private": true,
+  "scripts": {
+    "test": "node_modules/.bin/tsc --outDir dist"
+  },
+  "dependencies": {
+    "@connectrpc/connect-conformance": "*",
+    "@connectrpc/example": "*",
+    "@types/node": "22.10.1",
+    "typescript": "5.6.x"
+  }
+}

packages/typescript-compat/v5.6.x/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "include": [
+    "../../connect-conformance/src/index.ts",
+    "../../example/src/**/*.ts"
+  ],
+  // These are the default compiler options for TypeScript v5.4.x, created
+  // with `tsc --init` (except where noted in comments below)
+  "compilerOptions": {
+    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "module": "commonjs",                                /* Specify what module code is generated. */
+    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+    "strict": true,                                      /* Enable all strict type-checking options. */
+    // To guard against regression and ensure we are remaining backwards
+    // compatible, set the skipLibCheck flag to false explicitly.
+    "skipLibCheck": false,
+    // Certain errors are only triggered by actually emitting declaration files,
+    // see https://github.com/bufbuild/protobuf-es/pull/398
+    "declaration": true,
+    "declarationMap": true
+  }
+}