Merge branch 'main' into opt-in

Author: kodiakhq[bot]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -49,6 +49,13 @@ body:
     validations:
       required: true
 
+  - type: checkboxes
+    id: more-nextjs-info
+    attributes:
+      label: Is your issue related to the `app` directory (beta)?
+      options:
+        - label: Yes, I am using the `app` directory
+
   - type: checkboxes
     id: more-info
     attributes:

package-lock.json

@@ -52,7 +52,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.5.8",
+    "@netlify/build": "^29.6.0",
     "@netlify/eslint-config-node": "^7.0.1",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",

package.json

@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.5.8",
+    "@netlify/build": "^29.6.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

packages/runtime/package.json

@@ -15,7 +15,7 @@ const config = {
     '\\.[jt]sx?$': 'babel-jest',
   },
   verbose: true,
-  testTimeout: 300000,
+  testTimeout: 600000, // ten minutes
   moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx'],
   moduleNameMapper: {
     'e2e-utils': '<rootDir>/next-test-lib/e2e-utils.ts',