From 2e6bc8eba4aa6ff8e1668068dda217477efaaf82 Mon Sep 17 00:00:00 2001
From: Kristoffer K <merceyz@users.noreply.github.com>
Date: Mon, 17 Aug 2020 19:39:57 +0200
Subject: [PATCH] ci: add pnp test (#16255)

---
 .github/workflows/build_test_deploy.yml | 21 ++++++++++++++++++++-
 .gitignore                              |  1 +
 examples/with-typescript/package.json   |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
index 51d848de12..3d5dce3de6 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build_test_deploy.yml
@@ -70,10 +70,29 @@ jobs:
 
       - run: node run-tests.js --timings -g ${{ matrix.group }}/6 -c 3
 
+  testYarnPnP:
+    runs-on: ubuntu-latest
+    env:
+      NODE_OPTIONS: '--unhandled-rejections=strict'
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: yarn install --frozen-lockfile --check-files
+
+      - run: |
+          mkdir -p ./e2e-tests/next-pnp
+          cp -r ./examples/with-typescript/. ./e2e-tests/next-pnp
+          cd ./e2e-tests/next-pnp
+          touch yarn.lock
+          yarn set version berry
+          yarn config set pnpFallbackMode none
+          yarn link --all --private ../..
+          yarn build
+
   testsPass:
     name: thank you, next
     runs-on: ubuntu-latest
-    needs: [lint, checkPrecompiled, testAll]
+    needs: [lint, checkPrecompiled, testAll, testYarnPnP]
     steps:
       - run: exit 0
 
diff --git a/.gitignore b/.gitignore
index faedbe2adb..df46d328e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ coverage
 test/**/out*
 test/**/next-env.d.ts
 .DS_Store
+/e2e-tests
 
 # Editors
 **/.idea
diff --git a/examples/with-typescript/package.json b/examples/with-typescript/package.json
index fc269dba46..e871704c24 100644
--- a/examples/with-typescript/package.json
+++ b/examples/with-typescript/package.json
@@ -16,7 +16,7 @@
     "@types/node": "^12.12.21",
     "@types/react": "^16.9.16",
     "@types/react-dom": "^16.9.4",
-    "typescript": "3.7.3"
+    "typescript": "3.9.7"
   },
   "license": "ISC"
 }