Add "rush" workspace

2025-12-24 19:00:03 +00:00 · 2022-09-13 17:06:41 -05:00
130 changed files with 703 additions and 14066 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -7,11 +7,6 @@ on:
    tags:
    - '!*'

-env:
-  TURBO_REMOTE_ONLY: 'true'
-  TURBO_TEAM: 'vercel'
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-
 jobs:
  publish:
    name: Publish
@@ -39,7 +34,6 @@ jobs:
      uses: actions/setup-node@v3
      with:
        node-version: 14
-        cache: 'yarn'
    - name: Install
      if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
      run: yarn install --check-files --frozen-lockfile --network-timeout 1000000
--- a/.github/workflows/test-integration-cli.yml
+++ b/.github/workflows/test-integration-cli.yml
@@ -8,11 +8,6 @@ on:
    - '!*'
  pull_request:

-env:
-  TURBO_REMOTE_ONLY: 'true'
-  TURBO_TEAM: 'vercel'
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-
 jobs:
  test:
    name: CLI
@@ -24,16 +19,25 @@ jobs:
        node: [14]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
+      - name: Conditionally set remote env
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        run: |
+            echo "TURBO_REMOTE_ONLY=true" >> $GITHUB_ENV
+            echo "TURBO_TEAM=vercel" >> $GITHUB_ENV
+            echo "TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}" >> $GITHUB_ENV
      - uses: actions/setup-go@v3
        with:
          go-version: '1.13.15'
      - uses: actions/setup-node@v3
        with:
          node-version: ${{ matrix.node }}
-          cache: 'yarn'
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 100
+      - run: git --version
+      - run: git fetch origin main --depth=100
+      - run: git fetch origin ${{ github.ref }} --depth=100
+      - run: git diff origin/main...HEAD --name-only
      - run: yarn install --network-timeout 1000000 --frozen-lockfile
      - run: yarn run build
      - run: yarn test-integration-cli
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -8,11 +8,6 @@ on:
    - '!*'
  pull_request:

-env:
-  TURBO_REMOTE_ONLY: 'true'
-  TURBO_TEAM: 'vercel'
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-
 jobs:
  test:
    name: Unit
@@ -24,16 +19,25 @@ jobs:
        node: [14]
    runs-on: ${{ matrix.os }}
    steps:
+      - name: Conditionally set remote env
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        run: |
+            echo "TURBO_REMOTE_ONLY=true" >> $GITHUB_ENV
+            echo "TURBO_TEAM=vercel" >> $GITHUB_ENV
+            echo "TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}" >> $GITHUB_ENV
      - uses: actions/setup-go@v3
        with:
          go-version: '1.13.15'
-      - uses: actions/checkout@v3
-        with:
-            fetch-depth: 2
      - uses: actions/setup-node@v3
        with:
-            node-version: ${{ matrix.node }}
-            cache: 'yarn'
+          node-version: ${{ matrix.node }}
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 100
+      - run: git --version
+      - run: git fetch origin main --depth=100
+      - run: git fetch origin ${{ github.ref }} --depth=100
+      - run: git diff origin/main...HEAD --name-only
      - run: yarn install --network-timeout 1000000 --frozen-lockfile
      - run: yarn run build
      - run: yarn run lint
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,9 +10,6 @@ on:

 env:
  NODE_VERSION: '14'
-  TURBO_REMOTE_ONLY: 'true'
-  TURBO_TEAM: 'vercel'
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}

 jobs:
  setup:
@@ -23,11 +20,8 @@ jobs:
      dplUrl: ${{ steps.waitForTarball.outputs.url }}
    steps:
      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.13.15'
+      - run: git --version
+      - run: git fetch origin main
      - uses: actions/setup-node@v3
        with:
          node-version: ${{ env.NODE_VERSION }}
@@ -58,6 +52,12 @@ jobs:
      matrix:
        include: ${{ fromJson(needs.setup.outputs['tests']) }}
    steps:
+      - name: Conditionally set remote env
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        run: |
+            echo "TURBO_REMOTE_ONLY=true" >> $GITHUB_ENV
+            echo "TURBO_TEAM=vercel" >> $GITHUB_ENV
+            echo "TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}" >> $GITHUB_ENV
      - uses: actions/checkout@v3
        with:
          fetch-depth: 2
--- a/examples/nextjs/package.json
+++ b/examples/nextjs/package.json
@@ -9,12 +9,12 @@
    "lint": "next lint"
  },
  "dependencies": {
-    "next": "12.3.1",
+    "next": "12.3.0",
    "react": "18.2.0",
    "react-dom": "18.2.0"
  },
  "devDependencies": {
-    "eslint": "8.23.1",
-    "eslint-config-next": "12.3.1"
+    "eslint": "8.23.0",
+    "eslint-config-next": "12.3.0"
  }
 }
--- a/examples/nextjs/yarn.lock
+++ b/examples/nextjs/yarn.lock
@@ -3,11 +3,11 @@


 "@babel/runtime-corejs3@^7.10.2":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.19.1.tgz#f0cbbe7edda7c4109cd253bb1dee99aba4594ad9"
-  integrity sha512-j2vJGnkopRzH+ykJ8h68wrHnEUmtK//E723jjixiAl/PPf6FhqY/vYRcMVlNydRKQjQsTsYEjpx+DZMIvnGk/g==
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.19.0.tgz#0df75cb8e5ecba3ca9e658898694e5326d52397f"
+  integrity sha512-JyXXoCu1N8GLuKc2ii8y5RGma5FMpFeO2nAQIe0Yzrbq+rQnN+sFj47auLblR5ka6aHNGPDgv8G/iI2Grb0ldQ==
  dependencies:
-    core-js-pure "^3.25.1"
+    core-js-pure "^3.20.2"
    regenerator-runtime "^0.13.4"

 "@babel/runtime@^7.10.2", "@babel/runtime@^7.18.9":
@@ -17,10 +17,10 @@
  dependencies:
    regenerator-runtime "^0.13.4"

-"@eslint/eslintrc@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.2.tgz#58b69582f3b7271d8fa67fe5251767a5b38ea356"
-  integrity sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==
+"@eslint/eslintrc@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d"
+  integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==
  dependencies:
    ajv "^6.12.4"
    debug "^4.3.2"
@@ -56,82 +56,82 @@
  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==

-"@next/env@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-12.3.1.tgz#18266bd92de3b4aa4037b1927aa59e6f11879260"
-  integrity sha512-9P9THmRFVKGKt9DYqeC2aKIxm8rlvkK38V1P1sRE7qyoPBIs8l9oo79QoSdPtOWfzkbDAVUqvbQGgTMsb8BtJg==
+"@next/env@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-12.3.0.tgz#85f971fdc668cc312342761057c59cb8ab1abadf"
+  integrity sha512-PTJpjAFVbzBQ9xXpzMTroShvD5YDIIy46jQ7d4LrWpY+/5a8H90Tm8hE3Hvkc5RBRspVo7kvEOnqQms0A+2Q6w==

-"@next/eslint-plugin-next@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.1.tgz#b821f27b0f175954d8d18e5d323fce040ecc79a6"
-  integrity sha512-sw+lTf6r6P0j+g/n9y4qdWWI2syPqZx+uc0+B/fRENqfR3KpSid6MIKqc9gNwGhJASazEQ5b3w8h4cAET213jw==
+"@next/eslint-plugin-next@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.0.tgz#302c1f03618d5001ce92ea6826c329268759128e"
+  integrity sha512-jVdq1qYTNDjUtulnE8/hkPv0pHILV4jMg5La99iaY/FFm20WxVnsAZtbNnMvlPbf8dc010oO304SX9yXbg5PAw==
  dependencies:
    glob "7.1.7"

-"@next/swc-android-arm-eabi@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.1.tgz#b15ce8ad376102a3b8c0f3c017dde050a22bb1a3"
-  integrity sha512-i+BvKA8tB//srVPPQxIQN5lvfROcfv4OB23/L1nXznP+N/TyKL8lql3l7oo2LNhnH66zWhfoemg3Q4VJZSruzQ==
+"@next/swc-android-arm-eabi@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.3.0.tgz#9a934904643591cb6f66eb09803a92d2b10ada13"
+  integrity sha512-/PuirPnAKsYBw93w/7Q9hqy+KGOU9mjYprZ/faxMUJh/dc6v3rYLxkZKNG9nFPIW4QKNTCnhP40xF9hLnxO+xg==

-"@next/swc-android-arm64@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.3.1.tgz#85d205f568a790a137cb3c3f720d961a2436ac9c"
-  integrity sha512-CmgU2ZNyBP0rkugOOqLnjl3+eRpXBzB/I2sjwcGZ7/Z6RcUJXK5Evz+N0ucOxqE4cZ3gkTeXtSzRrMK2mGYV8Q==
+"@next/swc-android-arm64@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.3.0.tgz#c1e3e24d0625efe88f45a2135c8f5c4dff594749"
+  integrity sha512-OaI+FhAM6P9B6Ybwbn0Zl8YwWido0lLwhDBi9WiYCh4RQmIXAyVIoIJPHo4fP05+mXaJ/k1trvDvuURvHOq2qw==

-"@next/swc-darwin-arm64@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.1.tgz#b105457d6760a7916b27e46c97cb1a40547114ae"
-  integrity sha512-hT/EBGNcu0ITiuWDYU9ur57Oa4LybD5DOQp4f22T6zLfpoBMfBibPtR8XktXmOyFHrL/6FC2p9ojdLZhWhvBHg==
+"@next/swc-darwin-arm64@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.3.0.tgz#37a9f971b9ad620184af69f38243a36757126fb9"
+  integrity sha512-9s4d3Mhii+WFce8o8Jok7WC3Bawkr9wEUU++SJRptjU1L5tsfYJMrSYCACHLhZujziNDLyExe4Hwwsccps1sfg==

-"@next/swc-darwin-x64@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.1.tgz#6947b39082271378896b095b6696a7791c6e32b1"
-  integrity sha512-9S6EVueCVCyGf2vuiLiGEHZCJcPAxglyckTZcEwLdJwozLqN0gtS0Eq0bQlGS3dH49Py/rQYpZ3KVWZ9BUf/WA==
+"@next/swc-darwin-x64@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.3.0.tgz#fb017f1066c8cf2b8da49ef3588c8731d8bf1bf3"
+  integrity sha512-2scC4MqUTwGwok+wpVxP+zWp7WcCAVOtutki2E1n99rBOTnUOX6qXkgxSy083yBN6GqwuC/dzHeN7hIKjavfRA==

-"@next/swc-freebsd-x64@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.1.tgz#2b6c36a4d84aae8b0ea0e0da9bafc696ae27085a"
-  integrity sha512-qcuUQkaBZWqzM0F1N4AkAh88lLzzpfE6ImOcI1P6YeyJSsBmpBIV8o70zV+Wxpc26yV9vpzb+e5gCyxNjKJg5Q==
+"@next/swc-freebsd-x64@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-12.3.0.tgz#e7955b016f41e0f95088e3459ff4197027871fbf"
+  integrity sha512-xAlruUREij/bFa+qsE1tmsP28t7vz02N4ZDHt2lh3uJUniE0Ne9idyIDLc1Ed0IF2RjfgOp4ZVunuS3OM0sngw==

-"@next/swc-linux-arm-gnueabihf@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.1.tgz#6e421c44285cfedac1f4631d5de330dd60b86298"
-  integrity sha512-diL9MSYrEI5nY2wc/h/DBewEDUzr/DqBjIgHJ3RUNtETAOB3spMNHvJk2XKUDjnQuluLmFMloet9tpEqU2TT9w==
+"@next/swc-linux-arm-gnueabihf@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.3.0.tgz#d2233267bffaa24378245b328f2f8a01a37eab29"
+  integrity sha512-jin2S4VT/cugc2dSZEUIabhYDJNgrUh7fufbdsaAezgcQzqfdfJqfxl4E9GuafzB4cbRPTaqA0V5uqbp0IyGkQ==

-"@next/swc-linux-arm64-gnu@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.1.tgz#8863f08a81f422f910af126159d2cbb9552ef717"
-  integrity sha512-o/xB2nztoaC7jnXU3Q36vGgOolJpsGG8ETNjxM1VAPxRwM7FyGCPHOMk1XavG88QZSQf+1r+POBW0tLxQOJ9DQ==
+"@next/swc-linux-arm64-gnu@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.3.0.tgz#149a0cb877352ab63e81cf1dd53b37f382929d2a"
+  integrity sha512-RqJHDKe0WImeUrdR0kayTkRWgp4vD/MS7g0r6Xuf8+ellOFH7JAAJffDW3ayuVZeMYOa7RvgNFcOoWnrTUl9Nw==

-"@next/swc-linux-arm64-musl@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.1.tgz#0038f07cf0b259d70ae0c80890d826dfc775d9f3"
-  integrity sha512-2WEasRxJzgAmP43glFNhADpe8zB7kJofhEAVNbDJZANp+H4+wq+/cW1CdDi8DqjkShPEA6/ejJw+xnEyDID2jg==
+"@next/swc-linux-arm64-musl@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.3.0.tgz#73ec7f121f56fd7cf99cf2b00cf41f62c4560e90"
+  integrity sha512-nvNWoUieMjvDjpYJ/4SQe9lQs2xMj6ZRs8N+bmTrVu9leY2Fg3WD6W9p/1uU9hGO8u+OdF13wc4iRShu/WYIHg==

-"@next/swc-linux-x64-gnu@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.1.tgz#c66468f5e8181ffb096c537f0dbfb589baa6a9c1"
-  integrity sha512-JWEaMyvNrXuM3dyy9Pp5cFPuSSvG82+yABqsWugjWlvfmnlnx9HOQZY23bFq3cNghy5V/t0iPb6cffzRWylgsA==
+"@next/swc-linux-x64-gnu@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.3.0.tgz#6812e52ef21bfd091810f271dd61da11d82b66b9"
+  integrity sha512-4ajhIuVU9PeQCMMhdDgZTLrHmjbOUFuIyg6J19hZqwEwDTSqQyrSLkbJs2Nd7IRiM6Ul/XyrtEFCpk4k+xD2+w==

-"@next/swc-linux-x64-musl@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.1.tgz#c6269f3e96ac0395bc722ad97ce410ea5101d305"
-  integrity sha512-xoEWQQ71waWc4BZcOjmatuvPUXKTv6MbIFzpm4LFeCHsg2iwai0ILmNXf81rJR+L1Wb9ifEke2sQpZSPNz1Iyg==
+"@next/swc-linux-x64-musl@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.3.0.tgz#c9e7ffb6d44da330961c1ce651c5b03a1becfe22"
+  integrity sha512-U092RBYbaGxoMAwpauePJEu2PuZSEoUCGJBvsptQr2/2XIMwAJDYM4c/M5NfYEsBr+yjvsYNsOpYfeQ88D82Yg==

-"@next/swc-win32-arm64-msvc@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.1.tgz#83c639ee969cee36ce247c3abd1d9df97b5ecade"
-  integrity sha512-hswVFYQYIeGHE2JYaBVtvqmBQ1CppplQbZJS/JgrVI3x2CurNhEkmds/yqvDONfwfbttTtH4+q9Dzf/WVl3Opw==
+"@next/swc-win32-arm64-msvc@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.3.0.tgz#e0d9d26297f52b0d3b3c2f5138ddcce30601bc98"
+  integrity sha512-pzSzaxjDEJe67bUok9Nxf9rykbJfHXW0owICFsPBsqHyc+cr8vpF7g9e2APTCddtVhvjkga9ILoZJ9NxWS7Yiw==

-"@next/swc-win32-ia32-msvc@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.1.tgz#52995748b92aa8ad053440301bc2c0d9fbcf27c2"
-  integrity sha512-Kny5JBehkTbKPmqulr5i+iKntO5YMP+bVM8Hf8UAmjSMVo3wehyLVc9IZkNmcbxi+vwETnQvJaT5ynYBkJ9dWA==
+"@next/swc-win32-ia32-msvc@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.3.0.tgz#37daeac1acc68537b8e76cd81fde96dce11f78b4"
+  integrity sha512-MQGUpMbYhQmTZ06a9e0hPQJnxFMwETo2WtyAotY3GEzbNCQVbCGhsvqEKcl+ZEHgShlHXUWvSffq1ZscY6gK7A==

-"@next/swc-win32-x64-msvc@12.3.1":
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.1.tgz#27d71a95247a9eaee03d47adee7e3bd594514136"
-  integrity sha512-W1ijvzzg+kPEX6LAc+50EYYSEo0FVu7dmTE+t+DM4iOLqgGHoW9uYSz9wCVdkXOEEMP9xhXfGpcSxsfDucyPkA==
+"@next/swc-win32-x64-msvc@12.3.0":
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.0.tgz#c1b983316307f8f55fee491942b5d244bd2036e2"
+  integrity sha512-C/nw6OgQpEULWqs+wgMHXGvlJLguPRFFGqR2TAqWBerQ8J+Sg3z1ZTqwelkSi4FoqStGuZ2UdFHIDN1ySmR1xA==

 "@nodelib/fs.scandir@2.1.5":
  version "2.1.5"
@@ -155,9 +155,9 @@
    fastq "^1.6.0"

 "@rushstack/eslint-patch@^1.1.3":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
-  integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz#0c8b74c50f29ee44f423f7416829c0bf8bb5eb27"
+  integrity sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA==

 "@swc/helpers@0.4.11":
  version "0.4.11"
@@ -172,47 +172,47 @@
  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==

 "@typescript-eslint/parser@^5.21.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.38.0.tgz#5a59a1ff41a7b43aacd1bb2db54f6bf1c02b2ff8"
-  integrity sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.36.2.tgz#3ddf323d3ac85a25295a55fcb9c7a49ab4680ddd"
+  integrity sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==
  dependencies:
-    "@typescript-eslint/scope-manager" "5.38.0"
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/typescript-estree" "5.38.0"
+    "@typescript-eslint/scope-manager" "5.36.2"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/typescript-estree" "5.36.2"
    debug "^4.3.4"

-"@typescript-eslint/scope-manager@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz#8f0927024b6b24e28671352c93b393a810ab4553"
-  integrity sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==
+"@typescript-eslint/scope-manager@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz#a75eb588a3879ae659514780831370642505d1cd"
+  integrity sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==
  dependencies:
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/visitor-keys" "5.38.0"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.36.2"

-"@typescript-eslint/types@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.38.0.tgz#8cd15825e4874354e31800dcac321d07548b8a5f"
-  integrity sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==
+"@typescript-eslint/types@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.2.tgz#a5066e500ebcfcee36694186ccc57b955c05faf9"
+  integrity sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==

-"@typescript-eslint/typescript-estree@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz#89f86b2279815c6fb7f57d68cf9b813f0dc25d98"
-  integrity sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==
+"@typescript-eslint/typescript-estree@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz#0c93418b36c53ba0bc34c61fe9405c4d1d8fe560"
+  integrity sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==
  dependencies:
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/visitor-keys" "5.38.0"
+    "@typescript-eslint/types" "5.36.2"
+    "@typescript-eslint/visitor-keys" "5.36.2"
    debug "^4.3.4"
    globby "^11.1.0"
    is-glob "^4.0.3"
    semver "^7.3.7"
    tsutils "^3.21.0"

-"@typescript-eslint/visitor-keys@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz#60591ca3bf78aa12b25002c0993d067c00887e34"
-  integrity sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==
+"@typescript-eslint/visitor-keys@5.36.2":
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz#2f8f78da0a3bad3320d2ac24965791ac39dace5a"
+  integrity sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==
  dependencies:
-    "@typescript-eslint/types" "5.38.0"
+    "@typescript-eslint/types" "5.36.2"
    eslint-visitor-keys "^3.3.0"

 acorn-jsx@^5.3.2:
@@ -344,10 +344,10 @@ callsites@^3.0.0:
  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==

-caniuse-lite@^1.0.30001406:
-  version "1.0.30001406"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001406.tgz#d0146e7919635479f873b4507517b627f66ab269"
-  integrity sha512-bWTlaXUy/rq0BBtYShc/jArYfBPjEV95euvZ8JVtO43oQExEN/WquoqpufFjNu4kSpi5cy5kMbNvzztWDfv1Jg==
+caniuse-lite@^1.0.30001332:
+  version "1.0.30001393"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001393.tgz#1aa161e24fe6af2e2ccda000fc2b94be0b0db356"
+  integrity sha512-N/od11RX+Gsk+1qY/jbPa0R6zJupEa0lxeBG598EbrtblxVCTJsQwbRBm6+V+rxpc5lHKdsXb9RY83cZIPLseA==

 chalk@^4.0.0:
  version "4.1.2"
@@ -374,10 +374,10 @@ concat-map@0.0.1:
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==

-core-js-pure@^3.25.1:
-  version "3.25.2"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.2.tgz#44a4fd873bdd4fecf6ca11512bcefedbe87e744a"
-  integrity sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA==
+core-js-pure@^3.20.2:
+  version "3.25.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.1.tgz#79546518ae87cc362c991d9c2d211f45107991ee"
+  integrity sha512-7Fr74bliUDdeJCBMxkkIuQ4xfxn/SwrVg+HkJUAoNEXVqYLv55l6Af0dJ5Lq2YBUW9yKqSkLXaS5SYPK6MGa/A==

 cross-spawn@^7.0.2:
  version "7.0.3"
@@ -503,19 +503,19 @@ escape-string-regexp@^4.0.0:
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==

-eslint-config-next@12.3.1:
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.3.1.tgz#5d4eb0b7903cea81fd0d5106601d3afb0a453ff4"
-  integrity sha512-EN/xwKPU6jz1G0Qi6Bd/BqMnHLyRAL0VsaQaWA7F3KkjAgZHi4f1uL1JKGWNxdQpHTW/sdGONBd0bzxUka/DJg==
+eslint-config-next@12.3.0:
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.3.0.tgz#d887ab2d143fe1a2b308e9321e932a613e610800"
+  integrity sha512-guHSkNyKnTBB8HU35COgAMeMV0E026BiYRYvyEVVaTOeFcnU3i1EI8/Da0Rl7H3Sgua5FEvoA0vYd2s8kdIUXg==
  dependencies:
-    "@next/eslint-plugin-next" "12.3.1"
+    "@next/eslint-plugin-next" "12.3.0"
    "@rushstack/eslint-patch" "^1.1.3"
    "@typescript-eslint/parser" "^5.21.0"
    eslint-import-resolver-node "^0.3.6"
    eslint-import-resolver-typescript "^2.7.1"
    eslint-plugin-import "^2.26.0"
    eslint-plugin-jsx-a11y "^6.5.1"
-    eslint-plugin-react "^7.31.7"
+    eslint-plugin-react "^7.29.4"
    eslint-plugin-react-hooks "^4.5.0"

 eslint-import-resolver-node@^0.3.6:
@@ -587,10 +587,10 @@ eslint-plugin-react-hooks@^4.5.0:
  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==

-eslint-plugin-react@^7.31.7:
-  version "7.31.8"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz#3a4f80c10be1bcbc8197be9e8b641b2a3ef219bf"
-  integrity sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==
+eslint-plugin-react@^7.29.4:
+  version "7.31.7"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.7.tgz#36fb1c611a7db5f757fce09cbbcc01682f8b0fbb"
+  integrity sha512-8NldBTeYp/kQoTV1uT0XF6HcmDqbgZ0lNPkN0wlRw8DJKXEnaWu+oh/6gt3xIhzvQ35wB2Y545fJhIbJSZ2NNw==
  dependencies:
    array-includes "^3.1.5"
    array.prototype.flatmap "^1.3.0"
@@ -632,12 +632,12 @@ eslint-visitor-keys@^3.3.0:
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==

-eslint@8.23.1:
-  version "8.23.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.1.tgz#cfd7b3f7fdd07db8d16b4ac0516a29c8d8dca5dc"
-  integrity sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==
+eslint@8.23.0:
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040"
+  integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==
  dependencies:
-    "@eslint/eslintrc" "^1.3.2"
+    "@eslint/eslintrc" "^1.3.1"
    "@humanwhocodes/config-array" "^0.10.4"
    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
    "@humanwhocodes/module-importer" "^1.0.1"
@@ -656,6 +656,7 @@ eslint@8.23.1:
    fast-deep-equal "^3.1.3"
    file-entry-cache "^6.0.1"
    find-up "^5.0.0"
+    functional-red-black-tree "^1.0.1"
    glob-parent "^6.0.1"
    globals "^13.15.0"
    globby "^11.1.0"
@@ -664,7 +665,6 @@ eslint@8.23.1:
    import-fresh "^3.0.0"
    imurmurhash "^0.1.4"
    is-glob "^4.0.0"
-    js-sdsl "^4.1.4"
    js-yaml "^4.1.0"
    json-stable-stringify-without-jsonify "^1.0.1"
    levn "^0.4.1"
@@ -716,9 +716,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==

 fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
  dependencies:
    "@nodelib/fs.stat" "^2.0.2"
    "@nodelib/fs.walk" "^1.2.3"
@@ -798,15 +798,20 @@ function.prototype.name@^1.1.5:
    es-abstract "^1.19.0"
    functions-have-names "^1.2.2"

+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
+
 functions-have-names@^1.2.2:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==

 get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
-  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598"
+  integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
  dependencies:
    function-bind "^1.1.1"
    has "^1.0.3"
@@ -974,9 +979,9 @@ is-boolean-object@^1.1.0:
    has-tostringtag "^1.0.0"

 is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.6.tgz#fd6170b0b8c7e2cc73de342ef8284a2202023c44"
-  integrity sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==

 is-core-module@^2.8.1, is-core-module@^2.9.0:
  version "2.10.0"
@@ -1062,11 +1067,6 @@ isexe@^2.0.0:
  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==

-js-sdsl@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.4.tgz#78793c90f80e8430b7d8dc94515b6c77d98a26a6"
-  integrity sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==
-
 "js-tokens@^3.0.0 || ^4.0.0":
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -1200,31 +1200,31 @@ natural-compare@^1.4.0:
  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==

-next@12.3.1:
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/next/-/next-12.3.1.tgz#127b825ad2207faf869b33393ec8c75fe61e50f1"
-  integrity sha512-l7bvmSeIwX5lp07WtIiP9u2ytZMv7jIeB8iacR28PuUEFG5j0HGAPnMqyG5kbZNBG2H7tRsrQ4HCjuMOPnANZw==
+next@12.3.0:
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/next/-/next-12.3.0.tgz#0e4c1ed0092544c7e8f4c998ca57cf6529e286cb"
+  integrity sha512-GpzI6me9V1+XYtfK0Ae9WD0mKqHyzQlGq1xH1rzNIYMASo4Tkl4rTe9jSqtBpXFhOS33KohXs9ZY38Akkhdciw==
  dependencies:
-    "@next/env" "12.3.1"
+    "@next/env" "12.3.0"
    "@swc/helpers" "0.4.11"
-    caniuse-lite "^1.0.30001406"
+    caniuse-lite "^1.0.30001332"
    postcss "8.4.14"
-    styled-jsx "5.0.7"
+    styled-jsx "5.0.6"
    use-sync-external-store "1.2.0"
  optionalDependencies:
-    "@next/swc-android-arm-eabi" "12.3.1"
-    "@next/swc-android-arm64" "12.3.1"
-    "@next/swc-darwin-arm64" "12.3.1"
-    "@next/swc-darwin-x64" "12.3.1"
-    "@next/swc-freebsd-x64" "12.3.1"
-    "@next/swc-linux-arm-gnueabihf" "12.3.1"
-    "@next/swc-linux-arm64-gnu" "12.3.1"
-    "@next/swc-linux-arm64-musl" "12.3.1"
-    "@next/swc-linux-x64-gnu" "12.3.1"
-    "@next/swc-linux-x64-musl" "12.3.1"
-    "@next/swc-win32-arm64-msvc" "12.3.1"
-    "@next/swc-win32-ia32-msvc" "12.3.1"
-    "@next/swc-win32-x64-msvc" "12.3.1"
+    "@next/swc-android-arm-eabi" "12.3.0"
+    "@next/swc-android-arm64" "12.3.0"
+    "@next/swc-darwin-arm64" "12.3.0"
+    "@next/swc-darwin-x64" "12.3.0"
+    "@next/swc-freebsd-x64" "12.3.0"
+    "@next/swc-linux-arm-gnueabihf" "12.3.0"
+    "@next/swc-linux-arm64-gnu" "12.3.0"
+    "@next/swc-linux-arm64-musl" "12.3.0"
+    "@next/swc-linux-x64-gnu" "12.3.0"
+    "@next/swc-linux-x64-musl" "12.3.0"
+    "@next/swc-win32-arm64-msvc" "12.3.0"
+    "@next/swc-win32-ia32-msvc" "12.3.0"
+    "@next/swc-win32-x64-msvc" "12.3.0"

 object-assign@^4.1.1:
  version "4.1.1"
@@ -1574,10 +1574,10 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==

-styled-jsx@5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.7.tgz#be44afc53771b983769ac654d355ca8d019dff48"
-  integrity sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==
+styled-jsx@5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.6.tgz#fa684790a9cc3badded14badea163418fe568f77"
+  integrity sha512-xOeROtkK5MGMDimBQ3J6iPId8q0t/BDoG5XN6oKkZClVz9ISF/hihN8OCn2LggMU6N32aXnrXBdn3auSqNS9fA==

 supports-color@^7.1.0:
  version "7.2.0"
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
    "prettier": "2.6.2",
    "ts-eager": "2.0.2",
    "ts-jest": "28.0.5",
-    "turbo": "1.4.7"
+    "turbo": "1.3.2-canary.1"
  },
  "scripts": {
    "lerna": "lerna",
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "5.4.4",
+  "version": "5.4.2",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/clone-env.ts
+++ b/packages/build-utils/src/clone-env.ts
@@ -1,34 +0,0 @@
-import type { Env } from './types';
-
-const { hasOwnProperty } = Object.prototype;
-
-/**
- * Clones zero or more objects into a single new object while ensuring that the
- * `PATH` environment variable is defined when the `PATH` or `Path` environment
- * variables are defined.
- *
- * @param {Object} [...envs] Objects and/or `process.env` to clone and merge
- * @returns {Object} The new object
- */
-export function cloneEnv(...envs: (Env | undefined)[]): Env {
-  return envs.reduce((obj: Env, env) => {
-    if (env === undefined || env === null) {
-      return obj;
-    }
-
-    // mixin the env first
-    obj = Object.assign(obj, env);
-
-    if (hasOwnProperty.call(env, 'Path')) {
-      // the system path is called `Path` on Windows and Node.js will
-      // automatically return the system path when accessing `PATH`,
-      // however we lose this proxied value when we destructure and
-      // thus we must explicitly copy it, but we must also remove the
-      // `Path` property since we can't have both a `PATH` and `Path`
-      obj.PATH = obj.Path;
-      delete obj.Path;
-    }
-
-    return obj;
-  }, {});
-}
--- a/packages/build-utils/src/fs/run-user-scripts.ts
+++ b/packages/build-utils/src/fs/run-user-scripts.ts
@@ -11,7 +11,6 @@ import { NowBuildError } from '../errors';
 import { Meta, PackageJson, NodeVersion, Config } from '../types';
 import { getSupportedNodeVersion, getLatestNodeVersion } from './node-version';
 import { readConfigFile } from './read-config-file';
-import { cloneEnv } from '../clone-env';

 // Only allow one `runNpmInstall()` invocation to run concurrently
 const runNpmInstallSema = new Sema(1);
@@ -218,7 +217,7 @@ export function getSpawnOptions(
  nodeVersion: NodeVersion
 ): SpawnOptions {
  const opts = {
-    env: cloneEnv(process.env),
+    env: { ...process.env },
  };

  if (!meta.isDev) {
@@ -450,7 +449,7 @@ export async function runNpmInstall(
    debug(`Installing to ${destPath}`);

    const opts: SpawnOptionsExtended = { cwd: destPath, ...spawnOpts };
-    const env = cloneEnv(opts.env || process.env);
+    const env = opts.env ? { ...opts.env } : { ...process.env };
    delete env.NODE_ENV;
    opts.env = getEnvForPackageManager({
      cliType,
@@ -459,29 +458,12 @@ export async function runNpmInstall(
      env,
    });
    let commandArgs: string[];
-    const isPotentiallyBrokenNpm =
-      cliType === 'npm' &&
-      nodeVersion?.major === 16 &&
-      !args.includes('--legacy-peer-deps') &&
-      spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== '1';

    if (cliType === 'npm') {
      opts.prettyCommand = 'npm install';
      commandArgs = args
        .filter(a => a !== '--prefer-offline')
        .concat(['install', '--no-audit', '--unsafe-perm']);
-      if (
-        isPotentiallyBrokenNpm &&
-        spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === '1'
-      ) {
-        // Starting in npm@8.6.0, if you ran `npm install --legacy-peer-deps`,
-        // and then later ran `npm install`, it would fail. So the only way
-        // to safely upgrade npm from npm@8.5.0 is to set this flag. The docs
-        // say this flag is not recommended so its is behind a feature flag
-        // so we can remove it in node@18, which can introduce breaking changes.
-        // See https://docs.npmjs.com/cli/v8/using-npm/config#legacy-peer-deps
-        commandArgs.push('--legacy-peer-deps');
-      }
    } else if (cliType === 'pnpm') {
      // PNPM's install command is similar to NPM's but without the audit nonsense
      // @see options https://pnpm.io/cli/install
@@ -498,26 +480,7 @@ export async function runNpmInstall(
      commandArgs.push('--production');
    }

-    try {
-      await spawnAsync(cliType, commandArgs, opts);
-    } catch (_) {
-      const potentialErrorPath = path.join(
-        process.env.HOME || '/',
-        '.npm',
-        'eresolve-report.txt'
-      );
-      if (
-        isPotentiallyBrokenNpm &&
-        !commandArgs.includes('--legacy-peer-deps') &&
-        fs.existsSync(potentialErrorPath)
-      ) {
-        console.warn(
-          'Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.'
-        );
-        commandArgs.push('--legacy-peer-deps');
-        await spawnAsync(cliType, commandArgs, opts);
-      }
-    }
+    await spawnAsync(cliType, commandArgs, opts);
    debug(`Install complete [${Date.now() - installTime}ms]`);
    return true;
  } finally {
@@ -628,7 +591,10 @@ export async function runPackageJsonScript(
      cliType,
      lockfileVersion,
      nodeVersion: undefined,
-      env: cloneEnv(process.env, spawnOpts?.env),
+      env: {
+        ...process.env,
+        ...spawnOpts?.env,
+      },
    }),
  };

--- a/packages/build-utils/src/index.ts
+++ b/packages/build-utils/src/index.ts
@@ -41,7 +41,6 @@ import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
 import { getPrefixedEnvVars } from './get-prefixed-env-vars';
-import { cloneEnv } from './clone-env';

 export {
  FileBlob,
@@ -85,7 +84,6 @@ export {
  getLambdaOptionsFromFunction,
  scanParentDirs,
  getIgnoreFilter,
-  cloneEnv,
 };

 export { EdgeFunction } from './edge-function';
--- a/packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/.gitignore
+++ b/packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/.gitignore
@@ -1,2 +0,0 @@
-node_modules
-.vercel
--- a/packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/package-lock.json
+++ b/packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/package-lock.json
@@ -1,143 +0,0 @@
-{
-  "name": "15-npm-8-legacy-peer-deps",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "react": "16.8.0",
-        "swr": "1.3.0"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/react": {
-      "version": "16.8.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.8.0.tgz",
-      "integrity": "sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.13.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/scheduler": {
-      "version": "0.13.6",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
-      "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "node_modules/swr": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/swr/-/swr-1.3.0.tgz",
-      "integrity": "sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw==",
-      "peerDependencies": {
-        "react": "^16.11.0 || ^17.0.0 || ^18.0.0"
-      }
-    }
-  },
-  "dependencies": {
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "react": {
-      "version": "16.8.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.8.0.tgz",
-      "integrity": "sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.13.0"
-      }
-    },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "scheduler": {
-      "version": "0.13.6",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
-      "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "swr": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/swr/-/swr-1.3.0.tgz",
-      "integrity": "sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw=="
-    }
-  }
-}
--- a/packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/package.json
+++ b/packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/package.json
@@ -1,11 +0,0 @@
-{
-  "private": true,
-  "scripts": {
-    "build": "mkdir -p public && echo 'legacy peer deps' > public/index.txt"
-  },
-  "packageManager": "npm@8.6.0",
-  "dependencies": {
-    "swr": "1.3.0",
-    "react": "16.8.0"
-  }
-}
--- a/packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/probes.json
+++ b/packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/probes.json
@@ -1,3 +0,0 @@
-{
-  "probes": [{ "path": "/", "mustContain": "legacy peer deps" }]
-}
--- a/packages/build-utils/test/fixtures/20-npm-7/package-lock.json
+++ b/packages/build-utils/test/fixtures/20-npm-7/package-lock.json
@@ -5,7 +5,6 @@
  "requires": true,
  "packages": {
    "": {
-      "name": "20-npm-7",
      "version": "1.0.0"
    }
  }
--- a/packages/build-utils/test/integration.test.ts
+++ b/packages/build-utils/test/integration.test.ts
@@ -21,8 +21,6 @@ const skipFixtures: string[] = [
  '08-zero-config-middleman',
  '21-npm-workspaces',
  '23-pnpm-workspaces',
-  '41-nx-monorepo',
-  '42-npm-workspace-with-nx',
 ];

 // eslint-disable-next-line no-restricted-syntax
--- a/packages/build-utils/test/unit.clone-env.test.ts
+++ b/packages/build-utils/test/unit.clone-env.test.ts
@@ -1,117 +0,0 @@
-import { cloneEnv } from '../src';
-
-it('should clone env with Path', () => {
-  expect(
-    cloneEnv(
-      new Proxy(
-        {
-          foo: 'bar',
-          Path: 'baz',
-        },
-        {
-          get(target: typeof process.env, prop: string) {
-            if (prop === 'PATH') {
-              return target.PATH ?? target.Path;
-            }
-            return target[prop];
-          },
-        }
-      )
-    )
-  ).toEqual({
-    foo: 'bar',
-    PATH: 'baz',
-  });
-});
-
-it('should clone env with PATH', () => {
-  expect(
-    cloneEnv({
-      foo: 'bar',
-      PATH: 'baz',
-    })
-  ).toEqual({
-    foo: 'bar',
-    PATH: 'baz',
-  });
-});
-
-it('should clone and merge multiple env objects', () => {
-  // note: this also tests the last object doesn't overwrite `PATH` with
-  // `undefined`
-  expect(
-    cloneEnv(
-      {
-        foo: 'bar',
-      },
-      {
-        PATH: 'baz',
-      },
-      {
-        baz: 'wiz',
-      }
-    )
-  ).toEqual({
-    foo: 'bar',
-    PATH: 'baz',
-    baz: 'wiz',
-  });
-});
-
-it('should clone the actual process.env object', () => {
-  expect(cloneEnv(process.env).PATH).toEqual(process.env.PATH);
-});
-
-it('should overwrite PATH with last value', () => {
-  expect(
-    cloneEnv(
-      new Proxy(
-        {
-          Path: 'foo',
-        },
-        {
-          get(target: typeof process.env, prop: string) {
-            if (prop === 'PATH') {
-              return target.PATH ?? target.Path;
-            }
-            return target[prop];
-          },
-        }
-      ),
-      {
-        PATH: 'bar',
-      },
-      {
-        PATH: undefined,
-      }
-    )
-  ).toEqual({
-    PATH: undefined,
-  });
-});
-
-it('should handle process.env at any argument position', () => {
-  expect(
-    cloneEnv(
-      {
-        foo: 'bar',
-      },
-      new Proxy(
-        {
-          Path: 'baz',
-        },
-        {
-          get(target: typeof process.env, prop: string) {
-            if (prop === 'PATH') {
-              return target.PATH ?? target.Path;
-            }
-            return target[prop];
-          },
-        }
-      )
-    )
-  ).toEqual({
-    foo: 'bar',
-    PATH: 'baz',
-  });
-});
--- a/packages/build-utils/test/unit.run-npm-install.test.ts
+++ b/packages/build-utils/test/unit.run-npm-install.test.ts
@@ -1,172 +0,0 @@
-const spawnMock = jest.fn();
-jest.mock('cross-spawn', () => {
-  const spawn = (...args: any) => {
-    spawnMock(...args);
-    const child = {
-      on: (type: string, fn: (code: number) => void) => {
-        if (type === 'close') {
-          return fn(0);
-        }
-      },
-    };
-    return child;
-  };
-  return spawn;
-});
-
-afterEach(() => {
-  spawnMock.mockClear();
-});
-
-import path from 'path';
-import { runNpmInstall, cloneEnv } from '../src';
-import type { Meta } from '../src/types';
-
-function getTestSpawnOpts(env: Record<string, string>) {
-  return { env: cloneEnv(process.env, env) };
-}
-
-function getNodeVersion(major: number) {
-  return { major, range: `${major}.x`, runtime: `nodejs${major}.x` };
-}
-
-it('should not include peer dependencies when missing VERCEL_NPM_LEGACY_PEER_DEPS on node16', async () => {
-  const fixture = path.join(__dirname, 'fixtures', '20-npm-7');
-  const meta: Meta = {};
-  const spawnOpts = getTestSpawnOpts({});
-  const nodeVersion = { major: 16 } as any;
-  await runNpmInstall(fixture, [], spawnOpts, meta, nodeVersion);
-  expect(spawnMock.mock.calls.length).toBe(1);
-  const args = spawnMock.mock.calls[0];
-  expect(args[0]).toEqual('npm');
-  expect(args[1]).toEqual(['install', '--no-audit', '--unsafe-perm']);
-  expect(args[2]).toEqual({
-    cwd: fixture,
-    prettyCommand: 'npm install',
-    stdio: 'inherit',
-    env: expect.any(Object),
-  });
-});
-
-it('should include peer dependencies when VERCEL_NPM_LEGACY_PEER_DEPS=1 on node16', async () => {
-  const fixture = path.join(__dirname, 'fixtures', '20-npm-7');
-  const meta: Meta = {};
-  const spawnOpts = getTestSpawnOpts({ VERCEL_NPM_LEGACY_PEER_DEPS: '1' });
-  const nodeVersion = getNodeVersion(16);
-  await runNpmInstall(fixture, [], spawnOpts, meta, nodeVersion);
-  expect(spawnMock.mock.calls.length).toBe(1);
-  const args = spawnMock.mock.calls[0];
-  expect(args[0]).toEqual('npm');
-  expect(args[1]).toEqual([
-    'install',
-    '--no-audit',
-    '--unsafe-perm',
-    '--legacy-peer-deps',
-  ]);
-  expect(args[2]).toEqual({
-    cwd: fixture,
-    prettyCommand: 'npm install',
-    stdio: 'inherit',
-    env: expect.any(Object),
-  });
-});
-
-it('should not include peer dependencies when VERCEL_NPM_LEGACY_PEER_DEPS=1 on node14', async () => {
-  const fixture = path.join(__dirname, 'fixtures', '20-npm-7');
-  const meta: Meta = {};
-  const spawnOpts = getTestSpawnOpts({ VERCEL_NPM_LEGACY_PEER_DEPS: '1' });
-  const nodeVersion = getNodeVersion(14);
-  await runNpmInstall(fixture, [], spawnOpts, meta, nodeVersion);
-  expect(spawnMock.mock.calls.length).toBe(1);
-  const args = spawnMock.mock.calls[0];
-  expect(args[0]).toEqual('npm');
-  expect(args[1]).toEqual(['install', '--no-audit', '--unsafe-perm']);
-  expect(args[2]).toEqual({
-    cwd: fixture,
-    prettyCommand: 'npm install',
-    stdio: 'inherit',
-    env: expect.any(Object),
-  });
-});
-
-it('should not include peer dependencies when VERCEL_NPM_LEGACY_PEER_DEPS=1 on node16 with corepack enabled', async () => {
-  const fixture = path.join(__dirname, 'fixtures', '20-npm-7');
-  const meta: Meta = {};
-  const spawnOpts = getTestSpawnOpts({
-    VERCEL_NPM_LEGACY_PEER_DEPS: '1',
-    ENABLE_EXPERIMENTAL_COREPACK: '1',
-  });
-  const nodeVersion = getNodeVersion(16);
-  await runNpmInstall(fixture, [], spawnOpts, meta, nodeVersion);
-  expect(spawnMock.mock.calls.length).toBe(1);
-  const args = spawnMock.mock.calls[0];
-  expect(args[0]).toEqual('npm');
-  expect(args[1]).toEqual(['install', '--no-audit', '--unsafe-perm']);
-  expect(args[2]).toEqual({
-    cwd: fixture,
-    prettyCommand: 'npm install',
-    stdio: 'inherit',
-    env: expect.any(Object),
-  });
-});
-
-it('should only invoke `runNpmInstall()` once per `package.json` file (serial)', async () => {
-  const meta: Meta = {};
-  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
-  const apiDir = path.join(fixture, 'api');
-
-  const run1 = await runNpmInstall(apiDir, [], undefined, meta);
-  expect(run1).toEqual(true);
-  expect(
-    (meta.runNpmInstallSet as Set<string>).has(
-      path.join(fixture, 'package.json')
-    )
-  ).toEqual(true);
-
-  const run2 = await runNpmInstall(apiDir, [], undefined, meta);
-  expect(run2).toEqual(false);
-
-  const run3 = await runNpmInstall(fixture, [], undefined, meta);
-  expect(run3).toEqual(false);
-
-  expect(spawnMock.mock.calls.length).toBe(1);
-  const args = spawnMock.mock.calls[0];
-  expect(args[0]).toEqual('yarn');
-  expect(args[1]).toEqual(['install']);
-  expect(args[2]).toEqual({
-    cwd: apiDir,
-    prettyCommand: 'yarn install',
-    stdio: 'inherit',
-    env: expect.any(Object),
-  });
-});
-
-it('should only invoke `runNpmInstall()` once per `package.json` file (parallel)', async () => {
-  const meta: Meta = {};
-  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
-  const apiDir = path.join(fixture, 'api');
-  const [run1, run2, run3] = await Promise.all([
-    runNpmInstall(apiDir, [], undefined, meta),
-    runNpmInstall(apiDir, [], undefined, meta),
-    runNpmInstall(fixture, [], undefined, meta),
-  ]);
-  expect(run1).toEqual(true);
-  expect(run2).toEqual(false);
-  expect(run3).toEqual(false);
-  expect(
-    (meta.runNpmInstallSet as Set<string>).has(
-      path.join(fixture, 'package.json')
-    )
-  ).toEqual(true);
-
-  expect(spawnMock.mock.calls.length).toBe(1);
-  const args = spawnMock.mock.calls[0];
-  expect(args[0]).toEqual('yarn');
-  expect(args[1]).toEqual(['install']);
-  expect(args[2]).toEqual({
-    cwd: apiDir,
-    prettyCommand: 'yarn install',
-    stdio: 'inherit',
-    env: expect.any(Object),
-  });
-});
--- a/packages/build-utils/test/unit.test.ts
+++ b/packages/build-utils/test/unit.test.ts
@@ -1,6 +1,7 @@
 import ms from 'ms';
 import path from 'path';
 import fs, { readlink } from 'fs-extra';
+import retry from 'async-retry';
 import { strict as assert, strictEqual } from 'assert';
 import { createZip } from '../src/lambda';
 import { getSupportedNodeVersion } from '../src/fs/node-version';
@@ -15,6 +16,7 @@ import {
  runPackageJsonScript,
  scanParentDirs,
  FileBlob,
+  Meta,
 } from '../src';

 jest.setTimeout(10 * 1000);
@@ -576,16 +578,53 @@ it('should detect package.json in nested frontend', async () => {
  expect(result.packageJsonPath).toEqual(path.join(fixture, 'package.json'));
 });

-it('should retry npm install when peer deps invalid and npm@8 on node@16', async () => {
-  const nodeMajor = Number(process.versions.node.split('.')[0]);
-  if (nodeMajor !== 16) {
-    console.log(`Skipping test on node@${nodeMajor}`);
-    return;
-  }
-  const fixture = path.join(__dirname, 'fixtures', '15-npm-8-legacy-peer-deps');
-  const nodeVersion = { major: nodeMajor } as any;
-  await runNpmInstall(fixture, [], {}, {}, nodeVersion);
-  expect(warningMessages).toStrictEqual([
-    'Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.',
-  ]);
+it('should only invoke `runNpmInstall()` once per `package.json` file (serial)', async () => {
+  const meta: Meta = {};
+  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
+  const apiDir = path.join(fixture, 'api');
+  const retryOpts = { maxRetryTime: 1000 };
+  let run1, run2, run3;
+  await retry(async () => {
+    run1 = await runNpmInstall(apiDir, [], undefined, meta);
+    expect(run1).toEqual(true);
+    expect(
+      (meta.runNpmInstallSet as Set<string>).has(
+        path.join(fixture, 'package.json')
+      )
+    ).toEqual(true);
+  }, retryOpts);
+  await retry(async () => {
+    run2 = await runNpmInstall(apiDir, [], undefined, meta);
+    expect(run2).toEqual(false);
+  }, retryOpts);
+  await retry(async () => {
+    run3 = await runNpmInstall(fixture, [], undefined, meta);
+    expect(run3).toEqual(false);
+  }, retryOpts);
+});
+
+it('should only invoke `runNpmInstall()` once per `package.json` file (parallel)', async () => {
+  const meta: Meta = {};
+  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
+  const apiDir = path.join(fixture, 'api');
+  let results: [boolean, boolean, boolean] | undefined;
+  await retry(
+    async () => {
+      results = await Promise.all([
+        runNpmInstall(apiDir, [], undefined, meta),
+        runNpmInstall(apiDir, [], undefined, meta),
+        runNpmInstall(fixture, [], undefined, meta),
+      ]);
+    },
+    { maxRetryTime: 3000 }
+  );
+  const [run1, run2, run3] = results || [];
+  expect(run1).toEqual(true);
+  expect(run2).toEqual(false);
+  expect(run3).toEqual(false);
+  expect(
+    (meta.runNpmInstallSet as Set<string>).has(
+      path.join(fixture, 'package.json')
+    )
+  ).toEqual(true);
 });
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "28.4.0",
+  "version": "28.2.5",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -41,16 +41,16 @@
    "node": ">= 14"
  },
  "dependencies": {
-    "@vercel/build-utils": "5.4.4",
-    "@vercel/go": "2.2.7",
-    "@vercel/hydrogen": "0.0.20",
-    "@vercel/next": "3.1.27",
-    "@vercel/node": "2.5.16",
-    "@vercel/python": "3.1.16",
-    "@vercel/redwood": "1.0.25",
-    "@vercel/remix": "1.0.26",
-    "@vercel/ruby": "1.3.33",
-    "@vercel/static-build": "1.0.25",
+    "@vercel/build-utils": "5.4.2",
+    "@vercel/go": "2.2.5",
+    "@vercel/hydrogen": "0.0.18",
+    "@vercel/next": "3.1.25",
+    "@vercel/node": "2.5.14",
+    "@vercel/python": "3.1.14",
+    "@vercel/redwood": "1.0.23",
+    "@vercel/remix": "1.0.24",
+    "@vercel/ruby": "1.3.31",
+    "@vercel/static-build": "1.0.23",
    "update-notifier": "5.1.0"
  },
  "devDependencies": {
@@ -95,9 +95,9 @@
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
    "@types/yauzl-promise": "2.1.0",
-    "@vercel/client": "12.2.6",
-    "@vercel/frameworks": "1.1.6",
-    "@vercel/fs-detectors": "3.3.0",
+    "@vercel/client": "12.2.4",
+    "@vercel/frameworks": "1.1.5",
+    "@vercel/fs-detectors": "3.2.0",
    "@vercel/fun": "1.0.4",
    "@vercel/ncc": "0.24.0",
    "@zeit/source-map-support": "0.6.2",
--- a/packages/cli/src/commands/build.ts
+++ b/packages/cli/src/commands/build.ts
@@ -555,150 +555,7 @@ async function doBuild(
    builds: builderRoutes,
  });

-  const images = vercelConfig?.images
-  if (images) {
-    if (typeof images !== 'object') {
-      throw new Error(
-        `vercel.json "images" should be an object received ${typeof images}.`
-      );
-    }
-
-    if (!Array.isArray(images.domains)) {
-      throw new Error(
-        `vercel.json "images.domains" should be an Array received ${typeof images.domains}.`
-      );
-    }
-
-    if (images.domains.length > 50) {
-      throw new Error(
-        `vercel.json "images.domains" exceeds length of 50 received length (${images.domains.length}).`
-      );
-    }
-
-    const invalidImageDomains = images.domains.filter(
-      (d: unknown) => typeof d !== 'string'
-    );
-    if (invalidImageDomains.length > 0) {
-      throw new Error(
-        `vercel.json "images.domains" should be an Array of strings received invalid values (${invalidImageDomains.join(
-          ', '
-        )}).`
-      );
-    }
-
-    if (images.remotePatterns) {
-      if (!Array.isArray(images.remotePatterns)) {
-        throw new Error(
-          `vercel.json "images.remotePatterns" should be an Array received ${typeof images.remotePatterns}.`
-        );
-      }
-
-      if (images.remotePatterns.length > 50) {
-        throw new Error(
-          `vercel.json "images.remotePatterns" exceeds length of 50, received length (${images.remotePatterns.length}).`
-        );
-      }
-
-      const validProps = new Set(['protocol', 'hostname', 'pathname', 'port']);
-      const requiredProps = ['hostname'];
-      const invalidPatterns = images.remotePatterns.filter(
-        (d: unknown) =>
-          !d ||
-          typeof d !== 'object' ||
-          Object.entries(d).some(
-            ([k, v]) => !validProps.has(k) || typeof v !== 'string'
-          ) ||
-          requiredProps.some(k => !(k in d))
-      );
-      if (invalidPatterns.length > 0) {
-        throw new Error(
-          `vercel.json "images.remotePatterns" received invalid values:\n${invalidPatterns
-            .map(item => JSON.stringify(item))
-            .join(
-              '\n'
-            )}\n\nremotePatterns value must follow format { protocol: 'https', hostname: 'example.com', port: '', pathname: '/imgs/**' }.`
-        );
-      }
-    }
-
-    if (!Array.isArray(images.sizes)) {
-      throw new Error(
-        `vercel.json "images.sizes" should be an Array received ${typeof images.sizes}.`
-      );
-    }
-
-    if (images.sizes.length < 1 || images.sizes.length > 50) {
-      throw new Error(
-        `vercel.json "images.sizes" should be an Array of length between 1 to 50 received length (${images.sizes.length}).`
-      );
-    }
-
-    const invalidImageSizes = images.sizes.filter((d: unknown) => {
-      return typeof d !== 'number' || d < 1 || d > 10000;
-    });
-    if (invalidImageSizes.length > 0) {
-      throw new Error(
-        `vercel.json "images.sizes" should be an Array of numbers that are between 1 and 10000, received invalid values (${invalidImageSizes.join(
-          ', '
-        )}).`
-      );
-    }
-
-    if (images.minimumCacheTTL) {
-      if (
-        !Number.isInteger(images.minimumCacheTTL) ||
-        images.minimumCacheTTL < 0
-      ) {
-        throw new Error(
-          `vercel.json "images.minimumCacheTTL" should be an integer 0 or more received (${images.minimumCacheTTL}).`
-        );
-      }
-    }
-
-    if (images.formats) {
-      if (!Array.isArray(images.formats)) {
-        throw new Error(
-          `vercel.json "images.formats" should be an Array received ${typeof images.formats}.`
-        );
-      }
-      if (images.formats.length < 1 || images.formats.length > 2) {
-        throw new Error(
-          `vercel.json "images.formats" must be length 1 or 2, received length (${images.formats.length}).`
-        );
-      }
-
-      const invalid = images.formats.filter(f => {
-        return f !== 'image/avif' && f !== 'image/webp';
-      });
-      if (invalid.length > 0) {
-        throw new Error(
-          `vercel.json "images.formats" should be an Array of mime type strings, received invalid values (${invalid.join(
-            ', '
-          )}).`
-        );
-      }
-    }
-
-    if (
-      typeof images.dangerouslyAllowSVG !== 'undefined' &&
-      typeof images.dangerouslyAllowSVG !== 'boolean'
-    ) {
-      throw new Error(
-        `vercel.json "images.dangerouslyAllowSVG" should be a boolean received (${images.dangerouslyAllowSVG}).`
-      );
-    }
-
-    if (
-      typeof images.contentSecurityPolicy !== 'undefined' &&
-      typeof images.contentSecurityPolicy !== 'string'
-    ) {
-      throw new Error(
-        `vercel.json "images.contentSecurityPolicy" should be a string received ${images.contentSecurityPolicy}`
-      );
-    }
-  }
-
-  const mergedImages = mergeImages(images, buildResults.values());
+  const mergedImages = mergeImages(buildResults.values());
  const mergedWildcard = mergeWildcard(buildResults.values());
  const mergedOverrides: Record<string, PathOverride> =
    overrides.length > 0 ? Object.assign({}, ...overrides) : undefined;
@@ -767,9 +624,9 @@ function expandBuild(files: string[], build: Builder): Builder[] {
 }

 function mergeImages(
-  images: BuildResultV2Typical['images'],
  buildResults: Iterable<BuildResult>
 ): BuildResultV2Typical['images'] {
+  let images: BuildResultV2Typical['images'] = undefined;
  for (const result of buildResults) {
    if ('images' in result && result.images) {
      images = Object.assign({}, images, result.images);
--- a/packages/cli/src/commands/deploy/index.ts
+++ b/packages/cli/src/commands/deploy/index.ts
@@ -522,12 +522,7 @@ export default async (client: Client): Promise<number> => {
      quiet,
      wantsPublic: argv['--public'] || localConfig.public,
      type: null,
-      nowConfig: {
-        ...localConfig,
-        // `images` is allowed in "vercel.json" and processed
-        // by `vc build`, but don't send it to the API endpoint
-        images: undefined,
-      },
+      nowConfig: localConfig,
      regions,
      meta,
      gitMetadata,
--- a/packages/cli/src/util/dev/server.ts
+++ b/packages/cli/src/util/dev/server.ts
@@ -31,7 +31,6 @@ import {
 } from '@vercel/routing-utils';
 import {
  Builder,
-  cloneEnv,
  Env,
  StartDevServerResult,
  FileFsRef,
@@ -2223,22 +2222,18 @@ export default class DevServer {

    const port = await getPort();

-    const env: Env = cloneEnv(
-      {
-        // Because of child process 'pipe' below, isTTY will be false.
-        // Most frameworks use `chalk`/`supports-color` so we enable it anyway.
-        FORCE_COLOR: process.stdout.isTTY ? '1' : '0',
-        // Prevent framework dev servers from automatically opening a web
-        // browser window, since it will not be the port that `vc dev`
-        // is listening on and thus will be missing Vercel features.
-        BROWSER: 'none',
-      },
-      process.env,
-      this.envConfigs.allEnv,
-      {
-        PORT: `${port}`,
-      }
-    );
+    const env: Env = {
+      // Because of child process 'pipe' below, isTTY will be false.
+      // Most frameworks use `chalk`/`supports-color` so we enable it anyway.
+      FORCE_COLOR: process.stdout.isTTY ? '1' : '0',
+      // Prevent framework dev servers from automatically opening a web
+      // browser window, since it will not be the port that `vc dev`
+      // is listening on and thus will be missing Vercel features.
+      BROWSER: 'none',
+      ...process.env,
+      ...this.envConfigs.allEnv,
+      PORT: `${port}`,
+    };

    // This is necesary so that the dev command in the Project
    // will work cross-platform (especially Windows).
--- a/packages/cli/test/fixtures/unit/commands/build/images/.vercel/project.json
+++ b/packages/cli/test/fixtures/unit/commands/build/images/.vercel/project.json
@@ -1,7 +0,0 @@
-{
-  "orgId": ".",
-  "projectId": ".",
-  "settings": {
-    "framework": null
-  }
-}
--- a/packages/cli/test/fixtures/unit/commands/build/images/index.html
+++ b/packages/cli/test/fixtures/unit/commands/build/images/index.html
@@ -1 +0,0 @@
-<h1>Vercel</h1>
--- a/packages/cli/test/fixtures/unit/commands/build/images/vercel.json
+++ b/packages/cli/test/fixtures/unit/commands/build/images/vercel.json
@@ -1,8 +0,0 @@
-{
-  "images": {
-    "sizes": [256, 384, 600, 1000],
-    "domains": [],
-    "minimumCacheTTL": 60,
-    "formats": ["image/webp", "image/avif"]
-  }
-}
--- a/packages/cli/test/unit/commands/build.test.ts
+++ b/packages/cli/test/unit/commands/build.test.ts
@@ -920,30 +920,6 @@ describe('build', () => {
      delete process.env.__VERCEL_BUILD_RUNNING;
    }
  });
-  
-  it('should apply "images" configuration from `vercel.json`', async () => {
-    const cwd = fixture('images');
-    const output = join(cwd, '.vercel/output');
-    try {
-      process.chdir(cwd);
-      const exitCode = await build(client);
-      expect(exitCode).toEqual(0);
-
-      // `config.json` includes "images" from `vercel.json`
-      const configJson = await fs.readJSON(join(output, 'config.json'));
-      expect(configJson).toMatchObject({
-        images: {
-          sizes: [256, 384, 600, 1000],
-          domains: [],
-          minimumCacheTTL: 60,
-          formats: ['image/webp', 'image/avif'],
-        },
-      });
-    } finally {
-      process.chdir(originalCwd);
-      delete process.env.__VERCEL_BUILD_RUNNING;
-    }
-  });

  describe('should find packages with different main/module/browser keys', function () {
    let output: string;
--- a/packages/cli/test/unit/util/build/import-builders.test.ts
+++ b/packages/cli/test/unit/util/build/import-builders.test.ts
@@ -12,8 +12,6 @@ import vercelNodePkg from '@vercel/node/package.json';

 jest.setTimeout(ms('30 seconds'));

-const repoRoot = join(__dirname, '../../../../../..');
-
 describe('importBuilders()', () => {
  it('should import built-in Builders', async () => {
    const specs = new Set(['@vercel/node', '@vercel/next']);
@@ -21,12 +19,6 @@ describe('importBuilders()', () => {
    expect(builders.size).toEqual(2);
    expect(builders.get('@vercel/node')?.pkg).toMatchObject(vercelNodePkg);
    expect(builders.get('@vercel/next')?.pkg).toMatchObject(vercelNextPkg);
-    expect(builders.get('@vercel/node')?.pkgPath).toEqual(
-      join(repoRoot, 'packages/node/package.json')
-    );
-    expect(builders.get('@vercel/next')?.pkgPath).toEqual(
-      join(repoRoot, 'packages/next/package.json')
-    );
    expect(typeof builders.get('@vercel/node')?.builder.build).toEqual(
      'function'
    );
@@ -35,82 +27,7 @@ describe('importBuilders()', () => {
    );
  });

-  it('should import built-in Builders using `@latest`', async () => {
-    const specs = new Set(['@vercel/node@latest', '@vercel/next@latest']);
-    const builders = await importBuilders(specs, process.cwd(), client.output);
-    expect(builders.size).toEqual(2);
-    expect(builders.get('@vercel/node@latest')?.pkg).toMatchObject(
-      vercelNodePkg
-    );
-    expect(builders.get('@vercel/next@latest')?.pkg).toMatchObject(
-      vercelNextPkg
-    );
-    expect(builders.get('@vercel/node@latest')?.pkgPath).toEqual(
-      join(repoRoot, 'packages/node/package.json')
-    );
-    expect(builders.get('@vercel/next@latest')?.pkgPath).toEqual(
-      join(repoRoot, 'packages/next/package.json')
-    );
-    expect(typeof builders.get('@vercel/node@latest')?.builder.build).toEqual(
-      'function'
-    );
-    expect(typeof builders.get('@vercel/next@latest')?.builder.build).toEqual(
-      'function'
-    );
-  });
-
-  it('should import built-in Builders using `@canary`', async () => {
-    const specs = new Set(['@vercel/node@canary', '@vercel/next@canary']);
-    const builders = await importBuilders(specs, process.cwd(), client.output);
-    expect(builders.size).toEqual(2);
-    expect(builders.get('@vercel/node@canary')?.pkg).toMatchObject(
-      vercelNodePkg
-    );
-    expect(builders.get('@vercel/next@canary')?.pkg).toMatchObject(
-      vercelNextPkg
-    );
-    expect(builders.get('@vercel/node@canary')?.pkgPath).toEqual(
-      join(repoRoot, 'packages/node/package.json')
-    );
-    expect(builders.get('@vercel/next@canary')?.pkgPath).toEqual(
-      join(repoRoot, 'packages/next/package.json')
-    );
-    expect(typeof builders.get('@vercel/node@canary')?.builder.build).toEqual(
-      'function'
-    );
-    expect(typeof builders.get('@vercel/next@canary')?.builder.build).toEqual(
-      'function'
-    );
-  });
-
-  it('should install and import 1st party Builders with explicit version', async () => {
-    if (process.platform === 'win32') {
-      // this test creates symlinks which require admin by default on Windows
-      console.log('Skipping test on Windows');
-      return;
-    }
-
-    const cwd = await getWriteableDirectory();
-    try {
-      const spec = '@vercel/node@2.0.0';
-      const specs = new Set([spec]);
-      const builders = await importBuilders(specs, cwd, client.output);
-      expect(builders.size).toEqual(1);
-      expect(builders.get(spec)?.pkg.name).toEqual('@vercel/node');
-      expect(builders.get(spec)?.pkg.version).toEqual('2.0.0');
-      expect(builders.get(spec)?.pkgPath).toEqual(
-        join(cwd, '.vercel/builders/node_modules/@vercel/node/package.json')
-      );
-      expect(typeof builders.get(spec)?.builder.build).toEqual('function');
-      await expect(client.stderr).toOutput(
-        '> Installing Builder: @vercel/node'
-      );
-    } finally {
-      await remove(cwd);
-    }
-  });
-
-  it('should install and import 3rd party Builders', async () => {
+  it('should import 3rd party Builders', async () => {
    if (process.platform === 'win32') {
      // this test creates symlinks which require admin by default on Windows
      console.log('Skipping test on Windows');
@@ -129,7 +46,6 @@ describe('importBuilders()', () => {
      expect(builders.get(spec)?.pkgPath).toEqual(
        join(cwd, '.vercel/builders/node_modules/vercel-deno/package.json')
      );
-      expect(typeof builders.get(spec)?.builder.build).toEqual('function');
      expect(builders.get(tarballSpec)?.pkg.name).toEqual('vercel-bash');
      expect(builders.get(tarballSpec)?.pkg.version).toEqual('4.1.0');
      expect(builders.get(tarballSpec)?.pkgPath).toEqual(
@@ -146,30 +62,6 @@ describe('importBuilders()', () => {
    }
  });

-  it('should install and import legacy `@now/build-utils` Builders', async () => {
-    if (process.platform === 'win32') {
-      // this test creates symlinks which require admin by default on Windows
-      console.log('Skipping test on Windows');
-      return;
-    }
-
-    const cwd = await getWriteableDirectory();
-    try {
-      const spec = '@frontity/now@1.2.0';
-      const specs = new Set([spec]);
-      const builders = await importBuilders(specs, cwd, client.output);
-      expect(builders.size).toEqual(1);
-      expect(builders.get(spec)?.pkg.name).toEqual('@frontity/now');
-      expect(builders.get(spec)?.pkg.version).toEqual('1.2.0');
-      expect(builders.get(spec)?.pkgPath).toEqual(
-        join(cwd, '.vercel/builders/node_modules/@frontity/now/package.json')
-      );
-      expect(typeof builders.get(spec)?.builder.build).toEqual('function');
-    } finally {
-      await remove(cwd);
-    }
-  });
-
  it('should throw when importing a Builder that is not on npm registry', async () => {
    let err: Error | undefined;
    const cwd = await getWriteableDirectory();
@@ -194,6 +86,30 @@ describe('importBuilders()', () => {
      'https://vercel.link/builder-dependencies-install-failed'
    );
  });
+
+  it('should import legacy `@now/build-utils` Builders', async () => {
+    if (process.platform === 'win32') {
+      // this test creates symlinks which require admin by default on Windows
+      console.log('Skipping test on Windows');
+      return;
+    }
+
+    const cwd = await getWriteableDirectory();
+    try {
+      const spec = '@frontity/now@1.2.0';
+      const specs = new Set([spec]);
+      const builders = await importBuilders(specs, cwd, client.output);
+      expect(builders.size).toEqual(1);
+      expect(builders.get(spec)?.pkg.name).toEqual('@frontity/now');
+      expect(builders.get(spec)?.pkg.version).toEqual('1.2.0');
+      expect(builders.get(spec)?.pkgPath).toEqual(
+        join(cwd, '.vercel/builders/node_modules/@frontity/now/package.json')
+      );
+      expect(typeof builders.get(spec)?.builder.build).toEqual('function');
+    } finally {
+      await remove(cwd);
+    }
+  });
 });

 describe('resolveBuilders()', () => {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "12.2.6",
+  "version": "12.2.4",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -43,7 +43,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.4.2",
    "@vercel/routing-utils": "2.0.2",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
--- a/packages/client/src/types.ts
+++ b/packages/client/src/types.ts
@@ -1,7 +1,6 @@
 import type {
  Builder,
  BuilderFunctions,
-  Images,
  ProjectSettings,
 } from '@vercel/build-utils';
 import type { Header, Route, Redirect, Rewrite } from '@vercel/routing-utils';
@@ -153,7 +152,6 @@ export interface VercelConfig {
  installCommand?: string | null;
  framework?: string | null;
  outputDirectory?: string | null;
-  images?: Images;
 }

 export interface GitMetadata {
--- a/packages/frameworks/package.json
+++ b/packages/frameworks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/frameworks",
-  "version": "1.1.6",
+  "version": "1.1.5",
  "main": "./dist/frameworks.js",
  "types": "./dist/frameworks.d.ts",
  "files": [
--- a/packages/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/fs-detectors",
-  "version": "3.3.0",
+  "version": "3.2.0",
  "description": "Vercel filesystem detectors",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -19,7 +19,7 @@
    "test-unit": "yarn test"
  },
  "dependencies": {
-    "@vercel/frameworks": "1.1.6",
+    "@vercel/frameworks": "1.1.5",
    "@vercel/routing-utils": "2.0.2",
    "glob": "8.0.3",
    "js-yaml": "4.1.0",
--- a/packages/fs-detectors/src/workspaces/get-workspace-package-paths.ts
+++ b/packages/fs-detectors/src/workspaces/get-workspace-package-paths.ts
@@ -33,8 +33,11 @@ export async function getWorkspacePackagePaths({
    case 'pnpm':
      results = await getPnpmWorkspacePackagePaths({ fs: workspaceFs });
      break;
-    case 'nx':
-      results = await getNxWorkspacePackagePaths({ fs: workspaceFs });
+    case 'rush':
+      // /common/temp is the location that Rush defaults adding the pnpm workspace file
+      results = await getPnpmWorkspacePackagePaths({
+        fs: fs.chdir('/common/temp'),
+      });
      break;
    default:
      throw new Error(`Unknown workspace implementation: ${type}`);
@@ -106,17 +109,6 @@ async function getPackageJsonWorkspacePackagePaths({
  return getPackagePaths(packages, fs);
 }

-async function getNxWorkspacePackagePaths({
-  fs,
-}: GetPackagePathOptions): Promise<string[]> {
-  const nxWorkspaceJsonAsBuffer = await fs.readFile('workspace.json');
-
-  const { projects } = JSON.parse(nxWorkspaceJsonAsBuffer.toString());
-
-  const packages: string[] = Object.values(projects);
-  return getPackagePaths(packages, fs);
-}
-
 async function getPnpmWorkspacePackagePaths({
  fs,
 }: GetPackagePathOptions): Promise<string[]> {
--- a/packages/fs-detectors/src/workspaces/get-workspaces.ts
+++ b/packages/fs-detectors/src/workspaces/get-workspaces.ts
@@ -12,7 +12,7 @@ export interface GetWorkspaceOptions {
  cwd?: string;
 }

-export type WorkspaceType = 'yarn' | 'pnpm' | 'npm' | 'nx';
+export type WorkspaceType = 'yarn' | 'pnpm' | 'npm' | 'rush';

 export type Workspace = {
  type: WorkspaceType;
--- a/packages/fs-detectors/src/workspaces/workspace-managers.ts
+++ b/packages/fs-detectors/src/workspaces/workspace-managers.ts
@@ -60,13 +60,13 @@ export const workspaceManagers: Array<
    },
  },
  {
-    name: 'nx',
-    slug: 'nx',
+    name: 'rush',
+    slug: 'rush',
    detectors: {
      every: [
        {
-          path: 'workspace.json',
-          matchContent: '"projects":\\s*{[^}]',
+          path: 'rush.json',
+          matchContent: '"useWorkspaces":\\strue',
        },
      ],
    },
--- a/packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-one/package.json
+++ b/packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-one/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cowsay": "^1.5.0"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-two/package.json
+++ b/packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-two/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cowsay": "^1.5.0"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/41-nx-workspace/workspace.json
+++ b/packages/fs-detectors/test/fixtures/41-nx-workspace/workspace.json
@@ -1,7 +0,0 @@
-{
-  "version": 2,
-  "projects": {
-    "myblog": "apps/app-one",
-    "svelte-app": "apps/app-two"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-one/package.json
+++ b/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-one/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cowsay": "^1.5.0"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-two/package.json
+++ b/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-two/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cowsay": "^1.5.0"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/package-lock.json
+++ b/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/package-lock.json
@@ -1,782 +0,0 @@
-{
-  "name": "42-npm-workspace-with-nx",
-  "version": "1.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "version": "1.0.0",
-      "workspaces": [
-        "apps/app-one",
-        "apps/app-two"
-      ]
-    },
-    "apps/app-one": {
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "debug": "^4.3.2"
-      }
-    },
-    "apps/app-two": {
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "cowsay": "^1.5.0"
-      }
-    },
-    "node_modules/a": {
-      "resolved": "a",
-      "link": true
-    },
-    "node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/b": {
-      "resolved": "b",
-      "link": true
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/cliui/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/cowsay": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cowsay/-/cowsay-1.5.0.tgz",
-      "integrity": "sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==",
-      "dependencies": {
-        "get-stdin": "8.0.0",
-        "string-width": "~2.1.1",
-        "strip-final-newline": "2.0.0",
-        "yargs": "15.4.1"
-      },
-      "bin": {
-        "cowsay": "cli.js",
-        "cowthink": "cli.js"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-    },
-    "node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
-    },
-    "node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    }
-  },
-  "dependencies": {
-    "a": {
-      "version": "file:a",
-      "requires": {
-        "debug": "^4.3.2"
-      }
-    },
-    "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "b": {
-      "version": "file:b",
-      "requires": {
-        "cowsay": "^1.5.0"
-      }
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
-    "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "cowsay": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cowsay/-/cowsay-1.5.0.tgz",
-      "integrity": "sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==",
-      "requires": {
-        "get-stdin": "8.0.0",
-        "string-width": "~2.1.1",
-        "strip-final-newline": "2.0.0",
-        "yargs": "15.4.1"
-      }
-    },
-    "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "requires": {
-        "ansi-regex": "^3.0.0"
-      }
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-    },
-    "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
-      }
-    },
-    "y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
-    },
-    "yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    }
-  }
-}
--- a/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/package.json
+++ b/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/package.json
@@ -1,8 +0,0 @@
-{
-  "name": "42-npm-workspace-with-nx",
-  "version": "1.0.0",
-  "workspaces": [
-    "apps/app-one",
-    "apps/app-two"
-  ]
-}
--- a/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/workspace.json
+++ b/packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/workspace.json
@@ -1,4 +0,0 @@
-{
-  "version": 2,
-  "projects": {}
-}
--- a/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-one/package.json
+++ b/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-one/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cowsay": "^1.5.0"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-two/package.json
+++ b/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-two/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cowsay": "^1.5.0"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/workspace.json
+++ b/packages/fs-detectors/test/fixtures/43-nx-json-misshaped/workspace.json
@@ -1,3 +0,0 @@
-{
-  "version": 2
-}
--- a/packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-one/package.json
+++ b/packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-one/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cowsay": "^1.5.0"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-two/package.json
+++ b/packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-two/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cowsay": "^1.5.0"
-  }
-}
--- a/packages/fs-detectors/test/fixtures/44-nx-json-string/workspace.json
+++ b/packages/fs-detectors/test/fixtures/44-nx-json-string/workspace.json
@@ -1,4 +0,0 @@
-{
-  "version": 2,
-  "projects": "hello"
-}
--- a/packages/fs-detectors/test/unit.framework-detector.test.ts
+++ b/packages/fs-detectors/test/unit.framework-detector.test.ts
@@ -1,6 +1,5 @@
 import path from 'path';
 import frameworkList from '@vercel/frameworks';
-import workspaceManagers from '../src/workspaces/workspace-managers';
 import { detectFramework, DetectorFilesystem } from '../src';
 import { Stat } from '../src/detectors/filesystem';

@@ -272,28 +271,6 @@ describe('DetectorFilesystem', () => {
      expect(await detectFramework({ fs, frameworkList })).toBe(null);
    });

-    it('Detect nx', async () => {
-      const fs = new VirtualFilesystem({
-        'workspace.json': JSON.stringify({
-          projects: { 'app-one': 'apps/app-one' },
-        }),
-      });
-
-      expect(
-        await detectFramework({ fs, frameworkList: workspaceManagers })
-      ).toBe('nx');
-    });
-
-    it('Do not detect anything', async () => {
-      const fs = new VirtualFilesystem({
-        'workspace.json': JSON.stringify({ projects: {} }),
-      });
-
-      expect(
-        await detectFramework({ fs, frameworkList: workspaceManagers })
-      ).toBe(null);
-    });
-
    it('Detect Next.js', async () => {
      const fs = new VirtualFilesystem({
        'package.json': JSON.stringify({
--- a/packages/fs-detectors/test/unit.get-workspaces-package-paths.test.ts
+++ b/packages/fs-detectors/test/unit.get-workspaces-package-paths.test.ts
@@ -14,10 +14,6 @@ describe.each<[string, string[]]>([
    ['/backend/c', '/backend/d', '/frontend/a', '/frontend/b'],
  ],
  ['22-pnpm', []],
-  ['41-nx-workspace', ['/apps/app-one', '/apps/app-two']],
-  ['42-npm-workspace-with-nx', ['/apps/app-one', '/apps/app-two']],
-  ['43-nx-json-misshaped', []],
-  ['44-nx-json-string', []],
 ])('`getWorkspacesPackagePaths()`', (fixturePath, packagePaths) => {
  const testName =
    packagePaths.length > 0
--- a/packages/go/index.ts
+++ b/packages/go/index.ts
@@ -27,7 +27,6 @@ import {
  getWriteableDirectory,
  shouldServe,
  debug,
-  cloneEnv,
 } from '@vercel/build-utils';

 const TMP = tmpdir();
@@ -695,9 +694,11 @@ Learn more: https://vercel.com/docs/runtimes#official-runtimes/go`
    `vercel-dev-port-${Math.random().toString(32).substring(2)}`
  );

-  const env = cloneEnv(process.env, meta.env, {
+  const env: typeof process.env = {
+    ...process.env,
+    ...meta.env,
    VERCEL_DEV_PORT_FILE: portFile,
-  });
+  };

  const tmpRelative = `.${sep}${entrypointDir}`;
  const child = spawn('go', ['run', tmpRelative], {
--- a/packages/go/package.json
+++ b/packages/go/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/go",
-  "version": "2.2.7",
+  "version": "2.2.5",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -35,7 +35,7 @@
    "@types/jest": "28.1.6",
    "@types/node-fetch": "^2.3.0",
    "@types/tar": "^4.0.0",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.4.2",
    "@vercel/ncc": "0.24.0",
    "async-retry": "1.3.1",
    "execa": "^1.0.0",
--- a/packages/go/test/fixtures/25-square-brackets-with-go-mod/api/[hello].go
+++ b/packages/go/test/fixtures/25-square-brackets-with-go-mod/api/[hello].go
@@ -1,10 +0,0 @@
-package handler
-
-import (
-	"fmt"
-	"net/http"
-)
-
-func Handler(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintf(w, "hello:RANDOMNESS_PLACEHOLDER")
-}
--- a/packages/go/test/fixtures/25-square-brackets-with-go-mod/api/sub/[hi].go
+++ b/packages/go/test/fixtures/25-square-brackets-with-go-mod/api/sub/[hi].go
@@ -1,10 +0,0 @@
-package handler
-
-import (
-	"fmt"
-	"net/http"
-)
-
-func Handler(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintf(w, "hi:RANDOMNESS_PLACEHOLDER")
-}
--- a/packages/go/test/fixtures/25-square-brackets-with-go-mod/go.mod
+++ b/packages/go/test/fixtures/25-square-brackets-with-go-mod/go.mod
@@ -1,3 +0,0 @@
-module github.com/vercel/vercel/packages/go/test/fixtures/21-square-brackets-with-go-mod
-
-go 1.16
--- a/packages/go/test/fixtures/25-square-brackets-with-go-mod/go.sum
+++ b/packages/go/test/fixtures/25-square-brackets-with-go-mod/go.sum
--- a/packages/go/test/fixtures/25-square-brackets-with-go-mod/probes.json
+++ b/packages/go/test/fixtures/25-square-brackets-with-go-mod/probes.json
@@ -1,9 +0,0 @@
-{
-  "probes": [
-    {
-      "path": "/api/a",
-      "mustContain": "hello:RANDOMNESS_PLACEHOLDER"
-    },
-    { "path": "/api/sub/b", "mustContain": "hi:RANDOMNESS_PLACEHOLDER" }
-  ]
-}
--- a/packages/hydrogen/package.json
+++ b/packages/hydrogen/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/hydrogen",
-  "version": "0.0.20",
+  "version": "0.0.18",
  "license": "MIT",
  "main": "./dist/index.js",
  "homepage": "https://vercel.com/docs",
@@ -21,7 +21,7 @@
  "devDependencies": {
    "@types/jest": "27.5.1",
    "@types/node": "*",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.4.2",
    "typescript": "4.6.4"
  }
 }
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "3.1.27",
+  "version": "3.1.25",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -8,7 +8,7 @@
    "build": "node build.js",
    "build-dev": "node build.js --dev",
    "test": "jest --env node --verbose --bail --runInBand",
-    "test-unit": "yarn test test/unit/",
+    "test-unit": "yarn test test/build.test.ts  test/unit/",
    "test-next-local": "jest --env node --verbose --bail --forceExit --testTimeout=360000 test/integration/*.test.js test/integration/*.test.ts",
    "test-next-local:middleware": "jest --env node --verbose --bail --useStderr --testTimeout=360000 test/integration/middleware.test.ts",
    "test-integration-once": "rm test/builder-info.json; jest --env node --verbose --runInBand --bail test/fixtures/**/*.test.js"
@@ -44,7 +44,7 @@
    "@types/semver": "6.0.0",
    "@types/text-table": "0.2.1",
    "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.4.4",
+    "@vercel/build-utils": "5.4.2",
    "@vercel/nft": "0.22.1",
    "@vercel/routing-utils": "2.0.2",
    "async-sema": "3.0.1",
--- a/packages/next/src/index.ts
+++ b/packages/next/src/index.ts
@@ -675,7 +675,7 @@ export const build: BuildV2 = async ({
    }
  }

-  let dynamicPrefix = path.posix.join('/', entryDirectory);
+  let dynamicPrefix = path.join('/', entryDirectory);
  dynamicPrefix = dynamicPrefix === '/' ? '' : dynamicPrefix;

  if (imagesManifest) {
@@ -824,7 +824,7 @@ export const build: BuildV2 = async ({

        // Make sure to 404 for the /404 path itself
        {
-          src: path.posix.join('/', entryDirectory, '404/?'),
+          src: path.join('/', entryDirectory, '404/?'),
          status: 404,
          continue: true,
        },
@@ -838,7 +838,7 @@ export const build: BuildV2 = async ({
        ...(routesManifest?.basePath
          ? [
              {
-                src: path.posix.join('/', entryDirectory, '_next/image/?'),
+                src: path.join('/', entryDirectory, '_next/image/?'),
                dest: '/_next/image',
                check: true,
              },
@@ -848,12 +848,12 @@ export const build: BuildV2 = async ({
        // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
        // if no match to prevent rewriting _next/data unexpectedly
        {
-          src: path.posix.join('/', entryDirectory, '_next/data/(.*)'),
-          dest: path.posix.join('/', entryDirectory, '_next/data/$1'),
+          src: path.join('/', entryDirectory, '_next/data/(.*)'),
+          dest: path.join('/', entryDirectory, '_next/data/$1'),
          check: true,
        },
        {
-          src: path.posix.join('/', entryDirectory, '_next/data/(.*)'),
+          src: path.join('/', entryDirectory, '_next/data/(.*)'),
          status: 404,
        },

@@ -867,14 +867,14 @@ export const build: BuildV2 = async ({

        ...fallbackRewrites,

-        { src: path.posix.join('/', entryDirectory, '.*'), status: 404 },
+        { src: path.join('/', entryDirectory, '.*'), status: 404 },

        // We need to make sure to 404 for /_next after handle: miss since
        // handle: miss is called before rewrites and to prevent rewriting
        // /_next
        { handle: 'miss' },
        {
-          src: path.posix.join(
+          src: path.join(
            '/',
            entryDirectory,
            '_next/static/(?:[^/]+/pages|pages|chunks|runtime|css|image|media)/.+'
@@ -894,7 +894,7 @@ export const build: BuildV2 = async ({
        {
          // This ensures we only match known emitted-by-Next.js files and not
          // user-emitted files which may be missing a hash in their filename.
-          src: path.posix.join(
+          src: path.join(
            '/',
            entryDirectory,
            `_next/static/(?:[^/]+/pages|pages|chunks|runtime|css|image|media|${escapedBuildId})/.+`
@@ -909,15 +909,15 @@ export const build: BuildV2 = async ({
        },

        // error handling
-        ...(output[path.posix.join('./', entryDirectory, '404')] ||
-        output[path.posix.join('./', entryDirectory, '404/index')]
+        ...(output[path.join('./', entryDirectory, '404')] ||
+        output[path.join('./', entryDirectory, '404/index')]
          ? [
              { handle: 'error' } as RouteWithHandle,

              {
                status: 404,
-                src: path.posix.join(entryDirectory, '.*'),
-                dest: path.posix.join('/', entryDirectory, '404'),
+                src: path.join(entryDirectory, '.*'),
+                dest: path.join('/', entryDirectory, '404'),
              },
            ]
          : []),
@@ -1063,7 +1063,7 @@ export const build: BuildV2 = async ({
        }

        debug(`Creating serverless function for page: "${page}"...`);
-        lambdas[path.posix.join(entryDirectory, pathname)] = new NodejsLambda({
+        lambdas[path.join(entryDirectory, pathname)] = new NodejsLambda({
          files: {
            ...nextFiles,
            ...pageFiles,
@@ -1114,32 +1114,30 @@ export const build: BuildV2 = async ({
      prerenderManifest,
      routesManifest
    );
-    hasStatic500 = !!staticPages[path.posix.join(entryDirectory, '500')];
+    hasStatic500 = !!staticPages[path.join(entryDirectory, '500')];

    // this can be either 404.html in latest versions
    // or _errors/404.html versions while this was experimental
    static404Page =
-      staticPages[path.posix.join(entryDirectory, '404')] && hasPages404
-        ? path.posix.join(entryDirectory, '404')
-        : staticPages[path.posix.join(entryDirectory, '_errors/404')]
-        ? path.posix.join(entryDirectory, '_errors/404')
+      staticPages[path.join(entryDirectory, '404')] && hasPages404
+        ? path.join(entryDirectory, '404')
+        : staticPages[path.join(entryDirectory, '_errors/404')]
+        ? path.join(entryDirectory, '_errors/404')
        : undefined;

    const { i18n } = routesManifest || {};

    if (!static404Page && i18n) {
      static404Page = staticPages[
-        path.posix.join(entryDirectory, i18n.defaultLocale, '404')
+        path.join(entryDirectory, i18n.defaultLocale, '404')
      ]
-        ? path.posix.join(entryDirectory, i18n.defaultLocale, '404')
+        ? path.join(entryDirectory, i18n.defaultLocale, '404')
        : undefined;
    }

    if (!hasStatic500 && i18n) {
      hasStatic500 =
-        !!staticPages[
-          path.posix.join(entryDirectory, i18n.defaultLocale, '500')
-        ];
+        !!staticPages[path.join(entryDirectory, i18n.defaultLocale, '500')];
    }

    if (routesManifest) {
@@ -1173,7 +1171,7 @@ export const build: BuildV2 = async ({
                src: (
                  dataRoute.namedDataRouteRegex || dataRoute.dataRouteRegex
                ).replace(/^\^/, `^${appMountPrefixNoTrailingSlash}`),
-                dest: path.posix.join(
+                dest: path.join(
                  '/',
                  entryDirectory,
                  // make sure to route SSG data route to the data prerender
--- a/packages/next/src/server-build.ts
+++ b/packages/next/src/server-build.ts
@@ -169,7 +169,7 @@ export async function serverBuild({
    CORRECTED_MANIFESTS_VERSION
  );

-  let hasStatic500 = !!staticPages[path.posix.join(entryDirectory, '500')];
+  let hasStatic500 = !!staticPages[path.join(entryDirectory, '500')];

  if (lambdaPageKeys.length === 0) {
    throw new NowBuildError({
@@ -187,23 +187,23 @@ export async function serverBuild({
  const hasPages404 = routesManifest.pages404;

  let static404Page =
-    staticPages[path.posix.join(entryDirectory, '404')] && hasPages404
-      ? path.posix.join(entryDirectory, '404')
-      : staticPages[path.posix.join(entryDirectory, '_errors/404')]
-      ? path.posix.join(entryDirectory, '_errors/404')
+    staticPages[path.join(entryDirectory, '404')] && hasPages404
+      ? path.join(entryDirectory, '404')
+      : staticPages[path.join(entryDirectory, '_errors/404')]
+      ? path.join(entryDirectory, '_errors/404')
      : undefined;

  if (!static404Page && i18n) {
    static404Page = staticPages[
-      path.posix.join(entryDirectory, i18n.defaultLocale, '404')
+      path.join(entryDirectory, i18n.defaultLocale, '404')
    ]
-      ? path.posix.join(entryDirectory, i18n.defaultLocale, '404')
+      ? path.join(entryDirectory, i18n.defaultLocale, '404')
      : undefined;
  }

  if (!hasStatic500 && i18n) {
    hasStatic500 =
-      !!staticPages[path.posix.join(entryDirectory, i18n.defaultLocale, '500')];
+      !!staticPages[path.join(entryDirectory, i18n.defaultLocale, '500')];
  }

  const lstatSema = new Sema(25);
@@ -377,7 +377,7 @@ export async function serverBuild({
      if (i18n) {
        for (const locale of i18n.locales) {
          const static404File =
-            staticPages[path.posix.join(entryDirectory, locale, '/404')] ||
+            staticPages[path.join(entryDirectory, locale, '/404')] ||
            new FileFsRef({
              fsPath: path.join(pagesDir, locale, '/404.html'),
            });
@@ -520,14 +520,14 @@ export async function serverBuild({

    if (
      entryDirectory !== '.' &&
-      path.posix.join('/', entryDirectory) !== routesManifest.basePath
+      path.join('/', entryDirectory) !== routesManifest.basePath
    ) {
      // we normalize the entryDirectory in the request URL since
      // Next.js isn't aware of it and it isn't included in the
      // x-matched-path header
      launcher = launcher.replace(
        '// entryDirectory handler',
-        `req.url = req.url.replace(/^${path.posix
+        `req.url = req.url.replace(/^${path
          .join('/', entryDirectory)
          .replace(/\//g, '\\/')}/, '')`
      );
@@ -848,7 +848,7 @@ export async function serverBuild({
        }

        const outputName = normalizeIndexOutput(
-          path.posix.join(entryDirectory, pageNoExt),
+          path.join(entryDirectory, pageNoExt),
          true
        );

@@ -863,7 +863,7 @@ export async function serverBuild({
          for (const locale of i18n.locales) {
            lambdas[
              normalizeIndexOutput(
-                path.posix.join(
+                path.join(
                  entryDirectory,
                  locale,
                  pageNoExt === 'index' ? '' : pageNoExt
@@ -918,7 +918,7 @@ export async function serverBuild({
      route = normalizeLocalePath(route, routesManifest.i18n.locales).pathname;
    }
    delete lambdas[
-      path.posix.join('.', entryDirectory, route === '/' ? 'index' : route)
+      path.join('.', entryDirectory, route === '/' ? 'index' : route)
    ];
  });

@@ -968,7 +968,7 @@ export async function serverBuild({
    // routes since only the status is being modified and we don't want
    // to exceed the routes limit
    const starterRouteSrc = `^${
-      entryDirectory !== '.' ? path.posix.join('/', entryDirectory, '()') : '()'
+      entryDirectory !== '.' ? path.join('/', entryDirectory, '()') : '()'
    }`;
    let currentRouteSrc = starterRouteSrc;

@@ -1019,14 +1019,14 @@ export async function serverBuild({
      ? [
          // strip _next/data prefix for resolving
          {
-            src: `^${path.posix.join(
+            src: `^${path.join(
              '/',
              entryDirectory,
              '/_next/data/',
              escapedBuildId,
              '/(.*).json'
            )}`,
-            dest: `${path.posix.join(
+            dest: `${path.join(
              '/',
              entryDirectory,
              '/$1',
@@ -1044,18 +1044,14 @@ export async function serverBuild({
          // normalize "/index" from "/_next/data/index.json" to -> just "/"
          // as matches a rewrite sources will expect just "/"
          {
-            src: path.posix.join('^/', entryDirectory, '/index(?:/)?'),
+            src: path.join('^/', entryDirectory, '/index(?:/)?'),
            has: [
              {
                type: 'header',
                key: 'x-nextjs-data',
              },
            ],
-            dest: path.posix.join(
-              '/',
-              entryDirectory,
-              trailingSlash ? '/' : ''
-            ),
+            dest: path.join('/', entryDirectory, trailingSlash ? '/' : ''),
            ...(isOverride ? { override: true } : {}),
            continue: true,
          },
@@ -1067,19 +1063,14 @@ export async function serverBuild({
    return isNextDataServerResolving
      ? [
          {
-            src: path.posix.join(
-              '^/',
-              entryDirectory,
-              trailingSlash ? '/' : '',
-              '$'
-            ),
+            src: path.join('^/', entryDirectory, trailingSlash ? '/' : '', '$'),
            has: [
              {
                type: 'header',
                key: 'x-nextjs-data',
              },
            ],
-            dest: `${path.posix.join(
+            dest: `${path.join(
              '/',
              entryDirectory,
              '/_next/data/',
@@ -1090,7 +1081,7 @@ export async function serverBuild({
            ...(isOverride ? { override: true } : {}),
          },
          {
-            src: path.posix.join(
+            src: path.join(
              '^/',
              entryDirectory,
              '((?!_next/)(?:.*[^/]|.*))/?$'
@@ -1101,7 +1092,7 @@ export async function serverBuild({
                key: 'x-nextjs-data',
              },
            ],
-            dest: `${path.posix.join(
+            dest: `${path.join(
              '/',
              entryDirectory,
              '/_next/data/',
@@ -1185,7 +1176,7 @@ export async function serverBuild({
            // Handle auto-adding current default locale to path based on
            // $wildcard
            {
-              src: `^${path.posix.join(
+              src: `^${path.join(
                '/',
                entryDirectory,
                '/'
@@ -1195,9 +1186,7 @@ export async function serverBuild({
              // we aren't able to ensure trailing slash mode here
              // so ensure this comes after the trailing slash redirect
              dest: `${
-                entryDirectory !== '.'
-                  ? path.posix.join('/', entryDirectory)
-                  : ''
+                entryDirectory !== '.' ? path.join('/', entryDirectory) : ''
              }$wildcard/$1`,
              continue: true,
            },
@@ -1208,10 +1197,7 @@ export async function serverBuild({
            i18n.localeDetection !== false
              ? [
                  {
-                    src: `^${path.posix.join(
-                      '/',
-                      entryDirectory
-                    )}/?(?:${i18n.locales
+                    src: `^${path.join('/', entryDirectory)}/?(?:${i18n.locales
                      .map(locale => escapeStringRegexp(locale))
                      .join('|')})?/?$`,
                    locale: {
@@ -1265,12 +1251,8 @@ export async function serverBuild({
              : []),

            {
-              src: `^${path.posix.join('/', entryDirectory)}$`,
-              dest: `${path.posix.join(
-                '/',
-                entryDirectory,
-                i18n.defaultLocale
-              )}`,
+              src: `^${path.join('/', entryDirectory)}$`,
+              dest: `${path.join('/', entryDirectory, i18n.defaultLocale)}`,
              continue: true,
            },

@@ -1280,18 +1262,14 @@ export async function serverBuild({
            // e.g. for /de/posts/[slug] x-now-route-matches would have
            // 1=posts%2Fpost-1
            {
-              src: `^${path.posix.join(
+              src: `^${path.join(
                '/',
                entryDirectory,
                '/'
              )}(?!(?:_next/.*|${i18n.locales
                .map(locale => escapeStringRegexp(locale))
                .join('|')})(?:/.*|$))(.*)$`,
-              dest: `${path.posix.join(
-                '/',
-                entryDirectory,
-                i18n.defaultLocale
-              )}/$1`,
+              dest: `${path.join('/', entryDirectory, i18n.defaultLocale)}/$1`,
              continue: true,
            },
          ]
@@ -1315,11 +1293,7 @@ export async function serverBuild({
      ...(i18n
        ? [
            {
-              src: `${path.posix.join(
-                '/',
-                entryDirectory,
-                '/'
-              )}(?:${i18n.locales
+              src: `${path.join('/', entryDirectory, '/')}(?:${i18n.locales
                .map(locale => escapeStringRegexp(locale))
                .join('|')})?[/]?404/?`,
              status: 404,
@@ -1328,7 +1302,7 @@ export async function serverBuild({
          ]
        : [
            {
-              src: path.posix.join('/', entryDirectory, '404/?'),
+              src: path.join('/', entryDirectory, '404/?'),
              status: 404,
              continue: true,
            },
@@ -1340,11 +1314,7 @@ export async function serverBuild({
        : i18n
        ? [
            {
-              src: `${path.posix.join(
-                '/',
-                entryDirectory,
-                '/'
-              )}(?:${i18n.locales
+              src: `${path.join('/', entryDirectory, '/')}(?:${i18n.locales
                .map(locale => escapeStringRegexp(locale))
                .join('|')})?[/]?500`,
              status: 500,
@@ -1353,7 +1323,7 @@ export async function serverBuild({
          ]
        : [
            {
-              src: path.posix.join('/', entryDirectory, '500'),
+              src: path.join('/', entryDirectory, '500'),
              status: 500,
              continue: true,
            },
@@ -1376,7 +1346,7 @@ export async function serverBuild({
      ...(routesManifest?.basePath
        ? [
            {
-              src: path.posix.join('/', entryDirectory, '_next/image/?'),
+              src: path.join('/', entryDirectory, '_next/image/?'),
              dest: '/_next/image',
              check: true,
            },
@@ -1391,8 +1361,8 @@ export async function serverBuild({
            // No-op _next/data rewrite to trigger handle: 'rewrites' and then 404
            // if no match to prevent rewriting _next/data unexpectedly
            {
-              src: path.posix.join('/', entryDirectory, '_next/data/(.*)'),
-              dest: path.posix.join('/', entryDirectory, '_next/data/$1'),
+              src: path.join('/', entryDirectory, '_next/data/(.*)'),
+              dest: path.join('/', entryDirectory, '_next/data/$1'),
              check: true,
            },
          ]
@@ -1408,13 +1378,13 @@ export async function serverBuild({

      ...fallbackRewrites,

-      { src: path.posix.join('/', entryDirectory, '.*'), status: 404 },
+      { src: path.join('/', entryDirectory, '.*'), status: 404 },

      // We need to make sure to 404 for /_next after handle: miss since
      // handle: miss is called before rewrites and to prevent rewriting /_next
      { handle: 'miss' },
      {
-        src: path.posix.join(
+        src: path.join(
          '/',
          entryDirectory,
          '_next/static/(?:[^/]+/pages|pages|chunks|runtime|css|image|media)/.+'
@@ -1429,10 +1399,10 @@ export async function serverBuild({
      ...(i18n
        ? [
            {
-              src: `^${path.posix.join('/', entryDirectory)}/?(?:${i18n.locales
+              src: `^${path.join('/', entryDirectory)}/?(?:${i18n.locales
                .map(locale => escapeStringRegexp(locale))
                .join('|')})/(.*)`,
-              dest: `${path.posix.join('/', entryDirectory, '/')}$1`,
+              dest: `${path.join('/', entryDirectory, '/')}$1`,
              check: true,
            },
          ]
@@ -1504,8 +1474,8 @@ export async function serverBuild({
            // ensure we 404 for non-existent _next/data routes before
            // trying page dynamic routes
            {
-              src: path.posix.join('/', entryDirectory, '_next/data/(.*)'),
-              dest: path.posix.join('/', entryDirectory, '404'),
+              src: path.join('/', entryDirectory, '_next/data/(.*)'),
+              dest: path.join('/', entryDirectory, '404'),
              status: 404,
            },
          ]
@@ -1518,7 +1488,7 @@ export async function serverBuild({
      ...(isNextDataServerResolving
        ? [
            {
-              src: `^${path.posix.join(
+              src: `^${path.join(
                '/',
                entryDirectory,
                '/_next/data/',
@@ -1534,7 +1504,7 @@ export async function serverBuild({
            // add a catch-all data route so we don't 404 when getting
            // middleware effects
            {
-              src: `^${path.posix.join(
+              src: `^${path.join(
                '/',
                entryDirectory,
                '/_next/data/',
@@ -1552,7 +1522,7 @@ export async function serverBuild({
      {
        // This ensures we only match known emitted-by-Next.js files and not
        // user-emitted files which may be missing a hash in their filename.
-        src: path.posix.join(
+        src: path.join(
          '/',
          entryDirectory,
          `_next/static/(?:[^/]+/pages|pages|chunks|runtime|css|image|media|${escapedBuildId})/.+`
@@ -1569,7 +1539,7 @@ export async function serverBuild({
      // TODO: remove below workaround when `/` is allowed to be output
      // different than `/index`
      {
-        src: path.posix.join('/', entryDirectory, '/index'),
+        src: path.join('/', entryDirectory, '/index'),
        headers: {
          'x-matched-path': '/',
        },
@@ -1577,7 +1547,7 @@ export async function serverBuild({
        important: true,
      },
      {
-        src: path.posix.join('/', entryDirectory, `/((?!index$).*)`),
+        src: path.join('/', entryDirectory, `/((?!index$).*)`),
        headers: {
          'x-matched-path': '/$1',
        },
@@ -1592,20 +1562,20 @@ export async function serverBuild({
      ...(i18n && (static404Page || hasIsr404Page || lambdaPages['404.js'])
        ? [
            {
-              src: `${path.posix.join(
+              src: `${path.join(
                '/',
                entryDirectory,
                '/'
              )}(?<nextLocale>${i18n.locales
                .map(locale => escapeStringRegexp(locale))
                .join('|')})(/.*|$)`,
-              dest: path.posix.join('/', entryDirectory, '/$nextLocale/404'),
+              dest: path.join('/', entryDirectory, '/$nextLocale/404'),
              status: 404,
              caseSensitive: true,
            },
            {
-              src: path.posix.join('/', entryDirectory, '.*'),
-              dest: path.posix.join(
+              src: path.join('/', entryDirectory, '.*'),
+              dest: path.join(
                '/',
                entryDirectory,
                `/${i18n.defaultLocale}/404`
@@ -1615,13 +1585,13 @@ export async function serverBuild({
          ]
        : [
            {
-              src: path.posix.join('/', entryDirectory, '.*'),
-              dest: path.posix.join(
+              src: path.join('/', entryDirectory, '.*'),
+              dest: path.join(
                '/',
                entryDirectory,
                static404Page ||
                  hasIsr404Page ||
-                  lambdas[path.posix.join(entryDirectory, '404')]
+                  lambdas[path.join(entryDirectory, '404')]
                  ? '/404'
                  : '/_error'
              ),
@@ -1633,20 +1603,20 @@ export async function serverBuild({
      ...(i18n && (hasStatic500 || hasIsr500Page || lambdaPages['500.js'])
        ? [
            {
-              src: `${path.posix.join(
+              src: `${path.join(
                '/',
                entryDirectory,
                '/'
              )}(?<nextLocale>${i18n.locales
                .map(locale => escapeStringRegexp(locale))
                .join('|')})(/.*|$)`,
-              dest: path.posix.join('/', entryDirectory, '/$nextLocale/500'),
+              dest: path.join('/', entryDirectory, '/$nextLocale/500'),
              status: 500,
              caseSensitive: true,
            },
            {
-              src: path.posix.join('/', entryDirectory, '.*'),
-              dest: path.posix.join(
+              src: path.join('/', entryDirectory, '.*'),
+              dest: path.join(
                '/',
                entryDirectory,
                `/${i18n.defaultLocale}/500`
@@ -1656,13 +1626,13 @@ export async function serverBuild({
          ]
        : [
            {
-              src: path.posix.join('/', entryDirectory, '.*'),
-              dest: path.posix.join(
+              src: path.join('/', entryDirectory, '.*'),
+              dest: path.join(
                '/',
                entryDirectory,
                hasStatic500 ||
                  hasIsr500Page ||
-                  lambdas[path.posix.join(entryDirectory, '500')]
+                  lambdas[path.join(entryDirectory, '500')]
                  ? '/500'
                  : '/_error'
              ),
--- a/packages/next/src/utils.ts
+++ b/packages/next/src/utils.ts
@@ -290,7 +290,7 @@ export async function getDynamicRoutes(
          .map(({ page, regex }: { page: string; regex: string }) => {
            return {
              src: regex,
-              dest: !isDev ? path.posix.join('/', entryDirectory, page) : page,
+              dest: !isDev ? path.join('/', entryDirectory, page) : page,
              check: true,
              status:
                canUsePreviewMode && omittedRoutes?.has(page) ? 404 : undefined,
@@ -315,9 +315,7 @@ export async function getDynamicRoutes(
            const { page, namedRegex, regex, routeKeys } = params;
            const route: RouteWithSrc = {
              src: namedRegex || regex,
-              dest: `${
-                !isDev ? path.posix.join('/', entryDirectory, page) : page
-              }${
+              dest: `${!isDev ? path.join('/', entryDirectory, page) : page}${
                routeKeys
                  ? `?${Object.keys(routeKeys)
                      .map(key => `${routeKeys[key]}=$${key}`)
@@ -412,7 +410,7 @@ export async function getDynamicRoutes(
  pageMatchers.forEach(pageMatcher => {
    // in `vercel dev` we don't need to prefix the destination
    const dest = !isDev
-      ? path.posix.join('/', entryDirectory, pageMatcher.pageName)
+      ? path.join('/', entryDirectory, pageMatcher.pageName)
      : pageMatcher.pageName;

    if (pageMatcher && pageMatcher.matcher) {
@@ -467,8 +465,8 @@ export function localizeDynamicRoutes(
        // ensure destination has locale prefix to match prerender output
        // path so that the prerender object is used
        route.dest = route.dest!.replace(
-          `${path.posix.join('/', entryDirectory, '/')}`,
-          `${path.posix.join('/', entryDirectory, '$nextLocale', '/')}`
+          `${path.join('/', entryDirectory, '/')}`,
+          `${path.join('/', entryDirectory, '$nextLocale', '/')}`
        );
      }
    } else {
@@ -577,7 +575,7 @@ export function filterStaticPages(
      return;
    }

-    const staticRoute = path.posix.join(entryDirectory, pathname);
+    const staticRoute = path.join(entryDirectory, pathname);

    staticPages[staticRoute] = staticPageFiles[page];
    staticPages[staticRoute].contentType = htmlContentType;
@@ -1618,11 +1616,11 @@ export const onPrerenderRouteInitial = (
  // if the 404 page used getStaticProps we need to update static404Page
  // since it wasn't populated from the staticPages group
  if (routeNoLocale === '/404') {
-    static404Page = path.posix.join(entryDirectory, routeKey);
+    static404Page = path.join(entryDirectory, routeKey);
  }

  if (routeNoLocale === '/500') {
-    static500Page = path.posix.join(entryDirectory, routeKey);
+    static500Page = path.join(entryDirectory, routeKey);
  }

  if (
@@ -1853,10 +1851,7 @@ export const onPrerenderRoute =
          '/',
          srcRoute == null
            ? outputPathPageOrig
-            : path.posix.join(
-                entryDirectory,
-                srcRoute === '/' ? '/index' : srcRoute
-              )
+            : path.join(entryDirectory, srcRoute === '/' ? '/index' : srcRoute)
        ),
        isServerMode
      );
@@ -2071,17 +2066,17 @@ export async function getStaticFiles(
  const publicDirectoryFiles: Record<string, FileFsRef> = {};

  for (const file of Object.keys(nextStaticFiles)) {
-    staticFiles[path.posix.join(entryDirectory, `_next/static/${file}`)] =
+    staticFiles[path.join(entryDirectory, `_next/static/${file}`)] =
      nextStaticFiles[file];
  }

  for (const file of Object.keys(staticFolderFiles)) {
-    staticDirectoryFiles[path.posix.join(entryDirectory, 'static', file)] =
+    staticDirectoryFiles[path.join(entryDirectory, 'static', file)] =
      staticFolderFiles[file];
  }

  for (const file of Object.keys(publicFolderFiles)) {
-    publicDirectoryFiles[path.posix.join(entryDirectory, file)] =
+    publicDirectoryFiles[path.join(entryDirectory, file)] =
      publicFolderFiles[file];
  }

--- a/packages/next/test/fixtures/00-app-dir-edge/app/edge/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir-edge/app/edge/page.server.js
--- a/packages/next/test/fixtures/00-app-dir-edge/app/index/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir-edge/app/index/page.server.js
--- a/packages/next/test/fixtures/00-app-dir-edge/app/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir-edge/app/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/(newroot)/dashboard/another/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/(newroot)/dashboard/another/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/(newroot)/layout.js
+++ b/packages/next/test/fixtures/00-app-dir/app/(newroot)/layout.js
@@ -1,10 +0,0 @@
-export default function Root({ children }) {
-  return (
-    <html className="this-is-another-document-html">
-      <head>
-        <title>{`hello world`}</title>
-      </head>
-      <body className="this-is-another-document-body">{children}</body>
-    </html>
-  );
-}
--- a/packages/next/test/fixtures/00-app-dir/app/(newroot)/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/(newroot)/layout.server.js
@@ -0,0 +1,18 @@
+export async function getServerSideProps() {
+  return {
+    props: {
+      world: 'world',
+    },
+  };
+}
+
+export default function Root({ children, world }) {
+  return (
+    <html className="this-is-another-document-html">
+      <head>
+        <title>{`hello ${world}`}</title>
+      </head>
+      <body className="this-is-another-document-body">{children}</body>
+    </html>
+  );
+}
--- a/packages/next/test/fixtures/00-app-dir/app/(rootonly)/dashboard/changelog/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/(rootonly)/dashboard/changelog/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/(rootonly)/dashboard/hello/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/(rootonly)/dashboard/hello/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/client-component-route/page.client.js
+++ b/packages/next/test/fixtures/00-app-dir/app/client-component-route/page.client.js
@@ -1,5 +1,3 @@
-'client';
-
 import { useState, useEffect } from 'react';

 import style from './style.module.css';
--- a/packages/next/test/fixtures/00-app-dir/app/client-nested/layout.client.js
+++ b/packages/next/test/fixtures/00-app-dir/app/client-nested/layout.client.js
@@ -1,5 +1,3 @@
-'client';
-
 import { useState, useEffect } from 'react';

 import styles from './style.module.css';
--- a/packages/next/test/fixtures/00-app-dir/app/client-nested/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/client-nested/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/(custom)/deployments/breakdown/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/(custom)/deployments/breakdown/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/(custom)/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/(custom)/layout.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/[id]/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/[id]/page.server.js
@@ -1,7 +1,15 @@
+export async function getServerSideProps({ params }) {
+  return {
+    props: {
+      id: params.id,
+    },
+  };
+}
+
 export default function DeploymentsPage(props) {
  return (
    <>
-      <p>hello from app/dashboard/deployments/[id]. ID is: {props.params.id}</p>
+      <p>hello from app/dashboard/deployments/[id]. ID is: {props.id}</p>
    </>
  );
 }
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/info/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/info/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/layout.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/layout.js
@@ -1,8 +0,0 @@
-export default function DeploymentsLayout({ message, children }) {
-  return (
-    <>
-      <h2>Deployments hello</h2>
-      {children}
-    </>
-  );
-}
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/layout.server.js
@@ -0,0 +1,16 @@
+export function getServerSideProps() {
+  return {
+    props: {
+      message: 'hello',
+    },
+  };
+}
+
+export default function DeploymentsLayout({ message, children }) {
+  return (
+    <>
+      <h2>Deployments {message}</h2>
+      {children}
+    </>
+  );
+}
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/index/lazy.client.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/index/lazy.client.js
@@ -1,5 +1,3 @@
-'client';
-
 export default function LazyComponent() {
  return (
    <>
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/index/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/index/page.server.js
@@ -1,4 +1,4 @@
-import { ClientComponent } from './test.js';
+import { ClientComponent } from './test.client.js';

 export default function DashboardIndexPage() {
  return (
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/index/test.client.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/index/test.client.js
@@ -1,8 +1,6 @@
-'client';
-
 import { useState, lazy } from 'react';

-const Lazy = lazy(() => import('./lazy.js'));
+const Lazy = lazy(() => import('./lazy.client.js'));

 export function ClientComponent() {
  let [state] = useState('client');
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/integrations/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/integrations/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/layout.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/dashboard/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dashboard/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/dynamic/[category]/[id]/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dynamic/[category]/[id]/layout.server.js
@@ -1,3 +1,11 @@
+export async function getServerSideProps({ params }) {
+  return {
+    props: {
+      params,
+    },
+  };
+}
+
 export default function IdLayout({ children, params }) {
  return (
    <>
--- a/packages/next/test/fixtures/00-app-dir/app/dynamic/[category]/[id]/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dynamic/[category]/[id]/page.server.js
@@ -1,3 +1,11 @@
+export async function getServerSideProps({ params }) {
+  return {
+    props: {
+      params,
+    },
+  };
+}
+
 export default function IdPage({ children, params }) {
  return (
    <>
--- a/packages/next/test/fixtures/00-app-dir/app/dynamic/[category]/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dynamic/[category]/layout.server.js
@@ -1,3 +1,11 @@
+export async function getServerSideProps({ params }) {
+  return {
+    props: {
+      params,
+    },
+  };
+}
+
 export default function CategoryLayout({ children, params }) {
  return (
    <>
--- a/packages/next/test/fixtures/00-app-dir/app/dynamic/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/dynamic/layout.server.js
@@ -1,3 +1,11 @@
+export async function getServerSideProps({ params }) {
+  return {
+    props: {
+      params,
+    },
+  };
+}
+
 export default function DynamicLayout({ children, params }) {
  return (
    <>
--- a/packages/next/test/fixtures/00-app-dir/app/layout.js
+++ b/packages/next/test/fixtures/00-app-dir/app/layout.js
@@ -1,14 +0,0 @@
-export default function Root({ children }) {
-  return (
-    <html className="this-is-the-document-html">
-      <head>
-        <title>{`hello world`}</title>
-      </head>
-      <body className="this-is-the-document-body">{children}</body>
-    </html>
-  );
-}
-
-export const config = {
-  revalidate: 0,
-};
--- a/packages/next/test/fixtures/00-app-dir/app/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/layout.server.js
@@ -0,0 +1,18 @@
+export async function getServerSideProps() {
+  return {
+    props: {
+      world: 'world',
+    },
+  };
+}
+
+export default function Root({ children, custom, world }) {
+  return (
+    <html className="this-is-the-document-html">
+      <head>
+        <title>{`hello ${world}`}</title>
+      </head>
+      <body className="this-is-the-document-body">{children}</body>
+    </html>
+  );
+}
--- a/packages/next/test/fixtures/00-app-dir/app/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/partial-match-[id]/page.js
+++ b/packages/next/test/fixtures/00-app-dir/app/partial-match-[id]/page.js
@@ -1,7 +0,0 @@
-export default function DeploymentsPage(props) {
-  return (
-    <>
-      <p>hello from app/partial-match-[id]. ID is: {props.params.id}</p>
-    </>
-  );
-}
--- a/packages/next/test/fixtures/00-app-dir/app/partial-match-[id]/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/partial-match-[id]/page.server.js
@@ -0,0 +1,15 @@
+export async function getServerSideProps({ params }) {
+  return {
+    props: {
+      id: params.id,
+    },
+  };
+}
+
+export default function DeploymentsPage(props) {
+  return (
+    <>
+      <p>hello from app/partial-match-[id]. ID is: {props.id}</p>
+    </>
+  );
+}
--- a/packages/next/test/fixtures/00-app-dir/app/should-not-serve-client/page.client.js
+++ b/packages/next/test/fixtures/00-app-dir/app/should-not-serve-client/page.client.js
@@ -1,5 +1,3 @@
-'client';
-
 export default function ShouldNotServeClientDotJs(props) {
  return (
    <>
--- a/packages/next/test/fixtures/00-app-dir/app/should-not-serve-server/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/should-not-serve-server/page.server.js
--- a/packages/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/layout.js
+++ b/packages/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/layout.js
@@ -1,18 +0,0 @@
-import { experimental_use as use } from 'react';
-
-async function getData() {
-  await new Promise(resolve => setTimeout(resolve, 1000));
-  return {
-    message: 'hello from slow layout',
-  };
-}
-
-export default function SlowLayout(props) {
-  const data = use(getData());
-  return (
-    <>
-      <p id="slow-layout-message">{data.message}</p>
-      {props.children}
-    </>
-  );
-}
--- a/packages/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/layout.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/layout.server.js
@@ -0,0 +1,17 @@
+export async function getServerSideProps() {
+  await new Promise(resolve => setTimeout(resolve, 1000));
+  return {
+    props: {
+      message: 'hello from slow layout',
+    },
+  };
+}
+
+export default function SlowLayout(props) {
+  return (
+    <>
+      <p id="slow-layout-message">{props.message}</p>
+      {props.children}
+    </>
+  );
+}
--- a/Show More
+++ b/Show More