Merge branch 'main' into tn/cypress12

Author: taty2010

.github/workflows/add-to-project.yml

@@ -14,7 +14,7 @@ jobs:
           app_id: ${{ secrets.TOKENS_APP_ID }}
           private_key: ${{ secrets.TOKENS_PRIVATE_KEY }}
       - name: Add issue to Project
-        uses: actions/add-to-project@v0.4.1
+        uses: actions/add-to-project@v0.5.0
         with:
           project-url: https://github.com/orgs/netlify/projects/199
           github-token: ${{ steps.generate_token.outputs.token }}

demos/nx-next-monorepo-demo/package-lock.json

@@ -30,7 +30,7 @@
     "@testing-library/react": "13.4.0",
     "@types/jest": "28.1.8",
     "@types/node": "16.11.7",
-    "@types/react": "18.0.35",
+    "@types/react": "18.0.38",
     "@types/react-dom": "18.0.11",
     "@typescript-eslint/eslint-plugin": "^5.36.1",
     "@typescript-eslint/parser": "^5.36.1",

demos/nx-next-monorepo-demo/package.json

@@ -21,7 +21,7 @@
     "next-transpile-modules": "9.0.0",
     "tsconfig": "*",
     "@types/node": "^17.0.12",
-    "@types/react": "18.0.35",
+    "@types/react": "18.0.38",
     "typescript": "^4.5.3"
   }
 }

demos/turborepo-next-monorepo-demo/apps/docs/package.json

@@ -21,7 +21,7 @@
     "next-transpile-modules": "9.0.0",
     "tsconfig": "*",
     "@types/node": "^17.0.12",
-    "@types/react": "18.0.35",
+    "@types/react": "18.0.38",
     "typescript": "^4.5.3"
   }
 }

demos/turborepo-next-monorepo-demo/apps/web/package.json

@@ -85,7 +85,7 @@ export const moveStaticPages = async ({
   basePath?: string
 }): Promise<void> => {
   console.log('Moving static page files to serve from CDN...')
-  const outputDir = join(netlifyConfig.build.publish, target === 'server' ? 'server' : 'serverless')
+  const outputDir = join(netlifyConfig.build.publish, target === 'serverless' ? 'serverless' : 'server')
   const buildId = readFileSync(join(netlifyConfig.build.publish, 'BUILD_ID'), 'utf8').trim()
   const dataDir = join('_next', 'data', buildId)
   await ensureDir(join(netlifyConfig.build.publish, dataDir))
@@ -134,6 +134,7 @@ export const moveStaticPages = async ({
     const dest = join(netlifyConfig.build.publish, targetPath)
 
     try {
+      console.log(`Moving ${source} to ${dest}`)
       await move(source, dest)
     } catch (error) {
       console.warn('Error moving file', source, error)