Add "rush" workspace

.github/workflows/cancel.yml

@@ -0,0 +1,17 @@
+name: Cancel
+on:
+  push:
+    branches:
+    - '**'
+    - '!main'
+
+jobs:
+  cancel:
+    name: 'Cancel Previous Runs'
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+    steps:
+      - uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          workflow_id: test.yml, test-integration-cli.yml, test-unit.yml
+          access_token: ${{ github.token }}

.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
@@ -37,10 +32,8 @@ jobs:
     - name: Setup Node
       if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
       uses: actions/setup-node@v3
-      timeout-minutes: 5 # See https://github.com/actions/cache/issues/810
       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

.github/workflows/test-integration-cli.yml

@@ -8,15 +8,6 @@ on:
     - '!*'
   pull_request:
 
-env:
-  TURBO_REMOTE_ONLY: 'true'
-  TURBO_TEAM: 'vercel'
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-
 jobs:
   test:
     name: CLI
@@ -28,20 +19,28 @@ 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
-        timeout-minutes: 5 # See https://github.com/actions/cache/issues/810
         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
         env:
-          VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
-          VERCEL_TEST_REGISTRATION_URL: ${{ secrets.VERCEL_TEST_REGISTRATION_URL }}
+          VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
+          VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}

.github/workflows/test-unit.yml

@@ -8,15 +8,6 @@ on:
     - '!*'
   pull_request:
 
-env:
-  TURBO_REMOTE_ONLY: 'true'
-  TURBO_TEAM: 'vercel'
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-
 jobs:
   test:
     name: Unit
@@ -28,17 +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/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
       - uses: actions/checkout@v3
         with:
-            fetch-depth: 2
-      - uses: actions/setup-node@v3
-        timeout-minutes: 5 # See https://github.com/actions/cache/issues/810
-        with:
-            node-version: ${{ matrix.node }}
-            cache: 'yarn'
+          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

.github/workflows/test.yml

@@ -10,13 +10,6 @@ on:
 
 env:
   NODE_VERSION: '14'
-  TURBO_REMOTE_ONLY: 'true'
-  TURBO_TEAM: 'vercel'
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   setup:
@@ -27,13 +20,9 @@ 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
-        timeout-minutes: 5 # See https://github.com/actions/cache/issues/810
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'yarn'
@@ -63,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
@@ -70,7 +65,6 @@ jobs:
         with:
           go-version: '1.13.15'
       - uses: actions/setup-node@v3
-        timeout-minutes: 5 # See https://github.com/actions/cache/issues/810
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'yarn'
@@ -90,8 +84,8 @@ jobs:
         shell: bash
         env:
           VERCEL_CLI_VERSION: ${{ needs.setup.outputs.dplUrl }}/tarballs/vercel.tgz
-          VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
-          VERCEL_TEST_REGISTRATION_URL: ${{ secrets.VERCEL_TEST_REGISTRATION_URL }}
+          VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}
+          VERCEL_REGISTRATION_URL: ${{ secrets.VERCEL_REGISTRATION_URL }}
           FORCE_COLOR: '1'
 
   conclusion:

DEVELOPING_A_RUNTIME.md

@@ -380,8 +380,8 @@ This is a [class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Refere
 
 This is an abstract enumeration type that is implemented by one of the following possible `String` values:
 
-- `nodejs16.x`
 - `nodejs14.x`
+- `nodejs12.x`
 - `go1.x`
 - `java11`
 - `python3.9`

README.md

@@ -19,9 +19,11 @@
 
 ## Vercel
 
-Vercel is the platform for frontend developers, providing the speed and reliability innovators need to create at the moment of inspiration.
+Vercel is a platform for **static sites and frontend frameworks**, built to integrate with your headless content, commerce, or database.
 
-We enable teams to iterate quickly and develop, preview, and ship delightful user experiences. Vercel has zero-configuration support for 35+ frontend frameworks and integrates with your headless content, commerce, or database of choice.
+We provide a **frictionless developer experience** to take care of the hard things: deploy instantly, scale automatically, and serve personalized content around the globe.
+
+We make it easy for frontend teams to **develop, preview, and ship** delightful user experiences, where performance is the default.
 
 ## Deploy
 

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"
   }
 }

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"

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",

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "5.5.4",
+  "version": "5.4.2",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

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;
-  }, {});
-}

packages/build-utils/src/edge-function.ts

@@ -38,9 +38,6 @@ export class EdgeFunction {
    */
   assets?: { name: string; path: string }[];
 
-  /** The regions where the edge function will be executed on */
-  regions?: 'auto' | string[] | 'all' | 'default';
-
   constructor(params: Omit<EdgeFunction, 'type'>) {
     this.type = 'EdgeFunction';
     this.name = params.name;
@@ -49,6 +46,5 @@ export class EdgeFunction {
     this.files = params.files;
     this.envVarsInUse = params.envVarsInUse;
     this.assets = params.assets;
-    this.regions = params.regions;
   }
 }

packages/build-utils/src/errors.ts

@@ -61,14 +61,14 @@ export function getPrettyError(obj: {
     }
 
     return new NowBuildError({
-      code: 'INVALID_VERCEL_CONFIG',
+      code: 'DEV_VALIDATE_CONFIG',
       message: message,
       link: prop ? `${docsUrl}#project/${prop.toLowerCase()}` : docsUrl,
       action: 'View Documentation',
     });
   } catch (e) {
     return new NowBuildError({
-      code: 'INVALID_VERCEL_CONFIG',
+      code: 'DEV_VALIDATE_CONFIG',
       message: `Failed to validate configuration.`,
       link: docsUrl,
       action: 'View Documentation',

packages/build-utils/src/file-fs-ref.ts

@@ -5,13 +5,7 @@ import path from 'path';
 import Sema from 'async-sema';
 import { FileBase } from './types';
 
-const DEFAULT_SEMA = 20;
-const semaToPreventEMFILE = new Sema(
-  parseInt(
-    process.env.VERCEL_INTERNAL_FILE_FS_REF_SEMA || String(DEFAULT_SEMA),
-    10
-  ) || DEFAULT_SEMA
-);
+const semaToPreventEMFILE = new Sema(20);
 
 interface FileFsRefOptions {
   mode?: number;

packages/build-utils/src/file-ref.ts

@@ -12,13 +12,7 @@ interface FileRefOptions {
   mutable?: boolean;
 }
 
-const DEFAULT_SEMA = 5;
-const semaToDownloadFromS3 = new Sema(
-  parseInt(
-    process.env.VERCEL_INTERNAL_FILE_REF_SEMA || String(DEFAULT_SEMA),
-    10
-  ) || DEFAULT_SEMA
-);
+const semaToDownloadFromS3 = new Sema(5);
 
 class BailableError extends Error {
   public bail: boolean;

packages/build-utils/src/fs/node-version.ts

@@ -10,7 +10,7 @@ const allOptions = [
     major: 12,
     range: '12.x',
     runtime: 'nodejs12.x',
-    discontinueDate: new Date('2022-10-03'),
+    discontinueDate: new Date('2022-10-01'),
   },
   {
     major: 10,

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,30 +458,12 @@ export async function runNpmInstall(
       env,
     });
     let commandArgs: string[];
-    const isPotentiallyBrokenNpm =
-      cliType === 'npm' &&
-      (nodeVersion?.major === 16 ||
-        opts.env.PATH?.includes('/node16/bin-npm7')) &&
-      !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
@@ -499,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 {
@@ -629,7 +591,10 @@ export async function runPackageJsonScript(
       cliType,
       lockfileVersion,
       nodeVersion: undefined,
-      env: cloneEnv(process.env, spawnOpts?.env),
+      env: {
+        ...process.env,
+        ...spawnOpts?.env,
+      },
     }),
   };
 

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';

packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/.gitignore

@@ -1,2 +0,0 @@
-node_modules
-.vercel

packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/package-lock.json

@@ -1,64 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "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=="
-    }
-  }
-}

packages/build-utils/test/fixtures/14-npm-6-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@6.14.17",
-  "dependencies": {
-    "swr": "1.3.0",
-    "react": "16.8.0"
-  }
-}

packages/build-utils/test/fixtures/14-npm-6-legacy-peer-deps/probes.json

@@ -1,3 +0,0 @@
-{
-  "probes": [{ "path": "/", "mustContain": "legacy peer deps" }]
-}

packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/.gitignore

@@ -1,2 +0,0 @@
-node_modules
-.vercel

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=="
-    }
-  }
-}

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"
-  }
-}

packages/build-utils/test/fixtures/15-npm-8-legacy-peer-deps/probes.json

@@ -1,3 +0,0 @@
-{
-  "probes": [{ "path": "/", "mustContain": "legacy peer deps" }]
-}

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"
     }
   }

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

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',
-  });
-});

packages/build-utils/test/unit.run-npm-install.test.ts

@@ -1,197 +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 = 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 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 include peer dependencies when VERCEL_NPM_LEGACY_PEER_DEPS=1 on node14 and npm7+', 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',
-    '--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 and npm6', async () => {
-  const fixture = path.join(__dirname, 'fixtures', '14-npm-6-legacy-peer-deps');
-  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),
-  });
-});

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);
@@ -216,6 +218,10 @@ it('should download symlinks even with incorrect file', async () => {
 });
 
 it('should only match supported node versions, otherwise throw an error', async () => {
+  expect(await getSupportedNodeVersion('12.x', false)).toHaveProperty(
+    'major',
+    12
+  );
   expect(await getSupportedNodeVersion('14.x', false)).toHaveProperty(
     'major',
     14
@@ -236,6 +242,10 @@ it('should only match supported node versions, otherwise throw an error', async
   await expectBuilderError(getSupportedNodeVersion('foo', true), autoMessage);
   await expectBuilderError(getSupportedNodeVersion('=> 10', true), autoMessage);
 
+  expect(await getSupportedNodeVersion('12.x', true)).toHaveProperty(
+    'major',
+    12
+  );
   expect(await getSupportedNodeVersion('14.x', true)).toHaveProperty(
     'major',
     14
@@ -265,21 +275,21 @@ it('should only match supported node versions, otherwise throw an error', async
 
 it('should match all semver ranges', async () => {
   // See https://docs.npmjs.com/files/package.json#engines
-  expect(await getSupportedNodeVersion('14.0.0')).toHaveProperty('major', 14);
-  expect(await getSupportedNodeVersion('14.x')).toHaveProperty('major', 14);
+  expect(await getSupportedNodeVersion('12.0.0')).toHaveProperty('major', 12);
+  expect(await getSupportedNodeVersion('12.x')).toHaveProperty('major', 12);
   expect(await getSupportedNodeVersion('>=10')).toHaveProperty('major', 16);
   expect(await getSupportedNodeVersion('>=10.3.0')).toHaveProperty('major', 16);
-  expect(await getSupportedNodeVersion('16.5.0 - 16.9.0')).toHaveProperty(
+  expect(await getSupportedNodeVersion('11.5.0 - 12.5.0')).toHaveProperty(
     'major',
-    16
+    12
   );
-  expect(await getSupportedNodeVersion('>=9.5.0 <=14.5.0')).toHaveProperty(
+  expect(await getSupportedNodeVersion('>=9.5.0 <=12.5.0')).toHaveProperty(
     'major',
-    14
+    12
   );
-  expect(await getSupportedNodeVersion('~14.5.0')).toHaveProperty('major', 14);
-  expect(await getSupportedNodeVersion('^14.5.0')).toHaveProperty('major', 14);
-  expect(await getSupportedNodeVersion('14.5.0 - 14.20.0')).toHaveProperty(
+  expect(await getSupportedNodeVersion('~12.5.0')).toHaveProperty('major', 12);
+  expect(await getSupportedNodeVersion('^12.5.0')).toHaveProperty('major', 12);
+  expect(await getSupportedNodeVersion('12.5.0 - 14.5.0')).toHaveProperty(
     'major',
     14
   );
@@ -426,8 +436,8 @@ it('should warn for deprecated versions, soon to be discontinued', async () => {
   expect(warningMessages).toStrictEqual([
     'Error: Node.js version 10.x has reached End-of-Life. Deployments created on or after 2021-04-20 will fail to build. Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16.',
     'Error: Node.js version 10.x has reached End-of-Life. Deployments created on or after 2021-04-20 will fail to build. Please set Node.js Version to 16.x in your Project Settings to use Node.js 16.',
-    'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-03 will fail to build. Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16.',
-    'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-03 will fail to build. Please set Node.js Version to 16.x in your Project Settings to use Node.js 16.',
+    'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-01 will fail to build. Please set "engines": { "node": "16.x" } in your `package.json` file to use Node.js 16.',
+    'Error: Node.js version 12.x has reached End-of-Life. Deployments created on or after 2022-10-01 will fail to build. Please set Node.js Version to 16.x in your Project Settings to use Node.js 16.',
   ]);
 
   global.Date.now = realDateNow;
@@ -568,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);
 });

packages/cli/README.md

@@ -10,9 +10,11 @@
 
 ## Usage
 
-Vercel is the platform for frontend developers, providing the speed and reliability innovators need to create at the moment of inspiration.
+Vercel is a platform for **static sites and frontend frameworks**, built to integrate with your headless content, commerce, or database.
 
-We enable teams to iterate quickly and develop, preview, and ship delightful user experiences. Vercel has zero-configuration support for 35+ frontend frameworks and integrates with your headless content, commerce, or database of choice.
+We provide a **frictionless developer experience** to take care of the hard things: deploy instantly, scale automatically, and serve personalized content around the globe.
+
+We make it easy for frontend teams to **develop, preview, and ship** delightful user experiences, where performance is the default.
 
 To install the latest version of Vercel CLI, run this command:
 

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "28.4.7",
+  "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.5.4",
-    "@vercel/go": "2.2.12",
-    "@vercel/hydrogen": "0.0.25",
-    "@vercel/next": "3.2.3",
-    "@vercel/node": "2.5.22",
-    "@vercel/python": "3.1.21",
-    "@vercel/redwood": "1.0.30",
-    "@vercel/remix": "1.0.31",
-    "@vercel/ruby": "1.3.38",
-    "@vercel/static-build": "1.0.30",
+    "@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.12",
-    "@vercel/frameworks": "1.1.6",
-    "@vercel/fs-detectors": "3.4.1",
+    "@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",

packages/cli/src/commands/bisect/index.ts

@@ -2,6 +2,7 @@ import open from 'open';
 import boxen from 'boxen';
 import execa from 'execa';
 import plural from 'pluralize';
+import inquirer from 'inquirer';
 import { resolve } from 'path';
 import chalk, { Chalk } from 'chalk';
 import { URLSearchParams, parse } from 'url';
@@ -149,9 +150,7 @@ export default async function main(client: Client): Promise<number> {
 
   if (badDeployment) {
     if (badDeployment instanceof Error) {
-      badDeployment.message += ` when requesting bad deployment "${normalizeURL(
-        bad
-      )}"`;
+      badDeployment.message += ` "${bad}"`;
       output.prettyError(badDeployment);
       return 1;
     }
@@ -166,9 +165,7 @@ export default async function main(client: Client): Promise<number> {
 
   if (goodDeployment) {
     if (goodDeployment instanceof Error) {
-      goodDeployment.message += ` when requesting good deployment "${normalizeURL(
-        good
-      )}"`;
+      goodDeployment.message += ` "${good}"`;
       output.prettyError(goodDeployment);
       return 1;
     }
@@ -229,8 +226,7 @@ export default async function main(client: Client): Promise<number> {
     // If we have the "good" deployment in this chunk, then we're done
     for (let i = 0; i < newDeployments.length; i++) {
       if (newDeployments[i].url === good) {
-        // grab all deployments up until the good one
-        newDeployments = newDeployments.slice(0, i);
+        newDeployments = newDeployments.slice(0, i + 1);
         next = undefined;
         break;
       }
@@ -320,7 +316,7 @@ export default async function main(client: Client): Promise<number> {
       if (openEnabled) {
         await open(testUrl);
       }
-      const answer = await client.prompt({
+      const answer = await inquirer.prompt({
         type: 'expand',
         name: 'action',
         message: 'Select an action:',

packages/cli/src/commands/build.ts

@@ -3,7 +3,6 @@ import chalk from 'chalk';
 import dotenv from 'dotenv';
 import { join, normalize, relative, resolve } from 'path';
 import {
-  getDiscontinuedNodeVersions,
   normalizePath,
   Files,
   FileFsRef,
@@ -26,7 +25,6 @@ import {
   MergeRoutesProps,
   Route,
 } from '@vercel/routing-utils';
-import { fileNameSymbol } from '@vercel/client';
 import type { VercelConfig } from '@vercel/client';
 
 import pull from './pull';
@@ -56,7 +54,6 @@ import { importBuilders } from '../util/build/import-builders';
 import { initCorepack, cleanupCorepack } from '../util/build/corepack';
 import { sortBuilders } from '../util/build/sort-builders';
 import { toEnumerableError } from '../util/error';
-import { validateConfig } from '../util/validate-config';
 
 type BuildResult = BuildResultV2 | BuildResultV3;
 
@@ -235,8 +232,7 @@ export default async function main(client: Client): Promise<number> {
     process.env.VERCEL = '1';
     process.env.NOW_BUILDER = '1';
 
-    await doBuild(client, project, buildsJson, cwd, outputDir);
-    return 0;
+    return await doBuild(client, project, buildsJson, cwd, outputDir);
   } catch (err: any) {
     output.prettyError(err);
 
@@ -269,36 +265,23 @@ async function doBuild(
   buildsJson: BuildsManifest,
   cwd: string,
   outputDir: string
-): Promise<void> {
+): Promise<number> {
   const { output } = client;
   const workPath = join(cwd, project.settings.rootDirectory || '.');
 
-  const [pkg, vercelConfig, nowConfig] = await Promise.all([
+  // Load `package.json` and `vercel.json` files
+  const [pkg, vercelConfig] = await Promise.all([
     readJSONFile<PackageJson>(join(workPath, 'package.json')),
-    readJSONFile<VercelConfig>(join(workPath, 'vercel.json')),
-    readJSONFile<VercelConfig>(join(workPath, 'now.json')),
+    readJSONFile<VercelConfig>(join(workPath, 'vercel.json')).then(
+      config => config || readJSONFile<VercelConfig>(join(workPath, 'now.json'))
+    ),
   ]);
-
   if (pkg instanceof CantParseJSONFile) throw pkg;
   if (vercelConfig instanceof CantParseJSONFile) throw vercelConfig;
-  if (nowConfig instanceof CantParseJSONFile) throw nowConfig;
-
-  if (vercelConfig) {
-    vercelConfig[fileNameSymbol] = 'vercel.json';
-  } else if (nowConfig) {
-    nowConfig[fileNameSymbol] = 'now.json';
-  }
-
-  const localConfig = vercelConfig || nowConfig || {};
-  const validateError = validateConfig(localConfig);
-
-  if (validateError) {
-    throw validateError;
-  }
 
   const projectSettings = {
     ...project.settings,
-    ...pickOverrides(localConfig),
+    ...pickOverrides(vercelConfig || {}),
   };
 
   // Get a list of source files
@@ -306,12 +289,12 @@ async function doBuild(
     normalizePath(relative(workPath, f))
   );
 
-  const routesResult = getTransformedRoutes(localConfig);
+  const routesResult = getTransformedRoutes(vercelConfig || {});
   if (routesResult.error) {
     throw routesResult.error;
   }
 
-  if (localConfig.builds && localConfig.functions) {
+  if (vercelConfig?.builds && vercelConfig.functions) {
     throw new NowBuildError({
       code: 'bad_request',
       message:
@@ -320,7 +303,7 @@ async function doBuild(
     });
   }
 
-  let builds = localConfig.builds || [];
+  let builds = vercelConfig?.builds || [];
   let zeroConfigRoutes: Route[] = [];
   let isZeroConfig = false;
 
@@ -335,7 +318,7 @@ async function doBuild(
 
     // Detect the Vercel Builders that will need to be invoked
     const detectedBuilders = await detectBuilders(files, pkg, {
-      ...localConfig,
+      ...vercelConfig,
       projectSettings,
       ignoreBuildScript: true,
       featHandleMiss: true,
@@ -412,10 +395,13 @@ async function doBuild(
     })
   );
   buildsJson.builds = Array.from(buildsJsonBuilds.values());
-  await fs.writeJSON(join(outputDir, 'builds.json'), buildsJson, {
+  const buildsJsonPath = join(outputDir, 'builds.json');
+  const writeBuildsJsonPromise = fs.writeJSON(buildsJsonPath, buildsJson, {
     spaces: 2,
   });
 
+  ops.push(writeBuildsJsonPromise);
+
   // The `meta` config property is re-used for each Builder
   // invocation so that Builders can share state between
   // subsequent entrypoint builds.
@@ -468,25 +454,6 @@ async function doBuild(
       );
       const buildResult = await builder.build(buildOptions);
 
-      if (
-        buildResult &&
-        'output' in buildResult &&
-        'runtime' in buildResult.output &&
-        'type' in buildResult.output &&
-        buildResult.output.type === 'Lambda'
-      ) {
-        const lambdaRuntime = buildResult.output.runtime;
-        if (
-          getDiscontinuedNodeVersions().some(o => o.runtime === lambdaRuntime)
-        ) {
-          throw new NowBuildError({
-            code: 'NODEJS_DISCONTINUED_VERSION',
-            message: `The Runtime "${build.use}" is using "${lambdaRuntime}", which is discontinued. Please upgrade your Runtime to a more recent version or consult the author for more details.`,
-            link: 'https://github.com/vercel/vercel/blob/main/DEVELOPING_A_RUNTIME.md#lambdaruntime',
-          });
-        }
-      }
-
       // Store the build result to generate the final `config.json` after
       // all builds have completed
       buildResults.set(build, buildResult);
@@ -499,7 +466,7 @@ async function doBuild(
           build,
           builder,
           builderPkg,
-          localConfig
+          vercelConfig
         ).then(
           override => {
             if (override) overrides.push(override);
@@ -508,11 +475,26 @@ async function doBuild(
         )
       );
     } catch (err: any) {
+      output.prettyError(err);
+
+      const writeConfigJsonPromise = fs.writeJSON(
+        join(outputDir, 'config.json'),
+        { version: 3 },
+        { spaces: 2 }
+      );
+
+      await Promise.all([writeBuildsJsonPromise, writeConfigJsonPromise]);
+
       const buildJsonBuild = buildsJsonBuilds.get(build);
       if (buildJsonBuild) {
         buildJsonBuild.error = toEnumerableError(err);
+
+        await fs.writeJSON(buildsJsonPath, buildsJson, {
+          spaces: 2,
+        });
       }
-      throw err;
+
+      return 1;
     }
   }
 
@@ -573,7 +555,7 @@ async function doBuild(
     builds: builderRoutes,
   });
 
-  const mergedImages = mergeImages(localConfig.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;
@@ -599,6 +581,8 @@ async function doBuild(
       emoji('success')
     )}\n`
   );
+
+  return 0;
 }
 
 function expandBuild(files: string[], build: Builder): Builder[] {
@@ -640,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);

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,

packages/cli/src/util/client.ts

@@ -23,7 +23,6 @@ import type {
 } from '../types';
 import { sharedPromise } from './promise';
 import { APIError } from './errors-ts';
-import { normalizeError } from './is-error';
 
 const isSAMLError = (v: any): v is SAMLError => {
   return v && v.saml;
@@ -147,15 +146,10 @@ export default class Client extends EventEmitter implements Stdio {
         const error = await responseError(res);
 
         if (isSAMLError(error)) {
-          try {
-            // A SAML error means the token is expired, or is not
-            // designated for the requested team, so the user needs
-            // to re-authenticate
-            await this.reauthenticate(error);
-          } catch (reauthError) {
-            // there's no sense in retrying
-            return bail(normalizeError(reauthError));
-          }
+          // A SAML error means the token is expired, or is not
+          // designated for the requested team, so the user needs
+          // to re-authenticate
+          await this.reauthenticate(error);
         } else if (res.status >= 400 && res.status < 500) {
           // Any other 4xx should bail without retrying
           return bail(error);
@@ -192,7 +186,7 @@ export default class Client extends EventEmitter implements Stdio {
           `Failed to re-authenticate for ${bold(error.scope)} scope`
         );
       }
-      throw error;
+      process.exit(1);
     }
 
     this.authConfig.token = result.token;

packages/cli/src/util/create-git-meta.ts

@@ -78,23 +78,16 @@ function getLastCommit(directory: string): Promise<git.Commit> {
 
 export function isDirty(directory: string, output: Output): Promise<boolean> {
   return new Promise(resolve => {
-    // note: we specify the `--no-optional-locks` git flag so that `git status`
-    // does not perform any "optional" operations such as optimizing the index
-    // in the background: https://git-scm.com/docs/git-status#_background_refresh
-    exec(
-      'git --no-optional-locks status -s',
-      { cwd: directory },
-      function (err, stdout, stderr) {
-        let debugMessage = `Failed to determine if Git repo has been modified:`;
-        if (err || stderr) {
-          if (err) debugMessage += `\n${err}`;
-          if (stderr) debugMessage += `\n${stderr.trim()}`;
-          output.debug(debugMessage);
-          return resolve(false);
-        }
-        resolve(stdout.trim().length > 0);
+    exec('git status -s', { cwd: directory }, function (err, stdout, stderr) {
+      let debugMessage = `Failed to determine if Git repo has been modified:`;
+      if (err || stderr) {
+        if (err) debugMessage += `\n${err}`;
+        if (stderr) debugMessage += `\n${stderr.trim()}`;
+        output.debug(debugMessage);
+        return resolve(false);
       }
-    );
+      resolve(stdout.trim().length > 0);
+    });
   });
 }
 

packages/cli/src/util/deploy/process-deployment.ts

@@ -115,39 +115,29 @@ export default async function processDeployment({
           .reduce((a: number, b: number) => a + b, 0);
         const totalSizeHuman = bytes.format(missingSize, { decimalPlaces: 1 });
 
-        // When stderr is not a TTY then we only want to
-        // print upload progress in 25% increments
-        let nextStep = 0;
-        const stepSize = now._client.stderr.isTTY ? 0 : 0.25;
+        uploads.forEach((e: any) =>
+          e.on('progress', () => {
+            const uploadedBytes = uploads.reduce((acc: number, e: any) => {
+              return acc + e.bytesUploaded;
+            }, 0);
 
-        const updateProgress = () => {
-          const uploadedBytes = uploads.reduce((acc: number, e: any) => {
-            return acc + e.bytesUploaded;
-          }, 0);
-
-          const bar = progress(uploadedBytes, missingSize);
-          if (!bar) {
-            output.spinner(deployingSpinnerVal, 0);
-          } else {
-            const uploadedHuman = bytes.format(uploadedBytes, {
-              decimalPlaces: 1,
-              fixedDecimals: true,
-            });
-            const percent = uploadedBytes / missingSize;
-            if (percent >= nextStep) {
+            const bar = progress(uploadedBytes, missingSize);
+            if (!bar || uploadedBytes === missingSize) {
+              output.spinner(deployingSpinnerVal, 0);
+            } else {
+              const uploadedHuman = bytes.format(uploadedBytes, {
+                decimalPlaces: 1,
+                fixedDecimals: true,
+              });
               output.spinner(
                 `Uploading ${chalk.reset(
                   `[${bar}] (${uploadedHuman}/${totalSizeHuman})`
                 )}`,
                 0
               );
-              nextStep += stepSize;
             }
-          }
-        };
-
-        uploads.forEach((e: any) => e.on('progress', updateProgress));
-        updateProgress();
+          })
+        );
       }
 
       if (event.type === 'file-uploaded') {

packages/cli/src/util/dev/server.ts

@@ -31,7 +31,6 @@ import {
 } from '@vercel/routing-utils';
 import {
   Builder,
-  cloneEnv,
   Env,
   StartDevServerResult,
   FileFsRef,
@@ -57,7 +56,7 @@ import { MissingDotenvVarsError } from '../errors-ts';
 import cliPkg from '../pkg';
 import { getVercelDirectory } from '../projects/link';
 import { staticFiles as getFiles } from '../get-files';
-import { validateConfig } from '../validate-config';
+import { validateConfig } from './validate';
 import { devRouter, getRoutesTypes } from './router';
 import getMimeType from './mime-type';
 import { executeBuild, getBuildMatches, shutdownBuilder } from './builder';
@@ -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).

packages/cli/src/util/dev/validate.ts

@@ -7,7 +7,7 @@ import {
   rewritesSchema,
   trailingSlashSchema,
 } from '@vercel/routing-utils';
-import { VercelConfig } from './dev/types';
+import { VercelConfig } from './types';
 import {
   functionsSchema,
   buildsSchema,
@@ -16,83 +16,6 @@ import {
 } from '@vercel/build-utils';
 import { fileNameSymbol } from '@vercel/client';
 
-const imagesSchema = {
-  type: 'object',
-  additionalProperties: false,
-  required: ['sizes'],
-  properties: {
-    contentSecurityPolicy: {
-      type: 'string',
-      minLength: 1,
-      maxLength: 256,
-    },
-    dangerouslyAllowSVG: {
-      type: 'boolean',
-    },
-    domains: {
-      type: 'array',
-      minItems: 0,
-      maxItems: 50,
-      items: {
-        type: 'string',
-        minLength: 1,
-        maxLength: 256,
-      },
-    },
-    formats: {
-      type: 'array',
-      minItems: 1,
-      maxItems: 4,
-      items: {
-        enum: ['image/avif', 'image/webp', 'image/jpeg', 'image/png'],
-      },
-    },
-    minimumCacheTTL: {
-      type: 'integer',
-      minimum: 1,
-      maximum: 315360000,
-    },
-    remotePatterns: {
-      type: 'array',
-      minItems: 0,
-      maxItems: 50,
-      items: {
-        type: 'object',
-        additionalProperties: false,
-        required: ['hostname'],
-        properties: {
-          protocol: {
-            enum: ['http', 'https'],
-          },
-          hostname: {
-            type: 'string',
-            minLength: 1,
-            maxLength: 256,
-          },
-          port: {
-            type: 'string',
-            minLength: 1,
-            maxLength: 5,
-          },
-          pathname: {
-            type: 'string',
-            minLength: 1,
-            maxLength: 256,
-          },
-        },
-      },
-    },
-    sizes: {
-      type: 'array',
-      minItems: 1,
-      maxItems: 50,
-      items: {
-        type: 'number',
-      },
-    },
-  },
-};
-
 const vercelConfigSchema = {
   type: 'object',
   // These are not all possibilities because `vc dev`
@@ -107,7 +30,6 @@ const vercelConfigSchema = {
     rewrites: rewritesSchema,
     trailingSlash: trailingSlashSchema,
     functions: functionsSchema,
-    images: imagesSchema,
   },
 };
 

packages/cli/src/util/output/create-output.ts

@@ -4,8 +4,6 @@ import wait, { StopSpinner } from './wait';
 import type { WritableTTY } from '../../types';
 import { errorToString } from '../is-error';
 
-const IS_TEST = process.env.NODE_ENV === 'test';
-
 export interface OutputOptions {
   debug?: boolean;
 }
@@ -110,15 +108,12 @@ export class Output {
   };
 
   spinner = (message: string, delay: number = 300): void => {
+    this.spinnerMessage = message;
     if (this.debugEnabled) {
       this.debug(`Spinner invoked (${message}) with a ${delay}ms delay`);
       return;
     }
-    if (IS_TEST || !this.stream.isTTY) {
-      this.print(`${message}\n`);
-    } else {
-      this.spinnerMessage = message;
-
+    if (this.stream.isTTY) {
       if (this._spinner) {
         this._spinner.text = message;
       } else {
@@ -130,6 +125,8 @@ export class Output {
           delay
         );
       }
+    } else {
+      this.print(`${message}\n`);
     }
   };
 

packages/cli/src/util/projects/project-settings.ts

@@ -28,16 +28,6 @@ export async function writeProjectSettings(
   project: Project,
   org: Org
 ) {
-  let analyticsId: string | undefined;
-  if (
-    project.analytics?.id &&
-    (!project.analytics.disabledAt ||
-      (project.analytics.enabledAt &&
-        project.analytics.enabledAt > project.analytics.disabledAt))
-  ) {
-    analyticsId = project.analytics.id;
-  }
-
   const projectLinkAndSettings: ProjectLinkAndSettings = {
     projectId: project.id,
     orgId: org.id,
@@ -51,7 +41,7 @@ export async function writeProjectSettings(
       rootDirectory: project.rootDirectory,
       directoryListing: project.directoryListing,
       nodeVersion: project.nodeVersion,
-      analyticsId,
+      analyticsId: project.analytics?.id,
     },
   };
   const path = join(cwd, VERCEL_DIR, VERCEL_DIR_PROJECT);

packages/cli/test/dev/fixtures/edge-function/api/edge-import-browser.js

@@ -1,13 +0,0 @@
-import generateUUID from '../vendor/generate-uuid';
-
-export const config = {
-  runtime: 'experimental-edge',
-};
-
-export default async function edge(request, event) {
-  return new Response(
-    JSON.stringify({
-      randomString: generateUUID(),
-    })
-  );
-}

packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/index-browser.js

@@ -1,6 +0,0 @@
-// This uses the `crypto` globaly,
-// which will work fine in a browser or Edge Runtime environment
-
-export default function generateUUID(message) {
-  return crypto.randomUUID();
-}

packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/index-node.js

@@ -1,8 +0,0 @@
-import crypto from 'crypto';
-
-// this uses a core Node library,
-// which will fail to execute in a browser or Edge Runtime context
-
-export default function say(message) {
-  return crypto.generateUUID();
-}

packages/cli/test/dev/fixtures/edge-function/vendor/generate-uuid/package.json

@@ -1,6 +0,0 @@
-{
-  "name": "generate-uuid",
-  "private": true,
-  "main": "index-node.js",
-  "browser": "index-browser.js"
-}

packages/cli/test/dev/integration-1.test.ts

@@ -86,7 +86,6 @@ test(
   testFixtureStdio('edge-function', async (testPath: any) => {
     await testPath(500, '/api/edge-500-response');
     await testPath(200, '/api/edge-success');
-    await testPath(200, '/api/edge-import-browser');
   })
 );
 

packages/cli/test/fixtures/unit/commands/build/discontinued-nodejs12.x/.gitignore

@@ -1,2 +0,0 @@
-.vercel/builders
-.vercel/output

packages/cli/test/fixtures/unit/commands/build/discontinued-nodejs12.x/.vercel/project.json

@@ -1,7 +0,0 @@
-{
-  "orgId": ".",
-  "projectId": ".",
-  "settings": {
-    "framework": null
-  }
-}

packages/cli/test/fixtures/unit/commands/build/discontinued-nodejs12.x/api/index.php

@@ -1 +0,0 @@
-<?php echo 'This version of vercel-php uses the nodejs12.x Lambda Runtime'; ?>

packages/cli/test/fixtures/unit/commands/build/discontinued-nodejs12.x/vercel.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "https://openapi.vercel.sh/vercel.json",
-  "functions": {
-    "api/index.php": {
-      "runtime": "vercel-php@0.1.0"
-    }
-  }
-}

packages/cli/test/fixtures/unit/commands/build/images/.vercel/project.json

@@ -1,7 +0,0 @@
-{
-  "orgId": ".",
-  "projectId": ".",
-  "settings": {
-    "framework": null
-  }
-}

packages/cli/test/fixtures/unit/commands/build/images/index.html

@@ -1 +0,0 @@
-<h1>Vercel</h1>

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/avif", "image/webp"]
-  }
-}

packages/cli/test/fixtures/unit/commands/build/invalid-rewrites/.vercel/project.json

@@ -1,7 +0,0 @@
-{
-  "orgId": ".",
-  "projectId": ".",
-  "settings": {
-    "framework": null
-  }
-}

packages/cli/test/fixtures/unit/commands/build/invalid-rewrites/index.html

@@ -1 +0,0 @@
-<h1>Vercel</h1>

packages/cli/test/fixtures/unit/commands/build/invalid-rewrites/vercel.json

@@ -1,16 +0,0 @@
-{
-  "rewrites": [
-    {
-      "source": "/one",
-      "destination": "/api/one"
-    },
-    {
-      "source": "/two",
-      "destination": "/api/two"
-    },
-    {
-      "src": "/three",
-      "dest": "/api/three"
-    }
-  ]
-}

packages/cli/test/helpers/prepare.js

@@ -326,7 +326,7 @@ module.exports = async function prepare(session, binaryPath, tmpFixturesDir) {
       'vercel.json': JSON.stringify({
         functions: {
           'api/**/*.php': {
-            runtime: 'vercel-php@0.5.2',
+            runtime: 'vercel-php@0.1.0',
           },
         },
       }),

packages/cli/test/mocks/deployment.ts

@@ -3,26 +3,20 @@ import chance from 'chance';
 import { Deployment } from '@vercel/client';
 import { client } from './client';
 import { Build, User } from '../../src/types';
-import type { Request, Response } from 'express';
 
 let deployments = new Map<string, Deployment>();
 let deploymentBuilds = new Map<Deployment, Build[]>();
-let alreadySetupDeplomentEndpoints = false;
 
 type State = Deployment['readyState'];
 
 export function useDeployment({
   creator,
   state = 'READY',
-  createdAt,
 }: {
   creator: Pick<User, 'id' | 'email' | 'name' | 'username'>;
   state?: State;
-  createdAt?: number;
 }) {
-  setupDeploymentEndpoints();
-
-  createdAt = createdAt || Date.now();
+  const createdAt = Date.now();
   const url = new URL(chance().url());
   const name = chance().name();
   const id = `dpl_${chance().guid()}`;
@@ -105,15 +99,6 @@ export function useDeploymentMissingProjectSettings() {
 beforeEach(() => {
   deployments = new Map();
   deploymentBuilds = new Map();
-  alreadySetupDeplomentEndpoints = false;
-});
-
-function setupDeploymentEndpoints() {
-  if (alreadySetupDeplomentEndpoints) {
-    return;
-  }
-
-  alreadySetupDeplomentEndpoints = true;
 
   client.scenario.get('/:version/deployments/:id', (req, res) => {
     const { id } = req.params;
@@ -151,21 +136,8 @@ function setupDeploymentEndpoints() {
     res.json({ builds });
   });
 
-  function handleGetDeployments(req: Request, res: Response) {
-    const currentDeployments = Array.from(deployments.values()).sort(
-      (a: Deployment, b: Deployment) => {
-        // sort in reverse chronological order
-        return b.createdAt - a.createdAt;
-      }
-    );
-
-    res.json({
-      pagination: {
-        count: currentDeployments.length,
-      },
-      deployments: currentDeployments,
-    });
-  }
-  client.scenario.get('/:version/now/deployments', handleGetDeployments);
-  client.scenario.get('/:version/deployments', handleGetDeployments);
-}
+  client.scenario.get('/:version/now/deployments', (req, res) => {
+    const deploymentsList = Array.from(deployments.values());
+    res.json({ deployments: deploymentsList });
+  });
+});

packages/cli/test/unit/commands/bisect.test.ts

@@ -1,55 +0,0 @@
-import { client } from '../../mocks/client';
-import { useUser } from '../../mocks/user';
-import bisect from '../../../src/commands/bisect';
-import { useDeployment } from '../../mocks/deployment';
-
-describe('bisect', () => {
-  it('should find the bad deployment', async () => {
-    const user = useUser();
-
-    const now = Date.now();
-    const deployment1 = useDeployment({ creator: user, createdAt: now });
-    const deployment2 = useDeployment({
-      creator: user,
-      createdAt: now + 10000,
-    });
-    const deployment3 = useDeployment({
-      creator: user,
-      createdAt: now + 20000,
-    });
-
-    // also create an extra deployment before the known good deployment
-    // to make sure the bisect pool doesn't include it
-    useDeployment({
-      creator: user,
-      createdAt: now - 30000,
-    });
-
-    const bisectPromise = bisect(client);
-
-    await expect(client.stderr).toOutput('Specify a URL where the bug occurs:');
-    client.stdin.write(`https://${deployment3.url}\n`);
-
-    await expect(client.stderr).toOutput(
-      'Specify a URL where the bug does not occur:'
-    );
-    client.stdin.write(`https://${deployment1.url}\n`);
-
-    await expect(client.stderr).toOutput(
-      'Specify the URL subpath where the bug occurs:'
-    );
-    client.stdin.write('/docs\n');
-
-    await expect(client.stderr).toOutput('Bisecting');
-    await expect(client.stderr).toOutput(
-      `Deployment URL: https://${deployment2.url}`
-    );
-    client.stdin.write('b\n');
-
-    await expect(client.stderr).toOutput(
-      `The first bad deployment is: https://${deployment2.url}`
-    );
-
-    await expect(bisectPromise).resolves.toEqual(0);
-  });
-});

packages/cli/test/unit/commands/build.test.ts

@@ -750,71 +750,11 @@ describe('build', () => {
       const errorBuilds = builds.builds.filter((b: any) => 'error' in b);
       expect(errorBuilds).toHaveLength(1);
 
-      expect(errorBuilds[0].error).toEqual({
-        name: 'Error',
-        message: expect.stringContaining('TS1005'),
-        stack: expect.stringContaining('api/typescript.ts'),
-        hideStackTrace: true,
-        code: 'NODE_TYPESCRIPT_ERROR',
-      });
-
-      // top level "error" also contains the same error
-      expect(builds.error).toEqual({
-        name: 'Error',
-        message: expect.stringContaining('TS1005'),
-        stack: expect.stringContaining('api/typescript.ts'),
-        hideStackTrace: true,
-        code: 'NODE_TYPESCRIPT_ERROR',
-      });
-
-      // `config.json` contains `version`
-      const configJson = await fs.readJSON(join(output, 'config.json'));
-      expect(configJson.version).toBe(3);
-    } finally {
-      process.chdir(originalCwd);
-      delete process.env.__VERCEL_BUILD_RUNNING;
-    }
-  });
-
-  it('should error when "functions" has runtime that emits discontinued "nodejs12.x"', async () => {
-    if (process.platform === 'win32') {
-      console.log('Skipping test on Windows');
-      return;
-    }
-    const cwd = fixture('discontinued-nodejs12.x');
-    const output = join(cwd, '.vercel/output');
-    try {
-      process.chdir(cwd);
-      const exitCode = await build(client);
-      expect(exitCode).toEqual(1);
-
-      // Error gets printed to the terminal
-      await expect(client.stderr).toOutput(
-        'The Runtime "vercel-php@0.1.0" is using "nodejs12.x", which is discontinued. Please upgrade your Runtime to a more recent version or consult the author for more details.'
-      );
-
-      // `builds.json` contains "error" build
-      const builds = await fs.readJSON(join(output, 'builds.json'));
-      const errorBuilds = builds.builds.filter((b: any) => 'error' in b);
-      expect(errorBuilds).toHaveLength(1);
-      expect(errorBuilds[0].error).toEqual({
-        name: 'Error',
-        message: expect.stringContaining('Please upgrade your Runtime'),
-        stack: expect.stringContaining('Please upgrade your Runtime'),
-        hideStackTrace: true,
-        code: 'NODEJS_DISCONTINUED_VERSION',
-        link: 'https://github.com/vercel/vercel/blob/main/DEVELOPING_A_RUNTIME.md#lambdaruntime',
-      });
-
-      // top level "error" also contains the same error
-      expect(builds.error).toEqual({
-        name: 'Error',
-        message: expect.stringContaining('Please upgrade your Runtime'),
-        stack: expect.stringContaining('Please upgrade your Runtime'),
-        hideStackTrace: true,
-        code: 'NODEJS_DISCONTINUED_VERSION',
-        link: 'https://github.com/vercel/vercel/blob/main/DEVELOPING_A_RUNTIME.md#lambdaruntime',
-      });
+      expect(errorBuilds[0].error.name).toEqual('Error');
+      expect(errorBuilds[0].error.message).toMatch(`TS1005`);
+      expect(errorBuilds[0].error.message).toMatch(`',' expected.`);
+      expect(errorBuilds[0].error.hideStackTrace).toEqual(true);
+      expect(errorBuilds[0].error.code).toEqual('NODE_TYPESCRIPT_ERROR');
 
       // `config.json` contains `version`
       const configJson = await fs.readJSON(join(output, 'config.json'));
@@ -981,62 +921,6 @@ describe('build', () => {
     }
   });
 
-  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/avif', 'image/webp'],
-        },
-      });
-    } finally {
-      process.chdir(originalCwd);
-      delete process.env.__VERCEL_BUILD_RUNNING;
-    }
-  });
-
-  it('should fail with invalid "rewrites" configuration from `vercel.json`', async () => {
-    const cwd = fixture('invalid-rewrites');
-    const output = join(cwd, '.vercel/output');
-    try {
-      process.chdir(cwd);
-      const exitCode = await build(client);
-      expect(exitCode).toEqual(1);
-      await expect(client.stderr).toOutput(
-        'Error: Invalid vercel.json - `rewrites[2]` should NOT have additional property `src`. Did you mean `source`?' +
-          '\n' +
-          'View Documentation: https://vercel.com/docs/configuration#project/rewrites'
-      );
-      const builds = await fs.readJSON(join(output, 'builds.json'));
-      expect(builds.builds).toBeUndefined();
-      expect(builds.error).toEqual({
-        name: 'Error',
-        message:
-          'Invalid vercel.json - `rewrites[2]` should NOT have additional property `src`. Did you mean `source`?',
-        stack: expect.stringContaining('at validateConfig'),
-        hideStackTrace: true,
-        code: 'INVALID_VERCEL_CONFIG',
-        link: 'https://vercel.com/docs/configuration#project/rewrites',
-        action: 'View Documentation',
-      });
-      const configJson = await fs.readJSON(join(output, 'config.json'));
-      expect(configJson.version).toBe(3);
-    } finally {
-      process.chdir(originalCwd);
-      delete process.env.__VERCEL_BUILD_RUNNING;
-    }
-  });
-
   describe('should find packages with different main/module/browser keys', function () {
     let output: string;
 

packages/cli/test/unit/commands/deploy.test.ts

@@ -1,7 +1,4 @@
-import bytes from 'bytes';
-import fs from 'fs-extra';
 import { join } from 'path';
-import { randomBytes } from 'crypto';
 import { fileNameSymbol } from '@vercel/client';
 import { client } from '../../mocks/client';
 import deploy from '../../../src/commands/deploy';
@@ -202,119 +199,4 @@ describe('deploy', () => {
       process.chdir(originalCwd);
     }
   });
-
-  it('should upload missing files', async () => {
-    const cwd = setupFixture('commands/deploy/archive');
-    const originalCwd = process.cwd();
-
-    // Add random 1mb file
-    await fs.writeFile(join(cwd, 'data'), randomBytes(bytes('1mb')));
-
-    try {
-      process.chdir(cwd);
-
-      const user = useUser();
-      useTeams('team_dummy');
-      useProject({
-        ...defaultProject,
-        name: 'archive',
-        id: 'archive',
-      });
-
-      let body: any;
-      let fileUploaded = false;
-      client.scenario.post(`/v13/deployments`, (req, res) => {
-        if (fileUploaded) {
-          body = req.body;
-          res.json({
-            creator: {
-              uid: user.id,
-              username: user.username,
-            },
-            id: 'dpl_archive_test',
-          });
-        } else {
-          const sha = req.body.files[0].sha;
-          res.status(400).json({
-            error: {
-              code: 'missing_files',
-              message: 'Missing files',
-              missing: [sha],
-            },
-          });
-        }
-      });
-      client.scenario.post('/v2/files', (req, res) => {
-        // Wait for file to be finished uploading
-        req.on('data', () => {
-          // Noop
-        });
-        req.on('end', () => {
-          fileUploaded = true;
-          res.end();
-        });
-      });
-      client.scenario.get(`/v13/deployments/dpl_archive_test`, (req, res) => {
-        res.json({
-          creator: {
-            uid: user.id,
-            username: user.username,
-          },
-          id: 'dpl_archive_test',
-          readyState: 'READY',
-          aliasAssigned: true,
-          alias: [],
-        });
-      });
-      client.scenario.get(
-        `/v10/now/deployments/dpl_archive_test`,
-        (req, res) => {
-          res.json({
-            creator: {
-              uid: user.id,
-              username: user.username,
-            },
-            id: 'dpl_archive_test',
-            readyState: 'READY',
-            aliasAssigned: true,
-            alias: [],
-          });
-        }
-      );
-
-      // When stderr is not a TTY we expect 5 progress lines to be printed
-      client.stderr.isTTY = false;
-
-      client.setArgv('deploy', '--archive=tgz');
-      const uploadingLines: string[] = [];
-      client.stderr.on('data', data => {
-        if (data.startsWith('Uploading [')) {
-          uploadingLines.push(data);
-        }
-      });
-      client.stderr.resume();
-      const exitCode = await deploy(client);
-      expect(exitCode).toEqual(0);
-      expect(body?.files?.length).toEqual(1);
-      expect(body?.files?.[0].file).toEqual('.vercel/source.tgz');
-      expect(uploadingLines.length).toEqual(5);
-      expect(
-        uploadingLines[0].startsWith('Uploading [--------------------]')
-      ).toEqual(true);
-      expect(
-        uploadingLines[1].startsWith('Uploading [=====---------------]')
-      ).toEqual(true);
-      expect(
-        uploadingLines[2].startsWith('Uploading [==========----------]')
-      ).toEqual(true);
-      expect(
-        uploadingLines[3].startsWith('Uploading [===============-----]')
-      ).toEqual(true);
-      expect(
-        uploadingLines[4].startsWith('Uploading [====================]')
-      ).toEqual(true);
-    } finally {
-      process.chdir(originalCwd);
-    }
-  });
 });

packages/cli/test/unit/commands/list.test.ts

@@ -38,11 +38,11 @@ describe('list', () => {
 
       await list(client);
 
-      const output = await readOutputStream(client, 6);
+      const output = await readOutputStream(client, 4);
 
-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[2]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[5]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[6]);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
       data.shift();
 
       expect(org).toEqual(team[0].slug);
@@ -81,11 +81,11 @@ describe('list', () => {
       client.setArgv('-S', user.username);
       await list(client);
 
-      const output = await readOutputStream(client, 6);
+      const output = await readOutputStream(client, 4);
 
-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[2]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[5]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[6]);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
       data.shift();
 
       expect(org).toEqual(user.username);
@@ -116,11 +116,11 @@ describe('list', () => {
       client.setArgv(deployment.name);
       await list(client);
 
-      const output = await readOutputStream(client, 6);
+      const output = await readOutputStream(client, 4);
 
-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[2]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[5]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[6]);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
       data.shift();
 
       expect(org).toEqual(teamSlug || team[0].slug);

packages/cli/test/unit/commands/project.test.ts

@@ -22,10 +22,10 @@ describe('project', () => {
       client.setArgv('project', 'ls');
       await projects(client);
 
-      const output = await readOutputStream(client, 3);
-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[1]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
+      const output = await readOutputStream(client, 2);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[2]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[3]);
       data.pop();
 
       expect(org).toEqual(user.username);
@@ -47,10 +47,10 @@ describe('project', () => {
       client.setArgv('project', 'ls');
       await projects(client);
 
-      const output = await readOutputStream(client, 3);
-      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[1]);
-      const header: string[] = parseSpacedTableRow(output.split('\n')[3]);
-      const data: string[] = parseSpacedTableRow(output.split('\n')[4]);
+      const output = await readOutputStream(client, 2);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[2]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[3]);
       data.pop();
 
       expect(org).toEqual(user.username);

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()', () => {

packages/cli/test/unit/util/dev/validate.test.ts

@@ -1,4 +1,4 @@
-import { validateConfig } from '../../../../src/util/validate-config';
+import { validateConfig } from '../../../../src/util/dev/validate';
 
 describe('validateConfig', () => {
   it('should not error with empty config', async () => {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "12.2.12",
+  "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.5.4",
+    "@vercel/build-utils": "5.4.2",
     "@vercel/routing-utils": "2.0.2",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",

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 {

packages/client/src/upload.ts

@@ -1,5 +1,4 @@
-import http from 'http';
-import https from 'https';
+import { Agent } from 'https';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';
 import retry from 'async-retry';
@@ -79,9 +78,7 @@ export async function* upload(
   debug('Building an upload list...');
 
   const semaphore = new Sema(50, { capacity: 50 });
-  const agent = apiUrl?.startsWith('https://')
-    ? new https.Agent({ keepAlive: true })
-    : new http.Agent({ keepAlive: true });
+  const agent = new Agent({ keepAlive: true });
 
   shas.forEach((sha, index) => {
     const uploadProgress = uploads[index];

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": [

packages/fs-detectors/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "3.4.1",
+  "version": "3.2.0",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -19,11 +19,10 @@
     "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",
-    "json5": "2.2.1",
     "minimatch": "3.0.4",
     "semver": "6.1.1"
   },

packages/fs-detectors/src/detectors/filesystem.ts

@@ -89,34 +89,33 @@ export abstract class DetectorFilesystem {
     if (!p) {
       p = this._readdir(dirPath);
       this.readdirCache.set(dirPath, p);
-    }
 
-    const directoryContent = await p;
-    const directoryFiles = new Set<string>();
+      const directoryContent = await p;
+      const directoryFiles = new Set<string>();
 
-    for (const file of directoryContent) {
-      if (file.type === 'file') {
-        // we know this file exists, mark it as so on the filesystem
-        this.fileCache.set(file.path, Promise.resolve(true));
-        this.pathCache.set(file.path, Promise.resolve(true));
-        directoryFiles.add(file.name);
+      for (const file of directoryContent) {
+        if (file.type === 'file') {
+          // we know this file exists, mark it as so on the filesystem
+          this.fileCache.set(file.path, Promise.resolve(true));
+          this.pathCache.set(file.path, Promise.resolve(true));
+          directoryFiles.add(file.name);
+        }
+      }
+
+      if (options?.potentialFiles) {
+        // calculate the set of paths that truly do not exist
+        const filesThatDoNotExist = options.potentialFiles.filter(
+          path => !directoryFiles.has(path)
+        );
+        for (const filePath of filesThatDoNotExist) {
+          const fullFilePath =
+            dirPath === '/' ? filePath : posixPath.join(dirPath, filePath);
+          // we know this file does not exist, mark it as so on the filesystem
+          this.fileCache.set(fullFilePath, Promise.resolve(false));
+          this.pathCache.set(fullFilePath, Promise.resolve(false));
+        }
       }
     }
-
-    if (options?.potentialFiles) {
-      // calculate the set of paths that truly do not exist
-      const filesThatDoNotExist = options.potentialFiles.filter(
-        path => !directoryFiles.has(path)
-      );
-      for (const filePath of filesThatDoNotExist) {
-        const fullFilePath =
-          dirPath === '/' ? filePath : posixPath.join(dirPath, filePath);
-        // we know this file does not exist, mark it as so on the filesystem
-        this.fileCache.set(fullFilePath, Promise.resolve(false));
-        this.pathCache.set(fullFilePath, Promise.resolve(false));
-      }
-    }
-
     return p;
   };
 

packages/fs-detectors/src/workspaces/get-workspace-package-paths.ts

@@ -1,7 +1,6 @@
 import _path from 'path';
 import yaml from 'js-yaml';
 import glob from 'glob';
-import json5 from 'json5';
 import { DetectorFilesystem } from '../detectors/filesystem';
 import { Workspace } from './get-workspaces';
 import { getGlobFs } from './get-glob-fs';
@@ -34,11 +33,11 @@ export async function getWorkspacePackagePaths({
     case 'pnpm':
       results = await getPnpmWorkspacePackagePaths({ fs: workspaceFs });
       break;
-    case 'nx':
-      results = await getNxWorkspacePackagePaths({ fs: workspaceFs });
-      break;
     case 'rush':
-      results = await getRushWorkspacePackagePaths({ fs: workspaceFs });
+      // /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}`);
@@ -62,14 +61,6 @@ type PnpmWorkspaces = {
   packages?: string[];
 };
 
-type RushWorkspaces = {
-  projects: [
-    {
-      projectFolder: string;
-    }
-  ];
-};
-
 const isWin = process.platform === 'win32';
 const normalizePath = (p: string) => (isWin ? p.replace(/\\/g, '/') : p);
 
@@ -118,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[]> {
@@ -139,23 +119,3 @@ async function getPnpmWorkspacePackagePaths({
 
   return getPackagePaths(packages, fs);
 }
-
-async function getRushWorkspacePackagePaths({
-  fs,
-}: GetPackagePathOptions): Promise<string[]> {
-  const rushWorkspaceAsBuffer = await fs.readFile('rush.json');
-
-  const { projects = [] } = json5.parse(
-    rushWorkspaceAsBuffer.toString()
-  ) as RushWorkspaces;
-
-  if (Array.isArray(projects)) {
-    const packages = projects
-      .filter(proj => proj.projectFolder)
-      .map(project => project.projectFolder);
-
-    return getPackagePaths(packages, fs);
-  } else {
-    return [];
-  }
-}

packages/fs-detectors/src/workspaces/get-workspaces.ts

@@ -12,7 +12,7 @@ export interface GetWorkspaceOptions {
   cwd?: string;
 }
 
-export type WorkspaceType = 'yarn' | 'pnpm' | 'npm' | 'nx' | 'rush';
+export type WorkspaceType = 'yarn' | 'pnpm' | 'npm' | 'rush';
 
 export type Workspace = {
   type: WorkspaceType;

packages/fs-detectors/src/workspaces/workspace-managers.ts

@@ -59,18 +59,6 @@ export const workspaceManagers: Array<
       ],
     },
   },
-  {
-    name: 'nx',
-    slug: 'nx',
-    detectors: {
-      every: [
-        {
-          path: 'workspace.json',
-          matchContent: '"projects":\\s*{[^}]',
-        },
-      ],
-    },
-  },
   {
     name: 'rush',
     slug: 'rush',
@@ -78,6 +66,7 @@ export const workspaceManagers: Array<
       every: [
         {
           path: 'rush.json',
+          matchContent: '"useWorkspaces":\\strue',
         },
       ],
     },

packages/fs-detectors/test/fixtures/40-rush-monorepo/apps/my-app/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "my-app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "debug": "^4.3.2"
-  }
-}

packages/fs-detectors/test/fixtures/40-rush-monorepo/apps/my-second-app/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "my-second-app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "debug": "^4.3.2"
-  }
-}

packages/fs-detectors/test/fixtures/40-rush-monorepo/rush.json

@@ -2,6 +2,7 @@
   "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
 
   "rushVersion": "5.76.1",
+
   "pnpmVersion": "6.7.1",
 
   "pnpmOptions": {
@@ -21,16 +22,6 @@
 
     "postRushBuild": []
   },
-  // comment
   "variants": [],
-  "projects": [
-    {
-      "packageName": "my-app",
-      "projectFolder": "apps/my-app"
-    },
-    {
-      "packageName": "my-second-app",
-      "projectFolder": "apps/my-second-app"
-    }
-  ]
+  "projects": []
 }

packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-one/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "app-one",
-  "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"
-  }
-}

packages/fs-detectors/test/fixtures/41-nx-workspace/apps/app-two/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "app-two",
-  "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"
-  }
-}

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"
-  }
-}

packages/fs-detectors/test/fixtures/41-rush-monorepo-empty/rush.json

@@ -1,27 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
-
-  "rushVersion": "5.76.1",
-
-  "pnpmVersion": "6.7.1",
-
-  "pnpmOptions": {
-    "useWorkspaces": true
-  },
-
-  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.13.0 <17.0.0",
-
-  "gitPolicy": {},
-
-  "repository": {},
-  "eventHooks": {
-    "preRushInstall": [],
-
-    "postRushInstall": [],
-    "preRushBuild": [],
-
-    "postRushBuild": []
-  },
-  "variants": [],
-  "projects": []
-}

packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-one/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "app-one",
-  "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"
-  }
-}

packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/apps/app-two/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "app-two",
-  "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"
-  }
-}

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"
-      }
-    }
-  }
-}

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"
-  ]
-}

packages/fs-detectors/test/fixtures/42-npm-workspace-with-nx/workspace.json

@@ -1,4 +0,0 @@
-{
-  "version": 2,
-  "projects": {}
-}

packages/fs-detectors/test/fixtures/42-rush-json-invalid/rush.json

@@ -1,29 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
-
-  "rushVersion": "5.76.1",
-
-  "pnpmVersion": "6.7.1",
-
-  "pnpmOptions": {
-    "useWorkspaces": true
-  },
-
-  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.13.0 <17.0.0",
-
-  "gitPolicy": {},
-  /* 
-  this is a comment
-  */
-  "repository": {},
-  "eventHooks": {
-    "preRushInstall": [],
-
-    "postRushInstall": [],
-    "preRushBuild": [],
-
-    "postRushBuild": []
-  },
-  "variants": [],
-  "projects": "projects"
-}

packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-one/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "app-one",
-  "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"
-  }
-}

packages/fs-detectors/test/fixtures/43-nx-json-misshaped/apps/app-two/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "app-two",
-  "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"
-  }
-}

packages/fs-detectors/test/fixtures/43-nx-json-misshaped/workspace.json

@@ -1,3 +0,0 @@
-{
-  "version": 2
-}

packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-one/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "app-one",
-  "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"
-  }
-}

packages/fs-detectors/test/fixtures/44-nx-json-string/apps/app-two/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "app-two",
-  "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"
-  }
-}

packages/fs-detectors/test/fixtures/44-nx-json-string/workspace.json

@@ -1,4 +0,0 @@
-{
-  "version": 2,
-  "projects": "hello"
-}

packages/fs-detectors/test/fixtures/45-rush-no-project-folder/apps/my-app/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "my-app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "debug": "^4.3.2"
-  }
-}

packages/fs-detectors/test/fixtures/45-rush-no-project-folder/apps/my-second-app/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "my-second-app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "debug": "^4.3.2"
-  }
-}

packages/fs-detectors/test/fixtures/45-rush-no-project-folder/rush.json

@@ -1,35 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
-
-  "rushVersion": "5.76.1",
-
-  "pnpmVersion": "6.7.1",
-
-  "pnpmOptions": {
-    "useWorkspaces": true
-  },
-
-  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.13.0 <17.0.0",
-
-  "gitPolicy": {},
-
-  "repository": {},
-  "eventHooks": {
-    "preRushInstall": [],
-
-    "postRushInstall": [],
-    "preRushBuild": [],
-
-    "postRushBuild": []
-  },
-  "variants": [],
-  "projects": [
-    {
-      "packageName": "my-app"
-    },
-    {
-      "packageName": "my-second-app",
-      "projectFolder": "apps/my-second-app"
-    }
-  ]
-}

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';
 
@@ -172,20 +171,6 @@ describe('DetectorFilesystem', () => {
     hasPathSpy.mock.calls.length = 0;
     expect(await fs.hasPath('packages/app1/package.json')).toBe(true);
     expect(hasPathSpy).not.toHaveBeenCalled();
-
-    expect(
-      await fs.readdir('packages/app1', { potentialFiles: ['vercel.json'] })
-    ).toEqual([
-      {
-        name: 'package.json',
-        path: 'packages/app1/package.json',
-        type: 'file',
-      },
-    ]);
-
-    hasPathSpy.mock.calls.length = 0;
-    expect(await fs.hasPath('packages/app1/vercel.json')).toBe(false);
-    expect(hasPathSpy).not.toHaveBeenCalled();
   });
 
   it('should be able to write files', async () => {
@@ -286,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({