Merge remote-tracking branch 'origin/main' into test/function-304

pieh · pieh · commit e458ad396edb · 2025-07-22T09:58:06.000+02:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,4 +1,5 @@
 * @netlify/team-runtime
 /packages/dev/* @netlify/ecosystem-pod-frameworks
 /packages/dev-utils/* @netlify/ecosystem-pod-frameworks
-/packages/vite-plugin/* @netlify/ecosystem-pod-frameworks
+/packages/nuxt-module/* @netlify/ecosystem-pod-frameworks
+/packages/vite-plugin/* @netlify/ecosystem-pod-frameworks
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,18 +1,18 @@
 {
   "packages/blobs": "10.0.6",
   "packages/cache": "3.0.7",
-  "packages/dev": "4.4.4",
+  "packages/dev": "4.4.5",
   "packages/dev-utils": "4.0.0",
   "packages/edge-functions": "2.16.1",
-  "packages/functions": "4.1.12",
+  "packages/functions": "4.1.13",
   "packages/headers": "2.0.6",
   "packages/images": "1.2.2",
-  "packages/nuxt-module": "0.1.4",
+  "packages/nuxt-module": "0.1.5",
   "packages/otel": "3.1.0",
   "packages/redirects": "3.0.6",
   "packages/runtime": "4.0.10",
   "packages/runtime-utils": "2.1.0",
   "packages/static": "3.0.6",
   "packages/types": "2.0.2",
-  "packages/vite-plugin": "2.4.4"
+  "packages/vite-plugin": "2.4.5"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/dev/CHANGELOG.md b/packages/dev/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [4.4.5](https://github.com/netlify/primitives/compare/dev-v4.4.4...dev-v4.4.5) (2025-07-21)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @netlify/functions bumped from 4.1.12 to 4.1.13
+
 ## [4.4.4](https://github.com/netlify/primitives/compare/dev-v4.4.3...dev-v4.4.4) (2025-07-21)
 
 
diff --git a/packages/dev/package.json b/packages/dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netlify/dev",
-  "version": "4.4.4",
+  "version": "4.4.5",
   "description": "Emulation of the Netlify environment for local development",
   "type": "module",
   "engines": {
@@ -56,7 +56,7 @@
     "@netlify/config": "^23.2.0",
     "@netlify/dev-utils": "4.0.0",
     "@netlify/edge-functions": "2.16.1",
-    "@netlify/functions": "4.1.12",
+    "@netlify/functions": "4.1.13",
     "@netlify/headers": "2.0.6",
     "@netlify/images": "1.2.2",
     "@netlify/redirects": "3.0.6",
diff --git a/packages/functions/CHANGELOG.md b/packages/functions/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.1.13](https://github.com/netlify/primitives/compare/functions-v4.1.12...functions-v4.1.13) (2025-07-21)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @netlify/zip-it-and-ship-it to v14 ([#334](https://github.com/netlify/primitives/issues/334)) ([fe935fe](https://github.com/netlify/primitives/commit/fe935fe999b18440b3c051b68b3cf4867979d2c0))
+
 ## [4.1.12](https://github.com/netlify/primitives/compare/functions-v4.1.11...functions-v4.1.12) (2025-07-17)
 
 
diff --git a/packages/functions/package.json b/packages/functions/package.json
@@ -31,7 +31,7 @@
       }
     }
   },
-  "version": "4.1.12",
+  "version": "4.1.13",
   "description": "TypeScript utilities for interacting with Netlify Functions",
   "files": [
     "dist/**/*.js",
@@ -82,7 +82,7 @@
   "dependencies": {
     "@netlify/blobs": "10.0.6",
     "@netlify/dev-utils": "4.0.0",
-    "@netlify/serverless-functions-api": "2.1.3",
+    "@netlify/types": "2.0.2",
     "@netlify/zip-it-and-ship-it": "^14.1.0",
     "cron-parser": "^4.9.0",
     "decache": "^4.6.2",
diff --git a/packages/functions/src/function/v2.ts b/packages/functions/src/function/v2.ts
@@ -1,4 +1,4 @@
-export type { Context } from '@netlify/serverless-functions-api'
+export type { Context } from '@netlify/types'
 
 type Path = `/${string}`
 type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
diff --git a/packages/nuxt-module/CHANGELOG.md b/packages/nuxt-module/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.1.5](https://github.com/netlify/primitives/compare/nuxt-v0.1.4...nuxt-v0.1.5) (2025-07-21)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @netlify/dev bumped from ^4.4.4 to ^4.4.5
+
 ## [0.1.4](https://github.com/netlify/primitives/compare/nuxt-v0.1.3...nuxt-v0.1.4) (2025-07-21)
 
 
diff --git a/packages/nuxt-module/package.json b/packages/nuxt-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netlify/nuxt",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Nuxt module providing local emulation of the Netlify environment",
   "type": "module",
   "engines": {
@@ -50,7 +50,7 @@
   },
   "author": "Netlify Inc.",
   "dependencies": {
-    "@netlify/dev": "^4.4.4",
+    "@netlify/dev": "^4.4.5",
     "@netlify/dev-utils": "^4.0.0",
     "@nuxt/kit": "^4.0.0",
     "h3": "^1.15.3"
diff --git a/packages/nuxt-module/test/basic.test.ts b/packages/nuxt-module/test/basic.test.ts
@@ -7,6 +7,16 @@ describe('ssr', async () => {
   await setup({
     rootDir: fileURLToPath(new URL('./fixtures/basic', import.meta.url)),
     dev: true,
+    // Disable WebSocket server and HMR to prevent port conflicts in parallel testing
+    // See: https://github.com/vitejs/vite/pull/16219
+    nuxtConfig: {
+      vite: {
+        server: {
+          ws: false,
+          hmr: false,
+        },
+      },
+    },
   })
 
   it('renders the index page', async () => {
diff --git a/packages/nuxt-module/test/functions.test.ts b/packages/nuxt-module/test/functions.test.ts
@@ -7,6 +7,16 @@ describe('with user Netlify Functions and Edge Functions', async () => {
   await setup({
     rootDir: fileURLToPath(new URL('./fixtures/with-functions', import.meta.url)),
     dev: true,
+    // Disable WebSocket server and HMR to prevent port conflicts in parallel testing
+    // See: https://github.com/vitejs/vite/pull/16219
+    nuxtConfig: {
+      vite: {
+        server: {
+          ws: false,
+          hmr: false,
+        },
+      },
+    },
   })
 
   it('renders the index page', async () => {
diff --git a/packages/vite-plugin/CHANGELOG.md b/packages/vite-plugin/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [2.4.5](https://github.com/netlify/primitives/compare/vite-plugin-v2.4.4...vite-plugin-v2.4.5) (2025-07-21)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @netlify/dev bumped from 4.4.4 to 4.4.5
+
 ## [2.4.4](https://github.com/netlify/primitives/compare/vite-plugin-v2.4.3...vite-plugin-v2.4.4) (2025-07-21)
 
 
diff --git a/packages/vite-plugin/package.json b/packages/vite-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netlify/vite-plugin",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "Vite plugin with a local emulation of the Netlify environment",
   "type": "module",
   "engines": {
@@ -40,7 +40,7 @@
     "vitest": "^3.0.0"
   },
   "dependencies": {
-    "@netlify/dev": "4.4.4",
+    "@netlify/dev": "4.4.5",
     "@netlify/dev-utils": "^4.0.0",
     "chalk": "^5.4.1"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export type { Context } from '@netlify/serverless-functions-api'`
	`1`	`+export type { Context } from '@netlify/types'`
`2`	`2`
`3`	`3`	type Path = `/${string}`
`4`	`4`	`type HTTPMethod = 'GET' \| 'POST' \| 'PUT' \| 'PATCH' \| 'DELETE' \| 'OPTIONS'`