Add dynamic port assignment and FD 3 communication

.changeset/fast-sheep-hunt.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/heavy-bags-marry.md

@@ -0,0 +1,5 @@
+---
+"@vercel/next": patch
+---
+
+provide `experimentalBypassFor` to Prerender from manifest

.changeset/old-teachers-dress.md

@@ -0,0 +1,5 @@
+---
+"@vercel/next": patch
+---
+
+next.js: move app route handlers in their own lambda grouping, add flag to use bundled runtime

.changeset/rich-gifts-sell.md

@@ -0,0 +1,5 @@
+---
+'@vercel/remix-builder': patch
+---
+
+Fix usage with `bun install`

.changeset/sharp-bears-scream.md

@@ -0,0 +1,5 @@
+---
+"@vercel/frameworks": patch
+---
+
+Add `bun install` placeholder

.github/CODEOWNERS

@@ -2,17 +2,19 @@
 # https://help.github.com/en/articles/about-code-owners
 
 # Restricted Paths
-*                                        @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
-/.github/workflows                       @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/fs-detectors                   @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @agadzik @chloetedder
-/packages/next                           @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk @ztanner
-/packages/routing-utils                  @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @ijjk
-/packages/static-build                   @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
-/packages/edge                           @vercel/compute @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek
+*                                        @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek
+/.github/workflows                       @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
+/packages/fs-detectors                   @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @agadzik @chloetedder
+/packages/next                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk @ztanner
+/packages/routing-utils                  @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @ijjk
+/packages/edge                           @vercel/compute
 /examples                                @leerob
 /examples/create-react-app               @Timer
-/examples/nextjs                         @timneutkens @ijjk @ztanner @huozhi
-/packages/node                           @TooTallNate @EndangeredMassa @cb1kenobi @Ethan-Arrowood @trek @Kikobeats
+/examples/nextjs                         @timneutkens @ijjk @styfle @ztanner
+/examples/hugo                           @styfle
+/examples/jekyll                         @styfle
+/examples/zola                           @styfle
+/packages/node                           @TooTallNate @EndangeredMassa @styfle @cb1kenobi @Ethan-Arrowood @trek @Kikobeats
 
 # Unrestricted Paths
 .changeset/

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

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 14
       - name: Enable corepack
         run: corepack enable pnpm
       - name: Update Gatsby Fixtures

.github/workflows/test-lint.yml

@@ -49,5 +49,3 @@ jobs:
       - run: pnpm install
       - run: pnpm run lint
       - run: pnpm run prettier-check
-      - run: pnpm run build
-      - run: pnpm run type-check

.github/workflows/test.yml

@@ -64,7 +64,7 @@ jobs:
           fetch-depth: 2
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.nodeVersion || env.NODE_VERSION }}
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Install Hugo
         if: matrix.runner == 'macos-latest'
@@ -83,7 +83,7 @@ jobs:
         env:
           FORCE_COLOR: '1'
       - name: Test ${{matrix.packageName}}
-        run: node utils/gen.js && node_modules/.bin/turbo run test --summarize --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
+        run: node utils/gen.js && node_modules/.bin/turbo run test --cache-dir=".turbo" --log-order=stream --scope=${{matrix.packageName}} --no-deps -- ${{ join(matrix.testPaths, ' ') }}
         shell: bash
         env:
           JEST_JUNIT_OUTPUT_FILE: ${{github.workspace}}/.junit-reports/${{matrix.scriptName}}-${{matrix.packageName}}-${{matrix.chunkNumber}}-${{ matrix.runner }}.xml
@@ -91,19 +91,13 @@ jobs:
           VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
           VERCEL_TEST_REGISTRATION_URL: ${{ secrets.VERCEL_TEST_REGISTRATION_URL }}
           FORCE_COLOR: '1'
-      - name: 'Determine Turbo HIT or MISS'
-        if: ${{ !cancelled() }}
-        id: turbo-summary
-        shell: bash
-        run: |
-          TURBO_MISS_COUNT=`node utils/determine-turbo-hit-or-miss.js`
-          echo "MISS COUNT: $TURBO_MISS_COUNT"
-          echo "misses=$TURBO_MISS_COUNT" >> $GITHUB_OUTPUT
+
       - name: fetch ssl certificate after tests (linux, os x)
         if: matrix.runner != 'windows-latest'
         run: echo | openssl s_client -showcerts -servername 'api.vercel.com' -connect 76.76.21.21:443
+
       - name: 'Upload Test Report to Datadog'
-        if: ${{ steps['turbo-summary'].outputs.misses != '0' && !cancelled() }}
+        if: always()
         run: 'npx @datadog/datadog-ci@2.18.1 junit upload --service vercel-cli .junit-reports'
         env:
           DATADOG_API_KEY: ${{secrets.DATADOG_API_KEY_CLI}}

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

@@ -17,8 +17,6 @@ jobs:
           fetch-depth: 0
       - name: Setup node
         uses: actions/setup-node@v3
-        with:
-          node-version: 16
       - name: Enable corepack
         run: corepack enable pnpm
       - name: Update @remix-run/dev

examples/__tests__/integration/angular.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy angular', async () => {
-  await deployExample('angular');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/astro.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy astro', async () => {
-  await deployExample('astro');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/blitzjs.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy blitzjs', async () => {
-  await deployExample('blitzjs');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/brunch.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy brunch', async () => {
-  await deployExample('brunch');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/create-react-app.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy create-react-app', async () => {
-  await deployExample('create-react-app');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/docusaurus-2.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy docusaurus-2', async () => {
-  await deployExample('docusaurus-2');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/docusaurus.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy docusaurus', async () => {
-  await deployExample('docusaurus');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/dojo.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy dojo', async () => {
-  await deployExample('dojo');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/eleventy.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy eleventy', async () => {
-  await deployExample('eleventy');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/ember.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy ember', async () => {
-  await deployExample('ember');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/gatsby.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy gatsby', async () => {
-  await deployExample('gatsby');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/gridsome.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy gridsome', async () => {
-  await deployExample('gridsome');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/hexo.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy hexo', async () => {
-  await deployExample('hexo');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/hugo.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy hugo', async () => {
-  await deployExample('hugo');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/hydrogen-2.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy hydrogen-2', async () => {
-  await deployExample('hydrogen-2');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/hydrogen.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy hydrogen', async () => {
-  await deployExample('hydrogen');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/ionic-angular.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy ionic-angular', async () => {
-  await deployExample('ionic-angular');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/ionic-react.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy ionic-react', async () => {
-  await deployExample('ionic-react');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/jekyll.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy jekyll', async () => {
-  await deployExample('jekyll');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/middleman.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy middleman', async () => {
-  await deployExample('middleman');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/nextjs.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy nextjs', async () => {
-  await deployExample('nextjs');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/node_modules.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy node_modules', async () => {
-  await deployExample('node_modules');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/nuxtjs.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy nuxtjs', async () => {
-  await deployExample('nuxtjs');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/parcel.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy parcel', async () => {
-  await deployExample('parcel');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/polymer.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy polymer', async () => {
-  await deployExample('polymer');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/preact.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy preact', async () => {
-  await deployExample('preact');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/redwoodjs.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy redwoodjs', async () => {
-  await deployExample('redwoodjs');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/remix.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy remix', async () => {
-  await deployExample('remix');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/saber.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy saber', async () => {
-  await deployExample('saber');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/sanity.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy sanity', async () => {
-  await deployExample('sanity');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/sapper.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy sapper', async () => {
-  await deployExample('sapper');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/scully.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy scully', async () => {
-  await deployExample('scully');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/solidstart.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy solidstart', async () => {
-  await deployExample('solidstart');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/stencil.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy stencil', async () => {
-  await deployExample('stencil');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/storybook.test.ts

@@ -1,4 +1,4 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy storybook', async () => {
-  await deployExample('storybook');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });

examples/__tests__/integration/svelte.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy svelte', async () => {
-  await deployExample('svelte');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/sveltekit-1.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy sveltekit-1', async () => {
-  await deployExample('sveltekit-1');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/sveltekit.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy sveltekit', async () => {
-  await deployExample('sveltekit');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/umijs.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy umijs', async () => {
-  await deployExample('umijs');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/vite.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy vite', async () => {
-  await deployExample('vite');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/vitepress.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy vitepress', async () => {
-  await deployExample('vitepress');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/vue.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy vue', async () => {
-  await deployExample('vue');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/vuepress.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy vuepress', async () => {
-  await deployExample('vuepress');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/__tests__/integration/zola.test.ts

@@ -1,4 +1,5 @@
 import { deployExample } from '../test-utils';
-it('[examples] should deploy zola', async () => {
-  await deployExample('zola');
+it('should deploy', async () => {
+  await deployExample(__filename);
 });
+  

examples/nextjs/.gitignore

@@ -4,7 +4,6 @@
 /node_modules
 /.pnp
 .pnp.js
-.yarn/install-state.gz
 
 # testing
 /coverage

examples/nextjs/README.md

@@ -10,8 +10,6 @@ npm run dev
 yarn dev
 # or
 pnpm dev
-# or
-bun dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

examples/nextjs/app/layout.tsx

@@ -1,6 +1,6 @@
+import './globals.css'
 import type { Metadata } from 'next'
 import { Inter } from 'next/font/google'
-import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

examples/nextjs/package.json

@@ -9,19 +9,17 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "react": "^18",
-    "react-dom": "^18",
-    "next": "14.0.0"
-  },
-  "devDependencies": {
-    "typescript": "^5",
-    "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
-    "autoprefixer": "^10",
-    "postcss": "^8",
-    "tailwindcss": "^3",
-    "eslint": "^8",
-    "eslint-config-next": "14.0.0"
+    "@types/node": "20.5.1",
+    "@types/react": "18.2.20",
+    "@types/react-dom": "18.2.7",
+    "autoprefixer": "10.4.15",
+    "eslint": "8.47.0",
+    "eslint-config-next": "13.4.19",
+    "next": "13.4.19",
+    "postcss": "8.4.28",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "tailwindcss": "3.3.3",
+    "typescript": "5.1.6"
   }
 }

examples/package.json

@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@types/jest": "27.4.1",
-    "@vercel/frameworks": "2.0.3"
+    "@vercel/frameworks": "2.0.1"
   },
   "version": null
 }

examples/remix/.gitignore

@@ -4,4 +4,9 @@ node_modules
 /build
 /public/build
 .env
+
 .vercel
+.output
+
+/api/index.js
+/api/index.js.map

examples/remix/app/root.tsx

@@ -19,7 +19,7 @@ export default function App() {
     <html lang="en">
       <head>
         <meta charSet="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta name="viewport" content="width=device-width,initial-scale=1" />
         <Meta />
         <Links />
       </head>

examples/remix/app/routes/_index.tsx

@@ -1,15 +1,10 @@
-import type { MetaFunction } from "@vercel/remix";
+import type { V2_MetaFunction } from "@vercel/remix";
 
-export const meta: MetaFunction = () => {
-  return [
-    { title: "New Remix App" },
-    { name: "description", content: "Welcome to Remix!" },
-  ];
-};
+export const meta: V2_MetaFunction = () => [{ title: "New Remix App" }];
 
 export default function Index() {
   return (
-    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
       <h1>Welcome to Remix</h1>
       <ul>
         <li>

examples/remix/app/routes/edge.tsx

@@ -1,8 +1,8 @@
-import type { MetaFunction } from "@vercel/remix";
+import type { V2_MetaFunction } from "@vercel/remix";
 
 export const config = { runtime: "edge" };
 
-export const meta: MetaFunction = () => [{ title: "Remix@Edge | New Remix App" }];
+export const meta: V2_MetaFunction = () => [{ title: "Remix@Edge | New Remix App" }];
 
 export default function Edge() {
   return (

examples/remix/package.json

@@ -1,34 +1,32 @@
 {
-  "name": "my-remix-app",
   "private": true,
   "sideEffects": false,
-  "type": "module",
   "scripts": {
     "build": "remix build",
-    "dev": "remix dev --manual",
-    "start": "remix-serve ./build/index.js",
+    "dev": "remix dev",
+    "start": "remix-serve build",
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/css-bundle": "^2.0.0",
-    "@remix-run/node": "^2.0.0",
-    "@remix-run/react": "^2.0.0",
-    "@remix-run/serve": "^2.0.0",
-    "@vercel/analytics": "^1.0.2",
-    "@vercel/remix": "^2.0.0",
+    "@remix-run/css-bundle": "^1.18.0",
+    "@remix-run/node": "^1.18.0",
+    "@remix-run/react": "^1.18.0",
+    "@remix-run/serve": "^1.18.0",
+    "@vercel/analytics": "^0.1.11",
+    "@vercel/remix": "^1.18.0",
     "isbot": "^3.6.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.0.0",
-    "@remix-run/eslint-config": "^2.0.0",
-    "@types/react": "^18.2.20",
-    "@types/react-dom": "^18.2.7",
-    "eslint": "^8.38.0",
-    "typescript": "^5.1.6"
+    "@remix-run/dev": "^1.18.0",
+    "@remix-run/eslint-config": "^1.18.0",
+    "@types/react": "^18.0.25",
+    "@types/react-dom": "^18.0.11",
+    "eslint": "^8.28.0",
+    "typescript": "^5.1.3"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=16"
   }
 }

examples/remix/remix.config.js

@@ -1,8 +1,17 @@
 /** @type {import('@remix-run/dev').AppConfig} */
-export default {
+module.exports = {
+  future: {
+    v2_dev: true,
+    v2_errorBoundary: true,
+    v2_headers: true,
+    v2_meta: true,
+    v2_normalizeFormMethod: true,
+    v2_routeConvention: true,
+  },
   ignoredRouteFiles: ["**/.*"],
+  serverModuleFormat: "cjs",
   // appDirectory: "app",
   // assetsBuildDirectory: "public/build",
-  // publicPath: "/build/",
   // serverBuildPath: "build/index.js",
+  // publicPath: "/build/",
 };

examples/remix/tsconfig.json

@@ -1,13 +1,13 @@
 {
   "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
-    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "lib": ["DOM", "DOM.Iterable", "ES2019"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
-    "moduleResolution": "Bundler",
+    "moduleResolution": "node",
     "resolveJsonModule": true,
-    "target": "ES2022",
+    "target": "ES2019",
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,

internals/types/CHANGELOG.md

@@ -1,33 +1,5 @@
 # @vercel-internals/types
 
-## 1.0.14
-
-### Patch Changes
-
-- Updated dependencies [[`0861dc8fb`](https://github.com/vercel/vercel/commit/0861dc8fbcea1037626b00664a4b6c22f1b0a7ed)]:
-  - @vercel/build-utils@7.2.3
-
-## 1.0.13
-
-### Patch Changes
-
-- Updated dependencies [[`9e9fac019`](https://github.com/vercel/vercel/commit/9e9fac0191cb1428ac9e5479c3d5c8afd7b7d357)]:
-  - @vercel/routing-utils@3.1.0
-
-## 1.0.12
-
-### Patch Changes
-
-- Updated dependencies [[`2f5b0aeeb`](https://github.com/vercel/vercel/commit/2f5b0aeeb183ed3ea8cbc68cb3bc3c949c486ada)]:
-  - @vercel/build-utils@7.2.2
-
-## 1.0.11
-
-### Patch Changes
-
-- Updated dependencies [[`decdf27fb`](https://github.com/vercel/vercel/commit/decdf27fb5ca914fe50a9320c4fd50ef79d2fbb3)]:
-  - @vercel/build-utils@7.2.1
-
 ## 1.0.10
 
 ### Patch Changes

internals/types/index.d.ts

@@ -65,8 +65,6 @@ export type User = {
   billing: Billing;
   name?: string;
   limited?: boolean;
-  version?: 'northstar';
-  defaultTeamId?: string;
 };
 
 export interface Team {

internals/types/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.14",
+  "version": "1.0.10",
   "types": "index.d.ts",
   "main": "index.d.ts",
   "files": [
@@ -10,8 +10,8 @@
   "dependencies": {
     "@types/node": "14.14.31",
     "@vercel-internals/constants": "1.0.4",
-    "@vercel/build-utils": "7.2.3",
-    "@vercel/routing-utils": "3.1.0"
+    "@vercel/build-utils": "7.2.0",
+    "@vercel/routing-utils": "3.0.0"
   },
   "devDependencies": {
     "@vercel-internals/tsconfig": "1.0.0",

package.json

@@ -11,7 +11,7 @@
     "@typescript-eslint/eslint-plugin": "5.21.0",
     "@typescript-eslint/parser": "5.21.0",
     "@vercel/build-utils": "*",
-    "@vercel/style-guide": "4.0.2",
+    "@vercel/ncc": "0.24.0",
     "async-retry": "1.2.3",
     "buffer-replace": "1.0.0",
     "create-svelte": "2.0.1",
@@ -33,7 +33,7 @@
     "source-map-support": "0.5.12",
     "ts-eager": "2.0.2",
     "ts-jest": "29.1.0",
-    "turbo": "1.10.16",
+    "turbo": "1.10.13",
     "typescript": "4.9.5"
   },
   "scripts": {
@@ -50,8 +50,7 @@
     "prepare": "husky install",
     "pack": "cd utils && node -r ts-eager/register ./pack.ts",
     "ci:version": "changeset version && pnpm install --no-frozen-lockfile",
-    "ci:publish": "pnpm publish -r && node utils/update-canary-tags.mjs && changeset tag",
-    "type-check": "turbo type-check --concurrency=12 --output-logs=errors-only --summarize --continue"
+    "ci:publish": "pnpm publish -r && node utils/update-canary-tags.mjs && changeset tag"
   },
   "lint-staged": {
     "./{*,{api,packages,test,utils}/**/*}.{js,ts}": [

packages/build-utils/CHANGELOG.md

@@ -1,23 +1,5 @@
 # @vercel/build-utils
 
-## 7.2.3
-
-### Patch Changes
-
-- Add experimental flag to allow Node.js v20 ([#10802](https://github.com/vercel/vercel/pull/10802))
-
-## 7.2.2
-
-### Patch Changes
-
-- [cli] Update bun detection and add tests for projects with both bunlock binary and yarn.lock text files ([#10583](https://github.com/vercel/vercel/pull/10583))
-
-## 7.2.1
-
-### Patch Changes
-
-- Internal variants ([#10549](https://github.com/vercel/vercel/pull/10549))
-
 ## 7.2.0
 
 ### Minor Changes

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "7.2.3",
+  "version": "7.2.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -14,8 +14,7 @@
     "build": "node build.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
     "test-unit": "pnpm test test/unit.*test.*",
-    "test-e2e": "pnpm test test/integration.test.ts",
-    "type-check": "tsc --noEmit"
+    "test-e2e": "pnpm test test/integration.test.ts"
   },
   "devDependencies": {
     "@iarna/toml": "2.2.3",
@@ -33,7 +32,8 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.2",
-    "@vercel/error-utils": "2.0.2",
+    "@vercel/error-utils": "2.0.1",
+    "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",

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

@@ -37,12 +37,6 @@ function getOptions() {
       discontinueDate: new Date('2020-01-06'),
     },
   ] as const;
-  if (process.env.VERCEL_ALLOW_NODEJS20 === '1') {
-    return [
-      { major: 20, range: '20.x', runtime: 'nodejs20.x' },
-      ...options,
-    ] as const;
-  }
   return options;
 }
 

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

@@ -311,13 +311,8 @@ export async function scanParentDirs(
       bunLockPath ? fs.readFile(bunLockPath, 'utf8') : null,
     ]);
 
-  // Priority order is bun with yarn lock > yarn > pnpm > npm > bun
-  if (bunLockBin && hasYarnLock) {
-    cliType = 'bun';
-    lockfilePath = bunLockPath;
-    // TODO: read "bun-lockfile-format-v0"
-    lockfileVersion = 0;
-  } else if (hasYarnLock) {
+  // Priority order is Yarn > pnpm > npm > bun
+  if (hasYarnLock) {
     cliType = 'yarn';
     lockfilePath = yarnLockPath;
   } else if (pnpmLockYaml) {

packages/build-utils/src/types.ts

@@ -434,13 +434,6 @@ export interface Cron {
   schedule: string;
 }
 
-// TODO: Proper description once complete
-export interface Flag {
-  key: string;
-  defaultValue?: unknown;
-  metadata: Record<string, unknown>;
-}
-
 /** The framework which created the function */
 export interface FunctionFramework {
   slug: string;
@@ -465,7 +458,6 @@ export interface BuildResultV2Typical {
   framework?: {
     version: string;
   };
-  flags?: Flag[];
 }
 
 export type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/.gitignore

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

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/build.js

@@ -1,8 +0,0 @@
-import { mkdir, rm, writeFile } from 'node:fs/promises'
-import { say } from 'cowsay'
-
-const text = say({ text: `bun version: ${process.versions.bun}` })
-const content = say({ text })
-await rm('./public', { recursive: true, force: true })
-await mkdir('./public', { recursive: true })
-await writeFile('./public/index.txt', content)

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/package.json

@@ -1,9 +0,0 @@
-{
-  "private": true,
-  "scripts": {
-    "build": "bun build.js"
-  },
-  "dependencies": {
-    "cowsay": "1.5.0"
-  }
-}

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/probes.json

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

packages/build-utils/test/fixtures/31-bun-v1-with-yarn-lock/yarn.lock

@@ -1,221 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-# bun ./bun.lockb --hash: CD5862D9DB80873E-24483eaa80ed0cc4-641E4430BAAAECB3-abebd38edad3b1b9
-
-
-ansi-regex@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"
-  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-cowsay@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/cowsay/-/cowsay-1.5.0.tgz"
-  integrity sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==
-  dependencies:
-    get-stdin "8.0.0"
-    string-width "~2.1.1"
-    strip-final-newline "2.0.0"
-    yargs "15.4.1"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
-  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-stdin@8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz"
-  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
-string-width@~2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"
-  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-final-newline@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-which-module@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz"
-  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
-yargs@15.4.1:
-  version "15.4.1"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
-
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"

packages/build-utils/test/tsconfig.json

@@ -1,7 +1,4 @@
 {
-  "compilerOptions": {
-    "sourceMap": true
-  },
   "extends": "../tsconfig.json",
   "include": ["*.test.ts"]
 }

packages/build-utils/test/unit.read-config-file.test.ts

@@ -29,7 +29,7 @@ describe('Test `readConfigFile()`', () => {
   it('should return parsed object when file exists', async () => {
     expect(await readConfigFile(tsconfig)).toMatchObject({
       compilerOptions: {
-        outDir: './dist',
+        strict: true,
       },
     });
     expect(logMessages).toEqual([]);
@@ -39,7 +39,7 @@ describe('Test `readConfigFile()`', () => {
     const files = [doesnotexist, tsconfig];
     expect(await readConfigFile(files)).toMatchObject({
       compilerOptions: {
-        outDir: './dist',
+        strict: true,
       },
     });
     expect(logMessages).toEqual([]);
@@ -63,7 +63,7 @@ describe('Test `readConfigFile()`', () => {
       await writeFile(invalid, 'borked');
       expect(await readConfigFile([invalid, tsconfig])).toMatchObject({
         compilerOptions: {
-          outDir: './dist',
+          strict: true,
         },
       });
     } finally {

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

@@ -313,23 +313,6 @@ it('should warn for deprecated versions, soon to be discontinued', async () => {
   global.Date.now = realDateNow;
 });
 
-it('should only allow nodejs20.x when env var is set', async () => {
-  try {
-    expect(getLatestNodeVersion()).toHaveProperty('major', 18);
-    await expect(getSupportedNodeVersion('20.x')).rejects.toThrow();
-
-    process.env.VERCEL_ALLOW_NODEJS20 = '1';
-
-    expect(getLatestNodeVersion()).toHaveProperty('major', 20);
-    expect(await getSupportedNodeVersion('20.x')).toHaveProperty('major', 20);
-    expect(await getSupportedNodeVersion('20')).toHaveProperty('major', 20);
-    expect(await getSupportedNodeVersion('20.1.0')).toHaveProperty('major', 20);
-    expect(await getSupportedNodeVersion('>=16')).toHaveProperty('major', 20);
-  } finally {
-    delete process.env.VERCEL_ALLOW_NODEJS20;
-  }
-});
-
 it('should support initialHeaders and initialStatus correctly', async () => {
   new Prerender({
     expiration: 1,
@@ -558,15 +541,6 @@ it(
 );
 
 it('should return cliType bun and correct lock file for bun v1', async () => {
-  const fixture = path.join(__dirname, 'fixtures', '31-bun-v1-with-yarn-lock');
-  const result = await scanParentDirs(fixture);
-  expect(result.cliType).toEqual('bun');
-  expect(result.lockfileVersion).toEqual(0);
-  expect(result.lockfilePath).toEqual(path.join(fixture, 'bun.lockb'));
-  expect(result.packageJsonPath).toEqual(path.join(fixture, 'package.json'));
-});
-
-it('should return cliType bun and correct lock file for bun v1 with yarn.lock file', async () => {
   const fixture = path.join(__dirname, 'fixtures', '30-bun-v1');
   const result = await scanParentDirs(fixture);
   expect(result.cliType).toEqual('bun');

packages/build-utils/tsconfig.json

@@ -1,9 +1,21 @@
 {
   "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "esModuleInterop": true,
+    "lib": ["ES2021"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmitOnError": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
     "outDir": "./dist",
-    "types": ["node", "jest"]
+    "types": ["node", "jest"],
+    "strict": true,
+    "target": "ES2021"
   },
-  "extends": "../../tsconfig.base.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"]
 }

packages/cli/CHANGELOG.md

@@ -1,131 +1,5 @@
 # vercel
 
-## 32.5.1
-
-### Patch Changes
-
-- Debug log load user exceptions ([#10773](https://github.com/vercel/vercel/pull/10773))
-
-- bump: edge-runtime ([#10712](https://github.com/vercel/vercel/pull/10712))
-
-- Updated dependencies [[`fc90a3dc0`](https://github.com/vercel/vercel/commit/fc90a3dc0bd998453f6527c03d211c35bb0d5770), [`644b8a52c`](https://github.com/vercel/vercel/commit/644b8a52cb2cc8f05e215e2230f95f902cdf8ae8), [`0861dc8fb`](https://github.com/vercel/vercel/commit/0861dc8fbcea1037626b00664a4b6c22f1b0a7ed), [`33cc8e0ac`](https://github.com/vercel/vercel/commit/33cc8e0acf1b3466d50d45b2e5bbe66b89a87c14), [`f5296c3c0`](https://github.com/vercel/vercel/commit/f5296c3c06e620a39c5f88287ac94e58703bdaac), [`d9065c210`](https://github.com/vercel/vercel/commit/d9065c2102223e9cdb5b22df14db41c363cf7828)]:
-  - @vercel/next@4.0.12
-  - @vercel/node@3.0.8
-  - @vercel/build-utils@7.2.3
-  - @vercel/remix-builder@2.0.11
-  - @vercel/static-build@2.0.10
-
-## 32.5.0
-
-### Minor Changes
-
-- Indicates whether @vercel/speed-insights or @vercel/analytics are used ([#10623](https://github.com/vercel/vercel/pull/10623))
-
-- [cli] update env var validation rule to allow name start with underscore ([#10697](https://github.com/vercel/vercel/pull/10697))
-
-### Patch Changes
-
-- Updated dependencies [[`da300030c`](https://github.com/vercel/vercel/commit/da300030c999b3555c608a321c9d0a4d36923a5a), [`de84743e1`](https://github.com/vercel/vercel/commit/de84743e10d4c9701d409355c0fe057f35e6e435), [`913608de4`](https://github.com/vercel/vercel/commit/913608de4dd4e37557533d732ca8449a5737d4a6), [`7fa08088e`](https://github.com/vercel/vercel/commit/7fa08088ea0d5df6955ea4af7f08513cf4027bb3)]:
-  - @vercel/next@4.0.11
-  - @vercel/python@4.1.0
-  - @vercel/remix-builder@2.0.10
-  - @vercel/redwood@2.0.5
-  - @vercel/static-build@2.0.9
-
-## 32.4.1
-
-### Patch Changes
-
-- Updated dependencies [[`c523a755f`](https://github.com/vercel/vercel/commit/c523a755f8e4bc41f7c353ebc0b939c21703df00), [`58215906f`](https://github.com/vercel/vercel/commit/58215906f9ee28da3a7f2f3f4aeb862ab53bf55e)]:
-  - @vercel/next@4.0.10
-
-## 32.4.0
-
-### Minor Changes
-
-- Restore unsetting teamId for non-team accounts ([#10612](https://github.com/vercel/vercel/pull/10612))
-
-### Patch Changes
-
-- remove unused source map pkg ([#10577](https://github.com/vercel/vercel/pull/10577))
-
-- disable source map for prod build ([#10575](https://github.com/vercel/vercel/pull/10575))
-
-- Better rendering upon authentication error in `vc cert ls` ([#10551](https://github.com/vercel/vercel/pull/10551))
-
-- Updated dependencies [[`e9026c7a6`](https://github.com/vercel/vercel/commit/e9026c7a692937122e60e73b91100cf7009e022d), [`ea5bc8806`](https://github.com/vercel/vercel/commit/ea5bc8806276abf5ba14bdb4a966267497e5d14d), [`a4996e1c5`](https://github.com/vercel/vercel/commit/a4996e1c5a7e6986d5410b662014dc584c0f7c54), [`a18ed98f2`](https://github.com/vercel/vercel/commit/a18ed98f2df78fe1256410ea8676686564ed9b35), [`2f5b0aeeb`](https://github.com/vercel/vercel/commit/2f5b0aeeb183ed3ea8cbc68cb3bc3c949c486ada), [`09f1bbfa4`](https://github.com/vercel/vercel/commit/09f1bbfa41a87cf0063a3fb3022b7531d03862b5), [`ce7e82fa7`](https://github.com/vercel/vercel/commit/ce7e82fa7aa6cec5f5d7b4953353b297b7ad1694)]:
-  - @vercel/next@4.0.9
-  - @vercel/go@3.0.3
-  - @vercel/build-utils@7.2.2
-  - @vercel/node@3.0.7
-  - @vercel/redwood@2.0.4
-  - @vercel/remix-builder@2.0.9
-  - @vercel/static-build@2.0.8
-
-## 32.3.1
-
-### Patch Changes
-
-- Use "esbuild" to build CLI ([#10555](https://github.com/vercel/vercel/pull/10555))
-
-- Updated dependencies [[`9f63ca60a`](https://github.com/vercel/vercel/commit/9f63ca60ad914af0f7ba18c9bbe1656eeea68a0a), [`e3f9faf51`](https://github.com/vercel/vercel/commit/e3f9faf513bd97900d8966f2f1116fc3ca07221b)]:
-  - @vercel/next@4.0.8
-  - @vercel/remix-builder@2.0.8
-
-## 32.3.0
-
-### Minor Changes
-
-- [cli] Support northstar users ([#10535](https://github.com/vercel/vercel/pull/10535))
-
-### Patch Changes
-
-- Internal variants ([#10549](https://github.com/vercel/vercel/pull/10549))
-
-- [speed insights] Prepare for migration to new speed insights package ([#10500](https://github.com/vercel/vercel/pull/10500))
-
-- Updated dependencies [[`b0898a665`](https://github.com/vercel/vercel/commit/b0898a66591d5296dc38ffcf0e8345c9338b72f3), [`10d4e51ac`](https://github.com/vercel/vercel/commit/10d4e51ac57b76f05ddc0bf3adf220e2490244fc), [`decdf27fb`](https://github.com/vercel/vercel/commit/decdf27fb5ca914fe50a9320c4fd50ef79d2fbb3), [`f5ca497b7`](https://github.com/vercel/vercel/commit/f5ca497b7522a2dad637cef238da9716ac133057), [`ab329f0fe`](https://github.com/vercel/vercel/commit/ab329f0fe88e9cb72607d0cba41f5e168d77e077), [`d0d052011`](https://github.com/vercel/vercel/commit/d0d0520111264434d57d5920de0f622f6a2588dc), [`9bb3067de`](https://github.com/vercel/vercel/commit/9bb3067de28be77f3ce268a31a7aa6184836dfb1)]:
-  - @vercel/static-build@2.0.7
-  - @vercel/node@3.0.6
-  - @vercel/build-utils@7.2.1
-  - @vercel/next@4.0.7
-  - @vercel/python@4.0.2
-  - @vercel/redwood@2.0.3
-  - @vercel/remix-builder@2.0.7
-  - @vercel/go@3.0.2
-
-## 32.2.5
-
-### Patch Changes
-
-- Updated dependencies [[`849eedf0f`](https://github.com/vercel/vercel/commit/849eedf0f2841211e4175d374f1cf01330bf9611), [`f6f16b034`](https://github.com/vercel/vercel/commit/f6f16b0347bac9f5c33c79ccb1fb9fd9d254cae5), [`3035e18fb`](https://github.com/vercel/vercel/commit/3035e18fb67dfe7031e235a74136a41948f86d5a), [`cb784aeb9`](https://github.com/vercel/vercel/commit/cb784aeb9c9e4eddf1c65b61849a87edb1117af1)]:
-  - @vercel/next@4.0.6
-  - @vercel/remix-builder@2.0.6
-
-## 32.2.4
-
-### Patch Changes
-
-- Add support for bun detection in monorepo ([#10511](https://github.com/vercel/vercel/pull/10511))
-
-- Updated dependencies [[`1b6f3a0f6`](https://github.com/vercel/vercel/commit/1b6f3a0f6534f71c7486a4e33ac199f1da330626)]:
-  - @vercel/static-build@2.0.6
-
-## 32.2.3
-
-### Patch Changes
-
-- Updated dependencies [[`083aad448`](https://github.com/vercel/vercel/commit/083aad448e45edae296da3201eec9f890a01d22d)]:
-  - @vercel/next@4.0.5
-
-## 32.2.2
-
-### Patch Changes
-
-- Updated dependencies [[`7a0fed970`](https://github.com/vercel/vercel/commit/7a0fed970c39cb8f4df70544ded3284d3538b06a), [`2f461a8b0`](https://github.com/vercel/vercel/commit/2f461a8b0bcbdd05da0516395c2905c2d0242682), [`1bab21026`](https://github.com/vercel/vercel/commit/1bab21026ec0bb8a4a8fbeac3d6e4a197f1030fd)]:
-  - @vercel/next@4.0.4
-  - @vercel/remix-builder@2.0.5
-
 ## 32.2.1
 
 ### Patch Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "32.5.1",
+  "version": "32.2.1",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -16,37 +16,35 @@
     "test-e2e": "rimraf test/fixtures/integration && pnpm test test/integration-1.test.ts test/integration-2.test.ts test/integration-3.test.ts",
     "test-dev": "pnpm test test/dev/",
     "coverage": "codecov",
-    "build": "node scripts/build.mjs",
-    "dev": "ts-node ./src/index.ts",
-    "type-check": "tsc --noEmit"
+    "build": "ts-node ./scripts/build.ts",
+    "dev": "ts-node ./src/index.ts"
   },
   "bin": {
     "vc": "./dist/index.js",
     "vercel": "./dist/index.js"
   },
   "files": [
-    "dist"
+    "dist",
+    "scripts/preinstall.js"
   ],
   "engines": {
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.2.3",
-    "@vercel/fun": "1.1.0",
-    "@vercel/go": "3.0.3",
+    "@vercel/build-utils": "7.2.0",
+    "@vercel/go": "3.0.1",
     "@vercel/hydrogen": "1.0.1",
-    "@vercel/next": "4.0.12",
-    "@vercel/node": "3.0.8",
-    "@vercel/python": "4.1.0",
-    "@vercel/redwood": "2.0.5",
-    "@vercel/remix-builder": "2.0.11",
+    "@vercel/next": "4.0.3",
+    "@vercel/node": "3.0.5",
+    "@vercel/python": "4.0.1",
+    "@vercel/redwood": "2.0.2",
+    "@vercel/remix-builder": "2.0.4",
     "@vercel/ruby": "2.0.2",
-    "@vercel/static-build": "2.0.10",
-    "chokidar": "3.3.1"
+    "@vercel/static-build": "2.0.5"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
-    "@edge-runtime/node-utils": "2.2.2",
+    "@edge-runtime/node-utils": "2.2.1",
     "@next/env": "11.1.2",
     "@sentry/node": "5.5.0",
     "@sindresorhus/slugify": "0.11.0",
@@ -88,12 +86,15 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.14",
-    "@vercel/client": "13.0.7",
-    "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "2.0.3",
-    "@vercel/fs-detectors": "5.1.3",
-    "@vercel/routing-utils": "3.1.0",
+    "@vercel-internals/types": "1.0.10",
+    "@vercel/client": "13.0.3",
+    "@vercel/error-utils": "2.0.1",
+    "@vercel/frameworks": "2.0.1",
+    "@vercel/fs-detectors": "5.0.2",
+    "@vercel/fun": "1.1.0",
+    "@vercel/ncc": "0.24.0",
+    "@vercel/routing-utils": "3.0.0",
+    "@zeit/source-map-support": "0.6.2",
     "ajv": "6.12.2",
     "alpha-sort": "2.0.1",
     "ansi-escapes": "4.3.2",
@@ -105,8 +106,10 @@
     "bytes": "3.0.0",
     "chalk": "4.1.0",
     "chance": "1.1.7",
+    "chokidar": "3.3.1",
     "cli-table3": "0.6.3",
     "codecov": "3.8.2",
+    "cpy": "7.2.0",
     "date-fns": "1.29.0",
     "debug": "3.1.0",
     "dot": "1.1.3",
@@ -158,6 +161,7 @@
     "strip-ansi": "6.0.1",
     "supports-hyperlinks": "3.0.0",
     "tar-fs": "1.16.3",
+    "test-listen": "1.1.0",
     "text-table": "0.2.0",
     "title": "3.4.1",
     "tmp-promise": "1.0.3",

packages/cli/scripts/build.mjs

@@ -1,54 +0,0 @@
-import { join } from 'node:path';
-import { copyFileSync, readFileSync, writeFileSync } from 'node:fs';
-import { esbuild } from '../../../utils/build.mjs';
-import { compileDevTemplates } from './compile-templates.mjs';
-
-const repoRoot = new URL('../', import.meta.url);
-
-function createConstants() {
-  const filename = new URL('src/util/constants.ts', repoRoot);
-  const contents = `// This file is auto-generated
-export const GA_TRACKING_ID: string | undefined = ${envToString(
-    'GA_TRACKING_ID'
-  )};
-export const SENTRY_DSN: string | undefined = ${envToString('SENTRY_DSN')};
-`;
-  writeFileSync(filename, contents, 'utf8');
-}
-
-function envToString(key) {
-  const value = process.env[key];
-  if (value) {
-    return JSON.stringify(value);
-  }
-}
-
-// Read the secrets from GitHub Actions and generate a file.
-// During local development, these secrets will be empty.
-createConstants();
-
-// Compile the `doT.js` template files for `vercel dev`
-await compileDevTemplates();
-
-const pkgPath = join(process.cwd(), 'package.json');
-const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-const externals = Object.keys(pkg.dependencies || {});
-await esbuild({
-  bundle: true,
-  external: externals,
-});
-
-// Copy a few static files into `dist`
-const distRoot = new URL('dist/', repoRoot);
-copyFileSync(
-  new URL('src/util/projects/VERCEL_DIR_README.txt', repoRoot),
-  new URL('VERCEL_DIR_README.txt', distRoot)
-);
-copyFileSync(
-  new URL('src/util/dev/builder-worker.js', repoRoot),
-  new URL('builder-worker.js', distRoot)
-);
-copyFileSync(
-  new URL('src/util/get-latest-version/get-latest-worker.js', repoRoot),
-  new URL('get-latest-worker.js', distRoot)
-);

packages/cli/scripts/build.ts

@@ -0,0 +1,100 @@
+import cpy from 'cpy';
+import execa from 'execa';
+import { join } from 'path';
+import { remove, readJSON, writeFile } from 'fs-extra';
+
+const dirRoot = join(__dirname, '..');
+const distRoot = join(dirRoot, 'dist');
+
+async function createConstants() {
+  console.log('Creating constants.ts');
+  const filename = join(dirRoot, 'src/util/constants.ts');
+  const contents = `// This file is auto-generated
+export const GA_TRACKING_ID: string | undefined = ${envToString(
+    'GA_TRACKING_ID'
+  )};
+export const SENTRY_DSN: string | undefined = ${envToString('SENTRY_DSN')};
+`;
+  await writeFile(filename, contents, 'utf8');
+}
+
+function envToString(key: string) {
+  const value = process.env[key];
+  if (!value) {
+    console.log(`- Constant ${key} is not assigned`);
+  }
+  return JSON.stringify(value);
+}
+
+async function main() {
+  // Read the secrets from GitHub Actions and generate a file.
+  // During local development, these secrets will be empty.
+  await createConstants();
+
+  // `vercel dev` uses chokidar to watch the filesystem, but opts-out of the
+  // `fsevents` feature using `useFsEvents: false`, so delete the module here so
+  // that it is not compiled by ncc, which makes the npm package size larger
+  // than necessary.
+  await remove(join(dirRoot, '../../node_modules/fsevents'));
+
+  // Compile the `doT.js` template files for `vercel dev`
+  console.log();
+  await execa(process.execPath, [join(__dirname, 'compile-templates.js')], {
+    stdio: 'inherit',
+  });
+
+  const pkg = await readJSON(join(dirRoot, 'package.json'));
+  const dependencies = Object.keys(pkg?.dependencies ?? {});
+  // Do the initial `ncc` build
+  console.log('Dependencies:', dependencies);
+  const externs: Array<string> = [];
+  for (const dep of dependencies) {
+    externs.push('--external', dep);
+  }
+  const args = ['ncc', 'build', 'src/index.ts', ...externs];
+  await execa('pnpm', args, { stdio: 'inherit', cwd: dirRoot });
+
+  // `ncc` has some issues with `@vercel/fun`'s runtime files:
+  //   - Executable bits on the `bootstrap` files appear to be lost:
+  //       https://github.com/vercel/ncc/pull/182
+  //   - The `bootstrap.js` asset does not get copied into the output dir:
+  //       https://github.com/vercel/ncc/issues/278
+  //
+  // Aside from those issues, all the same files from the `runtimes` directory
+  // should be copied into the output runtimes dir, specifically the `index.js`
+  // files (correctly) do not get copied into the output bundle because they
+  // get compiled into the final ncc bundle file, however, we want them to be
+  // present in the npm package because the contents of those files are involved
+  // with `fun`'s cache invalidation mechanism and they need to be shasum'd.
+  const runtimes = join(dirRoot, 'node_modules/@vercel/fun/dist/src/runtimes');
+  await cpy('**/*', join(distRoot, 'runtimes'), {
+    parents: true,
+    cwd: runtimes,
+  });
+
+  // Band-aid to bundle stuff that `ncc` neglects to bundle
+  await cpy(join(dirRoot, 'src/util/projects/VERCEL_DIR_README.txt'), distRoot);
+  await cpy(join(dirRoot, 'src/util/dev/builder-worker.js'), distRoot);
+  await cpy(
+    join(dirRoot, 'src/util/get-latest-version/get-latest-worker.js'),
+    distRoot
+  );
+
+  console.log('Finished building Vercel CLI');
+}
+
+process.on('unhandledRejection', (reason: any, promise: Promise<any>) => {
+  console.error('Unhandled Rejection at:', promise, 'reason:', reason);
+  process.exit(1);
+});
+
+process.on('uncaughtException', err => {
+  console.error('Uncaught Exception:');
+  console.error(err);
+  process.exit(1);
+});
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

packages/cli/scripts/compile-templates.js

@@ -0,0 +1,88 @@
+const execa = require('execa');
+const { join } = require('path');
+const { readFile, writeFile, readdir, remove } = require('fs-extra');
+
+async function main() {
+  const dirRoot = join(__dirname, '..');
+
+  // Compile the `doT.js` template files for `vercel dev`
+  const templatesDir = join(dirRoot, 'src/util/dev/templates');
+  const dotPacker = join(dirRoot, '../../node_modules/dot/bin/dot-packer');
+  await execa(process.execPath, [dotPacker], {
+    cwd: templatesDir,
+    stdio: 'inherit',
+  });
+
+  const files = await readdir(templatesDir);
+  const compiledFiles = files.filter(f => f.endsWith('.js'));
+
+  // Prettier
+  console.log('\nMaking the compiled template functions prettier...');
+  const prettier = join(dirRoot, '../../node_modules/prettier/bin-prettier.js');
+  await execa(
+    process.execPath,
+    [prettier, '--write', '--single-quote', ...compiledFiles],
+    {
+      cwd: templatesDir,
+      stdio: 'inherit',
+    }
+  );
+
+  console.log('\nConverting template functions to TypeScript');
+  for (const file of compiledFiles) {
+    const start = Date.now();
+    const fnPath = join(templatesDir, file);
+    const tsPath = fnPath.replace(/\.js$/, '.ts');
+    const def = await readFile(fnPath.replace(/\.js$/, '.tsdef'), 'utf8');
+    const interfaceName = def.match(/interface (\w+)/)[1];
+
+    const lines = require(fnPath).toString().split('\n');
+    let errorHtmlStart = -1;
+    let errorHtmlEnd = -1;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      if (errorHtmlStart === -1 && line.includes('encodeHTML')) {
+        errorHtmlStart = i;
+      } else if (errorHtmlEnd === -1 && line.includes(')();')) {
+        errorHtmlEnd = i;
+      }
+      if (/\bvar\b/.test(line)) {
+        lines[i] = line.replace(/\bvar\b/g, 'let');
+      }
+    }
+    lines.splice(errorHtmlStart, errorHtmlEnd);
+
+    lines[0] = `export default ${lines[0].replace(
+      '(it)',
+      `(it: ${interfaceName}): string`
+    )}`;
+
+    lines.unshift(
+      "import encodeHTML from 'escape-html';",
+      '',
+      ...def.split('\n')
+    );
+
+    await Promise.all([writeFile(tsPath, lines.join('\n')), remove(fnPath)]);
+    console.log(
+      `${file} -> ${file.replace(/\.js$/, '.ts')} (${Date.now() - start}ms)`
+    );
+  }
+}
+
+process.on('unhandledRejection', err => {
+  console.error('Unhandled Rejection:');
+  console.error(err);
+  process.exit(1);
+});
+
+process.on('uncaughtException', err => {
+  console.error('Uncaught Exception:');
+  console.error(err);
+  process.exit(1);
+});
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

packages/cli/scripts/compile-templates.mjs

@@ -1,43 +0,0 @@
-import execa from 'execa';
-import { fileURLToPath } from 'node:url';
-import { readFile, writeFile, readdir, unlink } from 'node:fs/promises';
-
-export async function compileDevTemplates() {
-  const dirRoot = new URL('../', import.meta.url);
-
-  // Compile the `doT.js` template files for `vercel dev`
-  const templatesDir = new URL('src/util/dev/templates/', dirRoot);
-  const dotPacker = fileURLToPath(
-    new URL('../../node_modules/dot/bin/dot-packer', dirRoot)
-  );
-  await execa(process.execPath, [dotPacker], {
-    cwd: templatesDir,
-    stdio: ['ignore', 'ignore', 'inherit'],
-  });
-
-  const files = await readdir(templatesDir);
-  const compiledFiles = files.filter(f => f.endsWith('.js'));
-
-  for (const file of compiledFiles) {
-    const fnPath = new URL(file, templatesDir);
-    const tsPath = fnPath.href.replace(/\.js$/, '.ts');
-    const def = await readFile(
-      new URL(fnPath.href.replace(/\.js$/, '.tsdef')),
-      'utf8'
-    );
-    const interfaceName = def.match(/interface (\w+)/)[1];
-
-    const { default: fn } = await import(fnPath);
-
-    const contents = `import encodeHTML from 'escape-html';
-
-${def}
-export default ${fn
-      .toString()
-      .replace(/var encodeHTML.+\(\)\);/s, '')
-      .replace(/\bvar\b/g, 'let')
-      .replace(/\(it\s*\)/s, `(it: ${interfaceName}): string`)}`;
-
-    await Promise.all([writeFile(new URL(tsPath), contents), unlink(fnPath)]);
-  }
-}

packages/cli/src/args.ts

@@ -27,7 +27,7 @@ export const help = () => `
       pull                 [path]      Pull your Project Settings from the cloud
       redeploy             [url|id]    Rebuild and deploy a previous deployment.
       rollback             [url|id]    Quickly revert back to a previous deployment
-      switch               [scope]     Switches between different scopes
+      switch               [scope]     Switches between teams and your personal account
 
     ${chalk.dim('Advanced')}