Merge branch 'canary' into reafactor/misc-export-typescript-updates

Author: kodiakhq[bot]

scripts/code-freeze.js

@@ -66,9 +66,9 @@ async function getCurrentRules() {
       required_approving_review_count:
         data.required_pull_request_reviews.required_approving_review_count,
     },
-    restrictions: data.restrictions || {
-      users: [],
-      teams: [],
+    restrictions: {
+      users: data.restrictions.users?.map((user) => user.login) || [],
+      teams: data.restrictions.teams?.map((team) => team.slug) || [],
       apps: [],
     },
   }

test/e2e/app-dir/actions/app-action-form-state.test.ts

@@ -53,5 +53,21 @@ createNextDescribe(
         return browser.elementByCss('#hydrated').text()
       }, 'hydrated')
     })
+
+    it('should send the action to the provided permalink with form state when JS disabled', async () => {
+      const browser = await next.browser('/client/form-state/page-2', {
+        disableJavaScript: true,
+      })
+
+      // Simulate a progressively enhanced form request
+      await browser.eval(
+        `document.getElementById('name-input').value = 'test-permalink'`
+      )
+      await browser.eval(`document.getElementById('form-state-form').submit()`)
+
+      await check(() => {
+        return browser.elementByCss('#form-state').text()
+      }, 'initial-state:test-permalink')
+    })
   }
 )

test/e2e/app-dir/actions/app/client/form-state/page-2/page.js

@@ -0,0 +1,31 @@
+'use client'
+
+import { experimental_useFormState } from 'react-dom'
+import { appendName } from '../actions'
+import { useEffect, useState } from 'react'
+
+export default function Page() {
+  const [state, appendNameFormAction] = experimental_useFormState(
+    appendName,
+    'initial-state',
+    '/client/form-state'
+  )
+
+  const [hydrated, setHydrated] = useState(false)
+  useEffect(() => {
+    setHydrated(true)
+  }, [])
+
+  return (
+    <>
+      <form id="form-state-form" action={appendNameFormAction}>
+        <p id="form-state">{state}</p>
+        <input id="name-input" name="name" />
+        <button id="submit-form" type="submit">
+          log
+        </button>
+      </form>
+      {hydrated ? <p id="hydrated">hydrated</p> : null}
+    </>
+  )
+}

test/e2e/app-dir/actions/app/client/form-state/page.js

@@ -7,7 +7,8 @@ import { useEffect, useState } from 'react'
 export default function Page() {
   const [state, appendNameFormAction] = experimental_useFormState(
     appendName,
-    'initial-state'
+    'initial-state',
+    '/client/form-state'
   )
 
   const [hydrated, setHydrated] = useState(false)

test/e2e/app-dir/set-cookies/app/api/app/edge/route.js

@@ -1,6 +1,6 @@
 export const runtime = 'edge'
 
-import cookies from '../../../../cookies'
+import cookies from '../../../../cookies.mjs'
 
 export async function GET() {
   const headers = new Headers()

test/e2e/app-dir/set-cookies/app/api/app/experimental-edge/route.js

@@ -1,6 +1,6 @@
 export const runtime = 'experimental-edge'
 
-import cookies from '../../../../cookies'
+import cookies from '../../../../cookies.mjs'
 
 export async function GET() {
   const headers = new Headers()

test/e2e/app-dir/set-cookies/app/api/app/node/route.js

@@ -1,4 +1,4 @@
-import cookies from '../../../../cookies'
+import cookies from '../../../../cookies.mjs'
 
 export async function GET() {
   const headers = new Headers()

test/e2e/app-dir/set-cookies/pages/api/pages/edge.js

@@ -1,6 +1,6 @@
 export const runtime = 'edge'
 
-import cookies from '../../../cookies'
+import cookies from '../../../cookies.mjs'
 
 export default async function handler() {
   const headers = new Headers()

test/e2e/app-dir/set-cookies/pages/api/pages/experimental-edge.js

@@ -1,4 +1,4 @@
-import cookies from '../../../cookies'
+import cookies from '../../../cookies.mjs'
 
 export const runtime = 'edge'
 

test/e2e/app-dir/set-cookies/pages/api/pages/node.js

@@ -1,4 +1,4 @@
-import cookies from '../../../cookies'
+import cookies from '../../../cookies.mjs'
 
 export default async function handler(_req, res) {
   res.appendHeader('set-cookie', cookies)