Publish Stable

- @vercel/build-utils@6.6.0
 - vercel@28.18.2
 - @vercel/client@12.4.7
 - @vercel/fs-detectors@3.8.7
 - @vercel/gatsby-plugin-vercel-builder@1.2.5
 - @vercel/go@2.4.2
 - @vercel/hydrogen@0.0.60
 - @vercel/next@3.7.2
 - @vercel/node-bridge@4.0.0
 - @vercel/node@2.10.1
 - @vercel/python@3.1.56
 - @vercel/redwood@1.1.12
 - @vercel/remix-builder@1.8.2
 - @vercel/ruby@1.3.73
 - @vercel/static-build@1.3.20

.github/DISCUSSION_TEMPLATE/general.yml

@@ -0,0 +1,10 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions)
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true

.github/DISCUSSION_TEMPLATE/help.yml

@@ -0,0 +1,10 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions/categories/help)
+  - type: textarea
+    attributes:
+      label: Problem Description
+    validations:
+      required: true

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -0,0 +1,10 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions/categories/ideas)
+  - type: textarea
+    attributes:
+      label: Idea
+    validations:
+      required: true

.github/DISCUSSION_TEMPLATE/polls.yml

@@ -0,0 +1,10 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions)
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true

.github/DISCUSSION_TEMPLATE/show-and-tell.yml

@@ -0,0 +1,10 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > **Note**: For discussions not related to Vercel CLI or Runtimes, please visit the [Vercel Community](https://github.com/orgs/vercel/discussions)
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true

.github/DISCUSSION_TEMPLATE/temporary.yml

@@ -0,0 +1,5 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > **Note**: This category should not be used for new discussions. Please visit the [Vercel Community](https://github.com/orgs/vercel/discussions)

.github/ISSUE_TEMPLATE/config.yml

@@ -4,8 +4,8 @@ contact_links:
     url: https://vercel.com/support/request
     about: Report a bug using the Vercel support form
   - name: Feature Request
-    url: https://github.com/vercel/vercel/discussions/new?category=ideas
+    url: https://github.com/orgs/vercel/discussions/new?category=ideas
     about: Share ideas for new features
   - name: Ask a Question
-    url: https://github.com/vercel/vercel/discussions/new?category=help
+    url: https://github.com/orgs/vercel/discussions/new?category=help
     about: Ask the community for help

.github/workflows/cron-update-gatsby-fixtures.yml

@@ -0,0 +1,31 @@
+name: Cron Update Gatsby Fixtures
+
+on:
+  # Allow manual runs
+  workflow_dispatch:
+  # Run once a week https://crontab.guru/once-a-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: Enable corepack
+        run: corepack enable pnpm
+      - name: Create Pull Request
+        uses: actions/github-script@v6
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
+        # See https://github.com/actions/github-script#run-a-separate-file-with-an-async-function
+        with:
+          github-token: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
+          script: |
+            const script = require('./utils/update-gatsby-fixtures.js')
+            await script({ github, context })

.github/workflows/label-feature-request.yml

@@ -16,7 +16,7 @@ jobs:
           issue-number: ${{ github.event.issue.number }}
           body: |
             Thank you for taking the time to created this request!             
-            
+
             We added it to our backlog but need to discuss design/architecture before we can accept a PR. 
-            
+
             Please let us know if you would be interested in sending a PR once we approve the design.

.github/workflows/label-support.yml

@@ -16,9 +16,9 @@ jobs:
           issue-number: ${{ github.event.issue.number }}
           comment: |
             Thank you so much for filing this issue. 
-            
+
             We do try to keep issues in this repository focused on the vercel command line and related code. 
-            
+
             At this point we think that this issue is best handled by our friendly Vercel support team. They can be found by contacting them at: https://vercel.com/help#issues
-            
+
             If you think closing of this is a mistake, then please re-open this issue and we'll take another look :bow:

.github/workflows/label-triaged.yml

@@ -16,9 +16,9 @@ jobs:
           issue-number: ${{ github.event.issue.number }}
           body: |
             Thank you for taking the time to file this issue!             
-            
+
             We have confirmed this is a bug and added it to our backlog.
-            
+
             We don't have a timeline for when this issue will be fixed, but we will accept a Pull Request with a fix and a test.
-            
+
             See the [contributing guidelines](https://github.com/vercel/vercel/blob/main/.github/CONTRIBUTING.md) for more info.

.github/workflows/publish.yml

@@ -3,9 +3,9 @@ name: Publish
 on:
   push:
     branches:
-    - main
+      - main
     tags:
-    - '!*'
+      - '!*'
 
 env:
   TURBO_REMOTE_ONLY: 'true'
@@ -16,46 +16,52 @@ jobs:
   publish:
     name: Publish
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Check Release
-      id: check-release
-      run: |
-        tag="$(git describe --tags --exact-match 2> /dev/null || :)"
-        if [[ -z "$tag" ]];
-          then
-            echo "IS_RELEASE=false" >> $GITHUB_OUTPUT
-          else
-            echo "IS_RELEASE=true" >> $GITHUB_OUTPUT
-        fi
-    - name: Setup Go
-      if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
-      uses: actions/setup-go@v3
-      with:
-        go-version: '1.13.15'
-    - name: Setup Node
-      if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: install pnpm@7.24.2
-      run: npm i -g pnpm@7.24.2
-    - name: Install
-      if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
-      run: pnpm install
-    - name: Build
-      if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
-      run: pnpm build
-      env:
-        GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
-        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-    - name: Publish
-      if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
-      run: pnpm publish-from-github
-      env:
-        NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
-        GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
-        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Check Release
+        id: check-release
+        run: |
+          tag="$(git describe --tags --exact-match 2> /dev/null || :)"
+          if [[ -z "$tag" ]];
+            then
+              echo "IS_RELEASE=false" >> $GITHUB_OUTPUT
+            else
+              echo "IS_RELEASE=true" >> $GITHUB_OUTPUT
+          fi
+      - name: Setup Go
+        if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.13.15'
+      - name: Setup Node
+        if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: install npm@9
+        run: npm i -g npm@9
+      - name: install pnpm@7.24.2
+        run: npm i -g pnpm@7.24.2
+      - name: Install
+        if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
+        run: pnpm install
+      - name: Build
+        if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
+        run: pnpm build
+        env:
+          GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+      - name: Publish
+        if: ${{ steps.check-release.outputs.IS_RELEASE == 'true' }}
+        run: pnpm publish-from-github
+        env:
+          NPM_CONFIG_PROVENANCE: 'true'
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
+          GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}

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

@@ -3,9 +3,9 @@ name: CLI
 on:
   push:
     branches:
-    - main
+      - main
     tags:
-    - '!*'
+      - '!*'
   pull_request:
 
 env:
@@ -31,9 +31,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 2
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.18'
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}

.github/workflows/test-lint.yml

@@ -0,0 +1,35 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '!*'
+  pull_request:
+
+env:
+  TURBO_REMOTE_ONLY: 'true'
+  TURBO_TEAM: 'vercel'
+  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  NODE_VERSION: '16'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  test:
+    name: Lint
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: install pnpm@7.24.2
+        run: npm i -g pnpm@7.24.2
+      - run: pnpm install
+      - run: pnpm run lint
+      - run: pnpm run prettier-check

.github/workflows/test-unit.yml

@@ -1,50 +0,0 @@
-name: Unit
-
-on:
-  push:
-    branches:
-    - main
-    tags:
-    - '!*'
-  pull_request:
-
-env:
-  TURBO_REMOTE_ONLY: 'true'
-  TURBO_TEAM: 'vercel'
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-
-jobs:
-  test:
-    name: Unit
-    timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        node: [16]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.13.15'
-      - uses: actions/checkout@v3
-        with:
-            fetch-depth: 2
-      - uses: actions/setup-node@v3
-        with:
-            node-version: ${{ matrix.node }}
-      - name: install pnpm@7.24.2
-        run: npm i -g pnpm@7.24.2
-      - run: pnpm install
-      - run: pnpm run build
-      - run: pnpm run lint
-        if: matrix.os == 'ubuntu-latest' && matrix.node == 14 # only run lint once
-      - run: pnpm run test-unit
-      - run: pnpm -C packages/cli run coverage
-        if: matrix.os == 'ubuntu-latest' && matrix.node == 14 # only run coverage once
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/test.yml

@@ -3,9 +3,9 @@ name: Tests
 on:
   push:
     branches:
-    - main
+      - main
     tags:
-    - '!*'
+      - '!*'
   pull_request:
 
 env:
@@ -29,9 +29,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 2
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.13.15'
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -66,9 +63,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 2
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.13.15'
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}

.github/workflows/update-remix-run-dev.yml

@@ -0,0 +1,28 @@
+name: Update @remix-run/dev
+
+on:
+  workflow_dispatch:
+    inputs:
+      new-version:
+        type: string
+        description: 'Optional version to update @remix-run/dev to inside of @vercel/remix-builder'
+
+jobs:
+  update-remix-run-dev:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup node
+        uses: actions/setup-node@v3
+      - name: Enable corepack
+        run: corepack enable pnpm
+      - name: Update @remix-run/dev
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
+          script: |
+            const script = require('./utils/update-remix-run-dev.js')
+            await script({ github, context }, "${{ inputs.new-version }}")

.npmrc

@@ -1,3 +1,4 @@
+provenance=true
 save-exact=true
 hoist-pattern[]=!"**/@types/**"
 hoist-pattern[]=!"**/typedoc"

.prettierignore

@@ -7,3 +7,28 @@ examples/sveltekit-1
 
 # gatsby-plugin-vercel-analytics
 packages/gatsby-plugin-vercel-analytics
+
+# ignore directories that are not source code
+node_modules
+dist
+pnpm-lock.yaml
+.vscode
+.DS_Store
+.next
+.vercel
+.turbo
+.eslintcache
+.output
+.vercel_build_output
+.vercel
+coverage
+turbo-cache-key.json
+/examples
+/public
+packages/*/dist
+packages/*/node_modules
+packages/**/test/fixtures
+packages/**/test/dev/fixtures
+packages/**/test/build-fixtures
+packages/**/test/cache-fixtures
+

DEVELOPING_A_RUNTIME.md

@@ -79,18 +79,23 @@ project. An example use-case is that `@vercel/node` uses this function to cache
 the `node_modules` directory, making it faster to install npm dependencies for
 future builds.
 
+> Note: Only files within the repo root directory can be cached.
+
 **Example:**
 
 ```typescript
-import { PrepareCacheOptions } from '@vercel/build-utils';
+import { relative } from 'path';
+import { glob, PrepareCache } from '@vercel/build-utils';
 
-export async function prepareCache(options: PrepareCacheOptions) {
+export const prepareCache: PrepareCache = async ({
+  workPath,
+  repoRootPath,
+}) => {
   // Create a mapping of file names and `File` object instances to cache here…
-
-  return {
-    'path-to-file': File,
-  };
-}
+  const rootDirectory = relative(repoRootPath, workPath);
+  const cache = await glob(`${rootDirectory}/some/dir/**`, repoRootPath);
+  return cache;
+};
 ```
 
 ### `shouldServe()`

api/_lib/examples/github-repo-info.ts

@@ -51,8 +51,11 @@ export async function getGitHubRepoInfo(repo: Repo) {
     data.subdir = repo.path.slice(subdirPath.length).split('/');
   }
 
-  if (data.id === 'vercel/vercel' && data.subdir && data.subdir[0] === 'examples') {
-
+  if (
+    data.id === 'vercel/vercel' &&
+    data.subdir &&
+    data.subdir[0] === 'examples'
+  ) {
     // from our examples, add `homepage` and `description` fields
     const example = data.subdir[1];
     const exampleList = await getExampleList();

api/_lib/script/build.ts

@@ -33,7 +33,12 @@ async function main() {
   });
 
   const existingExamples = exampleDirs
-    .filter(dir => dir.isDirectory())
+    .filter(
+      dir =>
+        dir.isDirectory() &&
+        dir.name !== 'node_modules' &&
+        dir.name !== '__tests__'
+    )
     .map(dir => ({
       name: dir.name,
       visible: true,

codecov.yml

@@ -1,10 +0,0 @@
-codecov:
-  require_ci_to_pass: yes
-
-coverage:
-  status:
-    project: off
-    patch: off
-
-fixes:
-  - "::packages/cli/"         # move root   e.g., "path/" => "after/path/"

examples/astro/README.md

@@ -38,9 +38,9 @@ All commands are run from the root of the project, from a terminal:
 
 | Command                | Action                                             |
 | :--------------------- | :------------------------------------------------- |
-| `npm install`          | Installs dependencies                              |
-| `npm run dev`          | Starts local dev server at `localhost:3000`        |
-| `npm run build`        | Build your production site to `./dist/`            |
-| `npm run preview`      | Preview your build locally, before deploying       |
-| `npm run astro ...`    | Run CLI commands like `astro add`, `astro preview` |
-| `npm run astro --help` | Get help using the Astro CLI                       |
+| `pnpm install`          | Installs dependencies                              |
+| `pnpm run dev`          | Starts local dev server at `localhost:3000`        |
+| `pnpm run build`        | Build your production site to `./dist/`            |
+| `pnpm run preview`      | Preview your build locally, before deploying       |
+| `pnpm run astro ...`    | Run CLI commands like `astro add`, `astro preview` |
+| `pnpm run astro --help` | Get help using the Astro CLI                       |

examples/nextjs/jsconfig.json

@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./*"]
     }

examples/nextjs/package-lock.json

@@ -8,9 +8,9 @@
       "name": "nextjs",
       "version": "0.1.0",
       "dependencies": {
-        "eslint": "8.34.0",
-        "eslint-config-next": "13.2.1",
-        "next": "13.2.1",
+        "eslint": "8.35.0",
+        "eslint-config-next": "13.2.4",
+        "next": "13.2.4",
         "react": "18.2.0",
         "react-dom": "18.2.0"
       }
@@ -27,9 +27,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
-      "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
+      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -48,6 +48,14 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
+      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -79,22 +87,22 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
     },
     "node_modules/@next/env": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.2.1.tgz",
-      "integrity": "sha512-Hq+6QZ6kgmloCg8Kgrix+4F0HtvLqVK3FZAnlAoS0eonaDemHe1Km4kwjSWRE3JNpJNcKxFHF+jsZrYo0SxWoQ=="
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.2.4.tgz",
+      "integrity": "sha512-+Mq3TtpkeeKFZanPturjcXt+KHfKYnLlX6jMLyCrmpq6OOs4i1GqBOAauSkii9QeKCMTYzGppar21JU57b/GEA=="
     },
     "node_modules/@next/eslint-plugin-next": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.2.1.tgz",
-      "integrity": "sha512-r0i5rcO6SMAZtqiGarUVMr3k256X0R0j6pEkKg4PxqUW+hG0qgMxRVAJsuoRG5OBFkCOlSfWZJ0mP9fQdCcyNg==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.2.4.tgz",
+      "integrity": "sha512-ck1lI+7r1mMJpqLNa3LJ5pxCfOB1lfJncKmRJeJxcJqcngaFwylreLP7da6Rrjr6u2gVRTfmnkSkjc80IiQCwQ==",
       "dependencies": {
         "glob": "7.1.7"
       }
     },
     "node_modules/@next/swc-android-arm-eabi": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.2.1.tgz",
-      "integrity": "sha512-Yua7mUpEd1wzIT6Jjl3dpRizIfGp9NR4F2xeRuQv+ae+SDI1Em2WyM9m46UL+oeW5GpMiEHoaBagr47RScZFmQ==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.2.4.tgz",
+      "integrity": "sha512-DWlalTSkLjDU11MY11jg17O1gGQzpRccM9Oes2yTqj2DpHndajrXHGxj9HGtJ+idq2k7ImUdJVWS2h2l/EDJOw==",
       "cpu": [
         "arm"
       ],
@@ -107,9 +115,9 @@
       }
     },
     "node_modules/@next/swc-android-arm64": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.2.1.tgz",
-      "integrity": "sha512-Bifcr2f6VwInOdq1uH/9lp8fH7Nf7XGkIx4XceVd32LPJqG2c6FZU8ZRBvTdhxzXVpt5TPtuXhOP4Ij9UPqsVw==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.2.4.tgz",
+      "integrity": "sha512-sRavmUImUCf332Gy+PjIfLkMhiRX1Ez4SI+3vFDRs1N5eXp+uNzjFUK/oLMMOzk6KFSkbiK/3Wt8+dHQR/flNg==",
       "cpu": [
         "arm64"
       ],
@@ -122,9 +130,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.2.1.tgz",
-      "integrity": "sha512-gvqm+fGMYxAkwBapH0Vvng5yrb6HTkIvZfY4oEdwwYrwuLdkjqnJygCMgpNqIFmAHSXgtlWxfYv1VC8sjN81Kw==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.2.4.tgz",
+      "integrity": "sha512-S6vBl+OrInP47TM3LlYx65betocKUUlTZDDKzTiRDbsRESeyIkBtZ6Qi5uT2zQs4imqllJznVjFd1bXLx3Aa6A==",
       "cpu": [
         "arm64"
       ],
@@ -137,9 +145,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.2.1.tgz",
-      "integrity": "sha512-HGqVqmaZWj6zomqOZUVbO5NhlABL0iIaxTmd0O5B0MoMa5zpDGoaHSG+fxgcWMXcGcxmUNchv1NfNOYiTKoHOg==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.2.4.tgz",
+      "integrity": "sha512-a6LBuoYGcFOPGd4o8TPo7wmv5FnMr+Prz+vYHopEDuhDoMSHOnC+v+Ab4D7F0NMZkvQjEJQdJS3rqgFhlZmKlw==",
       "cpu": [
         "x64"
       ],
@@ -152,9 +160,9 @@
       }
     },
     "node_modules/@next/swc-freebsd-x64": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.2.1.tgz",
-      "integrity": "sha512-N/a4JarAq+E+g+9K2ywJUmDIgU2xs2nA+BBldH0oq4zYJMRiUhL0iaN9G4e72VmGOJ61L/3W6VN8RIUOwTLoqQ==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.2.4.tgz",
+      "integrity": "sha512-kkbzKVZGPaXRBPisoAQkh3xh22r+TD+5HwoC5bOkALraJ0dsOQgSMAvzMXKsN3tMzJUPS0tjtRf1cTzrQ0I5vQ==",
       "cpu": [
         "x64"
       ],
@@ -167,9 +175,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm-gnueabihf": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.2.1.tgz",
-      "integrity": "sha512-WaFoerF/eRbhbE57TaIGJXbQAERADZ/RZ45u6qox9beb5xnWsyYgzX+WuN7Tkhyvga0/aMuVYFzS9CEay7D+bw==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.2.4.tgz",
+      "integrity": "sha512-7qA1++UY0fjprqtjBZaOA6cas/7GekpjVsZn/0uHvquuITFCdKGFCsKNBx3S0Rpxmx6WYo0GcmhNRM9ru08BGg==",
       "cpu": [
         "arm"
       ],
@@ -182,9 +190,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.2.1.tgz",
-      "integrity": "sha512-R+Jhc1/RJTnncE9fkePboHDNOCm1WJ8daanWbjKhfPySMyeniKYRwGn5SLYW3S8YlRS0QVdZaaszDSZWgUcsmA==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.2.4.tgz",
+      "integrity": "sha512-xzYZdAeq883MwXgcwc72hqo/F/dwUxCukpDOkx/j1HTq/J0wJthMGjinN9wH5bPR98Mfeh1MZJ91WWPnZOedOg==",
       "cpu": [
         "arm64"
       ],
@@ -197,9 +205,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.2.1.tgz",
-      "integrity": "sha512-oI1UfZPidGAVddlL2eOTmfsuKV9EaT1aktIzVIxIAgxzQSdwsV371gU3G55ggkurzfdlgF3GThFePDWF0d8dmw==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.2.4.tgz",
+      "integrity": "sha512-8rXr3WfmqSiYkb71qzuDP6I6R2T2tpkmf83elDN8z783N9nvTJf2E7eLx86wu2OJCi4T05nuxCsh4IOU3LQ5xw==",
       "cpu": [
         "arm64"
       ],
@@ -212,9 +220,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.2.1.tgz",
-      "integrity": "sha512-PCygPwrQmS+7WUuAWWioWMZCzZm4PG91lfRxToLDg7yIm/3YfAw5N2EK2TaM9pzlWdvHQAqRMX/oLvv027xUiA==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.2.4.tgz",
+      "integrity": "sha512-Ngxh51zGSlYJ4EfpKG4LI6WfquulNdtmHg1yuOYlaAr33KyPJp4HeN/tivBnAHcZkoNy0hh/SbwDyCnz5PFJQQ==",
       "cpu": [
         "x64"
       ],
@@ -227,9 +235,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.2.1.tgz",
-      "integrity": "sha512-sUAKxo7CFZYGHNxheGh9nIBElLYBM6md/liEGfOTwh/xna4/GTTcmkGWkF7PdnvaYNgcPIQgHIMYiAa6yBKAVw==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.2.4.tgz",
+      "integrity": "sha512-gOvwIYoSxd+j14LOcvJr+ekd9fwYT1RyMAHOp7znA10+l40wkFiMONPLWiZuHxfRk+Dy7YdNdDh3ImumvL6VwA==",
       "cpu": [
         "x64"
       ],
@@ -242,9 +250,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.2.1.tgz",
-      "integrity": "sha512-qDmyEjDBpl/vBXxuOOKKWmPQOcARcZIMach1s7kjzaien0SySut/PHRlj56sosa81Wt4hTGhfhZ1R7g1n7+B8w==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.2.4.tgz",
+      "integrity": "sha512-q3NJzcfClgBm4HvdcnoEncmztxrA5GXqKeiZ/hADvC56pwNALt3ngDC6t6qr1YW9V/EPDxCYeaX4zYxHciW4Dw==",
       "cpu": [
         "arm64"
       ],
@@ -257,9 +265,9 @@
       }
     },
     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.2.1.tgz",
-      "integrity": "sha512-2joqFQ81ZYPg6DcikIzQn3DgjKglNhPAozx6dL5sCNkr1CPMD0YIkJgT3CnYyMHQ04Qi3Npv0XX3MD6LJO8OCA==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.2.4.tgz",
+      "integrity": "sha512-/eZ5ncmHUYtD2fc6EUmAIZlAJnVT2YmxDsKs1Ourx0ttTtvtma/WKlMV5NoUsyOez0f9ExLyOpeCoz5aj+MPXw==",
       "cpu": [
         "ia32"
       ],
@@ -272,9 +280,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.2.1.tgz",
-      "integrity": "sha512-r3+0fSaIZT6N237iMzwUhfNwjhAFvXjqB+4iuW+wcpxW+LHm1g/IoxN8eSRcb8jPItC86JxjAxpke0QL97qd6g==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.2.4.tgz",
+      "integrity": "sha512-0MffFmyv7tBLlji01qc0IaPP/LVExzvj7/R5x1Jph1bTAIj4Vu81yFQWHHQAP6r4ff9Ukj1mBK6MDNVXm7Tcvw==",
       "cpu": [
         "x64"
       ],
@@ -356,13 +364,13 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.53.0.tgz",
-      "integrity": "sha512-MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ==",
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.1.tgz",
+      "integrity": "sha512-8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg==",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.53.0",
-        "@typescript-eslint/types": "5.53.0",
-        "@typescript-eslint/typescript-estree": "5.53.0",
+        "@typescript-eslint/scope-manager": "5.54.1",
+        "@typescript-eslint/types": "5.54.1",
+        "@typescript-eslint/typescript-estree": "5.54.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -382,12 +390,12 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz",
-      "integrity": "sha512-Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w==",
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.1.tgz",
+      "integrity": "sha512-zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg==",
       "dependencies": {
-        "@typescript-eslint/types": "5.53.0",
-        "@typescript-eslint/visitor-keys": "5.53.0"
+        "@typescript-eslint/types": "5.54.1",
+        "@typescript-eslint/visitor-keys": "5.54.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -398,9 +406,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.53.0.tgz",
-      "integrity": "sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==",
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
+      "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -410,12 +418,12 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz",
-      "integrity": "sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==",
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
+      "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
       "dependencies": {
-        "@typescript-eslint/types": "5.53.0",
-        "@typescript-eslint/visitor-keys": "5.53.0",
+        "@typescript-eslint/types": "5.54.1",
+        "@typescript-eslint/visitor-keys": "5.54.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -436,11 +444,11 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz",
-      "integrity": "sha512-JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w==",
+      "version": "5.54.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
+      "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
       "dependencies": {
-        "@typescript-eslint/types": "5.53.0",
+        "@typescript-eslint/types": "5.54.1",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
@@ -670,9 +678,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001457",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001457.tgz",
-      "integrity": "sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==",
+      "version": "1.0.30001464",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz",
+      "integrity": "sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g==",
       "funding": [
         {
           "type": "opencollective",
@@ -967,11 +975,12 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.34.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
-      "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
+      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
       "dependencies": {
-        "@eslint/eslintrc": "^1.4.1",
+        "@eslint/eslintrc": "^2.0.0",
+        "@eslint/js": "8.35.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -985,7 +994,7 @@
         "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
         "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
@@ -1022,11 +1031,11 @@
       }
     },
     "node_modules/eslint-config-next": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.2.1.tgz",
-      "integrity": "sha512-2GAx7EjSiCzJN6H2L/v1kbYrNiwQxzkyjy6eWSjuhAKt+P6d3nVNHGy9mON8ZcYd72w/M8kyMjm4UB9cvijgrw==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.2.4.tgz",
+      "integrity": "sha512-lunIBhsoeqw6/Lfkd6zPt25w1bn0znLA/JCL+au1HoEpSb4/PpsOYsYtgV/q+YPsoKIOzFyU5xnb04iZnXjUvg==",
       "dependencies": {
-        "@next/eslint-plugin-next": "13.2.1",
+        "@next/eslint-plugin-next": "13.2.4",
         "@rushstack/eslint-patch": "^1.1.3",
         "@typescript-eslint/parser": "^5.42.0",
         "eslint-import-resolver-node": "^0.3.6",
@@ -1369,9 +1378,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz",
-      "integrity": "sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -1844,12 +1853,12 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "is-typed-array": "^1.1.10"
       },
       "funding": {
@@ -2317,11 +2326,11 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "node_modules/next": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.2.1.tgz",
-      "integrity": "sha512-qhgJlDtG0xidNViJUPeQHLGJJoT4zDj/El7fP3D3OzpxJDUfxsm16cK4WTMyvSX1ciIfAq05u+0HqFAa+VJ+Hg==",
+      "version": "13.2.4",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.2.4.tgz",
+      "integrity": "sha512-g1I30317cThkEpvzfXujf0O4wtaQHtDCLhlivwlTJ885Ld+eOgcz7r3TGQzeU+cSRoNHtD8tsJgzxVdYojFssw==",
       "dependencies": {
-        "@next/env": "13.2.1",
+        "@next/env": "13.2.4",
         "@swc/helpers": "0.4.14",
         "caniuse-lite": "^1.0.30001406",
         "postcss": "8.4.14",
@@ -2334,19 +2343,19 @@
         "node": ">=14.6.0"
       },
       "optionalDependencies": {
-        "@next/swc-android-arm-eabi": "13.2.1",
-        "@next/swc-android-arm64": "13.2.1",
-        "@next/swc-darwin-arm64": "13.2.1",
-        "@next/swc-darwin-x64": "13.2.1",
-        "@next/swc-freebsd-x64": "13.2.1",
-        "@next/swc-linux-arm-gnueabihf": "13.2.1",
-        "@next/swc-linux-arm64-gnu": "13.2.1",
-        "@next/swc-linux-arm64-musl": "13.2.1",
-        "@next/swc-linux-x64-gnu": "13.2.1",
-        "@next/swc-linux-x64-musl": "13.2.1",
-        "@next/swc-win32-arm64-msvc": "13.2.1",
-        "@next/swc-win32-ia32-msvc": "13.2.1",
-        "@next/swc-win32-x64-msvc": "13.2.1"
+        "@next/swc-android-arm-eabi": "13.2.4",
+        "@next/swc-android-arm64": "13.2.4",
+        "@next/swc-darwin-arm64": "13.2.4",
+        "@next/swc-darwin-x64": "13.2.4",
+        "@next/swc-freebsd-x64": "13.2.4",
+        "@next/swc-linux-arm-gnueabihf": "13.2.4",
+        "@next/swc-linux-arm64-gnu": "13.2.4",
+        "@next/swc-linux-arm64-musl": "13.2.4",
+        "@next/swc-linux-x64-gnu": "13.2.4",
+        "@next/swc-linux-x64-musl": "13.2.4",
+        "@next/swc-win32-arm64-msvc": "13.2.4",
+        "@next/swc-win32-ia32-msvc": "13.2.4",
+        "@next/swc-win32-x64-msvc": "13.2.4"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.4.0",
@@ -3074,12 +3083,12 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dependencies": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }

examples/nextjs/package.json

@@ -9,9 +9,9 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "eslint": "8.34.0",
-    "eslint-config-next": "13.2.1",
-    "next": "13.2.1",
+    "eslint": "8.35.0",
+    "eslint-config-next": "13.2.4",
+    "next": "13.2.4",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   }

examples/remix/app/entry.server.tsx

@@ -1,14 +0,0 @@
-import handleRequest from "@vercel/remix-entry-server";
-import { RemixServer } from "@remix-run/react";
-import type { EntryContext } from "@remix-run/server-runtime";
-
-export default function (
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext
-) {
-  const remixServer = <RemixServer context={remixContext} url={request.url} />;
-  return handleRequest(request, responseStatusCode, responseHeaders, remixServer)
-}
-

examples/remix/app/root.tsx

@@ -1,4 +1,4 @@
-import type { MetaFunction } from "@remix-run/node";
+import type { MetaFunction } from "@vercel/remix";
 import {
   Links,
   LiveReload,
@@ -7,7 +7,7 @@ import {
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
-import { Analytics } from '@vercel/analytics/react';
+import { Analytics } from "@vercel/analytics/react";
 
 export const meta: MetaFunction = () => ({
   charset: "utf-8",

examples/remix/app/routes/edge.tsx

@@ -1,6 +1,4 @@
-export const config = {
-  runtime: 'edge'
-};
+export const config = { runtime: "edge" };
 
 export default function Edge() {
   return (

examples/remix/package.json

@@ -6,18 +6,17 @@
     "dev": "remix dev"
   },
   "dependencies": {
-    "@remix-run/node": "^1.13.0",
-    "@remix-run/react": "^1.13.0",
-    "@remix-run/serve": "^1.13.0",
-    "@remix-run/server-runtime": "^1.13.0",
-    "@vercel/analytics": "^0.1.10",
-    "@vercel/remix-entry-server": "^0.1.0",
+    "@remix-run/node": "^1.14.3",
+    "@remix-run/react": "^1.14.3",
+    "@remix-run/serve": "^1.14.3",
+    "@vercel/analytics": "^0.1.11",
+    "@vercel/remix": "1.14.3-patch.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.13.0",
-    "@remix-run/eslint-config": "^1.13.0",
+    "@remix-run/dev": "^1.14.3",
+    "@remix-run/eslint-config": "^1.14.3",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.11",
     "eslint": "^8.28.0",

examples/remix/pnpm-lock.yaml

@@ -4,32 +4,30 @@ importers:
 
   .:
     specifiers:
-      '@remix-run/dev': ^1.13.0
-      '@remix-run/eslint-config': ^1.13.0
-      '@remix-run/node': ^1.13.0
-      '@remix-run/react': ^1.13.0
-      '@remix-run/serve': ^1.13.0
-      '@remix-run/server-runtime': ^1.13.0
+      '@remix-run/dev': ^1.14.3
+      '@remix-run/eslint-config': ^1.14.3
+      '@remix-run/node': ^1.14.3
+      '@remix-run/react': ^1.14.3
+      '@remix-run/serve': ^1.14.3
       '@types/react': ^18.0.25
       '@types/react-dom': ^18.0.11
-      '@vercel/analytics': ^0.1.10
-      '@vercel/remix-entry-server': ^0.1.0
+      '@vercel/analytics': ^0.1.11
+      '@vercel/remix': 1.14.3-patch.1
       eslint: ^8.28.0
       react: ^18.2.0
       react-dom: ^18.2.0
       typescript: ^4.9.3
     dependencies:
-      '@remix-run/node': 1.13.0
-      '@remix-run/react': 1.13.0_biqbaboplfbrettd7655fr4n2y
-      '@remix-run/serve': 1.13.0
-      '@remix-run/server-runtime': 1.13.0
-      '@vercel/analytics': 0.1.10_react@18.2.0
-      '@vercel/remix-entry-server': 0.1.0_react@18.2.0
+      '@remix-run/node': 1.14.3
+      '@remix-run/react': 1.14.3_biqbaboplfbrettd7655fr4n2y
+      '@remix-run/serve': 1.14.3
+      '@vercel/analytics': 0.1.11_react@18.2.0
+      '@vercel/remix': 1.14.3-patch.1_biqbaboplfbrettd7655fr4n2y
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
     devDependencies:
-      '@remix-run/dev': 1.13.0_@remix-run+serve@1.13.0
-      '@remix-run/eslint-config': 1.13.0_km5ddj7uwb23cqeymeyvzjsfb4
+      '@remix-run/dev': 1.14.3_@remix-run+serve@1.14.3
+      '@remix-run/eslint-config': 1.14.3_km5ddj7uwb23cqeymeyvzjsfb4
       '@types/react': 18.0.28
       '@types/react-dom': 18.0.11
       eslint: 8.34.0
@@ -1665,12 +1663,12 @@ packages:
       tslib: 2.5.0
     dev: true
 
-  /@remix-run/dev/1.13.0_@remix-run+serve@1.13.0:
-    resolution: {integrity: sha512-hPqUjM9RRcz3inBOWqP3GKhggVz0a0ikWaRZpdKrhpQNCNiF6Hunbx876mJERj2YrmIzJ05eoeQmmdF6xcr4qg==}
+  /@remix-run/dev/1.14.3_@remix-run+serve@1.14.3:
+    resolution: {integrity: sha512-46mmwiA/k9YDkg0UrP90UB3azVVWRXw16NLHRSbZiaaYe8XgUkddEtBnH/nBp/IrVCtzUL3LObplUe5sFk5Z9Q==}
     engines: {node: '>=14'}
     hasBin: true
     peerDependencies:
-      '@remix-run/serve': ^1.13.0
+      '@remix-run/serve': ^1.14.3
     peerDependenciesMeta:
       '@remix-run/serve':
         optional: true
@@ -1686,8 +1684,8 @@ packages:
       '@babel/types': 7.20.7
       '@esbuild-plugins/node-modules-polyfill': 0.1.4_esbuild@0.16.3
       '@npmcli/package-json': 2.0.0
-      '@remix-run/serve': 1.13.0
-      '@remix-run/server-runtime': 1.13.0
+      '@remix-run/serve': 1.14.3
+      '@remix-run/server-runtime': 1.14.3
       '@vanilla-extract/integration': 6.1.0
       arg: 5.0.2
       cacache: 15.3.0
@@ -1718,6 +1716,7 @@ packages:
       prettier: 2.7.1
       pretty-ms: 7.0.1
       proxy-agent: 5.0.0
+      react-refresh: 0.14.0
       recast: 0.21.5
       remark-frontmatter: 4.0.1
       remark-mdx-frontmatter: 1.1.1
@@ -1736,8 +1735,8 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@remix-run/eslint-config/1.13.0_km5ddj7uwb23cqeymeyvzjsfb4:
-    resolution: {integrity: sha512-qz/N99D/q1mQefZl2X+p11xVk03r6aFDMvk/4mG+8IrMRU4BqMJ/bF53/CUOveSzvzLua4Pfi2wmqF+deHw0GQ==}
+  /@remix-run/eslint-config/1.14.3_km5ddj7uwb23cqeymeyvzjsfb4:
+    resolution: {integrity: sha512-Yy4PYSvAehj31LmkDA+lS5yCPL1lR9O04gMIo0xwHT2o59pF4QU54lEAvJJH+9MI0byZUI/v9DoGz1oGIb44IA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^8.0.0
@@ -1772,35 +1771,20 @@ packages:
       - supports-color
     dev: true
 
-  /@remix-run/express/1.13.0_express@4.18.2:
-    resolution: {integrity: sha512-MX80PdQu3k1HlQsHlUjPBZe5rpTdn4FqZ5Fg4d85cVi+GMfu3x8n8hB0xbCDLhmRbKTR01PQ01j3UUNtsWWikg==}
+  /@remix-run/express/1.14.3_express@4.18.2:
+    resolution: {integrity: sha512-v3TT+zBFSnOiVTHNiLp5A783UVYyZYbePxmPhvoe9JwHCmzVDA9mfyxYgDl/8NPDtYS+dAPU7mQ+aE1M5MXc7g==}
     engines: {node: '>=14'}
     peerDependencies:
       express: ^4.17.1
     dependencies:
-      '@remix-run/node': 1.13.0
+      '@remix-run/node': 1.14.3
       express: 4.18.2
 
-  /@remix-run/node/1.12.0:
-    resolution: {integrity: sha512-WiyRTEQKTUTf3Z3ke5DOwx+fjCkeD8ilI9kbRws1bG3xfdugaDrV9ra76DOZcrYlmVwjwtKE3mVDSRFtiYTTMw==}
+  /@remix-run/node/1.14.3:
+    resolution: {integrity: sha512-Mq0wUtgJtGwMQEBr/8p9XpdPBm7N+lby5CEbW6IKV59UC9N3VMGY3snfrsphBCq3sNZfbhIpaDdu2W+8EoqfnQ==}
     engines: {node: '>=14'}
     dependencies:
-      '@remix-run/server-runtime': 1.12.0
-      '@remix-run/web-fetch': 4.3.2
-      '@remix-run/web-file': 3.0.2
-      '@remix-run/web-stream': 1.0.3
-      '@web3-storage/multipart-parser': 1.0.0
-      abort-controller: 3.0.0
-      cookie-signature: 1.2.0
-      source-map-support: 0.5.21
-      stream-slice: 0.1.2
-    dev: false
-
-  /@remix-run/node/1.13.0:
-    resolution: {integrity: sha512-FDvPGaoDyon8UGYQ9DroLtiX8vFa0efBQQSHV3az0s7HbUpugw7BcA6NBW5pIs2z5sszCCeRbAgSIXcETLzfhw==}
-    engines: {node: '>=14'}
-    dependencies:
-      '@remix-run/server-runtime': 1.13.0
+      '@remix-run/server-runtime': 1.14.3
       '@remix-run/web-fetch': 4.3.2
       '@remix-run/web-file': 3.0.2
       '@remix-run/web-stream': 1.0.3
@@ -1810,59 +1794,41 @@ packages:
       source-map-support: 0.5.21
       stream-slice: 0.1.2
 
-  /@remix-run/react/1.13.0_biqbaboplfbrettd7655fr4n2y:
-    resolution: {integrity: sha512-LT9TStmMavBlLqRG8u5Ku8bxdYcpIbqpmh44/f2Fyw8RvdaRCYYMkuUXsr8bhOqftaEZMFLqFhi19NWY/18DLA==}
+  /@remix-run/react/1.14.3_biqbaboplfbrettd7655fr4n2y:
+    resolution: {integrity: sha512-dvwIx+9ZdE/9LHe8Rjos9gEOdQFLvC0dojCnKlsUIwfGhyjKE4wOHfqS9mZcmKFCvOFDakcZDallLNGaj0mEYg==}
     engines: {node: '>=14'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.3.2
+      '@remix-run/router': 1.3.3
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
-      react-router-dom: 6.8.1_biqbaboplfbrettd7655fr4n2y
+      react-router-dom: 6.8.2_biqbaboplfbrettd7655fr4n2y
       use-sync-external-store: 1.2.0_react@18.2.0
     dev: false
 
-  /@remix-run/router/1.3.1:
-    resolution: {integrity: sha512-+eun1Wtf72RNRSqgU7qM2AMX/oHp+dnx7BHk1qhK5ZHzdHTUU4LA1mGG1vT+jMc8sbhG3orvsfOmryjzx2PzQw==}
-    engines: {node: '>=14'}
-    dev: false
-
-  /@remix-run/router/1.3.2:
-    resolution: {integrity: sha512-t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA==}
+  /@remix-run/router/1.3.3:
+    resolution: {integrity: sha512-YRHie1yQEj0kqqCTCJEfHqYSSNlZQ696QJG+MMiW4mxSl9I0ojz/eRhJS4fs88Z5i6D1SmoF9d3K99/QOhI8/w==}
     engines: {node: '>=14'}
 
-  /@remix-run/serve/1.13.0:
-    resolution: {integrity: sha512-ondApr1ZUbQR6iy1iGvdarBGqvTZdET4wSNFb2+2NrbxW9Y9E3RZ7q+5M5/iiuy1qbdqubqsoq2N7uFk+gDGxw==}
+  /@remix-run/serve/1.14.3:
+    resolution: {integrity: sha512-5So5+PtAaYZq3hc45snkCKIOh51Z45WvhHpRgB0ZsOuhUf6p9UAY9LQk7GRNvkcqL9LChE3LQ9O4gPqnUiZgpA==}
     engines: {node: '>=14'}
     hasBin: true
     dependencies:
-      '@remix-run/express': 1.13.0_express@4.18.2
+      '@remix-run/express': 1.14.3_express@4.18.2
       compression: 1.7.4
       express: 4.18.2
       morgan: 1.10.0
     transitivePeerDependencies:
       - supports-color
 
-  /@remix-run/server-runtime/1.12.0:
-    resolution: {integrity: sha512-7I0165Ns/ffPfCEfuiqD58lMderTn2s/sew1xJ34ONa21mG/7+5T7diHIgxKST8rS3816JPmlwSqUaHgwbmO6Q==}
+  /@remix-run/server-runtime/1.14.3:
+    resolution: {integrity: sha512-qh8sxfLj/XW1u6rluN7yIgbvMCoKrVacYGUiPM7g0VHk8h8MlZGAIUfsWM45Poxo3X0uLhNuqqxMaPWldKawIQ==}
     engines: {node: '>=14'}
     dependencies:
-      '@remix-run/router': 1.3.1
-      '@types/cookie': 0.4.1
-      '@types/react': 18.0.28
-      '@web3-storage/multipart-parser': 1.0.0
-      cookie: 0.4.2
-      set-cookie-parser: 2.5.1
-      source-map: 0.7.4
-    dev: false
-
-  /@remix-run/server-runtime/1.13.0:
-    resolution: {integrity: sha512-gjIW3XCeIlOt3rrOZMD6HixQydRgs1SwYjP99ZAVruG2+gNq/tL2OusMFYTLvtWrybt215tPROyF/6iTLsaO3g==}
-    engines: {node: '>=14'}
-    dependencies:
-      '@remix-run/router': 1.3.2
+      '@remix-run/router': 1.3.3
       '@types/cookie': 0.4.1
       '@types/react': 18.0.28
       '@web3-storage/multipart-parser': 1.0.0
@@ -2252,21 +2218,24 @@ packages:
     resolution: {integrity: sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==}
     dev: true
 
-  /@vercel/analytics/0.1.10_react@18.2.0:
-    resolution: {integrity: sha512-jjJ8GzcPnQp0cMxpfYoUycMRBtDiaIeyVjZPiEPe99Dj1PdjMzAFYEASiV/hpNsXHkpcNYCveDFh6jnmh0YSDQ==}
+  /@vercel/analytics/0.1.11_react@18.2.0:
+    resolution: {integrity: sha512-mj5CPR02y0BRs1tN3oZcBNAX9a8NxsIUl9vElDPcqxnMfP0RbRc9fI9Ud7+QDg/1Izvt5uMumsr+6YsmVHcyuw==}
     peerDependencies:
       react: ^16.8||^17||^18
     dependencies:
       react: 18.2.0
     dev: false
 
-  /@vercel/remix-entry-server/0.1.0_react@18.2.0:
-    resolution: {integrity: sha512-ux1pcYvcPXAUXQuSH4fwNfkrzYYemFpdc3r4lF3L3PBE5doGhYDuBdTfXZpWl1M5zXi6VAbK6V6qkD33iZWGDA==}
+  /@vercel/remix/1.14.3-patch.1_biqbaboplfbrettd7655fr4n2y:
+    resolution: {integrity: sha512-TBI/FS77HYZqjbgeABi7Rbg7RVQ1YLHcXm4/zroV4zl0nVbcXM2jVR3SXm0EuQKze+NZ0p3VBUz4I/xocTvq0w==}
+    engines: {node: '>=14'}
     peerDependencies:
-      react: ^18.0.0
+      react: '*'
+      react-dom: '*'
     dependencies:
-      '@remix-run/node': 1.12.0
-      isbot: 3.6.5
+      '@remix-run/node': 1.14.3
+      '@remix-run/server-runtime': 1.14.3
+      isbot: 3.6.6
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
     dev: false
@@ -3092,7 +3061,7 @@ packages:
     dev: true
 
   /ee-first/1.1.1:
-    resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=}
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
   /electron-to-chromium/1.4.296:
     resolution: {integrity: sha512-i/6Q+Y9bluDa2a0NbMvdtG5TuS/1Fr3TKK8L+7UUL9QjRS5iFJzCC3r70xjyOnLiYG8qGV4/mMpe6HuAbdJW4w==}
@@ -3901,7 +3870,7 @@ packages:
     engines: {node: '>= 0.6'}
 
   /fresh/0.5.2:
-    resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=}
+    resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
     engines: {node: '>= 0.6'}
 
   /fs-constants/1.0.0:
@@ -4638,8 +4607,8 @@ packages:
     resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
     dev: true
 
-  /isbot/3.6.5:
-    resolution: {integrity: sha512-BchONELXt6yMad++BwGpa0oQxo/uD0keL7N15cYVf0A1oMIoNQ79OqeYdPMFWDrNhCqCbRuw9Y9F3QBjvAxZ5g==}
+  /isbot/3.6.6:
+    resolution: {integrity: sha512-98aGl1Spbx1led422YFrusDJ4ZutSNOymb2avZ2V4BCCjF3MqAF2k+J2zoaLYahubaFkb+3UyvbVDVlk/Ngrew==}
     engines: {node: '>=12'}
     dev: false
 
@@ -5006,11 +4975,11 @@ packages:
     dev: true
 
   /media-typer/0.3.0:
-    resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=}
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
 
   /merge-descriptors/1.0.1:
-    resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=}
+    resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
 
   /merge-stream/2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
@@ -6057,26 +6026,31 @@ packages:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
     dev: true
 
-  /react-router-dom/6.8.1_biqbaboplfbrettd7655fr4n2y:
-    resolution: {integrity: sha512-67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ==}
+  /react-refresh/0.14.0:
+    resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /react-router-dom/6.8.2_biqbaboplfbrettd7655fr4n2y:
+    resolution: {integrity: sha512-N/oAF1Shd7g4tWy+75IIufCGsHBqT74tnzHQhbiUTYILYF0Blk65cg+HPZqwC+6SqEyx033nKqU7by38v3lBZg==}
     engines: {node: '>=14'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.3.2
+      '@remix-run/router': 1.3.3
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
-      react-router: 6.8.1_react@18.2.0
+      react-router: 6.8.2_react@18.2.0
     dev: false
 
-  /react-router/6.8.1_react@18.2.0:
-    resolution: {integrity: sha512-Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg==}
+  /react-router/6.8.2_react@18.2.0:
+    resolution: {integrity: sha512-lF7S0UmXI5Pd8bmHvMdPKI4u4S5McxmHnzJhrYi9ZQ6wE+DA8JN5BzVC5EEBuduWWDaiJ8u6YhVOCmThBli+rw==}
     engines: {node: '>=14'}
     peerDependencies:
       react: '>=16.8'
     dependencies:
-      '@remix-run/router': 1.3.2
+      '@remix-run/router': 1.3.3
       react: 18.2.0
     dev: false
 
@@ -6993,7 +6967,7 @@ packages:
       which-typed-array: 1.1.9
 
   /utils-merge/1.0.1:
-    resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=}
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
     engines: {node: '>= 0.4.0'}
 
   /uvu/0.5.6:

examples/remix/remix.env.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="@remix-run/dev" />
-/// <reference types="@remix-run/node" />
+/// <reference types="@vercel/remix" />

internals/tsconfig/package.json

@@ -0,0 +1,11 @@
+{
+  "private": true,
+  "name": "@vercel-internals/tsconfig",
+  "description": "Node.js tsconfig file based on `@vercel/style-guide`",
+  "files": [
+    "tsconfig.json"
+  ],
+  "devDependencies": {
+    "@vercel/style-guide": "4.0.2"
+  }
+}

internals/tsconfig/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "extends": "@vercel/style-guide/typescript",
+  "compilerOptions": {
+    "declaration": true,
+    "allowJs": true,
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "lib": ["ES2020"],
+    "resolveJsonModule": true,
+    "sourceMap": true
+  }
+}

internals/types/index.ts

@@ -300,6 +300,7 @@ export interface Secret {
   createdAt: number;
 }
 
+// TODO (Ethan-Arrowood) - Replace enums
 export enum ProjectEnvTarget {
   Production = 'production',
   Preview = 'preview',

internals/types/package.json

@@ -0,0 +1,21 @@
+{
+  "private": true,
+  "name": "@vercel-internals/types",
+  "types": "dist/index.d.ts",
+  "main": "dist/index.js",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json"
+  },
+  "dependencies": {
+    "@vercel/build-utils": "6.3.2",
+    "@vercel/routing-utils": "2.1.10"
+  },
+  "devDependencies": {
+    "@vercel-internals/tsconfig": "*",
+    "@vercel/style-guide": "4.0.2",
+    "typescript": "4.9.4"
+  }
+}

internals/types/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "@vercel-internals/tsconfig",
+  "compilerOptions": {
+    "outDir": "./dist"
+  },
+  "include": ["index.ts"]
+}

internals/utils/package.json

@@ -0,0 +1,17 @@
+{
+  "private": true,
+  "name": "@vercel-internals/utils",
+  "types": "dist/index.d.ts",
+  "main": "dist/index.js",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json"
+  },
+  "devDependencies": {
+    "@vercel-internals/tsconfig": "*",
+    "@vercel/style-guide": "4.0.2",
+    "typescript": "4.9.4"
+  }
+}

internals/utils/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "@vercel-internals/tsconfig",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"]
+}

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.4"
+    "turbo": "1.8.5"
   },
   "scripts": {
     "lerna": "lerna",
@@ -42,15 +42,16 @@
     "publish-canary": "git checkout main && git pull && lerna version prerelease --preid canary --message \"Publish Canary\" --exact",
     "publish-from-github": "./utils/publish.sh",
     "changelog": "node utils/changelog.js",
-    "build": "node utils/gen.js && turbo run build",
+    "build": "node utils/gen.js && turbo --no-update-notifier run build",
     "vercel-build": "pnpm build && pnpm run pack && cd api && node -r ts-eager/register ./_lib/script/build.ts",
     "pre-commit": "lint-staged",
     "test": "jest --rootDir=\"test\" --testPathPattern=\"\\.test.js\"",
-    "test-unit": "pnpm test && node utils/gen.js && turbo run test-unit",
-    "test-cli": "node utils/gen.js && turbo run test-cli",
-    "test-e2e": "node utils/gen.js && turbo run test-e2e",
-    "test-dev": "node utils/gen.js && turbo run test-dev",
+    "test-unit": "pnpm test && node utils/gen.js && turbo --no-update-notifier run test-unit",
+    "test-cli": "node utils/gen.js && turbo --no-update-notifier run test-cli",
+    "test-e2e": "node utils/gen.js && turbo --no-update-notifier run test-e2e",
+    "test-dev": "node utils/gen.js && turbo --no-update-notifier run test-dev",
     "lint": "eslint . --cache --ext .ts,.js",
+    "prettier-check": "prettier --check .",
     "prepare": "husky install",
     "pack": "cd utils && node -r ts-eager/register ./pack.ts"
   },

packages/build-utils/package.json

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

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

@@ -487,6 +487,7 @@ export function getEnvForPackageManager({
   const oldPath = env.PATH + '';
   const npm7 = '/node16/bin-npm7';
   const pnpm7 = '/pnpm7/node_modules/.bin';
+  const pnpm8 = '/pnpm8/node_modules/.bin';
   const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === '1';
   if (cliType === 'npm') {
     if (
@@ -509,7 +510,20 @@ export function getEnvForPackageManager({
     ) {
       // Ensure that pnpm 7 is at the beginning of the `$PATH`
       newEnv.PATH = `${pnpm7}${path.delimiter}${oldPath}`;
-      console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
+      console.log(
+        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 7...`
+      );
+    } else if (
+      typeof lockfileVersion === 'number' &&
+      lockfileVersion >= 6 &&
+      !oldPath.includes(pnpm8) &&
+      !corepackEnabled
+    ) {
+      // Ensure that pnpm 8 is at the beginning of the `$PATH`
+      newEnv.PATH = `${pnpm8}${path.delimiter}${oldPath}`;
+      console.log(
+        `Detected \`pnpm-lock.yaml\` version ${lockfileVersion} generated by pnpm 8...`
+      );
     }
   } else {
     // Yarn v2 PnP mode may be activated, so force "node-modules" linker style

packages/build-utils/src/get-prefixed-env-vars.ts

@@ -14,10 +14,11 @@ export function getPrefixedEnvVars({
   envs: Envs;
 }): Envs {
   const vercelSystemEnvPrefix = 'VERCEL_';
+  const allowed = ['VERCEL_URL', 'VERCEL_ENV', 'VERCEL_REGION'];
   const newEnvs: Envs = {};
   if (envPrefix && envs.VERCEL_URL) {
     Object.keys(envs)
-      .filter(key => key.startsWith(vercelSystemEnvPrefix))
+      .filter(key => allowed.includes(key) || key.startsWith('VERCEL_GIT_'))
       .forEach(key => {
         const newKey = `${envPrefix}${key}`;
         if (!(newKey in envs)) {

packages/build-utils/src/hard-link-dir.ts

@@ -0,0 +1,79 @@
+// Source: https://github.com/pnpm/pnpm/blob/b38d711f3892a473e20e69dd32ca7e1b439efaec/fs/hard-link-dir/src/index.ts#L4
+// LICENSE (MIT): https://github.com/pnpm/pnpm/blob/b38d711f3892a473e20e69dd32ca7e1b439efaec/LICENSE
+
+import path from 'path';
+import { promises as fs } from 'fs';
+
+export async function hardLinkDir(src: string, destDirs: string[]) {
+  if (destDirs.length === 0) return;
+  // Don't try to hard link the source directory to itself
+  destDirs = destDirs.filter(destDir => path.relative(destDir, src) !== '');
+  const files = await fs.readdir(src);
+  await Promise.all(
+    files.map(async file => {
+      if (file === 'node_modules') return;
+      const srcFile = path.join(src, file);
+      if ((await fs.lstat(srcFile)).isDirectory()) {
+        const destSubdirs = await Promise.all(
+          destDirs.map(async destDir => {
+            const destSubdir = path.join(destDir, file);
+            try {
+              await fs.mkdir(destSubdir, { recursive: true });
+            } catch (err: any) {
+              // eslint-disable-line
+              if (err.code !== 'EEXIST') throw err;
+            }
+            return destSubdir;
+          })
+        );
+        await hardLinkDir(srcFile, destSubdirs);
+        return;
+      }
+      await Promise.all(
+        destDirs.map(async destDir => {
+          const destFile = path.join(destDir, file);
+          try {
+            await linkOrCopyFile(srcFile, destFile);
+          } catch (err: any) {
+            // eslint-disable-line
+            if (err.code === 'ENOENT') {
+              // Ignore broken symlinks
+              return;
+            }
+            throw err;
+          }
+        })
+      );
+    })
+  );
+}
+
+async function linkOrCopyFile(srcFile: string, destFile: string) {
+  try {
+    await linkOrCopy(srcFile, destFile);
+  } catch (err: any) {
+    // eslint-disable-line
+    if (err.code === 'ENOENT') {
+      await fs.mkdir(path.dirname(destFile), { recursive: true });
+      await linkOrCopy(srcFile, destFile);
+      return;
+    }
+    if (err.code !== 'EEXIST') {
+      throw err;
+    }
+  }
+}
+
+/*
+ * This function could be optimized because we don't really need to try linking again
+ * if linking failed once.
+ */
+async function linkOrCopy(srcFile: string, destFile: string) {
+  try {
+    await fs.link(srcFile, destFile);
+  } catch (err: any) {
+    // eslint-disable-line
+    if (err.code !== 'EXDEV') throw err;
+    await fs.copyFile(srcFile, destFile);
+  }
+}

packages/build-utils/src/index.ts

@@ -42,6 +42,7 @@ import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
 import { getPrefixedEnvVars } from './get-prefixed-env-vars';
 import { cloneEnv } from './clone-env';
+import { hardLinkDir } from './hard-link-dir';
 
 export {
   FileBlob,
@@ -86,6 +87,7 @@ export {
   scanParentDirs,
   getIgnoreFilter,
   cloneEnv,
+  hardLinkDir,
 };
 
 export { EdgeFunction } from './edge-function';

packages/build-utils/src/prerender.ts

@@ -11,6 +11,7 @@ interface PrerenderOptions {
   initialHeaders?: Record<string, string>;
   initialStatus?: number;
   passQuery?: boolean;
+  sourcePath?: string;
 }
 
 export class Prerender {
@@ -24,6 +25,7 @@ export class Prerender {
   public initialHeaders?: Record<string, string>;
   public initialStatus?: number;
   public passQuery?: boolean;
+  public sourcePath?: string;
 
   constructor({
     expiration,
@@ -35,9 +37,11 @@ export class Prerender {
     initialHeaders,
     initialStatus,
     passQuery,
+    sourcePath,
   }: PrerenderOptions) {
     this.type = 'Prerender';
     this.expiration = expiration;
+    this.sourcePath = sourcePath;
 
     this.lambda = lambda;
     if (this.lambda) {

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

@@ -4,8 +4,7 @@
   "probes": [
     {
       "path": "/",
-      "mustContain": "pnpm version: 6",
-      "logMustContain": "pnpm run build"
+      "mustContain": "pnpm version: 7"
     }
   ]
 }

packages/build-utils/test/fixtures/27-pnpm-v7/package.json

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

packages/build-utils/test/fixtures/27-pnpm-v7/pnpm-lock.yaml

@@ -0,0 +1,21 @@
+lockfileVersion: 5.4
+
+importers:
+
+  .:
+    specifiers:
+      once: ^1.4.0
+    dependencies:
+      once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+    dev: false

packages/build-utils/test/fixtures/27-pnpm-v7/pnpm-workspace.yaml

@@ -0,0 +1 @@
+# Empty so this is treated as its own pnpm workspace

packages/build-utils/test/fixtures/27-pnpm-v7/probes.json

@@ -0,0 +1,8 @@
+{
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "pnpm version: 7"
+    }
+  ]
+}

packages/build-utils/test/fixtures/28-pnpm-v8/package.json

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

packages/build-utils/test/fixtures/28-pnpm-v8/pnpm-lock.yaml

@@ -0,0 +1,21 @@
+lockfileVersion: '6.0'
+
+importers:
+
+  .:
+    dependencies:
+      once:
+        specifier: ^1.4.0
+        version: 1.4.0
+
+packages:
+
+  /once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+    dev: false

packages/build-utils/test/fixtures/28-pnpm-v8/pnpm-workspace.yaml

@@ -0,0 +1 @@
+# Empty so this is treated as its own pnpm workspace

packages/build-utils/test/fixtures/28-pnpm-v8/probes.json

@@ -0,0 +1,8 @@
+{
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "pnpm version: 8"
+    }
+  ]
+}

packages/build-utils/test/unit.get-prefixed-env-vars.test.ts

@@ -14,6 +14,7 @@ describe('Test `getPrefixedEnvVars()`', () => {
           VERCEL: '1',
           VERCEL_URL: 'example.vercel.sh',
           USER_ENV_VAR_NOT_VERCEL: 'example.com',
+          VERCEL_ARTIFACTS_TOKEN: 'abc123',
           FOO: 'bar',
         },
       },
@@ -28,6 +29,7 @@ describe('Test `getPrefixedEnvVars()`', () => {
         envPrefix: 'GATSBY_',
         envs: {
           USER_ENV_VAR_NOT_VERCEL: 'example.com',
+          VERCEL_ARTIFACTS_TOKEN: 'abc123',
           FOO: 'bar',
           VERCEL_URL: 'example.vercel.sh',
           VERCEL_ENV: 'production',
@@ -51,6 +53,7 @@ describe('Test `getPrefixedEnvVars()`', () => {
           USER_ENV_VAR_NOT_VERCEL: 'example.com',
           FOO: 'bar',
           BLARG_VERCEL_THING: 'fake',
+          VERCEL_ARTIFACTS_TOKEN: 'abc123',
         },
       },
       want: {},

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

@@ -506,6 +506,11 @@ it('should retry npm install when peer deps invalid and npm@8 on node@16', async
     console.log('Skipping test on windows');
     return;
   }
+  if (process.platform === 'darwin') {
+    console.log('Skipping test on mac');
+    return;
+  }
+
   const fixture = path.join(__dirname, 'fixtures', '15-npm-8-legacy-peer-deps');
   const nodeVersion = { major: nodeMajor } as any;
   await runNpmInstall(fixture, [], {}, {}, nodeVersion);

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "28.16.8",
+  "version": "28.18.2",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -14,7 +14,7 @@
     "preinstall": "node ./scripts/preinstall.js",
     "test": "jest --env node --verbose --bail",
     "test-unit": "pnpm test test/unit/",
-    "test-cli": "rimraf test/fixtures/integration && ava test/integration.js --serial --fail-fast --verbose",
+    "test-cli": "rimraf test/fixtures/integration && pnpm test test/integration.test.ts",
     "test-dev": "pnpm test test/dev/",
     "coverage": "codecov",
     "build": "ts-node ./scripts/build.ts",
@@ -28,29 +28,20 @@
     "dist",
     "scripts/preinstall.js"
   ],
-  "ava": {
-    "extensions": [
-      "ts"
-    ],
-    "require": [
-      "ts-node/register/transpile-only",
-      "esm"
-    ]
-  },
   "engines": {
     "node": ">= 14"
   },
   "dependencies": {
-    "@vercel/build-utils": "6.3.2",
-    "@vercel/go": "2.3.9",
-    "@vercel/hydrogen": "0.0.55",
-    "@vercel/next": "3.6.2",
-    "@vercel/node": "2.9.9",
-    "@vercel/python": "3.1.51",
-    "@vercel/redwood": "1.1.7",
-    "@vercel/remix": "1.4.2",
-    "@vercel/ruby": "1.3.68",
-    "@vercel/static-build": "1.3.13"
+    "@vercel/build-utils": "6.6.0",
+    "@vercel/go": "2.4.2",
+    "@vercel/hydrogen": "0.0.60",
+    "@vercel/next": "3.7.2",
+    "@vercel/node": "2.10.1",
+    "@vercel/python": "3.1.56",
+    "@vercel/redwood": "1.1.12",
+    "@vercel/remix-builder": "1.8.2",
+    "@vercel/ruby": "1.3.73",
+    "@vercel/static-build": "1.3.20"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
@@ -93,13 +84,14 @@
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
     "@types/yauzl-promise": "2.1.0",
-    "@vercel/client": "12.4.2",
+    "@vercel-internals/types": "*",
+    "@vercel/client": "12.4.7",
     "@vercel/error-utils": "1.0.8",
-    "@vercel/frameworks": "1.3.2",
-    "@vercel/fs-detectors": "3.8.2",
+    "@vercel/frameworks": "1.3.3",
+    "@vercel/fs-detectors": "3.8.7",
     "@vercel/fun": "1.0.4",
     "@vercel/ncc": "0.24.0",
-    "@vercel/routing-utils": "2.1.10",
+    "@vercel/routing-utils": "2.1.11",
     "@zeit/source-map-support": "0.6.2",
     "ajv": "6.12.2",
     "alpha-sort": "2.0.1",
@@ -109,7 +101,6 @@
     "async-listen": "1.2.0",
     "async-retry": "1.1.3",
     "async-sema": "2.1.4",
-    "ava": "2.2.0",
     "bytes": "3.0.0",
     "chalk": "4.1.0",
     "chance": "1.1.7",

packages/cli/scripts/compile-templates.js

@@ -36,9 +36,7 @@ async function main() {
     const def = await readFile(fnPath.replace(/\.js$/, '.tsdef'), 'utf8');
     const interfaceName = def.match(/interface (\w+)/)[1];
 
-    const lines = require(fnPath)
-      .toString()
-      .split('\n');
+    const lines = require(fnPath).toString().split('\n');
     let errorHtmlStart = -1;
     let errorHtmlEnd = -1;
     for (let i = 0; i < lines.length; i++) {

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

@@ -12,7 +12,7 @@ import stamp from '../../util/output/stamp';
 import strlen from '../../util/strlen';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
-import { Alias } from '../../types';
+import { Alias } from '@vercel-internals/types';
 
 export default async function ls(
   client: Client,

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

@@ -9,7 +9,7 @@ import strlen from '../../util/strlen';
 import confirm from '../../util/input/confirm';
 import findAliasByAliasOrId from '../../util/alias/find-alias-by-alias-or-id';
 
-import { Alias } from '../../types';
+import { Alias } from '@vercel-internals/types';
 import { isValidName } from '../../util/is-valid-name';
 import { getCommandName } from '../../util/pkg-name';
 

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

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { SetDifference } from 'utility-types';
 import { AliasRecord } from '../../util/alias/create-alias';
-import { Domain } from '../../types';
+import { Domain } from '@vercel-internals/types';
 import { Output } from '../../util/output';
 import * as ERRORS from '../../util/errors-ts';
 import assignAlias from '../../util/alias/assign-alias';

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

@@ -13,7 +13,7 @@ import logo from '../../util/output/logo';
 import getArgs from '../../util/get-args';
 import Client from '../../util/client';
 import { getPkgName } from '../../util/pkg-name';
-import { Deployment, PaginationOptions } from '../../types';
+import { Deployment, PaginationOptions } from '@vercel-internals/types';
 import { normalizeURL } from '../../util/bisect/normalize-url';
 import getScope from '../../util/get-scope';
 import getDeployment from '../../util/get-deployment';

packages/cli/src/commands/build.ts

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import chalk from 'chalk';
 import dotenv from 'dotenv';
-import { join, normalize, relative, resolve } from 'path';
+import { join, normalize, relative, resolve, sep } from 'path';
 import {
   getDiscontinuedNodeVersions,
   normalizePath,
@@ -157,6 +157,7 @@ export default async function main(client: Client): Promise<number> {
     '--output': String,
     '--prod': Boolean,
     '--yes': Boolean,
+    '-y': '--yes',
   });
 
   if (argv['--help']) {
@@ -296,13 +297,15 @@ async function doBuild(
   cwd: string,
   outputDir: string
 ): Promise<void> {
-  const { output } = client;
+  const { localConfigPath, output } = client;
 
   const workPath = join(cwd, project.settings.rootDirectory || '.');
 
   const [pkg, vercelConfig, nowConfig] = await Promise.all([
     readJSONFile<PackageJson>(join(workPath, 'package.json')),
-    readJSONFile<VercelConfig>(join(workPath, 'vercel.json')),
+    readJSONFile<VercelConfig>(
+      localConfigPath || join(workPath, 'vercel.json')
+    ),
     readJSONFile<VercelConfig>(join(workPath, 'now.json')),
   ]);
 
@@ -710,7 +713,9 @@ function expandBuild(files: string[], build: Builder): Builder[] {
     });
   }
 
-  let src = normalize(build.src || '**');
+  let src = normalize(build.src || '**')
+    .split(sep)
+    .join('/');
   if (src === '.' || src === './') {
     throw new NowBuildError({
       code: `invalid_build_specification`,

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

@@ -5,7 +5,7 @@ import stamp from '../../util/output/stamp';
 import createCertFromFile from '../../util/certs/create-cert-from-file';
 import createCertForCns from '../../util/certs/create-cert-for-cns';
 import { getCommandName } from '../../util/pkg-name';
-import { Cert } from '../../types';
+import { Cert } from '@vercel-internals/types';
 
 interface Options {
   '--overwrite'?: boolean;

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

@@ -10,7 +10,7 @@ import {
 import stamp from '../../util/output/stamp';
 import getCerts from '../../util/certs/get-certs';
 import strlen from '../../util/strlen';
-import { Cert } from '../../types';
+import { Cert } from '@vercel-internals/types';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
 

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

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import ms from 'ms';
 import plural from 'pluralize';
 import table from 'text-table';
-import { Cert } from '../../types';
+import { Cert } from '@vercel-internals/types';
 import * as ERRORS from '../../util/errors-ts';
 import { Output } from '../../util/output';
 import deleteCertById from '../../util/certs/delete-cert-by-id';

packages/cli/src/commands/dev/dev.ts

@@ -5,7 +5,7 @@ import DevServer from '../../util/dev/server';
 import { parseListen } from '../../util/dev/parse-listen';
 import Client from '../../util/client';
 import { getLinkedProject } from '../../util/projects/link';
-import { ProjectSettings } from '../../types';
+import { ProjectSettings } from '@vercel-internals/types';
 import setupAndLink from '../../util/link/setup-and-link';
 import { getCommandName } from '../../util/pkg-name';
 import param from '../../util/output/param';

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

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import ms from 'ms';
 import { DomainNotFound } from '../../util/errors-ts';
-import { DNSRecord } from '../../types';
+import { DNSRecord } from '@vercel-internals/types';
 import Client from '../../util/client';
 import formatTable from '../../util/format-table';
 import getDNSRecords, {

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

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import ms from 'ms';
 import table from 'text-table';
-import { DNSRecord } from '../../types';
+import { DNSRecord } from '@vercel-internals/types';
 import { Output } from '../../util/output';
 import Client from '../../util/client';
 import deleteDNSRecordById from '../../util/dns/delete-dns-record-by-id';

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

@@ -8,7 +8,7 @@ import getScope from '../../util/get-scope';
 import stamp from '../../util/output/stamp';
 import formatTable from '../../util/format-table';
 import { formatDateWithoutTime } from '../../util/format-date';
-import { Domain } from '../../types';
+import { Domain } from '@vercel-internals/types';
 import getCommandFlags from '../../util/get-command-flags';
 import {
   PaginationOptions,

packages/cli/src/commands/domains/move.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import plural from 'pluralize';
 
-import { User, Team } from '../../types';
+import { User, Team } from '@vercel-internals/types';
 import * as ERRORS from '../../util/errors-ts';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';

packages/cli/src/commands/domains/rm.ts

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import plural from 'pluralize';
 
 import { DomainNotFound, DomainPermissionDenied } from '../../util/errors-ts';
-import { Domain } from '../../types';
+import { Domain } from '@vercel-internals/types';
 import { Output } from '../../util/output';
 import Client from '../../util/client';
 import deleteCertById from '../../util/certs/delete-cert-by-id';

packages/cli/src/commands/env/add.ts

@@ -1,5 +1,9 @@
 import chalk from 'chalk';
-import { ProjectEnvTarget, Project, ProjectEnvType } from '../../types';
+import {
+  ProjectEnvTarget,
+  Project,
+  ProjectEnvType,
+} from '@vercel-internals/types';
 import { Output } from '../../util/output';
 import Client from '../../util/client';
 import stamp from '../../util/output/stamp';

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

@@ -1,7 +1,11 @@
 import chalk from 'chalk';
 import ms from 'ms';
 import { Output } from '../../util/output';
-import { Project, ProjectEnvVariable, ProjectEnvType } from '../../types';
+import {
+  Project,
+  ProjectEnvVariable,
+  ProjectEnvType,
+} from '@vercel-internals/types';
 import Client from '../../util/client';
 import formatTable from '../../util/format-table';
 import getEnvRecords from '../../util/env/get-env-records';

packages/cli/src/commands/env/pull.ts

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import { outputFile } from 'fs-extra';
 import { closeSync, openSync, readSync } from 'fs';
 import { resolve } from 'path';
-import { Project, ProjectEnvTarget } from '../../types';
+import { Project, ProjectEnvTarget } from '@vercel-internals/types';
 import Client from '../../util/client';
 import { emoji, prependEmoji } from '../../util/emoji';
 import confirm from '../../util/input/confirm';

packages/cli/src/commands/env/rm.ts

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { Project } from '../../types';
+import { Project } from '@vercel-internals/types';
 import { Output } from '../../util/output';
 import confirm from '../../util/input/confirm';
 import removeEnvRecord from '../../util/env/remove-env-record';

packages/cli/src/commands/git/connect.ts

@@ -1,7 +1,7 @@
 import { Dictionary } from '@vercel/client';
 import chalk from 'chalk';
 import { join } from 'path';
-import { Org, Project, ProjectLinkData } from '../../types';
+import { Org, Project, ProjectLinkData } from '@vercel-internals/types';
 import Client from '../../util/client';
 import { parseGitConfig, pluckRemoteUrls } from '../../util/create-git-meta';
 import confirm from '../../util/input/confirm';

packages/cli/src/commands/git/disconnect.ts

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { Org, Project } from '../../types';
+import { Org, Project } from '@vercel-internals/types';
 import Client from '../../util/client';
 import confirm from '../../util/input/confirm';
 import { getCommandName } from '../../util/pkg-name';

packages/cli/src/commands/inspect.ts

@@ -10,7 +10,7 @@ import getScope from '../util/get-scope';
 import { getPkgName, getCommandName } from '../util/pkg-name';
 import Client from '../util/client';
 import getDeployment from '../util/get-deployment';
-import { Build, Deployment } from '../types';
+import { Build, Deployment } from '@vercel-internals/types';
 import title from 'title';
 import { isErrnoException } from '@vercel/error-utils';
 import { URL } from 'url';

packages/cli/src/commands/project/list.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import ms from 'ms';
 import table from 'text-table';
-import { Project } from '../../types';
+import { Project } from '@vercel-internals/types';
 import Client from '../../util/client';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';

packages/cli/src/commands/pull.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { join } from 'path';
 import Client from '../util/client';
-import { ProjectEnvTarget } from '../types';
+import type { Project, ProjectEnvTarget } from '@vercel-internals/types';
 import { emoji, prependEmoji } from '../util/emoji';
 import getArgs from '../util/get-args';
 import logo from '../util/output/logo';
@@ -10,7 +10,6 @@ import { getPkgName } from '../util/pkg-name';
 import { VERCEL_DIR, VERCEL_DIR_PROJECT } from '../util/projects/link';
 import { writeProjectSettings } from '../util/projects/project-settings';
 import envPull from './env/pull';
-import type { Project } from '../types';
 import {
   isValidEnvTarget,
   getEnvTargetPlaceholder,

packages/cli/src/commands/remove.ts

@@ -18,7 +18,7 @@ import getArgs from '../util/get-args';
 import handleError from '../util/handle-error';
 import type Client from '../util/client';
 import { Output } from '../util/output';
-import { Alias, Deployment, Project } from '../types';
+import { Alias, Deployment, Project } from '@vercel-internals/types';
 import { NowError } from '../util/now-error';
 
 type DeploymentWithAliases = Deployment & {

packages/cli/src/commands/teams/switch.ts

@@ -7,7 +7,7 @@ import { emoji } from '../../util/emoji';
 import getUser from '../../util/get-user';
 import getTeams from '../../util/teams/get-teams';
 import listInput from '../../util/input/list';
-import { Team, GlobalConfig } from '../../types';
+import { Team, GlobalConfig } from '@vercel-internals/types';
 import { writeToConfigFile } from '../../util/config/files';
 
 const updateCurrentTeam = (config: GlobalConfig, team?: Team) => {

packages/cli/src/index.ts

@@ -50,7 +50,7 @@ import getUpdateCommand from './util/get-update-command';
 import { metrics, shouldCollectMetrics } from './util/metrics';
 import { getCommandName, getTitleName } from './util/pkg-name';
 import doLoginPrompt from './util/login/prompt';
-import { AuthConfig, GlobalConfig } from './types';
+import { AuthConfig, GlobalConfig } from '@vercel-internals/types';
 import { VercelConfig } from '@vercel/client';
 import box from './util/output/box';
 
@@ -267,6 +267,7 @@ const main = async () => {
     config,
     authConfig,
     localConfig,
+    localConfigPath,
     argv: process.argv,
   });
 
@@ -280,7 +281,12 @@ const main = async () => {
       GLOBAL_COMMANDS.has(targetOrSubcommand) ||
       commands.has(targetOrSubcommand);
 
-    if (targetPathExists && subcommandExists && !argv['--cwd']) {
+    if (
+      targetPathExists &&
+      subcommandExists &&
+      !argv['--cwd'] &&
+      !process.env.NOW_BUILDER
+    ) {
       output.warn(
         `Did you mean to deploy the subdirectory "${targetOrSubcommand}"? ` +
           `Use \`vc --cwd ${targetOrSubcommand}\` instead.`

packages/cli/src/util/alias/assign-alias.ts

@@ -1,4 +1,4 @@
-import type { Deployment } from '../../types';
+import type { Deployment } from '@vercel-internals/types';
 import { Output } from '../output';
 import Client from '../client';
 import createAlias from './create-alias';

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

@@ -1,4 +1,4 @@
-import type { Deployment } from '../../types';
+import type { Deployment } from '@vercel-internals/types';
 import { Output } from '../output';
 import * as ERRORS from '../errors-ts';
 import Client from '../client';

packages/cli/src/util/alias/find-alias-by-alias-or-id.ts

@@ -1,5 +1,5 @@
 import { Output } from '../output';
-import { Alias } from '../../types';
+import { Alias } from '@vercel-internals/types';
 
 import Client from '../client';
 

packages/cli/src/util/alias/get-aliases.ts

@@ -1,4 +1,4 @@
-import { Alias, PaginationOptions } from '../../types';
+import { Alias, PaginationOptions } from '@vercel-internals/types';
 import Client from '../client';
 
 type Response = {

packages/cli/src/util/alias/get-deployment-by-alias.ts

@@ -2,7 +2,7 @@ import path from 'path';
 import chalk from 'chalk';
 import Client from '../client';
 import { Output } from '../output';
-import { User } from '../../types';
+import { User } from '@vercel-internals/types';
 import { VercelConfig } from '../dev/types';
 import getDeploymentsByAppName from '../deploy/get-deployments-by-appname';
 import getDeployment from '../get-deployment';

packages/cli/src/util/alias/get-domain-aliases.ts

@@ -1,6 +1,6 @@
 import Client from '../client';
 import getAliases from './get-aliases';
-import { Alias } from '../../types';
+import { Alias } from '@vercel-internals/types';
 
 export default async function getDomainAliases(client: Client, domain: string) {
   const { aliases } = await getAliases(client);

packages/cli/src/util/build-state.ts

@@ -1,4 +1,4 @@
-import { Build } from '../types';
+import { Build } from '@vercel-internals/types';
 
 export const isReady = ({ readyState }: Pick<Build, 'readyState'>) =>
   readyState === 'READY';

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

@@ -50,9 +50,7 @@ export async function setMonorepoDefaultSettings(
     const { monorepoManager, ...commands } = result;
 
     output.log(
-      `Automatically detected ${title(
-        monorepoManager
-      )} monorepo manager. Attempting to assign default settings.`
+      `Detected ${title(monorepoManager)}. Adjusting default settings...`
     );
 
     if (commands.buildCommand) {

packages/cli/src/util/certs/create-cert-from-file.ts

@@ -1,7 +1,7 @@
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
 import Client from '../client';
-import { Cert } from '../../types';
+import { Cert } from '@vercel-internals/types';
 import { isErrnoException } from '@vercel/error-utils';
 import { isAPIError } from '../errors-ts';
 

packages/cli/src/util/certs/finish-cert-order.ts

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 
-import { Cert } from '../../types';
+import { Cert } from '@vercel-internals/types';
 import * as ERRORS from '../errors-ts';
 import Client from '../client';
 import mapCertError from './map-cert-error';

packages/cli/src/util/certs/get-cert-by-id.ts

@@ -1,4 +1,4 @@
-import { Cert } from '../../types';
+import { Cert } from '@vercel-internals/types';
 import Client from '../client';
 import * as ERRORS from '../errors-ts';
 

packages/cli/src/util/certs/get-certs-for-cn.ts

@@ -1,5 +1,5 @@
 import { stringify } from 'querystring';
-import { Cert } from '../../types';
+import { Cert } from '@vercel-internals/types';
 import Client from '../client';
 
 /**

packages/cli/src/util/certs/get-certs.ts

@@ -1,5 +1,5 @@
 import Client from '../client';
-import { Cert, PaginationOptions } from '../../types';
+import { Cert, PaginationOptions } from '@vercel-internals/types';
 
 type Response = {
   certs: Cert[];