Merge branch 'main' into tn/data-redirect

Author: taty2010

.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:

test/e2e/jest.config.js

@@ -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',