Publish Canary

- @vercel/build-utils@2.10.1-canary.0
 - @vercel/cgi@1.0.7-canary.1
 - vercel@21.3.3-canary.2
 - @vercel/client@9.0.8-canary.0
 - @vercel/frameworks@0.3.1-canary.0
 - @vercel/go@1.2.2-canary.0
 - @vercel/node-bridge@1.3.3-canary.0
 - @vercel/node@1.9.1-canary.3
 - @vercel/python@2.0.1-canary.0
 - @vercel/routing-utils@1.10.1-canary.0
 - @vercel/ruby@1.2.6-canary.1

.eslintignore

@@ -5,36 +5,36 @@ examples
 # gatsby-plugin-now
 packages/gatsby-plugin-now/test/fixtures
 
-# now-build-utils
+# build-utils
-packages/now-build-utils/test/fixtures
+packages/build-utils/test/fixtures
 
-# now-cli
+# cli
-packages/now-cli/@types
+packages/cli/@types
-packages/now-cli/download
+packages/cli/download
-packages/now-cli/dist
+packages/cli/dist
-packages/now-cli/test/fixtures
+packages/cli/test/fixtures
-packages/now-cli/test/dev/fixtures
+packages/cli/test/dev/fixtures
-packages/now-cli/bin
+packages/cli/bin
-packages/now-cli/link
+packages/cli/link
-packages/now-cli/src/util/dev/templates/*.ts
+packages/cli/src/util/dev/templates/*.ts
 
-# now-client
+# client
-packages/now-client/tests/fixtures
+packages/client/tests/fixtures
-packages/now-client/lib
+packages/client/lib
 
-# now-next
+# next
-packages/now-next/test/fixtures
+packages/next/test/fixtures
 
-# now-node
+# node
-packages/now-node/src/bridge.ts
+packages/node/src/bridge.ts
-packages/now-node/test/fixtures
+packages/node/test/fixtures
 
-# now-node-bridge
+# node-bridge
-packages/now-node-bridge/bridge.*
+packages/node-bridge/bridge.*
 
-# now-static-build
+# static-build
-packages/now-static-build/test/fixtures
+packages/static-build/test/fixtures
-packages/now-static-build/test/build-fixtures
+packages/static-build/test/build-fixtures
 
 # redwood
 packages/redwood/test/fixtures

.github/CODEOWNERS

@@ -4,21 +4,21 @@
 *                                        @TooTallNate
 /.github/workflows                       @AndyBitz @styfle
 /packages/frameworks                     @AndyBitz
-/packages/now-cli/src/commands/dev       @TooTallNate @styfle @AndyBitz
+/packages/cli/src/commands/dev       @TooTallNate @styfle @AndyBitz
-/packages/now-cli/src/util/dev           @TooTallNate @styfle @AndyBitz
+/packages/cli/src/util/dev           @TooTallNate @styfle @AndyBitz
-/packages/now-cli/src/commands/domains   @javivelasco @mglagola @anatrajkovska
+/packages/cli/src/commands/domains   @javivelasco @mglagola @anatrajkovska
-/packages/now-cli/src/commands/certs     @javivelasco @mglagola @anatrajkovska
+/packages/cli/src/commands/certs     @javivelasco @mglagola @anatrajkovska
-/packages/now-cli/src/commands/env       @styfle @lucleray
+/packages/cli/src/commands/env       @styfle @lucleray
-/packages/now-client                     @rdev @styfle @TooTallNate
+/packages/client                     @rdev @styfle @TooTallNate
-/packages/now-build-utils                @styfle @AndyBitz @TooTallNate
+/packages/build-utils                @styfle @AndyBitz @TooTallNate
-/packages/now-node                       @styfle @TooTallNate @lucleray
+/packages/node                       @styfle @TooTallNate @lucleray
-/packages/now-node-bridge                @styfle @TooTallNate @lucleray
+/packages/node-bridge                @styfle @TooTallNate @lucleray
-/packages/now-next                       @Timer @ijjk
+/packages/next                       @Timer @ijjk
-/packages/now-go                         @styfle @TooTallNate
+/packages/go                         @styfle @TooTallNate
-/packages/now-python                     @styfle @TooTallNate
+/packages/python                     @styfle @TooTallNate
-/packages/now-ruby                       @styfle @coetry @TooTallNate
+/packages/ruby                       @styfle @coetry @TooTallNate
-/packages/now-static-build               @styfle @AndyBitz
+/packages/static-build               @styfle @AndyBitz
-/packages/now-routing-utils              @styfle @dav-is @ijjk
+/packages/routing-utils              @styfle @dav-is @ijjk
 /examples                                @mcsdevv @timothyis
 /examples/create-react-app               @Timer
 /examples/nextjs                         @timneutkens @Timer

.github/CONTRIBUTING.md

@@ -88,7 +88,7 @@ When you run this script, you'll see all imported files. If anything file is mis
 
 Sometimes you want to test changes to a Builder against an existing project, maybe with `vercel dev` or an actual deployment. You can avoid publishing every Builder change to npm by uploading the Builder as a tarball.
 
-1. Change directory to the desired Builder `cd ./packages/now-node`
+1. Change directory to the desired Builder `cd ./packages/node`
 2. Run `yarn build` to compile typescript and other build steps
 3. Run `npm pack` to create a tarball file
 4. Run `vercel *.tgz` to upload the tarball file and get a URL

.github/workflows/publish.yml

@@ -12,10 +12,13 @@ jobs:
     name: Publish
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/setup-go@v2
-    - uses: actions/setup-node@v1
+      with:
+        go-version: '1.13.15'
+    - uses: actions/setup-node@v2
       with:
         node-version: 12
+    - uses: actions/checkout@v1
     - name: Install
       run: yarn install --check-files --frozen-lockfile --network-timeout 1000000
     - name: Build

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

@@ -19,6 +19,12 @@ jobs:
         node: [12]
     runs-on: ${{ matrix.os }}
     steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.13.15'
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
       - uses: actions/checkout@v2
         with:
           fetch-depth: 100
@@ -28,9 +34,6 @@ jobs:
       - run: git diff origin/master...HEAD --name-only
       - run: yarn install --network-timeout 1000000
       - run: yarn run build
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
       - run: yarn test-integration-cli --clean false
         env:
           VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}

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

@@ -19,6 +19,12 @@ jobs:
         node: [12]
     runs-on: ${{ matrix.os }}
     steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.13.15'
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
       - uses: actions/checkout@v2
         with:
           fetch-depth: 100
@@ -28,12 +34,9 @@ jobs:
       - run: git diff origin/master...HEAD --name-only
       - name: Install Hugo
         if: matrix.os == 'macos-latest'
-        run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
+        run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/cli/test/dev/fixtures/08-hugo/
       - run: yarn install --network-timeout 1000000
       - run: yarn run build
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
       - run: yarn test-integration-dev --clean false
         env:
           VERCEL_TEAM_TOKEN: ${{ secrets.VERCEL_TEAM_TOKEN }}

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

@@ -14,6 +14,12 @@ jobs:
     timeout-minutes: 120
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.13.15'
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12
       - uses: actions/checkout@v2
         with:
           fetch-depth: 100

.github/workflows/test-unit.yml

@@ -19,6 +19,12 @@ jobs:
         node: [12]
     runs-on: ${{ matrix.os }}
     steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.13.15'
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
       - uses: actions/checkout@v2
         with:
           fetch-depth: 100
@@ -26,9 +32,6 @@ jobs:
       - run: git fetch origin master --depth=100
       - run: git fetch origin ${{ github.ref }} --depth=100
       - run: git diff origin/master...HEAD --name-only
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
       - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - run: yarn run lint

.gitignore

@@ -9,17 +9,17 @@ coverage.lcov
 *.swp
 *.bak
 *.tgz
-packages/now-cli/src/util/dev/templates/*.ts
+packages/cli/src/util/dev/templates/*.ts
-packages/now-cli/src/util/constants.ts
+packages/cli/src/util/constants.ts
-packages/now-cli/test/**/yarn.lock
+packages/cli/test/**/yarn.lock
-!packages/now-cli/test/dev/**/yarn.lock
+!packages/cli/test/dev/**/yarn.lock
-packages/now-cli/test/**/node_modules
+packages/cli/test/**/node_modules
-packages/now-cli/test/dev/fixtures/08-hugo/hugo
+packages/cli/test/dev/fixtures/08-hugo/hugo
-packages/now-cli/test/dev/fixtures/**/dist
+packages/cli/test/dev/fixtures/**/dist
-packages/now-cli/test/dev/fixtures/**/public
+packages/cli/test/dev/fixtures/**/public
-packages/now-cli/test/dev/fixtures/**/.now
+packages/cli/test/dev/fixtures/**/.now
-packages/now-cli/test/dev/fixtures/**/.vercel
+packages/cli/test/dev/fixtures/**/.vercel
-packages/now-cli/test/fixtures/integration
+packages/cli/test/fixtures/integration
 test/lib/deployment/failed-page.txt
 .DS_Store
 .next

README.md

@@ -24,7 +24,7 @@ For details on how to use Vercel, check out our [documentation](https://vercel.c
 1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device
 2. Install dependencies with `yarn install`
 3. Compile the code: `yarn build`
-4. Link the package to the global module directory: `cd ./packages/now-cli && yarn link`
+4. Link the package to the global module directory: `cd ./packages/cli && yarn link`
 5. You can start using `vercel` anywhere inside the command line
 
 As always, you should use `yarn test-unit` to run the tests and see if your changes have broken anything.

api/_lib/util/with-api-handler.ts

@@ -1,10 +1,10 @@
-import { NowRequest, NowResponse } from '@vercel/node';
+import { VercelRequest, VercelResponse } from '@vercel/node';
 import { errorHandler } from './error-handler';
 
-type Handler = (req: NowRequest, res: NowResponse) => Promise<any>;
+type Handler = (req: VercelRequest, res: VercelResponse) => Promise<any>;
 
 export function withApiHandler(handler: Handler): Handler {
-  return async (req: NowRequest, res: NowResponse) => {
+  return async (req: VercelRequest, res: VercelResponse) => {
     res.setHeader('Access-Control-Allow-Origin', '*');
     res.setHeader('Access-Control-Allow-Methods', 'GET');
     res.setHeader(

api/examples/download/[segment].ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 // @ts-ignore
 import tar from 'tar-fs';
 import { extract } from '../../_lib/examples/extract';
-import { NowRequest, NowResponse } from '@vercel/node';
+import { VercelRequest, VercelResponse } from '@vercel/node';
 import { withApiHandler } from '../../_lib/util/with-api-handler';
 
 const TMP_DIR = '/tmp';
@@ -11,7 +11,7 @@ function isDirectory(path: string) {
   return fs.existsSync(path) && fs.lstatSync(path).isDirectory();
 }
 
-function notFound(res: NowResponse, message: string) {
+function notFound(res: VercelResponse, message: string) {
   return res.status(404).send({
     error: {
       code: 'not_found',
@@ -36,8 +36,8 @@ function streamToBuffer(stream: any) {
 }
 
 export default withApiHandler(async function (
-  req: NowRequest,
+  req: VercelRequest,
-  res: NowResponse
+  res: VercelResponse
 ) {
   const ext = '.tar.gz';
   const { segment = '' } = req.query;

api/examples/info.ts

@@ -3,14 +3,14 @@
 
 // @ts-ignore
 import parseGitUrl from 'parse-github-url';
-import { NowRequest, NowResponse } from '@vercel/node';
+import { VercelRequest, VercelResponse } from '@vercel/node';
 import { withApiHandler } from '../_lib/util/with-api-handler';
 import { getGitHubRepoInfo } from '../_lib/examples/github-repo-info';
 import { getGitLabRepoInfo } from '../_lib/examples/gitlab-repo-info';
 
 export default withApiHandler(async function (
-  req: NowRequest,
+  req: VercelRequest,
-  res: NowResponse
+  res: VercelResponse
 ) {
   const repoPath = decodeURIComponent((req.query.repo as string) || '');
 

api/examples/list-all.ts

@@ -1,10 +1,10 @@
-import { NowRequest, NowResponse } from '@vercel/node';
+import { VercelRequest, VercelResponse } from '@vercel/node';
 import { getExampleList } from '../_lib/examples/example-list';
 import { withApiHandler } from '../_lib/util/with-api-handler';
 
 export default withApiHandler(async function (
-  req: NowRequest,
+  req: VercelRequest,
-  res: NowResponse
+  res: VercelResponse
 ) {
   res.status(200).json(await getExampleList());
 });

api/examples/list.ts

@@ -1,12 +1,12 @@
 import { extract } from '../_lib/examples/extract';
 import { summary } from '../_lib/examples/summary';
-import { NowRequest, NowResponse } from '@vercel/node';
+import { VercelRequest, VercelResponse } from '@vercel/node';
 import { mapOldToNew } from '../_lib/examples/map-old-to-new';
 import { withApiHandler } from '../_lib/util/with-api-handler';
 
 export default withApiHandler(async function (
-  req: NowRequest,
+  req: VercelRequest,
-  res: NowResponse
+  res: VercelResponse
 ) {
   await extract('https://github.com/vercel/vercel/archive/master.zip', '/tmp');
   const exampleList = summary('/tmp/vercel-master/examples');

api/frameworks.ts

@@ -1,4 +1,4 @@
-import { NowRequest, NowResponse } from '@vercel/node';
+import { VercelRequest, VercelResponse } from '@vercel/node';
 import { withApiHandler } from './_lib/util/with-api-handler';
 import _frameworks, { Framework } from '../packages/frameworks';
 
@@ -27,8 +27,8 @@ const frameworks = (_frameworks as Framework[])
   });
 
 export default withApiHandler(async function (
-  req: NowRequest,
+  req: VercelRequest,
-  res: NowResponse
+  res: VercelResponse
 ) {
   res.setHeader('Access-Control-Allow-Origin', '*');
   res.setHeader('Access-Control-Allow-Methods', 'GET');

api/package.json

@@ -18,7 +18,7 @@
   "devDependencies": {
     "@types/node": "13.1.4",
     "@types/node-fetch": "2.5.4",
-    "@vercel/node": "1.7.2",
+    "@vercel/node": "1.9.0",
     "typescript": "3.9.6"
   }
 }

api/yarn.lock

@@ -134,10 +134,10 @@
   dependencies:
     "@types/node" "*"
 
-"@vercel/node@1.7.2":
+"@vercel/node@1.9.0":
-  version "1.7.2"
+  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@vercel/node/-/node-1.7.2.tgz#85cb8aac661c02dfef6fe752740f5b162e90767b"
+  resolved "https://registry.yarnpkg.com/@vercel/node/-/node-1.9.0.tgz#6b64f3b9a962ddb1089276fad00f441a1f4b9cf0"
-  integrity sha512-XV5lrLC+K/cxsaFj8H2OoGu1zliOqnxcrOnPInI8HmQjR/Tztt+0nzgpt+7sx8wXcrib0Nu7lK303jP7VjSETw==
+  integrity sha512-Vk/ZpuY4Cdc8oUwBi/kf8qETRaJb/KYdFddVkLuS10QwA0yJx+RQ11trhZ1KFUdc27aBr5S2k8/dDxK8sLr+IA==
   dependencies:
     "@types/node" "*"
     ts-node "8.9.1"

examples/gatsby/api/date.ts

@@ -1,6 +1,6 @@
-import { NowRequest, NowResponse } from '@vercel/node';
+import { VercelRequest, VercelResponse } from '@vercel/node';
 
-export default (_req: NowRequest, res: NowResponse) => {
+export default (_req: VercelRequest, res: VercelResponse) => {
   const date = new Date().toString();
   res.status(200).send(date);
 };

examples/gatsby/package.json

@@ -12,7 +12,7 @@
     "react-helmet": "^5.2.0"
   },
   "devDependencies": {
-    "@vercel/node": "1.8.5"
+    "@vercel/node": "1.9.0"
   },
   "scripts": {
     "dev": "gatsby develop",

examples/gatsby/yarn.lock

@@ -1400,10 +1400,10 @@
   dependencies:
     wonka "^4.0.14"
 
-"@vercel/node@1.8.5":
+"@vercel/node@1.9.0":
-  version "1.8.5"
+  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@vercel/node/-/node-1.8.5.tgz#2c8b9532f1bb25734a9964c52973386ed78022d4"
+  resolved "https://registry.yarnpkg.com/@vercel/node/-/node-1.9.0.tgz#6b64f3b9a962ddb1089276fad00f441a1f4b9cf0"
-  integrity sha512-1iw7FSR8Oau6vZB1MWfBnA5q2a/IqRHiSZSbt8lz0dyTF599q8pc5GcSv/TvmrYaEGzh3+N0S4cbmuMCqVlwJg==
+  integrity sha512-Vk/ZpuY4Cdc8oUwBi/kf8qETRaJb/KYdFddVkLuS10QwA0yJx+RQ11trhZ1KFUdc27aBr5S2k8/dDxK8sLr+IA==
   dependencies:
     "@types/node" "*"
     ts-node "8.9.1"

package.json

@@ -114,7 +114,7 @@
       },
       {
         "files": [
-          "packages/now-cli/**/*"
+          "packages/cli/**/*"
         ],
         "rules": {
           "lines-between-class-members": 0,
@@ -134,7 +134,7 @@
       },
       {
         "files": [
-          "packages/now-client/**/*"
+          "packages/client/**/*"
         ],
         "rules": {
           "prefer-const": 0,

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.10.0",
+  "version": "2.10.1-canary.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -29,7 +29,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.3.0",
+    "@vercel/frameworks": "0.3.1-canary.0",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",