fix: support appDir

.eslintrc.js

@@ -29,6 +29,7 @@ module.exports = {
     'unicorn/filename-case': 0,
     'unicorn/no-array-push-push': 0,
     'unicorn/numeric-separators-style': 0,
+    'max-lines': 0,
   },
   parserOptions: {
     sourceType: 'module',

.github/workflows/cypress-canary.yml

@@ -1,7 +1,7 @@
 name: Run e2e (canary demo)
 on:
   pull_request:
-    types: [opened, labeled, unlabeled, synchronize]
+    types: [opened, synchronize]
   push:
     branches:
       - main

.github/workflows/cypress-demo-nx.yml

@@ -1,7 +1,7 @@
 name: Run e2e (Nx monorepo)
 on:
   pull_request:
-    types: [opened, labeled, unlabeled, synchronize]
+    types: [opened, synchronize]
   push:
     branches:
       - main

.github/workflows/cypress-demo-static.yml

@@ -1,7 +1,7 @@
 name: Run e2e (static root)
 on:
   pull_request:
-    types: [opened, labeled, unlabeled, synchronize]
+    types: [opened, synchronize]
   push:
     branches:
       - main

.github/workflows/cypress-demo.yml

@@ -1,7 +1,7 @@
 name: Run e2e (default demo)
 on:
   pull_request:
-    types: [opened, labeled, unlabeled, synchronize]
+    types: [opened, synchronize]
   push:
     branches:
       - main

.github/workflows/cypress-middleware.yml

@@ -1,7 +1,7 @@
 name: Run e2e (middleware demo)
 on:
   pull_request:
-    types: [opened, labeled, unlabeled, synchronize]
+    types: [opened, synchronize]
   push:
     branches:
       - main

.github/workflows/e2e-appdir.yml

@@ -0,0 +1,71 @@
+name: Next.js appdir test suite
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+  push:
+    branches: [main]
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      test-files: ${{ steps['set-test-files'].outputs['test-files'] }}
+    steps:
+      - uses: actions/checkout@v3
+      - run: npm install
+      - id: set-test-files
+        name: Get test files
+        # Extracts the list of all test files as JSON and trims to be relative to the test dir to be easier to read
+        run:
+          echo "test-files=$(npx jest -c test/e2e/jest.config.appdir.js --listTests --json | jq -cM 'map(.[env.PWD |
+          length + 10:])')" >> $GITHUB_OUTPUT
+          # echo "test-files=$(npx jest -c test/e2e/jest.config.all.js --listTests --json | jq -cM 'map(.[env.PWD | length
+          # + 10:])')" >> $GITHUB_OUTPUT
+
+  test:
+    runs-on: ubuntu-latest
+    name: test (${{ matrix.test-file }})
+    needs:
+      - setup
+    strategy:
+      fail-fast: false
+      matrix:
+        # Creates a job for each chunk ID. This will be assigned one or more test files to run
+        test-file: ${{ fromJson(needs.setup.outputs['test-files']) }}
+    steps:
+      - uses: actions/checkout@v3
+      - run: npm install
+      - name: Run tests
+        run: npx jest --reporters=jest-junit --reporters=default -c test/e2e/jest.config.all.js ${{ matrix.test-file }}
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_BOT_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: 1d5a5c76-d445-4ae5-b694-b0d3f2e2c395
+          NEXT_TEST_VERSION: canary
+      - uses: actions/upload-artifact@v3
+        if: ${{ always() }}
+        name: Upload test results
+        with:
+          name: test-results
+          path: reports/jest-*.xml
+  report:
+    name: Report appDir e2e test results
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs:
+      - test
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
+        with:
+          path: reports
+      - name: Combine reports
+        # The test reporter can handle multiple files, but these have random filenames so the output is better when combined
+        run: npx junit-report-merger test-results.xml reports/**/*.xml
+      - uses: phoenix-actions/test-reporting@v10
+        with:
+          name: Jest Tests
+          output-to: 'step-summary'
+          path: 'test-results.xml'
+          max-annotations: 49
+          reporter: jest-junit

.github/workflows/e2e-next.yml

@@ -2,6 +2,7 @@ name: Next.js e2e test suite
 
 on:
   pull_request:
+    types: [opened, synchronize]
   push:
     branches: [main]
 
@@ -41,17 +42,6 @@ jobs:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_BOT_AUTH_TOKEN }}
           NETLIFY_SITE_ID: 1d5a5c76-d445-4ae5-b694-b0d3f2e2c395
           # RUN_SKIPPED_TESTS: true
-      # - uses: phoenix-actions/test-reporting@v10
-      #   if: ${{ always() }}
-      #   name: Report Test Results
-      #   # Generates annotations for the test failures
-      #   id: test-report
-      #   with:
-      #     name: E2E Test chunk ${{ matrix.chunk }}
-      #     path: 'reports/**/*.xml' # Path to test results (inside artifact .zip)
-      #     output-to: 'checks'
-      #     max-annotations: 49 # Maximum number of annotations to be created
-      #     reporter: jest-junit # Format of test results
 
       - uses: actions/upload-artifact@v3
         # upload test results
@@ -61,6 +51,7 @@ jobs:
           name: test-results
           path: reports/jest-*.xml
   report:
+    name: Report Next.js e2e test results
     runs-on: ubuntu-latest
     if: ${{ always() }}
     needs:

cypress/integration/nx/general.spec.ts

@@ -10,10 +10,10 @@ describe('Default site', () => {
     cy.url().should('eq', `${Cypress.config().baseUrl}/`)
   })
 
-  it('serves generated public files', async () => {
-    cy.request('service-worker.js').then((res) => {
+  it('serves generated public files', () => {
+    cy.request('favicon.ico').then((res) => {
       expect(res.status).to.eq(200)
-      expect(res.headers['content-type']).to.match(/javascript/)
+      expect(res.headers['content-type']).to.match(/image/)
     })
   })
 

demos/base-path/package.json

@@ -14,7 +14,7 @@
     "typescript": "^4.6.3"
   },
   "dependencies": {
-    "next": "^13.0.3"
+    "next": "^13.0.6"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

demos/custom-routes/package.json

@@ -15,7 +15,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "next": "^13.0.3"
+    "next": "^13.0.6"
   },
   "scripts": {
     "build": "next build",

demos/default/package.json

@@ -22,7 +22,7 @@
     "@reach/dialog": "^0.16.2",
     "@reach/visually-hidden": "^0.16.0",
     "@vercel/og": "^0.0.21",
-    "next": "^13.0.3",
+    "next": "^13.0.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

demos/middleware/package.json

@@ -12,7 +12,7 @@
     "@netlify/next": "*",
     "@netlify/plugin-nextjs": "*",
     "isomorphic-unfetch": "^3.1.0",
-    "next": "^13.0.3",
+    "next": "^13.0.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

demos/next-auth/package.json

@@ -23,7 +23,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "next": "^13.0.3",
+    "next": "^13.0.6",
     "next-auth": "^4.15.0",
     "nodemailer": "^6.6.3",
     "react": "^18.2.0",

demos/next-export/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "next": "^13.0.3"
+    "next": "^13.0.6"
   },
   "devDependencies": {
     "@netlify/next": "*",

demos/next-i18next/package.json

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "^13.0.3",
+    "next": "^13.0.6",
     "next-i18next": "^11.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"