fix: resolve next-server from next app directory and not from plugin (#2059)

Co-authored-by: Nick Taylor <nick@iamdeveloper.com>
Co-authored-by: LekoArts <lekoarts@gmail.com>

Author: 3 people

.eslintignore

@@ -8,4 +8,5 @@ packages/runtime/lib
 packages/runtime/dist-types
 jestSetup.js
 test/e2e
-test/fixtures/broken_next_config/next.config.js
+test/fixtures/broken_next_config/next.config.js
+test/integration/fixtures

.eslintrc.js

@@ -48,6 +48,9 @@ module.exports = {
         'n/no-unsupported-features/es-syntax': 'off',
         '@typescript-eslint/no-extra-semi': 'off',
         'n/no-missing-import': 'off',
+        // https://github.com/typescript-eslint/typescript-eslint/issues/2483
+        'no-shadow': 'off',
+        '@typescript-eslint/no-shadow': 'error',
       },
     },
     {
@@ -74,12 +77,18 @@ module.exports = {
         'unicorn/no-await-expression-member': 0,
         'import/no-anonymous-default-export': 0,
         'no-shadow': 0,
+        '@typescript-eslint/no-shadow': 0,
         '@typescript-eslint/no-var-requires': 0,
         'require-await': 0,
+        'n/no-sync': 0,
+        'promise/prefer-await-to-then': 0,
+        'no-async-promise-executor': 0,
+        'import/no-dynamic-require': 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,
+        'jest/no-standalone-expect': [2, { additionalTestBlockFunctions: ['beforeAll'] }],
       },
     },
   ],

.github/workflows/test-integration.yml

@@ -0,0 +1,29 @@
+name: Next Runtime Integration Tests
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Integration tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Installing with LTS Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18
+          check-latest: true
+      - name: Install netlify-cli and npm
+        run: npm install -g netlify-cli npm
+      - name: NPM Install
+        run: npm install
+      - name: Run integration tests
+        run: npm run test:integration

package-lock.json

@@ -24,6 +24,7 @@
     "test:next:all": "RUN_SKIPPED_TESTS=1 jest -c test/e2e/jest.config.all.js",
     "test:next:appdir": "jest -c test/e2e/jest.config.appdir.js",
     "test:jest": "jest",
+    "test:integration": "jest -c test/integration/jest.config.js",
     "playwright:install": "playwright install --with-deps chromium",
     "test:jest:update": "jest --updateSnapshot",
     "test:update": "run-s build build:demo test:jest:update"
@@ -79,6 +80,7 @@
     "jest-junit": "^14.0.1",
     "mock-fs": "^5.2.0",
     "netlify-plugin-cypress": "^2.2.1",
+    "node-fetch": "^2.6.6",
     "npm-run-all": "^4.1.5",
     "outdent": "^0.8.0",
     "pathe": "^1.1.0",
@@ -90,7 +92,8 @@
     "sass": "^1.49.0",
     "sharp": "^0.30.4",
     "tmp-promise": "^3.0.2",
-    "typescript": "^4.3.4"
+    "typescript": "^4.3.4",
+    "wait-on": "^7.0.1"
   },
   "dependencies": {
     "next": "^13.3.0"
@@ -106,6 +109,7 @@
       "**/test/**/*.spec.js",
       "**/test/**/*.spec.ts",
       "!**/test/e2e/**",
+      "!**/test/integration/**",
       "!**/test/fixtures/**",
       "!**/test/sample/**",
       "!**/test/templates/edge-shared/**"