Publish Stable

- @vercel/build-utils@6.1.0
 - vercel@28.15.0
 - @vercel/client@12.3.5
 - @vercel/fs-detectors@3.7.8
 - @vercel/gatsby-plugin-vercel-builder@1.1.0
 - @vercel/go@2.3.1
 - @vercel/hydrogen@0.0.47
 - @vercel/next@3.3.21
 - @vercel/node@2.9.0
 - @vercel/python@3.1.43
 - @vercel/redwood@1.0.54
 - @vercel/remix@1.2.10
 - @vercel/ruby@1.3.59
 - @vercel/static-build@1.3.2
 - @vercel/static-config@2.0.12

.github/CODEOWNERS

@@ -3,9 +3,6 @@
 
 *                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood
 /.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
-/packages/cli/src/commands/domains       @mglagola @anatrajkovska
-/packages/cli/src/commands/certs         @mglagola @anatrajkovska
-/packages/cli/src/commands/env           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood
 /packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @agadzik @chloetedder
 /packages/node-bridge                    @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk
 /packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @ijjk

.github/workflows/cron-update-turbo.yml

@@ -0,0 +1,27 @@
+name: Cron Update Turbo
+
+on:
+  # Run every week https://crontab.guru/every-week
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  create-pull-request:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        # 0 means fetch all commits so we can commit and push in the script below
+        with:
+          fetch-depth: 0
+      - name: install pnpm@7.26.0
+        run: npm i -g pnpm@7.26.0
+      - name: Create Pull Request
+        uses: actions/github-script@v6
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        # See https://github.com/actions/github-script#run-a-separate-file-with-an-async-function
+        with:
+          script: |
+            const script = require('./utils/update-turbo.js')
+            await script({ github, context })

.github/workflows/publish.yml

@@ -39,16 +39,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
-    - name: Cache
-      if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
-      uses: actions/cache@v3
-      with:
-        path: '**/node_modules'
-        key: pnpm-${{ matrix.os }}-${{ matrix.node }}-${{ hashFiles('pnpm-lock.yaml') }}
-        restore-keys: pnpm-${{ matrix.os }}-${{ matrix.node }}
     - name: install pnpm@7.24.2
       run: npm i -g pnpm@7.24.2
     - name: Install

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

@@ -35,14 +35,8 @@ jobs:
         with:
           go-version: '1.18'
       - uses: actions/setup-node@v3
-        timeout-minutes: 5 # See https://github.com/actions/cache/issues/810
         with:
           node-version: ${{ matrix.node }}
-      - uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: pnpm-${{ matrix.os }}-${{ matrix.node }}-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: pnpm-${{ matrix.os }}-${{ matrix.node }}
       - name: install pnpm@7.24.2
         run: npm i -g pnpm@7.24.2
       - run: pnpm install

.github/workflows/test-unit.yml

@@ -35,14 +35,8 @@ jobs:
         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 }}
-      - uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: pnpm-${{ matrix.os }}-${{ matrix.node }}-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: pnpm-${{ matrix.os }}-${{ matrix.node }}
       - name: install pnpm@7.24.2
         run: npm i -g pnpm@7.24.2
       - run: pnpm install

.github/workflows/test.yml

@@ -33,14 +33,8 @@ 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 }}
-      - uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: pnpm-${{ matrix.os }}-${{ matrix.node }}-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: pnpm-${{ matrix.os }}-${{ matrix.node }}
       - name: install pnpm@7.24.2
         run: npm i -g pnpm@7.24.2
       - run: pnpm install
@@ -76,14 +70,8 @@ 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 }}
-      - uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: pnpm-${{ matrix.os }}-${{ matrix.node }}-${{ hashFiles('pnpm-lock.yaml') }}
-          restore-keys: pnpm-${{ matrix.os }}-${{ matrix.node }}
 
       - name: Install Hugo
         if: matrix.runner == 'macos-latest'

errors/now-next-legacy-mode.md

@@ -1,8 +1,8 @@
-# `@now/next` Legacy Mode
+# `@vercel/next` Legacy Mode
 
 #### Why This Warning Occurred
 
-`@now/next` has two modes: `legacy` and `serverless`. You will always want to use the `serverless` mode. `legacy` is to provide backwards compatibility with previous `@now/next` versions.
+`@vercel/next` has two modes: `legacy` and `serverless`. You will always want to use the `serverless` mode. `legacy` is to provide backwards compatibility with previous `@vercel/next` versions.
 
 The differences:
 
@@ -63,7 +63,7 @@ module.exports = {
 ```js
 {
   "version": 2,
-  "builds": [{ "src": "package.json", "use": "@now/next" }]
+  "builds": [{ "src": "package.json", "use": "@vercel/next" }]
 }
 ```
 

errors/now-next-no-serverless-pages-built.md

@@ -1,4 +1,4 @@
-# `@now/next` No Serverless Pages Built
+# `@vercel/next` No Serverless Pages Built
 
 #### Why This Error Occurred
 
@@ -33,13 +33,13 @@ module.exports = {
 };
 ```
 
-4. Remove `distDir` from `next.config.js` as `@now/next` can't parse this file and expects your build output at `/.next`
+4. Remove `distDir` from `next.config.js` as `@vercel/next` can't parse this file and expects your build output at `/.next`
 
 5. Optionally make sure the `"src"` in `"builds"` points to your application `package.json`
 
 ```js
 {
   "version": 2,
-  "builds": [{ "src": "package.json", "use": "@now/next" }]
+  "builds": [{ "src": "package.json", "use": "@vercel/next" }]
 }
 ```

examples/gatsby/README.md

@@ -2,7 +2,7 @@
 
 This directory is a brief example of a [Gatsby](https://www.gatsbyjs.org/) app that can be deployed to Vercel with zero configuration.
 
-> **Note:** We do not currently support some Gatsby v5 features, including API Routes and DSG. We are actively working on adding support for these features.
+> **Note:** SSR, DSG, and API Routes [are now supported](https://vercel.com/changelog/improved-support-for-gatsby-sites). We do not currently support some Gatsby v5 features, including Partial Hydration and the Slice API.
 
 ## Deploy Your Own
 

examples/gridsome/package.json

@@ -9,5 +9,8 @@
   },
   "dependencies": {
     "gridsome": "0.7.23"
+  },
+  "engines": {
+    "node": "<17"
   }
 }

examples/nextjs/package-lock.json

@@ -8,18 +8,18 @@
       "name": "nextjs",
       "version": "0.1.0",
       "dependencies": {
-        "@next/font": "13.1.2",
+        "@next/font": "13.1.6",
-        "eslint": "8.31.0",
+        "eslint": "8.32.0",
-        "eslint-config-next": "13.1.2",
+        "eslint-config-next": "13.1.6",
-        "next": "13.1.2",
+        "next": "13.1.6",
         "react": "18.2.0",
         "react-dom": "18.2.0"
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.20.7",
+      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==",
+      "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==",
       "dependencies": {
         "regenerator-runtime": "^0.13.11"
       },
@@ -80,27 +80,27 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
     },
     "node_modules/@next/env": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.1.6.tgz",
-      "integrity": "sha512-PpT4UZIX66VMTqXt4HKEJ+/PwbS+tWmmhZlazaws1a+dbUA5pPdjntQ46Jvj616i3ZKN9doS9LHx3y50RLjAWg=="
+      "integrity": "sha512-s+W9Fdqh5MFk6ECrbnVmmAOwxKQuhGMT7xXHrkYIBMBcTiOqNWhv5KbJIboKR5STXxNXl32hllnvKaffzFaWQg=="
     },
     "node_modules/@next/eslint-plugin-next": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.1.6.tgz",
-      "integrity": "sha512-WGaNVvIYphdriesP6r7jq/8l7u38tzotnVQuxc1RYKLqYYApSsrebti3OCPoT3Gx0pw2smPIFHH98RzcsgW5GQ==",
+      "integrity": "sha512-o7cauUYsXjzSJkay8wKjpKJf2uLzlggCsGUkPu3lP09Pv97jYlekTC20KJrjQKmSv5DXV0R/uks2ZXhqjNkqAw==",
       "dependencies": {
         "glob": "7.1.7"
       }
     },
     "node_modules/@next/font": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/font/-/font-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/font/-/font-13.1.6.tgz",
-      "integrity": "sha512-NXGXGFGiOKEnvBIHq9cdFTKbHO2/4B3Zd9K27M7j1DioIQVar7oVRqZMYs0h3XMVEZLwjjkdAtqRPCzzd3RtXg=="
+      "integrity": "sha512-AITjmeb1RgX1HKMCiA39ztx2mxeAyxl4ljv2UoSBUGAbFFMg8MO7YAvjHCgFhD39hL7YTbFjol04e/BPBH5RzQ=="
     },
     "node_modules/@next/swc-android-arm-eabi": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.6.tgz",
-      "integrity": "sha512-7mRz1owoGsbfIcdOJA3kk7KEwPZ+OvVT1z9DkR/yru4QdVLF69h/1SHy0vlUNQMxDRllabhxCfkoZCB34GOGAg==",
+      "integrity": "sha512-F3/6Z8LH/pGlPzR1AcjPFxx35mPqjE5xZcf+IL+KgbW9tMkp7CYi1y7qKrEWU7W4AumxX/8OINnDQWLiwLasLQ==",
       "cpu": [
         "arm"
       ],
@@ -113,9 +113,9 @@
       }
     },
     "node_modules/@next/swc-android-arm64": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.1.6.tgz",
-      "integrity": "sha512-mgjZ2eJSayovQm1LcE54BLSI4jjnnnLtq5GY5g+DdPuUiCT644gKtjZ/w2BQvuIecCqqBO+Ph9yzo/wUTq7NLg==",
+      "integrity": "sha512-cMwQjnB8vrYkWyK/H0Rf2c2pKIH4RGjpKUDvbjVAit6SbwPDpmaijLio0LWFV3/tOnY6kvzbL62lndVA0mkYpw==",
       "cpu": [
         "arm64"
       ],
@@ -128,9 +128,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.6.tgz",
-      "integrity": "sha512-RikoQqy109r2222UJlyGs4dZw2BibkfPqpeFdW5JEGv+L2PStlHID8DwyVYbmHfQ0VIBGvbf/NAUtFakAWlhwg==",
+      "integrity": "sha512-KKRQH4DDE4kONXCvFMNBZGDb499Hs+xcFAwvj+rfSUssIDrZOlyfJNy55rH5t2Qxed1e4K80KEJgsxKQN1/fyw==",
       "cpu": [
         "arm64"
       ],
@@ -143,9 +143,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.6.tgz",
-      "integrity": "sha512-JbDZjaTvL8gyPC5TAH6OnD4jmXPkyUxRYPvu08ZmhT/XAFBb/Cso0BdXyDax/BPCG70mimP9d3hXNKNq+A0VtQ==",
+      "integrity": "sha512-/uOky5PaZDoaU99ohjtNcDTJ6ks/gZ5ykTQDvNZDjIoCxFe3+t06bxsTPY6tAO6uEAw5f6vVFX5H5KLwhrkZCA==",
       "cpu": [
         "x64"
       ],
@@ -158,9 +158,9 @@
       }
     },
     "node_modules/@next/swc-freebsd-x64": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.6.tgz",
-      "integrity": "sha512-ax4j8VrdFQ/xc3W7Om0u1vnDxVApQHKsChBbAMynCrnycZmpbqK4MZu4ZkycT+mx2eccCiqZROpbzDbEdPosEw==",
+      "integrity": "sha512-qaEALZeV7to6weSXk3Br80wtFQ7cFTpos/q+m9XVRFggu+8Ib895XhMWdJBzew6aaOcMvYR6KQ6JmHA2/eMzWw==",
       "cpu": [
         "x64"
       ],
@@ -173,9 +173,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm-gnueabihf": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.6.tgz",
-      "integrity": "sha512-NcRHTesnCxnUvSJa637PQJffBBkmqi5XS/xVWGY7dI6nyJ+pC96Oj7kd+mcjnFUQI5lHKbg39qBWKtOzbezc4w==",
+      "integrity": "sha512-OybkbC58A1wJ+JrJSOjGDvZzrVEQA4sprJejGqMwiZyLqhr9Eo8FXF0y6HL+m1CPCpPhXEHz/2xKoYsl16kNqw==",
       "cpu": [
         "arm"
       ],
@@ -188,9 +188,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.6.tgz",
-      "integrity": "sha512-AxJdjocLtPrsBY4P2COSBIc3crT5bpjgGenNuINoensOlXhBkYM0aRDYZdydwXOhG+kN2ngUvfgitop9pa204w==",
+      "integrity": "sha512-yCH+yDr7/4FDuWv6+GiYrPI9kcTAO3y48UmaIbrKy8ZJpi7RehJe3vIBRUmLrLaNDH3rY1rwoHi471NvR5J5NQ==",
       "cpu": [
         "arm64"
       ],
@@ -203,9 +203,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.6.tgz",
-      "integrity": "sha512-JmNimDkcCRq7P5zpkdqeaSZ69qKDntEPtyIaMNWqy5M0WUJxGim0Fs6Qzxayiyvuuh9Guxks4woQ/j/ZvX/c8Q==",
+      "integrity": "sha512-ECagB8LGX25P9Mrmlc7Q/TQBb9rGScxHbv/kLqqIWs2fIXy6Y/EiBBiM72NTwuXUFCNrWR4sjUPSooVBJJ3ESQ==",
       "cpu": [
         "arm64"
       ],
@@ -218,9 +218,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.6.tgz",
-      "integrity": "sha512-TsLsjZwUlgmvI42neTuIoD6K9RlXCUzqPtvIClgXxVO0um0DiZwK+M+0zX/uVXhMVphfPY2c5YeR1zFSIONY4A==",
+      "integrity": "sha512-GT5w2mruk90V/I5g6ScuueE7fqj/d8Bui2qxdw6lFxmuTgMeol5rnzAv4uAoVQgClOUO/MULilzlODg9Ib3Y4Q==",
       "cpu": [
         "x64"
       ],
@@ -233,9 +233,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.6.tgz",
-      "integrity": "sha512-eSkyXgCXydEFPTkcncQOGepafedPte6JT/OofB9uvruucrrMVBagCASOuPxodWEMrlfEKSXVnExMKIlfmQMD7A==",
+      "integrity": "sha512-keFD6KvwOPzmat4TCnlnuxJCQepPN+8j3Nw876FtULxo8005Y9Ghcl7ACcR8GoiKoddAq8gxNBrpjoxjQRHeAQ==",
       "cpu": [
         "x64"
       ],
@@ -248,9 +248,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.6.tgz",
-      "integrity": "sha512-DmXFaRTgt2KrV9dmRLifDJE+cYiutHVFIw5/C9BtnwXH39uf3YbPxeD98vNrtqqqZVVLXY/1ySaSIwzYnqeY9g==",
+      "integrity": "sha512-OwertslIiGQluFvHyRDzBCIB07qJjqabAmINlXUYt7/sY7Q7QPE8xVi5beBxX/rxTGPIbtyIe3faBE6Z2KywhQ==",
       "cpu": [
         "arm64"
       ],
@@ -263,9 +263,9 @@
       }
     },
     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.6.tgz",
-      "integrity": "sha512-3+nBkuFs/wT+lmRVQNH5SyDT7I4vUlNPntosEaEP63FuYQdPLaxz0GvcR66MdFSFh2fsvazpe4wciOwVS4FItQ==",
+      "integrity": "sha512-g8zowiuP8FxUR9zslPmlju7qYbs2XBtTLVSxVikPtUDQedhcls39uKYLvOOd1JZg0ehyhopobRoH1q+MHlIN/w==",
       "cpu": [
         "ia32"
       ],
@@ -278,9 +278,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.6.tgz",
-      "integrity": "sha512-avsyveEvcvH42PvKjR4Pb8JlLttuGURr2H3ZhS2b85pHOiZ7yjH3rMUoGnNzuLMApyxYaCvd4MedPrLhnNhkog==",
+      "integrity": "sha512-Ls2OL9hi3YlJKGNdKv8k3X/lLgc3VmLG3a/DeTkAd+lAituJp8ZHmRmm9f9SL84fT3CotlzcgbdaCDfFwFA6bA==",
       "cpu": [
         "x64"
       ],
@@ -362,13 +362,13 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz",
-      "integrity": "sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==",
+      "integrity": "sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.48.1",
+        "@typescript-eslint/scope-manager": "5.49.0",
-        "@typescript-eslint/types": "5.48.1",
+        "@typescript-eslint/types": "5.49.0",
-        "@typescript-eslint/typescript-estree": "5.48.1",
+        "@typescript-eslint/typescript-estree": "5.49.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -388,12 +388,12 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz",
-      "integrity": "sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==",
+      "integrity": "sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==",
       "dependencies": {
-        "@typescript-eslint/types": "5.48.1",
+        "@typescript-eslint/types": "5.49.0",
-        "@typescript-eslint/visitor-keys": "5.48.1"
+        "@typescript-eslint/visitor-keys": "5.49.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -404,9 +404,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz",
-      "integrity": "sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==",
+      "integrity": "sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -416,12 +416,12 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz",
-      "integrity": "sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==",
+      "integrity": "sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==",
       "dependencies": {
-        "@typescript-eslint/types": "5.48.1",
+        "@typescript-eslint/types": "5.49.0",
-        "@typescript-eslint/visitor-keys": "5.48.1",
+        "@typescript-eslint/visitor-keys": "5.49.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -442,11 +442,11 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz",
-      "integrity": "sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==",
+      "integrity": "sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==",
       "dependencies": {
-        "@typescript-eslint/types": "5.48.1",
+        "@typescript-eslint/types": "5.49.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
@@ -458,9 +458,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.8.1",
+      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -615,9 +615,9 @@
       }
     },
     "node_modules/axe-core": {
-      "version": "4.6.2",
+      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz",
-      "integrity": "sha512-b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg==",
+      "integrity": "sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg==",
       "engines": {
         "node": ">=4"
       }
@@ -676,9 +676,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001443",
+      "version": "1.0.30001449",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001443.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz",
-      "integrity": "sha512-jUo8svymO8+Mkj3qbUbVjR8zv8LUGpGkUM/jKvc9SO2BvjCI980dp9fQbf/dyLs6RascPzgR4nhAKFA4OHeSaA==",
+      "integrity": "sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw==",
       "funding": [
         {
           "type": "opencollective",
@@ -906,18 +906,19 @@
       }
     },
     "node_modules/es-get-iterator": {
-      "version": "1.1.2",
+      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
+        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.0",
+        "is-arguments": "^1.1.1",
         "is-map": "^2.0.2",
         "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
+        "is-string": "^1.0.7",
-        "isarray": "^2.0.5"
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -972,9 +973,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.31.0",
+      "version": "8.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
+      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
       "dependencies": {
         "@eslint/eslintrc": "^1.4.1",
         "@humanwhocodes/config-array": "^0.11.8",
@@ -1027,11 +1028,11 @@
       }
     },
     "node_modules/eslint-config-next": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.6.tgz",
-      "integrity": "sha512-zdRAQOr8v69ZwJRtBrGqAqm160ONqKxU/pV1FB1KlgfyqveGsLZmlQ7l31otwtw763901J7xdiTVkj2y3YxXZA==",
+      "integrity": "sha512-0cg7h5wztg/SoLAlxljZ0ZPUQ7i6QKqRiP4M2+MgTZtxWwNKb2JSwNc18nJ6/kXBI6xYvPraTbQSIhAuVw6czw==",
       "dependencies": {
-        "@next/eslint-plugin-next": "13.1.2",
+        "@next/eslint-plugin-next": "13.1.6",
         "@rushstack/eslint-patch": "^1.1.3",
         "@typescript-eslint/parser": "^5.42.0",
         "eslint-import-resolver-node": "^0.3.6",
@@ -1147,13 +1148,13 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.27.4",
+      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.4.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-Z1jVt1EGKia1X9CnBCkpAOhWy8FgQ7OmJ/IblEkT82yrFU/xJaxwujaTzLWqigewwynRQ9mmHfX9MtAfhxm0sA==",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.0",
+        "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
@@ -1239,9 +1240,9 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.32.0",
+      "version": "7.32.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz",
-      "integrity": "sha512-vSBi1+SrPiLZCGvxpiZIa28fMEUaMjXtCplrvxcIxGzmFiYdsXQDwInEjuv5/i/2CTTxbkS87tE8lsQ0Qxinbw==",
+      "integrity": "sha512-vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www==",
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.flatmap": "^1.3.1",
@@ -1558,9 +1559,9 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.3",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -2138,9 +2139,9 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "node_modules/js-sdsl": {
-      "version": "4.2.0",
+      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/js-sdsl"
@@ -2322,11 +2323,11 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "node_modules/next": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.1.6.tgz",
-      "integrity": "sha512-Rdnnb2YH///w78FEOR/IQ6TXga+qpth4OqFSem48ng1PYYKr6XBsIk1XVaRcIGM3o6iiHnun0nJvkJHDf+ICyQ==",
+      "integrity": "sha512-hHlbhKPj9pW+Cymvfzc15lvhaOZ54l+8sXDXJWm3OBNBzgrVj6hwGPmqqsXg40xO1Leq+kXpllzRPuncpC0Phw==",
       "dependencies": {
-        "@next/env": "13.1.2",
+        "@next/env": "13.1.6",
         "@swc/helpers": "0.4.14",
         "caniuse-lite": "^1.0.30001406",
         "postcss": "8.4.14",
@@ -2339,19 +2340,19 @@
         "node": ">=14.6.0"
       },
       "optionalDependencies": {
-        "@next/swc-android-arm-eabi": "13.1.2",
+        "@next/swc-android-arm-eabi": "13.1.6",
-        "@next/swc-android-arm64": "13.1.2",
+        "@next/swc-android-arm64": "13.1.6",
-        "@next/swc-darwin-arm64": "13.1.2",
+        "@next/swc-darwin-arm64": "13.1.6",
-        "@next/swc-darwin-x64": "13.1.2",
+        "@next/swc-darwin-x64": "13.1.6",
-        "@next/swc-freebsd-x64": "13.1.2",
+        "@next/swc-freebsd-x64": "13.1.6",
-        "@next/swc-linux-arm-gnueabihf": "13.1.2",
+        "@next/swc-linux-arm-gnueabihf": "13.1.6",
-        "@next/swc-linux-arm64-gnu": "13.1.2",
+        "@next/swc-linux-arm64-gnu": "13.1.6",
-        "@next/swc-linux-arm64-musl": "13.1.2",
+        "@next/swc-linux-arm64-musl": "13.1.6",
-        "@next/swc-linux-x64-gnu": "13.1.2",
+        "@next/swc-linux-x64-gnu": "13.1.6",
-        "@next/swc-linux-x64-musl": "13.1.2",
+        "@next/swc-linux-x64-musl": "13.1.6",
-        "@next/swc-win32-arm64-msvc": "13.1.2",
+        "@next/swc-win32-arm64-msvc": "13.1.6",
-        "@next/swc-win32-ia32-msvc": "13.1.2",
+        "@next/swc-win32-ia32-msvc": "13.1.6",
-        "@next/swc-win32-x64-msvc": "13.1.2"
+        "@next/swc-win32-x64-msvc": "13.1.6"
       },
       "peerDependencies": {
         "fibers": ">= 3.1.0",
@@ -2659,9 +2660,9 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.2.0",
+      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "engines": {
         "node": ">=6"
       }
@@ -2897,6 +2898,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "dependencies": {
+        "internal-slot": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
@@ -3075,9 +3087,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.4.1",
+      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
@@ -3262,9 +3274,9 @@
   },
   "dependencies": {
     "@babel/runtime": {
-      "version": "7.20.7",
+      "version": "7.20.13",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz",
-      "integrity": "sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==",
+      "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==",
       "requires": {
         "regenerator-runtime": "^0.13.11"
       }
@@ -3306,99 +3318,99 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
     },
     "@next/env": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.1.6.tgz",
-      "integrity": "sha512-PpT4UZIX66VMTqXt4HKEJ+/PwbS+tWmmhZlazaws1a+dbUA5pPdjntQ46Jvj616i3ZKN9doS9LHx3y50RLjAWg=="
+      "integrity": "sha512-s+W9Fdqh5MFk6ECrbnVmmAOwxKQuhGMT7xXHrkYIBMBcTiOqNWhv5KbJIboKR5STXxNXl32hllnvKaffzFaWQg=="
     },
     "@next/eslint-plugin-next": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.1.6.tgz",
-      "integrity": "sha512-WGaNVvIYphdriesP6r7jq/8l7u38tzotnVQuxc1RYKLqYYApSsrebti3OCPoT3Gx0pw2smPIFHH98RzcsgW5GQ==",
+      "integrity": "sha512-o7cauUYsXjzSJkay8wKjpKJf2uLzlggCsGUkPu3lP09Pv97jYlekTC20KJrjQKmSv5DXV0R/uks2ZXhqjNkqAw==",
       "requires": {
         "glob": "7.1.7"
       }
     },
     "@next/font": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/font/-/font-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/font/-/font-13.1.6.tgz",
-      "integrity": "sha512-NXGXGFGiOKEnvBIHq9cdFTKbHO2/4B3Zd9K27M7j1DioIQVar7oVRqZMYs0h3XMVEZLwjjkdAtqRPCzzd3RtXg=="
+      "integrity": "sha512-AITjmeb1RgX1HKMCiA39ztx2mxeAyxl4ljv2UoSBUGAbFFMg8MO7YAvjHCgFhD39hL7YTbFjol04e/BPBH5RzQ=="
     },
     "@next/swc-android-arm-eabi": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.6.tgz",
-      "integrity": "sha512-7mRz1owoGsbfIcdOJA3kk7KEwPZ+OvVT1z9DkR/yru4QdVLF69h/1SHy0vlUNQMxDRllabhxCfkoZCB34GOGAg==",
+      "integrity": "sha512-F3/6Z8LH/pGlPzR1AcjPFxx35mPqjE5xZcf+IL+KgbW9tMkp7CYi1y7qKrEWU7W4AumxX/8OINnDQWLiwLasLQ==",
       "optional": true
     },
     "@next/swc-android-arm64": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.1.6.tgz",
-      "integrity": "sha512-mgjZ2eJSayovQm1LcE54BLSI4jjnnnLtq5GY5g+DdPuUiCT644gKtjZ/w2BQvuIecCqqBO+Ph9yzo/wUTq7NLg==",
+      "integrity": "sha512-cMwQjnB8vrYkWyK/H0Rf2c2pKIH4RGjpKUDvbjVAit6SbwPDpmaijLio0LWFV3/tOnY6kvzbL62lndVA0mkYpw==",
       "optional": true
     },
     "@next/swc-darwin-arm64": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.6.tgz",
-      "integrity": "sha512-RikoQqy109r2222UJlyGs4dZw2BibkfPqpeFdW5JEGv+L2PStlHID8DwyVYbmHfQ0VIBGvbf/NAUtFakAWlhwg==",
+      "integrity": "sha512-KKRQH4DDE4kONXCvFMNBZGDb499Hs+xcFAwvj+rfSUssIDrZOlyfJNy55rH5t2Qxed1e4K80KEJgsxKQN1/fyw==",
       "optional": true
     },
     "@next/swc-darwin-x64": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.6.tgz",
-      "integrity": "sha512-JbDZjaTvL8gyPC5TAH6OnD4jmXPkyUxRYPvu08ZmhT/XAFBb/Cso0BdXyDax/BPCG70mimP9d3hXNKNq+A0VtQ==",
+      "integrity": "sha512-/uOky5PaZDoaU99ohjtNcDTJ6ks/gZ5ykTQDvNZDjIoCxFe3+t06bxsTPY6tAO6uEAw5f6vVFX5H5KLwhrkZCA==",
       "optional": true
     },
     "@next/swc-freebsd-x64": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.6.tgz",
-      "integrity": "sha512-ax4j8VrdFQ/xc3W7Om0u1vnDxVApQHKsChBbAMynCrnycZmpbqK4MZu4ZkycT+mx2eccCiqZROpbzDbEdPosEw==",
+      "integrity": "sha512-qaEALZeV7to6weSXk3Br80wtFQ7cFTpos/q+m9XVRFggu+8Ib895XhMWdJBzew6aaOcMvYR6KQ6JmHA2/eMzWw==",
       "optional": true
     },
     "@next/swc-linux-arm-gnueabihf": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.6.tgz",
-      "integrity": "sha512-NcRHTesnCxnUvSJa637PQJffBBkmqi5XS/xVWGY7dI6nyJ+pC96Oj7kd+mcjnFUQI5lHKbg39qBWKtOzbezc4w==",
+      "integrity": "sha512-OybkbC58A1wJ+JrJSOjGDvZzrVEQA4sprJejGqMwiZyLqhr9Eo8FXF0y6HL+m1CPCpPhXEHz/2xKoYsl16kNqw==",
       "optional": true
     },
     "@next/swc-linux-arm64-gnu": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.6.tgz",
-      "integrity": "sha512-AxJdjocLtPrsBY4P2COSBIc3crT5bpjgGenNuINoensOlXhBkYM0aRDYZdydwXOhG+kN2ngUvfgitop9pa204w==",
+      "integrity": "sha512-yCH+yDr7/4FDuWv6+GiYrPI9kcTAO3y48UmaIbrKy8ZJpi7RehJe3vIBRUmLrLaNDH3rY1rwoHi471NvR5J5NQ==",
       "optional": true
     },
     "@next/swc-linux-arm64-musl": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.6.tgz",
-      "integrity": "sha512-JmNimDkcCRq7P5zpkdqeaSZ69qKDntEPtyIaMNWqy5M0WUJxGim0Fs6Qzxayiyvuuh9Guxks4woQ/j/ZvX/c8Q==",
+      "integrity": "sha512-ECagB8LGX25P9Mrmlc7Q/TQBb9rGScxHbv/kLqqIWs2fIXy6Y/EiBBiM72NTwuXUFCNrWR4sjUPSooVBJJ3ESQ==",
       "optional": true
     },
     "@next/swc-linux-x64-gnu": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.6.tgz",
-      "integrity": "sha512-TsLsjZwUlgmvI42neTuIoD6K9RlXCUzqPtvIClgXxVO0um0DiZwK+M+0zX/uVXhMVphfPY2c5YeR1zFSIONY4A==",
+      "integrity": "sha512-GT5w2mruk90V/I5g6ScuueE7fqj/d8Bui2qxdw6lFxmuTgMeol5rnzAv4uAoVQgClOUO/MULilzlODg9Ib3Y4Q==",
       "optional": true
     },
     "@next/swc-linux-x64-musl": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.6.tgz",
-      "integrity": "sha512-eSkyXgCXydEFPTkcncQOGepafedPte6JT/OofB9uvruucrrMVBagCASOuPxodWEMrlfEKSXVnExMKIlfmQMD7A==",
+      "integrity": "sha512-keFD6KvwOPzmat4TCnlnuxJCQepPN+8j3Nw876FtULxo8005Y9Ghcl7ACcR8GoiKoddAq8gxNBrpjoxjQRHeAQ==",
       "optional": true
     },
     "@next/swc-win32-arm64-msvc": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.6.tgz",
-      "integrity": "sha512-DmXFaRTgt2KrV9dmRLifDJE+cYiutHVFIw5/C9BtnwXH39uf3YbPxeD98vNrtqqqZVVLXY/1ySaSIwzYnqeY9g==",
+      "integrity": "sha512-OwertslIiGQluFvHyRDzBCIB07qJjqabAmINlXUYt7/sY7Q7QPE8xVi5beBxX/rxTGPIbtyIe3faBE6Z2KywhQ==",
       "optional": true
     },
     "@next/swc-win32-ia32-msvc": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.6.tgz",
-      "integrity": "sha512-3+nBkuFs/wT+lmRVQNH5SyDT7I4vUlNPntosEaEP63FuYQdPLaxz0GvcR66MdFSFh2fsvazpe4wciOwVS4FItQ==",
+      "integrity": "sha512-g8zowiuP8FxUR9zslPmlju7qYbs2XBtTLVSxVikPtUDQedhcls39uKYLvOOd1JZg0ehyhopobRoH1q+MHlIN/w==",
       "optional": true
     },
     "@next/swc-win32-x64-msvc": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.6.tgz",
-      "integrity": "sha512-avsyveEvcvH42PvKjR4Pb8JlLttuGURr2H3ZhS2b85pHOiZ7yjH3rMUoGnNzuLMApyxYaCvd4MedPrLhnNhkog==",
+      "integrity": "sha512-Ls2OL9hi3YlJKGNdKv8k3X/lLgc3VmLG3a/DeTkAd+lAituJp8ZHmRmm9f9SL84fT3CotlzcgbdaCDfFwFA6bA==",
       "optional": true
     },
     "@nodelib/fs.scandir": {
@@ -3456,37 +3468,37 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "@typescript-eslint/parser": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz",
-      "integrity": "sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==",
+      "integrity": "sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==",
       "requires": {
-        "@typescript-eslint/scope-manager": "5.48.1",
+        "@typescript-eslint/scope-manager": "5.49.0",
-        "@typescript-eslint/types": "5.48.1",
+        "@typescript-eslint/types": "5.49.0",
-        "@typescript-eslint/typescript-estree": "5.48.1",
+        "@typescript-eslint/typescript-estree": "5.49.0",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz",
-      "integrity": "sha512-S035ueRrbxRMKvSTv9vJKIWgr86BD8s3RqoRZmsSh/s8HhIs90g6UlK8ZabUSjUZQkhVxt7nmZ63VJ9dcZhtDQ==",
+      "integrity": "sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==",
       "requires": {
-        "@typescript-eslint/types": "5.48.1",
+        "@typescript-eslint/types": "5.49.0",
-        "@typescript-eslint/visitor-keys": "5.48.1"
+        "@typescript-eslint/visitor-keys": "5.49.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz",
-      "integrity": "sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg=="
+      "integrity": "sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg=="
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz",
-      "integrity": "sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==",
+      "integrity": "sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==",
       "requires": {
-        "@typescript-eslint/types": "5.48.1",
+        "@typescript-eslint/types": "5.49.0",
-        "@typescript-eslint/visitor-keys": "5.48.1",
+        "@typescript-eslint/visitor-keys": "5.49.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3495,18 +3507,18 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.48.1",
+      "version": "5.49.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz",
-      "integrity": "sha512-Ns0XBwmfuX7ZknznfXozgnydyR8F6ev/KEGePP4i74uL3ArsKbEhJ7raeKr1JSa997DBDwol/4a0Y+At82c9dA==",
+      "integrity": "sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==",
       "requires": {
-        "@typescript-eslint/types": "5.48.1",
+        "@typescript-eslint/types": "5.49.0",
         "eslint-visitor-keys": "^3.3.0"
       }
     },
     "acorn": {
-      "version": "8.8.1",
+      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="
     },
     "acorn-jsx": {
       "version": "5.3.2",
@@ -3613,9 +3625,9 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
     },
     "axe-core": {
-      "version": "4.6.2",
+      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz",
-      "integrity": "sha512-b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg=="
+      "integrity": "sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg=="
     },
     "axobject-query": {
       "version": "3.1.1",
@@ -3662,9 +3674,9 @@
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "caniuse-lite": {
-      "version": "1.0.30001443",
+      "version": "1.0.30001449",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001443.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz",
-      "integrity": "sha512-jUo8svymO8+Mkj3qbUbVjR8zv8LUGpGkUM/jKvc9SO2BvjCI980dp9fQbf/dyLs6RascPzgR4nhAKFA4OHeSaA=="
+      "integrity": "sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw=="
     },
     "chalk": {
       "version": "4.1.2",
@@ -3835,18 +3847,19 @@
       }
     },
     "es-get-iterator": {
-      "version": "1.1.2",
+      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
       "requires": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
+        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.0",
+        "is-arguments": "^1.1.1",
         "is-map": "^2.0.2",
         "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
+        "is-string": "^1.0.7",
-        "isarray": "^2.0.5"
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
       }
     },
     "es-set-tostringtag": {
@@ -3883,9 +3896,9 @@
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
     },
     "eslint": {
-      "version": "8.31.0",
+      "version": "8.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-      "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==",
+      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
       "requires": {
         "@eslint/eslintrc": "^1.4.1",
         "@humanwhocodes/config-array": "^0.11.8",
@@ -3929,11 +3942,11 @@
       }
     },
     "eslint-config-next": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.1.6.tgz",
-      "integrity": "sha512-zdRAQOr8v69ZwJRtBrGqAqm160ONqKxU/pV1FB1KlgfyqveGsLZmlQ7l31otwtw763901J7xdiTVkj2y3YxXZA==",
+      "integrity": "sha512-0cg7h5wztg/SoLAlxljZ0ZPUQ7i6QKqRiP4M2+MgTZtxWwNKb2JSwNc18nJ6/kXBI6xYvPraTbQSIhAuVw6czw==",
       "requires": {
-        "@next/eslint-plugin-next": "13.1.2",
+        "@next/eslint-plugin-next": "13.1.6",
         "@rushstack/eslint-patch": "^1.1.3",
         "@typescript-eslint/parser": "^5.42.0",
         "eslint-import-resolver-node": "^0.3.6",
@@ -4016,13 +4029,13 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.27.4",
+      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.4.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-Z1jVt1EGKia1X9CnBCkpAOhWy8FgQ7OmJ/IblEkT82yrFU/xJaxwujaTzLWqigewwynRQ9mmHfX9MtAfhxm0sA==",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
       "requires": {
         "array-includes": "^3.1.6",
         "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.0",
+        "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
@@ -4091,9 +4104,9 @@
       }
     },
     "eslint-plugin-react": {
-      "version": "7.32.0",
+      "version": "7.32.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz",
-      "integrity": "sha512-vSBi1+SrPiLZCGvxpiZIa28fMEUaMjXtCplrvxcIxGzmFiYdsXQDwInEjuv5/i/2CTTxbkS87tE8lsQ0Qxinbw==",
+      "integrity": "sha512-vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www==",
       "requires": {
         "array-includes": "^3.1.6",
         "array.prototype.flatmap": "^1.3.1",
@@ -4327,9 +4340,9 @@
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
     },
     "get-intrinsic": {
-      "version": "1.1.3",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -4709,9 +4722,9 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "js-sdsl": {
-      "version": "4.2.0",
+      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="
+      "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="
     },
     "js-tokens": {
       "version": "4.0.0",
@@ -4847,24 +4860,24 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "next": {
-      "version": "13.1.2",
+      "version": "13.1.6",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.1.6.tgz",
-      "integrity": "sha512-Rdnnb2YH///w78FEOR/IQ6TXga+qpth4OqFSem48ng1PYYKr6XBsIk1XVaRcIGM3o6iiHnun0nJvkJHDf+ICyQ==",
+      "integrity": "sha512-hHlbhKPj9pW+Cymvfzc15lvhaOZ54l+8sXDXJWm3OBNBzgrVj6hwGPmqqsXg40xO1Leq+kXpllzRPuncpC0Phw==",
       "requires": {
-        "@next/env": "13.1.2",
+        "@next/env": "13.1.6",
-        "@next/swc-android-arm-eabi": "13.1.2",
+        "@next/swc-android-arm-eabi": "13.1.6",
-        "@next/swc-android-arm64": "13.1.2",
+        "@next/swc-android-arm64": "13.1.6",
-        "@next/swc-darwin-arm64": "13.1.2",
+        "@next/swc-darwin-arm64": "13.1.6",
-        "@next/swc-darwin-x64": "13.1.2",
+        "@next/swc-darwin-x64": "13.1.6",
-        "@next/swc-freebsd-x64": "13.1.2",
+        "@next/swc-freebsd-x64": "13.1.6",
-        "@next/swc-linux-arm-gnueabihf": "13.1.2",
+        "@next/swc-linux-arm-gnueabihf": "13.1.6",
-        "@next/swc-linux-arm64-gnu": "13.1.2",
+        "@next/swc-linux-arm64-gnu": "13.1.6",
-        "@next/swc-linux-arm64-musl": "13.1.2",
+        "@next/swc-linux-arm64-musl": "13.1.6",
-        "@next/swc-linux-x64-gnu": "13.1.2",
+        "@next/swc-linux-x64-gnu": "13.1.6",
-        "@next/swc-linux-x64-musl": "13.1.2",
+        "@next/swc-linux-x64-musl": "13.1.6",
-        "@next/swc-win32-arm64-msvc": "13.1.2",
+        "@next/swc-win32-arm64-msvc": "13.1.6",
-        "@next/swc-win32-ia32-msvc": "13.1.2",
+        "@next/swc-win32-ia32-msvc": "13.1.6",
-        "@next/swc-win32-x64-msvc": "13.1.2",
+        "@next/swc-win32-x64-msvc": "13.1.6",
         "@swc/helpers": "0.4.14",
         "caniuse-lite": "^1.0.30001406",
         "postcss": "8.4.14",
@@ -5061,9 +5074,9 @@
       }
     },
     "punycode": {
-      "version": "2.2.0",
+      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw=="
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
     },
     "queue-microtask": {
       "version": "1.2.3",
@@ -5207,6 +5220,14 @@
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
       "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
     },
+    "stop-iteration-iterator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "requires": {
+        "internal-slot": "^1.0.4"
+      }
+    },
     "string.prototype.matchall": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
@@ -5329,9 +5350,9 @@
       }
     },
     "tslib": {
-      "version": "2.4.1",
+      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
     },
     "tsutils": {
       "version": "3.21.0",

examples/nextjs/package.json

@@ -9,10 +9,10 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@next/font": "13.1.2",
+    "@next/font": "13.1.6",
-    "eslint": "8.31.0",
+    "eslint": "8.32.0",
-    "eslint-config-next": "13.1.2",
+    "eslint-config-next": "13.1.6",
-    "next": "13.1.2",
+    "next": "13.1.6",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   }

examples/parcel/package.json

@@ -7,6 +7,6 @@
     "build": "parcel build"
   },
   "devDependencies": {
-    "parcel": "^2.0.0"
+    "parcel": "^2.8.3"
   }
 }

package.json

@@ -32,7 +32,7 @@
     "source-map-support": "0.5.12",
     "ts-eager": "2.0.2",
     "ts-jest": "28.0.5",
-    "turbo": "1.7.0-canary.9"
+    "turbo": "1.7.0"
   },
   "scripts": {
     "lerna": "lerna",

packages/build-utils/package.json

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

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

@@ -1,4 +1,4 @@
-import type { Files } from './types';
+import type { Cron, Files } from './types';
 
 /**
  * An Edge Functions output
@@ -41,6 +41,9 @@ export class EdgeFunction {
   /** The regions where the edge function will be executed on */
   regions?: string | string[];
 
+  /** Cronjob definition for the edge function */
+  cron?: Cron;
+
   constructor(params: Omit<EdgeFunction, 'type'>) {
     this.type = 'EdgeFunction';
     this.name = params.name;
@@ -50,5 +53,6 @@ export class EdgeFunction {
     this.envVarsInUse = params.envVarsInUse;
     this.assets = params.assets;
     this.regions = params.regions;
+    this.cron = params.cron;
   }
 }

packages/build-utils/src/fs/rename.ts

@@ -1,12 +1,17 @@
 import { Files } from '../types';
 type Delegate = (name: string) => string;
 
+/**
+ * Renames the keys of a `Files` map.
+ *
+ * @param files A map of filenames to `File` instances
+ * @param delegate A function that returns the new filename
+ * @returns A new file map with the renamed filenames
+ */
 export default function rename(files: Files, delegate: Delegate): Files {
-  return Object.keys(files).reduce(
+  const result: Files = {};
-    (newFiles, name) => ({
+  for (const [name, file] of Object.entries(files)) {
-      ...newFiles,
+    result[delegate(name)] = file;
-      [delegate(name)]: files[name],
+  }
-    }),
+  return result;
-    {}
-  );
 }

packages/build-utils/src/fs/run-user-scripts.ts

@@ -111,56 +111,6 @@ export function spawnAsync(
   });
 }
 
-export function execAsync(
-  command: string,
-  args: string[],
-  opts: SpawnOptionsExtended = {}
-) {
-  return new Promise<{ stdout: string; stderr: string; code: number }>(
-    (resolve, reject) => {
-      opts.stdio = 'pipe';
-
-      const stdoutList: Buffer[] = [];
-      const stderrList: Buffer[] = [];
-
-      const child = spawn(command, args, opts);
-
-      child.stderr!.on('data', data => {
-        stderrList.push(data);
-      });
-
-      child.stdout!.on('data', data => {
-        stdoutList.push(data);
-      });
-
-      child.on('error', reject);
-      child.on('close', (code, signal) => {
-        if (code === 0 || opts.ignoreNon0Exit) {
-          return resolve({
-            // ignoring the next line due to do some Node.js type issue when we removed hoisting of dependencies in https://github.com/vercel/vercel/pull/9198
-            // should eventually be fixed when this method is remove by https://github.com/vercel/vercel/pull/9200 or we update to Node 16
-            // @ts-ignore
-            code,
-            stdout: Buffer.concat(stdoutList).toString(),
-            stderr: Buffer.concat(stderrList).toString(),
-          });
-        }
-
-        const cmd = opts.prettyCommand
-          ? `Command "${opts.prettyCommand}"`
-          : 'Command';
-
-        return reject(
-          new NowBuildError({
-            code: `BUILD_UTILS_EXEC_${code || signal}`,
-            message: `${cmd} exited with ${code || signal}`,
-          })
-        );
-      });
-    }
-  );
-}
-
 export function spawnCommand(command: string, options: SpawnOptions = {}) {
   const opts = { ...options, prettyCommand: command };
   if (process.platform === 'win32') {
@@ -249,7 +199,7 @@ export function getSpawnOptions(
 
 export async function getNodeVersion(
   destPath: string,
-  _nodeVersion?: string,
+  nodeVersionFallback = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION,
   config: Config = {},
   meta: Meta = {}
 ): Promise<NodeVersion> {
@@ -259,7 +209,7 @@ export async function getNodeVersion(
     return { ...latest, runtime: 'nodejs' };
   }
   const { packageJson } = await scanParentDirs(destPath, true);
-  let { nodeVersion } = config;
+  let nodeVersion = config.nodeVersion || nodeVersionFallback;
   let isAuto = true;
   if (packageJson?.engines?.node) {
     const { node } = packageJson.engines;

packages/build-utils/src/index.ts

@@ -14,7 +14,6 @@ import getWriteableDirectory from './fs/get-writable-directory';
 import glob, { GlobOptions } from './fs/glob';
 import rename from './fs/rename';
 import {
-  execAsync,
   spawnAsync,
   execCommand,
   spawnCommand,
@@ -59,7 +58,6 @@ export {
   glob,
   GlobOptions,
   rename,
-  execAsync,
   spawnAsync,
   getScriptName,
   installDependencies,

packages/build-utils/src/lambda.ts

@@ -5,7 +5,7 @@ import minimatch from 'minimatch';
 import { readlink } from 'fs-extra';
 import { isSymbolicLink, isDirectory } from './fs/download';
 import streamToBuffer from './fs/stream-to-buffer';
-import type { Files, Config } from './types';
+import type { Files, Config, Cron } from './types';
 
 interface Environment {
   [key: string]: string;
@@ -25,6 +25,7 @@ export interface LambdaOptionsBase {
   supportsWrapper?: boolean;
   experimentalResponseStreaming?: boolean;
   operationType?: string;
+  cron?: Cron;
 }
 
 export interface LambdaOptionsWithFiles extends LambdaOptionsBase {
@@ -62,6 +63,7 @@ export class Lambda {
   environment: Environment;
   allowQuery?: string[];
   regions?: string[];
+  cron?: Cron;
   /**
    * @deprecated Use `await lambda.createZip()` instead.
    */
@@ -79,6 +81,7 @@ export class Lambda {
       environment = {},
       allowQuery,
       regions,
+      cron,
       supportsMultiPayloads,
       supportsWrapper,
       experimentalResponseStreaming,
@@ -132,6 +135,10 @@ export class Lambda {
       );
     }
 
+    if (cron !== undefined) {
+      assert(typeof cron === 'string', '"cron" is not a string');
+    }
+
     this.type = 'Lambda';
     this.operationType = operationType;
     this.files = 'files' in opts ? opts.files : undefined;
@@ -142,6 +149,7 @@ export class Lambda {
     this.environment = environment;
     this.allowQuery = allowQuery;
     this.regions = regions;
+    this.cron = cron;
     this.zipBuffer = 'zipBuffer' in opts ? opts.zipBuffer : undefined;
     this.supportsMultiPayloads = supportsMultiPayloads;
     this.supportsWrapper = supportsWrapper;

packages/build-utils/src/types.ts

@@ -410,6 +410,8 @@ export interface BuildResultBuildOutput {
   buildOutputPath: string;
 }
 
+export type Cron = string;
+
 /**
  * When a Builder implements `version: 2`, the `build()` function is expected
  * to return this type.

packages/build-utils/test/fixtures/21-npm-workspaces/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "a21",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/build-utils/test/fixtures/21-npm-workspaces/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "b21",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/build-utils/test/fixtures/21-npm-workspaces/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "21-npm-workspaces",
+  "private": true,
   "version": "1.0.0",
   "workspaces": [
     "a",

packages/build-utils/test/fixtures/22-pnpm/package.json

@@ -1,14 +1,8 @@
 {
-  "name": "22-pnpm",
+  "private": true,
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
   "scripts": {
     "build": "mkdir -p public && (printf \"pnpm version: \" && pnpm -v) > public/index.txt"
   },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
   "dependencies": {
     "once": "^1.4.0"
   }

packages/build-utils/test/fixtures/23-pnpm-workspaces/c/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "c",
+  "name": "build-c23",
   "license": "MIT",
   "version": "0.1.0"
 }

packages/build-utils/test/fixtures/23-pnpm-workspaces/d/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "d",
+  "name": "build-d23",
   "license": "MIT",
   "version": "0.1.0",
   "devDependencies": {

packages/build-utils/test/fixtures/24-pnpm-hoisted/package.json

@@ -1,6 +1,5 @@
 {
-  "private": "true",
+  "private": true,
-  "name": "24-pnpm-hoisted",
   "scripts": {
     "build": "ls -Al node_modules && node index.js"
   },

packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "build-a25",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "build-b25",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package.json

@@ -1,6 +1,5 @@
 {
-  "private": "true",
+  "private": true,
-  "name": "25-multiple-lock-files-yarn",
   "workspaces": [
     "a",
     "b"

packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "build-a26",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "build-b26",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package.json

@@ -1,6 +1,5 @@
 {
-  "private": "true",
+  "private": true,
-  "name": "26-multiple-lock-files-pnpm",
   "workspaces": [
     "a",
     "b"

packages/build-utils/test/unit.exec-async.test.ts

@@ -1,29 +0,0 @@
-import { execAsync, NowBuildError } from '../src';
-
-it('should execute a command', async () => {
-  const { code, stdout, stderr } = await execAsync('echo', ['hello']);
-
-  expect(code).toBe(0);
-  expect(stdout).toContain('hello');
-  expect(stderr).toBe('');
-});
-
-it('should throw if the command exits with non-0 code', async () => {
-  await expect(execAsync('find', ['unknown-file'])).rejects.toBeInstanceOf(
-    NowBuildError
-  );
-});
-
-it('should return if the command exits with non-0 code and ignoreNon0Exit=true', async () => {
-  const { code, stdout, stderr } = await execAsync('find', ['unknown-file'], {
-    ignoreNon0Exit: true,
-  });
-
-  expect(code).toBe(process.platform === 'win32' ? 2 : 1);
-  expect(stdout).toBe('');
-  expect(stderr).toContain(
-    process.platform === 'win32'
-      ? 'Parameter format not correct'
-      : 'No such file or directory'
-  );
-});

packages/build-utils/test/unit.test.ts

@@ -4,14 +4,17 @@ import fs from 'fs-extra';
 import { strict as assert } from 'assert';
 import { getSupportedNodeVersion } from '../src/fs/node-version';
 import {
+  FileBlob,
   getNodeVersion,
   getLatestNodeVersion,
   getDiscontinuedNodeVersions,
+  rename,
   runNpmInstall,
   runPackageJsonScript,
   scanParentDirs,
   Prerender,
 } from '../src';
+import type { Files } from '../src';
 
 jest.setTimeout(10 * 1000);
 
@@ -135,13 +138,25 @@ it('should ignore node version in vercel dev getNodeVersion()', async () => {
   ).toHaveProperty('runtime', 'nodejs');
 });
 
-it('should select project setting from config when no package.json is found', async () => {
+it('should select project setting from config when no package.json is found and fallback undefined', async () => {
   expect(
     await getNodeVersion('/tmp', undefined, { nodeVersion: '16.x' }, {})
   ).toHaveProperty('range', '16.x');
   expect(warningMessages).toStrictEqual([]);
 });
 
+it('should select project setting from config when no package.json is found and fallback is null', async () => {
+  expect(
+    await getNodeVersion('/tmp', null as any, { nodeVersion: '16.x' }, {})
+  ).toHaveProperty('range', '16.x');
+  expect(warningMessages).toStrictEqual([]);
+});
+
+it('should select project setting from fallback when no package.json is found', async () => {
+  expect(await getNodeVersion('/tmp', '16.x')).toHaveProperty('range', '16.x');
+  expect(warningMessages).toStrictEqual([]);
+});
+
 it('should prefer package.json engines over project setting from config and warn', async () => {
   expect(
     await getNodeVersion(
@@ -451,3 +466,18 @@ it('should retry npm install when peer deps invalid and npm@8 on node@16', async
     'Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.',
   ]);
 });
+
+describe('rename', () => {
+  it('should rename keys of files map', () => {
+    const before: Files = {};
+    const toUpper = (s: string) => s.toUpperCase();
+
+    for (let i = 97; i <= 122; i++) {
+      const key = String.fromCharCode(i);
+      before[key] = new FileBlob({ contentType: 'text/plain', data: key });
+    }
+
+    const after = rename(before, toUpper);
+    expect(Object.keys(after)).toEqual('ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''));
+  });
+});

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "28.13.0",
+  "version": "28.15.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -41,16 +41,16 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@vercel/build-utils": "5.9.0",
+    "@vercel/build-utils": "6.1.0",
-    "@vercel/go": "2.2.30",
+    "@vercel/go": "2.3.1",
-    "@vercel/hydrogen": "0.0.44",
+    "@vercel/hydrogen": "0.0.47",
-    "@vercel/next": "3.3.18",
+    "@vercel/next": "3.3.21",
-    "@vercel/node": "2.8.15",
+    "@vercel/node": "2.9.0",
-    "@vercel/python": "3.1.40",
+    "@vercel/python": "3.1.43",
-    "@vercel/redwood": "1.0.51",
+    "@vercel/redwood": "1.0.54",
-    "@vercel/remix": "1.2.7",
+    "@vercel/remix": "1.2.10",
-    "@vercel/ruby": "1.3.56",
+    "@vercel/ruby": "1.3.59",
-    "@vercel/static-build": "1.2.0"
+    "@vercel/static-build": "1.3.2"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
@@ -93,10 +93,10 @@
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
     "@types/yauzl-promise": "2.1.0",
-    "@vercel/client": "12.3.2",
+    "@vercel/client": "12.3.5",
     "@vercel/error-utils": "1.0.8",
-    "@vercel/frameworks": "1.2.4",
+    "@vercel/frameworks": "1.3.0",
-    "@vercel/fs-detectors": "3.7.5",
+    "@vercel/fs-detectors": "3.7.8",
     "@vercel/fun": "1.0.4",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "2.1.8",
@@ -171,7 +171,7 @@
     "tmp-promise": "1.0.3",
     "tree-kill": "1.2.2",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4",
+    "typescript": "4.9.4",
     "universal-analytics": "0.4.20",
     "utility-types": "2.1.0",
     "write-json-file": "2.2.0",

packages/cli/src/commands/alias/ls.ts

@@ -51,7 +51,7 @@ export default async function ls(
     ...paginationOptions
   );
   output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
-  output.log(printAliasTable(aliases));
+  client.stdout.write(printAliasTable(aliases));
 
   if (pagination && pagination.count === 20) {
     const flags = getCommandFlags(opts, ['_', '--next']);

packages/cli/src/commands/build.ts

@@ -212,10 +212,15 @@ export default async function main(client: Client): Promise<number> {
   }
 
   // Delete output directory from potential previous build
+  const defaultOutputDir = join(cwd, OUTPUT_DIR);
   const outputDir = argv['--output']
     ? resolve(argv['--output'])
-    : join(cwd, OUTPUT_DIR);
+    : defaultOutputDir;
-  await fs.remove(outputDir);
+  await Promise.all([
+    fs.remove(outputDir),
+    // Also delete `.vercel/output`, in case the script is targeting Build Output API directly
+    outputDir !== defaultOutputDir ? fs.remove(defaultOutputDir) : undefined,
+  ]);
 
   const buildsJson: BuildsManifest = {
     '//': 'This file was generated by the `vercel build` command. It is not part of the Build Output API.',
@@ -471,6 +476,22 @@ async function doBuild(
     try {
       const { builder, pkg: builderPkg } = builderWithPkg;
 
+      for (const key of [
+        'buildCommand',
+        'installCommand',
+        'outputDirectory',
+        'nodeVersion',
+      ] as const) {
+        const value = projectSettings[key];
+        if (typeof value === 'string') {
+          const envKey =
+            `VERCEL_PROJECT_SETTINGS_` +
+            key.replace(/[A-Z]/g, letter => `_${letter}`).toUpperCase();
+          process.env[envKey] = value;
+          output.debug(`Setting env ${envKey} to "${value}"`);
+        }
+      }
+
       const buildConfig: Config = isZeroConfig
         ? {
             outputDirectory: projectSettings.outputDirectory ?? undefined,

packages/cli/src/commands/certs/ls.ts

@@ -55,7 +55,7 @@ async function ls(
   );
 
   if (certs.length > 0) {
-    output.log(formatCertsTable(certs));
+    client.stdout.write(formatCertsTable(certs));
   }
 
   if (pagination && pagination.count === 20) {

packages/cli/src/commands/dns/ls.ts

@@ -70,7 +70,7 @@ export default async function ls(
         records.length > 0 ? 'Records' : 'No records'
       } found under ${chalk.bold(contextName)} ${chalk.gray(lsStamp())}`
     );
-    output.log(getDNSRecordsTable([{ domainName, records }]));
+    client.stdout.write(getDNSRecordsTable([{ domainName, records }]));
 
     if (pagination && pagination.count === 20) {
       const flags = getCommandFlags(opts, ['_', '--next']);

packages/cli/src/util/build/import-builders.ts

@@ -5,18 +5,14 @@ import { satisfies } from 'semver';
 import { dirname, join } from 'path';
 import { mkdirp, outputJSON, readJSON, symlink } from 'fs-extra';
 import { isStaticRuntime } from '@vercel/fs-detectors';
-import {
+import { BuilderV2, BuilderV3, PackageJson } from '@vercel/build-utils';
-  BuilderV2,
+import execa from 'execa';
-  BuilderV3,
-  PackageJson,
-  spawnAsync,
-} from '@vercel/build-utils';
 import * as staticBuilder from './static-builder';
 import { VERCEL_DIR } from '../projects/link';
 import { Output } from '../output';
 import readJSONFile from '../read-json-file';
 import { CantParseJSONFile } from '../errors-ts';
-import { errorToString, isErrnoException, isError } from '@vercel/error-utils';
+import { isErrnoException, isError } from '@vercel/error-utils';
 import cmd from '../output/cmd';
 import code from '../output/code';
 
@@ -213,32 +209,44 @@ async function installBuilders(
     ).join(', ')}`
   );
   try {
-    await spawnAsync(
+    const { stderr } = await execa(
       'npm',
       ['install', '@vercel/build-utils', ...buildersToAdd],
       {
         cwd: buildersDir,
         stdio: 'pipe',
+        reject: true,
       }
     );
+    stderr
+      .split('/\r?\n/')
+      .filter(line => line.includes('npm WARN deprecated'))
+      .forEach(line => {
+        output.warn(line);
+      });
   } catch (err: unknown) {
     if (isError(err)) {
-      (err as any).link =
+      const execaMessage = err.message;
-        'https://vercel.link/builder-dependencies-install-failed';
+      let message =
-      if (isErrnoException(err) && err.code === 'ENOENT') {
+        err && 'stderr' in err && typeof err.stderr === 'string'
+          ? err.stderr
+          : execaMessage;
+      if (execaMessage.startsWith('Command failed with ENOENT')) {
         // `npm` is not installed
-        err.message = `Please install ${cmd('npm')} before continuing`;
+        message = `Please install ${cmd('npm')} before continuing`;
       } else {
-        const message = errorToString(err);
         const notFound = /GET (.*) - Not found/.exec(message);
         if (notFound) {
           const url = new URL(notFound[1]);
           const packageName = decodeURIComponent(url.pathname.slice(1));
-          err.message = `The package ${code(
+          message = `The package ${code(
             packageName
           )} is not published on the npm registry`;
         }
       }
+      err.message = message;
+      (err as any).link =
+        'https://vercel.link/builder-dependencies-install-failed';
     }
     throw err;
   }

packages/cli/src/util/build/merge.ts

@@ -0,0 +1,46 @@
+import { join } from 'path';
+import { isErrnoException } from '@vercel/error-utils';
+import { stat, move, remove, rmdir, readdir } from 'fs-extra';
+import type { Stats } from 'fs-extra';
+
+/**
+ * Merge a directory into another directory. A `move` file operation is preferred,
+ * falling back to a recursive `move` of contents within the source directory.
+ */
+export async function merge(source: string, destination: string) {
+  const destStat: Stats | NodeJS.ErrnoException = await stat(destination).catch(
+    err => err
+  );
+  if (isErrnoException(destStat)) {
+    if (destStat.code === 'ENOENT') {
+      // Destination does not exist, so move directly
+      await move(source, destination);
+      return;
+    }
+    // Some other kind of error, bail
+    throw destStat;
+  } else if (destStat.isDirectory()) {
+    // Destination is already a directory, so merge contents recursively
+    const contents: string[] | NodeJS.ErrnoException = await readdir(
+      source
+    ).catch(err => err);
+    if (isErrnoException(contents)) {
+      // If source is not a directory, then fall through to rm + move
+      if (contents.code !== 'ENOTDIR') {
+        // Any other error then bail
+        throw contents;
+      }
+    } else {
+      await Promise.all(
+        contents.map(name => merge(join(source, name), join(destination, name)))
+      );
+      // Source should be empty at this point
+      await rmdir(source);
+      return;
+    }
+  }
+
+  // Destination is not a directory, or dest is a dir + source is not, so overwrite
+  await remove(destination);
+  await move(source, destination);
+}

packages/cli/src/util/build/write-build-result.ts

@@ -28,9 +28,10 @@ import {
   normalizePath,
 } from '@vercel/build-utils';
 import pipe from 'promisepipe';
+import { merge } from './merge';
 import { unzip } from './unzip';
 import { VERCEL_DIR } from '../projects/link';
-import { VercelConfig } from '@vercel/client';
+import { fileNameSymbol, VercelConfig } from '@vercel/client';
 
 const { normalize } = posix;
 export const OUTPUT_DIR = join(VERCEL_DIR, 'output');
@@ -56,6 +57,7 @@ export async function writeBuildResult(
     return writeBuildResultV2(
       outputDir,
       buildResult as BuildResultV2,
+      build,
       vercelConfig
     );
   } else if (version === 3) {
@@ -107,6 +109,7 @@ function stripDuplicateSlashes(path: string): string {
 async function writeBuildResultV2(
   outputDir: string,
   buildResult: BuildResultV2,
+  build: Builder,
   vercelConfig: VercelConfig | null
 ) {
   if ('buildOutputPath' in buildResult) {
@@ -114,6 +117,18 @@ async function writeBuildResultV2(
     return;
   }
 
+  // Some very old `@now` scoped Builders return `output` at the top-level.
+  // These Builders are no longer supported.
+  if (!buildResult.output) {
+    const configFile = vercelConfig?.[fileNameSymbol];
+    const updateMessage = build.use.startsWith('@now/')
+      ? ` Please update from "@now" to "@vercel" in your \`${configFile}\` file.`
+      : '';
+    throw new Error(
+      `The build result from "${build.use}" is missing the "output" property.${updateMessage}`
+    );
+  }
+
   const lambdas = new Map<Lambda, string>();
   const overrides: Record<string, PathOverride> = {};
   for (const [path, output] of Object.entries(buildResult.output)) {
@@ -412,7 +427,7 @@ async function mergeBuilderOutput(
     // so no need to do anything
     return;
   }
-  await fs.copy(buildResult.buildOutputPath, outputDir);
+  await merge(buildResult.buildOutputPath, outputDir);
 }
 
 /**

packages/cli/test/fixtures/package.json

@@ -0,0 +1,5 @@
+{
+  "private": true,
+  "name": "cli-test-fixtures",
+  "description": "We created package.json here to avoid reading the monorepo package.json during testing"
+}

packages/cli/test/fixtures/unit/commands/build/now-node-server/.gitignore

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

packages/cli/test/fixtures/unit/commands/build/now-node-server/.vercel/project.json

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

packages/cli/test/fixtures/unit/commands/build/now-node-server/server.js

@@ -0,0 +1,4 @@
+const { createServer } = require('http');
+const handler = (_req, res) => res.end('hi');
+const server = createServer(handler);
+module.exports = server;

packages/cli/test/fixtures/unit/commands/build/now-node-server/vercel.json

@@ -0,0 +1,4 @@
+{
+  "builds": [{ "src": "server.js", "use": "@now/node-server" }],
+  "routes": [{ "src": "/(.*)", "dest": "/server.js" }]
+}

packages/cli/test/fixtures/unit/commands/build/project-settings-env-vars/.gitignore

@@ -0,0 +1 @@
+out

packages/cli/test/fixtures/unit/commands/build/project-settings-env-vars/.vercel/project.json

@@ -0,0 +1,11 @@
+{
+  "orgId": ".",
+  "projectId": ".",
+  "settings": {
+    "nodeVersion": "18.x",
+    "buildCommand": "node build.cjs",
+    "installCommand": "",
+    "outputDirectory": "out",
+    "framework": null
+  }
+}

packages/cli/test/fixtures/unit/commands/build/project-settings-env-vars/build.cjs

@@ -0,0 +1,4 @@
+const fs = require('fs');
+const { join } = require('path');
+fs.mkdirSync(join(__dirname , 'out'), { recursive: true });
+fs.writeFileSync(join(__dirname , 'out', 'env.json'), JSON.stringify(process.env));

packages/cli/test/fixtures/unit/commands/build/with-cron/.vercel/project.json

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

packages/cli/test/fixtures/unit/commands/build/with-cron/api/edge.js

@@ -0,0 +1,17 @@
+export const config = {
+  runtime: 'edge',
+  cron: '* * * * *',
+};
+
+export default async function edge(request, event) {
+  const requestBody = await request.text();
+
+  return new Response(
+    JSON.stringify({
+      headerContentType: request.headers.get('content-type'),
+      url: request.url,
+      method: request.method,
+      body: requestBody,
+    })
+  );
+}

packages/cli/test/fixtures/unit/commands/build/with-cron/api/serverless.js

@@ -0,0 +1,7 @@
+export default function (req, res) {
+  res.json({ memory: parseInt(process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE) });
+}
+
+export const config = {
+  cron: '* * * * *',
+};

packages/cli/test/fixtures/unit/commands/build/with-cron/index.html

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

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

@@ -10,7 +10,7 @@ describe('alias', () => {
     client.setArgv('alias', 'ls');
     const exitCodePromise = alias(client);
     await expect(exitCodePromise).resolves.toEqual(0);
-    await expect(client.stderr).toOutput('dummy-19.app');
+    await expect(client.stdout).toOutput('dummy-19.app');
   });
 
   it('should list up to 2 aliases', async () => {
@@ -19,6 +19,6 @@ describe('alias', () => {
     client.setArgv('alias', 'ls', '--limit', '2');
     const exitCodePromise = alias(client);
     await expect(exitCodePromise).resolves.toEqual(0);
-    await expect(client.stderr).toOutput('dummy-1.app');
+    await expect(client.stdout).toOutput('dummy-1.app');
   });
 });

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

@@ -834,6 +834,42 @@ describe('build', () => {
     }
   });
 
+  /* Skipping because this legacy builder is causing something to break with cwd
+  it('should error when builder returns result without "output" such as @now/node-server', async () => {
+    const cwd = join(os.tmpdir(), 'now-node-server');
+    const output = join(cwd, '.vercel/output');
+    try {
+      // Copy to a temp directory to avoid breaking other tests
+      await fs.copy(fixture('now-node-server'), cwd);
+      process.chdir(cwd);
+      const exitCode = await build(client);
+      expect(exitCode).toEqual(1);
+
+      // Error gets printed to the terminal
+      const message =
+        'The build result from "@now/node-server" is missing the "output" property. Please update from "@now" to "@vercel" in your `vercel.json` file.';
+      await expect(client.stderr).toOutput(message);
+
+      const builds = await fs.readJSON(join(output, 'builds.json'));
+
+      // top level "error" also contains the same error
+      expect(builds.error).toEqual({
+        name: 'Error',
+        message,
+        stack: expect.stringContaining(message),
+      });
+
+      // `config.json` contains `version`
+      const configJson = await fs.readJSON(join(output, 'config.json'));
+      expect(configJson.version).toBe(3);
+    } finally {
+      await fs.remove(cwd);
+      process.chdir(originalCwd);
+      delete process.env.__VERCEL_BUILD_RUNNING;
+    }
+  });
+  */
+
   it('should allow for missing "build" script', async () => {
     const cwd = fixture('static-with-pkg');
     const output = join(cwd, '.vercel/output');
@@ -989,6 +1025,27 @@ describe('build', () => {
     }
   });
 
+  it('should set VERCEL_PROJECT_SETTINGS_ environment variables', async () => {
+    const cwd = fixture('project-settings-env-vars');
+    const output = join(cwd, '.vercel/output');
+    try {
+      process.chdir(cwd);
+      const exitCode = await build(client);
+      expect(exitCode).toEqual(0);
+
+      const contents = await fs.readJSON(join(output, 'static/env.json'));
+      expect(contents).toMatchObject({
+        VERCEL_PROJECT_SETTINGS_BUILD_COMMAND: `node build.cjs`,
+        VERCEL_PROJECT_SETTINGS_INSTALL_COMMAND: '',
+        VERCEL_PROJECT_SETTINGS_OUTPUT_DIRECTORY: 'out',
+        VERCEL_PROJECT_SETTINGS_NODE_VERSION: '18.x',
+      });
+    } finally {
+      process.chdir(originalCwd);
+      delete process.env.__VERCEL_BUILD_RUNNING;
+    }
+  });
+
   it('should apply "images" configuration from `vercel.json`', async () => {
     const cwd = fixture('images');
     const output = join(cwd, '.vercel/output');
@@ -1045,6 +1102,30 @@ describe('build', () => {
     }
   });
 
+  it('should include crons property in build output', async () => {
+    const cwd = fixture('with-cron');
+    const output = join(cwd, '.vercel', 'output', 'functions', 'api');
+
+    try {
+      process.chdir(cwd);
+      const exitCode = await build(client);
+      expect(exitCode).toBe(0);
+
+      const edge = await fs.readJSON(
+        join(output, 'edge.func', '.vc-config.json')
+      );
+      expect(edge).toHaveProperty('cron', '* * * * *');
+
+      const serverless = await fs.readJSON(
+        join(output, 'serverless.func', '.vc-config.json')
+      );
+      expect(serverless).toHaveProperty('cron', '* * * * *');
+    } finally {
+      process.chdir(originalCwd);
+      delete process.env.__VERCEL_BUILD_RUNNING;
+    }
+  });
+
   describe('should find packages with different main/module/browser keys', function () {
     let output: string;
 
@@ -1193,13 +1274,13 @@ describe('build', () => {
         turbo: {
           name: 'Turbo',
           buildCommand: 'cd ../.. && npx turbo run build --filter=app-1...',
-          installCommand: 'cd ../.. && yarn install',
+          installCommand: 'yarn install',
-          ignoreCommand: 'cd ../.. && npx turbo-ignore',
+          ignoreCommand: 'npx turbo-ignore',
         },
         nx: {
           name: 'Nx',
           buildCommand: 'cd ../.. && npx nx build app-1',
-          installCommand: 'cd ../.. && yarn install',
+          installCommand: 'yarn install',
         },
         // rush: {
         //   name: 'Rush',

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

@@ -9,7 +9,7 @@ describe('certs', () => {
     useCert();
     client.setArgv('certs', 'ls');
     const exitCodePromise = certs(client);
-    await expect(client.stderr).toOutput('dummy-19.cert');
+    await expect(client.stdout).toOutput('dummy-19.cert');
     await expect(exitCodePromise).resolves.toEqual(0);
   });
 
@@ -18,7 +18,7 @@ describe('certs', () => {
     useCert();
     client.setArgv('certs', 'ls', '--limit', '2');
     const exitCodePromise = certs(client);
-    await expect(client.stderr).toOutput('dummy-1.cert');
+    await expect(client.stdout).toOutput('dummy-1.cert');
     await expect(exitCodePromise).resolves.toEqual(0);
   });
 });

packages/cli/test/unit/util/build/import-builders.test.ts

@@ -105,6 +105,7 @@ describe('importBuilders()', () => {
       await expect(client.stderr).toOutput(
         '> Installing Builder: @vercel/node'
       );
+      await expect(client.stderr).not.toOutput('npm WARN deprecated');
     } finally {
       await remove(cwd);
     }
@@ -146,6 +147,33 @@ describe('importBuilders()', () => {
     }
   });
 
+  it('should install and warn when Builder is deprecated', 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 = '@now/node';
+      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('@now/node');
+      expect(builders.get(spec)?.pkg.version).toEqual('1.8.5');
+      expect(builders.get(spec)?.pkgPath).toEqual(
+        join(cwd, '.vercel/builders/node_modules/@now/node/package.json')
+      );
+      expect(typeof builders.get(spec)?.builder.build).toEqual('function');
+      await expect(client.stderr).toOutput(
+        'npm WARN deprecated @now/node@1.8.5: "@now/node" is deprecated and will stop receiving updates on December 31, 2020. Please use "@vercel/node" instead.'
+      );
+    } finally {
+      await remove(cwd);
+    }
+  });
+
   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

packages/cli/test/unit/util/build/merge.test.ts

@@ -0,0 +1,71 @@
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { writeFile, readdir, mkdirp, stat, remove, readFile } from 'fs-extra';
+import { merge } from '../../../../src/util/build/merge';
+import { isErrnoException } from '@vercel/error-utils';
+
+describe('merge()', () => {
+  it('should move source to non-existent destination', async () => {
+    const source = join(tmpdir(), 'src');
+    const dest = join(tmpdir(), 'dest');
+    try {
+      await mkdirp(source);
+      await writeFile(join(source, 'a.txt'), 'a');
+      await merge(source, dest);
+      const destContents = await readdir(dest);
+      expect(destContents.sort()).toEqual(['a.txt']);
+      const sourceStat: Error = await stat(source).then(
+        () => {},
+        err => err
+      );
+      expect(isErrnoException(sourceStat) && sourceStat.code).toEqual('ENOENT');
+    } finally {
+      await Promise.all([source, dest].map(p => remove(p)));
+    }
+  });
+
+  it('should merge source into existing destination', async () => {
+    const source = join(tmpdir(), 'src');
+    const dest = join(tmpdir(), 'dest');
+    try {
+      await mkdirp(source);
+      await mkdirp(dest);
+      await writeFile(join(source, 'a.txt'), 'a');
+      await writeFile(join(source, 'c.txt'), 'c');
+      await writeFile(join(dest, 'b.txt'), 'b');
+      await writeFile(join(dest, 'c.txt'), 'original');
+      await merge(source, dest);
+      const destContents = await readdir(dest);
+      expect(destContents.sort()).toEqual(['a.txt', 'b.txt', 'c.txt']);
+      const sourceStat: Error = await stat(source).then(
+        () => {},
+        err => err
+      );
+      expect(isErrnoException(sourceStat) && sourceStat.code).toEqual('ENOENT');
+      expect(await readFile(join(dest, 'c.txt'), 'utf8')).toEqual('c');
+    } finally {
+      await Promise.all([source, dest].map(p => remove(p)));
+    }
+  });
+
+  it('should overwrite dest directory when source is a file', async () => {
+    const source = join(tmpdir(), 'src');
+    const dest = join(tmpdir(), 'dest');
+    try {
+      await mkdirp(source);
+      await mkdirp(join(dest, 'a'));
+      await writeFile(join(source, 'a'), 'a');
+      await merge(source, dest);
+      const destContents = await readdir(dest);
+      expect(destContents.sort()).toEqual(['a']);
+      const sourceStat: Error = await stat(source).then(
+        () => {},
+        err => err
+      );
+      expect(isErrnoException(sourceStat) && sourceStat.code).toEqual('ENOENT');
+      expect(await readFile(join(dest, 'a'), 'utf8')).toEqual('a');
+    } finally {
+      await Promise.all([source, dest].map(p => remove(p)));
+    }
+  });
+});

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "12.3.2",
+  "version": "12.3.5",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -43,7 +43,7 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "5.9.0",
+    "@vercel/build-utils": "6.1.0",
     "@vercel/routing-utils": "2.1.8",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",

packages/edge/README.md

@@ -1,4 +1,4 @@
 # `@vercel/edge`
 
 A set of utilities to help you deploy any framework on the Edge using Vercel.
-Please [follow the documentation](https://vercel.com/docs/concepts/functions/edge-functions/edge-functions-api#the-@vercel/edge-package) for examples and usage.
+Please [follow the documentation](https://vercel.com/docs/concepts/functions/edge-functions/vercel-edge-package) for examples and usage.

packages/edge/package.json

@@ -1,10 +1,19 @@
 {
   "name": "@vercel/edge",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "homepage": "https://vercel.com/docs/concepts/functions/edge-functions/vercel-edge-package",
+  "files": [
+    "dist"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/vercel.git",
+    "directory": "packages/edge"
+  },
   "scripts": {
     "build": "tsup src/index.ts --dts --format esm,cjs",
     "test": "jest --env node --verbose --runInBand --bail",

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "main": "./dist/frameworks.js",
   "types": "./dist/frameworks.d.ts",
   "files": [

packages/frameworks/src/frameworks.ts

@@ -272,6 +272,11 @@ export const frameworks = [
         headers: { 'cache-control': 'public, max-age=31536000, immutable' },
         continue: true,
       },
+      {
+        src: '^/_astro/(.*)$',
+        headers: { 'cache-control': 'public, max-age=31536000, immutable' },
+        continue: true,
+      },
     ],
   },
   {

packages/fs-detectors/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "3.7.5",
+  "version": "3.7.8",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@vercel/error-utils": "1.0.8",
-    "@vercel/frameworks": "1.2.4",
+    "@vercel/frameworks": "1.3.0",
     "@vercel/routing-utils": "2.1.8",
     "glob": "8.0.3",
     "js-yaml": "4.1.0",
@@ -35,7 +35,7 @@
     "@types/minimatch": "3.0.5",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.10",
-    "@vercel/build-utils": "5.9.0",
+    "@vercel/build-utils": "6.1.0",
     "typescript": "4.3.4"
   }
 }

packages/fs-detectors/src/monorepos/get-monorepo-default-settings.ts

@@ -67,8 +67,11 @@ export async function getMonorepoDefaultSettings(
     return {
       monorepoManager: 'turbo',
       buildCommand: `cd ${relativeToRoot} && npx turbo run build --filter={${projectPath}}...`,
-      installCommand: `cd ${relativeToRoot} && ${packageManager} install`,
+      installCommand:
-      commandForIgnoringBuildStep: `cd ${relativeToRoot} && npx turbo-ignore`,
+        packageManager === 'npm'
+          ? `${packageManager} install --prefix=${relativeToRoot}`
+          : `${packageManager} install`,
+      commandForIgnoringBuildStep: `npx turbo-ignore`,
     };
   } else if (monorepoManager === 'nx') {
     // No ENOENT handling required here since conditional wouldn't be `true` unless `nx.json` was found.
@@ -111,7 +114,10 @@ export async function getMonorepoDefaultSettings(
     return {
       monorepoManager: 'nx',
       buildCommand: `cd ${relativeToRoot} && npx nx build ${projectName}`,
-      installCommand: `cd ${relativeToRoot} && ${packageManager} install`,
+      installCommand:
+        packageManager === 'npm'
+          ? `${packageManager} install --prefix=${relativeToRoot}`
+          : `${packageManager} install`,
     };
   }
   // TODO (@Ethan-Arrowood) - Revisit rush support when we can test it better

packages/fs-detectors/test/fixtures/21-npm-workspaces/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "npm-workspace-a21",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/21-npm-workspaces/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "npm-workspace-b21",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/21-npm-workspaces/package.json

@@ -1,6 +1,5 @@
 {
-  "name": "21-npm-workspaces",
+  "private": true,
-  "version": "1.0.0",
   "workspaces": [
     "a",
     "b"

packages/fs-detectors/test/fixtures/23-pnpm-workspaces/c/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "c",
+  "name": "fs-c23",
   "license": "MIT",
   "version": "0.1.0"
 }

packages/fs-detectors/test/fixtures/23-pnpm-workspaces/d/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "d",
+  "name": "fs-d23",
   "license": "MIT",
   "version": "0.1.0",
   "devDependencies": {

packages/fs-detectors/test/fixtures/23-pnpm-workspaces/package.json

@@ -1,6 +1,5 @@
 {
   "private": true,
-  "name": "23-pnpm-workspaces",
   "license": "MIT",
   "version": "1.0.0"
 }

packages/fs-detectors/test/fixtures/24-pnpm-hoisted/package.json

@@ -1,6 +1,5 @@
 {
-  "private": "true",
+  "private": true,
-  "name": "24-pnpm-hoisted",
   "scripts": {
     "build": "ls -Al node_modules && node index.js"
   },

packages/fs-detectors/test/fixtures/25-multiple-lock-files-yarn/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "fs-a25",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/25-multiple-lock-files-yarn/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "fs-b25",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/25-multiple-lock-files-yarn/package.json

@@ -1,6 +1,5 @@
 {
-  "private": "true",
+  "private": true,
-  "name": "25-multiple-lock-files-yarn",
   "workspaces": [
     "a",
     "b"

packages/fs-detectors/test/fixtures/26-multiple-lock-files-pnpm/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "fs-a26",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/26-multiple-lock-files-pnpm/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "fs-b26",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/26-multiple-lock-files-pnpm/package.json

@@ -1,6 +1,5 @@
 {
-  "private": "true",
+  "private": true,
-  "name": "26-multiple-lock-files-pnpm",
   "workspaces": [
     "a",
     "b"

packages/fs-detectors/test/fixtures/27-yarn-workspaces/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "fs-a27",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/27-yarn-workspaces/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "fs-b27",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/27-yarn-workspaces/package.json

@@ -1,6 +1,4 @@
 {
-  "name": "21-npm-workspaces",
-  "version": "1.0.0",
   "private": true,
   "workspaces": [
     "a",

packages/fs-detectors/test/fixtures/28-pnpm-7/package.json

@@ -1,5 +1,5 @@
 {
-  "private": "true",
+  "private": true,
   "scripts": {
     "build": "mkdir -p public && (printf \"pnpm version: \" && pnpm -v) > public/index.txt"
   },

packages/fs-detectors/test/fixtures/28-turborepo-with-yarn-workspaces/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "fs-a28",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/28-turborepo-with-yarn-workspaces/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "fs-b28",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/28-turborepo-with-yarn-workspaces/package.json

@@ -1,6 +1,4 @@
 {
-  "name": "21-npm-workspaces",
-  "version": "1.0.0",
   "private": true,
   "workspaces": [
     "a",

packages/fs-detectors/test/fixtures/29-nested-workspaces/backend/c/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "c",
+  "name": "backend-c29",
   "license": "MIT",
   "version": "0.1.0"
 }

packages/fs-detectors/test/fixtures/29-nested-workspaces/backend/d/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "d",
+  "name": "backend-d29",
   "license": "MIT",
   "version": "0.1.0",
   "devDependencies": {

packages/fs-detectors/test/fixtures/29-nested-workspaces/backend/package.json

@@ -1,6 +1,5 @@
 {
   "private": true,
-  "name": "29-nested-workspaces-backend",
   "license": "MIT",
   "version": "1.0.0"
 }

packages/fs-detectors/test/fixtures/29-nested-workspaces/frontend/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "frontend-a29",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/29-nested-workspaces/frontend/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "frontend-b29",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/29-nested-workspaces/frontend/package.json

@@ -1,6 +1,4 @@
 {
-  "name": "29-nested-workspaces-frontend",
-  "version": "1.0.0",
   "private": true,
   "workspaces": [
     "a",

packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/c/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "c",
+  "name": "backend-c30",
   "license": "MIT",
   "version": "0.1.0"
 }

packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/d/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "d",
+  "name": "backend-d30",
   "license": "MIT",
   "version": "0.1.0",
   "devDependencies": {

packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/backend/package.json

@@ -1,6 +1,5 @@
 {
   "private": true,
-  "name": "30-double-nested-workspaces-packages-backend",
   "license": "MIT",
   "version": "1.0.0"
 }

packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/frontend/a/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "a",
+  "name": "frontend-a30",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

packages/fs-detectors/test/fixtures/30-double-nested-workspaces/packages/frontend/b/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "b",
+  "name": "frontend-b30",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",