Merge branch 'main' into rs/shim-require-buffer

Author: kodiakhq[bot]

.eslintignore

@@ -1,10 +1,11 @@
 .next
 node_modules
-test
 lib
 demos
 packages/runtime/src/templates/edge
 packages/runtime/src/templates/edge-shared
 packages/runtime/lib
 packages/runtime/dist-types
-jestSetup.js
+jestSetup.js
+test/e2e
+test/fixtures/broken_next_config/next.config.js

.eslintrc.js

@@ -59,5 +59,28 @@ module.exports = {
         'promise/catch-or-return': 0,
       },
     },
+    {
+      files: ['test/**', 'packages/**/test/**'],
+      plugins: ['jest'],
+      extends: ['plugin:jest/recommended'],
+      rules: {
+        // Disable global rules
+        'max-nested-callbacks': 'off',
+        '@typescript-eslint/no-empty-function': 0,
+        'max-lines-per-function': 0,
+        'unicorn/no-empty-file': 0,
+        'prefer-destructuring': 0,
+        '@typescript-eslint/no-unused-vars': 0,
+        'unicorn/no-await-expression-member': 0,
+        'import/no-anonymous-default-export': 0,
+        'no-shadow': 0,
+        '@typescript-eslint/no-var-requires': 0,
+        'require-await': 0,
+        // esling-plugin-jest specific rules
+        'jest/consistent-test-it': ['error', { fn: 'it', withinDescribe: 'it' }],
+        'jest/no-disabled-tests': 0,
+        'jest/no-conditional-expect': 0,
+      },
+    },
   ],
 }

.github/workflows/cypress-canary.yml

@@ -13,10 +13,6 @@ jobs:
   cypress:
     name: Cypress
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        containers: [1, 2, 3, 4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -59,9 +55,7 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
-          parallel: true
           config-file: cypress/config/canary.config.ts
           group: 'Next Runtime - Demo Canary'
           spec: cypress/e2e/canary/*

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

@@ -13,10 +13,6 @@ jobs:
   cypress:
     name: Cypress
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        containers: [1, 2, 3, 4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -59,9 +55,7 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
-          parallel: true
           config-file: cypress/config/nx-demo.config.ts
           group: 'Next Runtime - Demo NX'
           spec: cypress/e2e/nx/*

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

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4]
+        containers: [1, 2]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -59,7 +59,6 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
           parallel: true
           config-file: cypress/config/static-root.config.ts

.github/workflows/cypress-demo.yml

@@ -59,7 +59,6 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
           parallel: true
           config-file: cypress/config/ci.config.ts

.github/workflows/cypress-middleware.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4]
+        containers: [1, 2]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -59,7 +59,6 @@ jobs:
         uses: cypress-io/github-action@v5
         with:
           browser: chrome
-          headless: true
           record: true
           parallel: true
           config-file: cypress/config/middleware.config.ts

.prettierignore

@@ -21,6 +21,8 @@ node_modules
 lib
 tsconfig.json
 demos/nx-next-monorepo-demo
+test/fixtures/broken_next_config/next.config.js
+test/e2e
 
 **/CHANGELOG.md
 packages/runtime/lib

cypress/e2e/default/appdir.cy.ts

@@ -25,7 +25,7 @@ describe('appDir', () => {
       },
       followRedirect: false,
     }).then((response) => {
-      expect(response.headers).to.have.property('content-type', 'application/octet-stream')
+      expect(response.headers).to.have.property('content-type', 'text/x-component')
     })
   })
 
@@ -58,7 +58,7 @@ describe('appDir', () => {
       },
       followRedirect: false,
     }).then((response) => {
-      expect(response.headers).to.have.property('content-type', 'application/octet-stream')
+      expect(response.headers).to.have.property('content-type', 'text/x-component')
     })
   })
 
@@ -70,7 +70,7 @@ describe('appDir', () => {
       },
       followRedirect: false,
     }).then((response) => {
-      expect(response.headers).to.have.property('content-type', 'application/octet-stream')
+      expect(response.headers).to.have.property('content-type', 'text/x-component')
     })
   })
 

demos/base-path/package.json

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