Merge branch 'canary' into feat-telemetry-type

vercel · Jul 24, 2023 · d20b62b · d20b62b
2 parents e8fbd44 + 5f16176
commit d20b62b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/docs/02-app/01-building-your-application/03-data-fetching/04-server-actions.mdx b/docs/02-app/01-building-your-application/03-data-fetching/04-server-actions.mdx
@@ -455,7 +455,7 @@ function ExampleServerComponent({ id }) {
 'use client'
 
 function ExampleClientComponent({ updateItem }) {
-  async function action(formData: FormData) {
+  async function action(formData) {
     await updateItem(formData)
   }
 
@@ -497,7 +497,7 @@ export const action = withValidate((data) => {
 
 ```js filename="lib/form-validation.js"
 export function withValidate(action) {
-  return async (formData: FormData) => {
+  return async (formData) => {
     'use server'
 
     const isValidData = verifyData(formData)

diff --git a/scripts/install-native.mjs b/scripts/install-native.mjs
@@ -56,7 +56,10 @@ import fs from 'fs-extra'
       path.join(tmpdir, 'package.json'),
       JSON.stringify(pkgJson)
     )
-    let { stdout } = await execa('yarn', ['--force'], { cwd: tmpdir })
+    await fs.writeFile(path.join(tmpdir, '.npmrc'), 'node-linker=hoisted')
+    let { stdout } = await execa('pnpm', ['install', '--force'], {
+      cwd: tmpdir,
+    })
     console.log(stdout)
     let pkgs = await fs.readdir(path.join(tmpdir, 'node_modules/@next'))
     await fs.ensureDir(path.join(cwd, 'node_modules/@next'))