Revert "break intentionally"

This reverts commit 7c9db4da39.

.eslintignore

@@ -34,7 +34,6 @@ packages/now-node-bridge/bridge.*
 
 # now-static-build
 packages/now-static-build/test/fixtures
-packages/now-static-build/test/build-fixtures
 
 # redwood
 packages/redwood/test/fixtures

.github/CONTRIBUTING.md

@@ -68,13 +68,13 @@ In such cases you can visit the URL of the failed deployment and append `/_logs`
 
 The logs of this deployment will contain the actual error which may help you to understand what went wrong.
 
-### @vercel/nft
+### @zeit/node-file-trace
 
-Some of the Builders use `@vercel/nft` to tree-shake files before deployment. If you suspect an error with this tree-shaking mechanism, you can create the following script in your project:
+Some of the Builders use `@zeit/node-file-trace` to tree-shake files before deployment. If you suspect an error with this tree-shaking mechanism, you can create the following script in your project:
 
 ```js
-const { nodeFileTrace } = require('@vercel/nft');
-nodeFileTrace(['path/to/entrypoint.js'], {
+const trace = require('@zeit/node-file-trace');
+trace(['path/to/entrypoint.js'], {
   ts: true,
   mixedModules: true,
 })
@@ -82,7 +82,7 @@ nodeFileTrace(['path/to/entrypoint.js'], {
   .then(e => console.error(e));
 ```
 
-When you run this script, you'll see all imported files. If anything file is missing, the bug is in [@vercel/nft](https://github.com/vercel/nft) and not the Builder.
+When you run this script, you'll see all imported files. If anything file is missing, the bug is in [@zeit/node-file-trace](https://github.com/vercel/node-file-trace) and not the Builder.
 
 ## Deploy a Builder with existing project
 
@@ -94,3 +94,12 @@ Sometimes you want to test changes to a Builder against an existing project, may
 4. Run `vercel *.tgz` to upload the tarball file and get a URL
 5. Edit any existing `vercel.json` project and replace `use` with the URL
 6. Run `vercel` or `vercel dev` to deploy with the experimental Builder
+
+## Add a New Framework
+
+You can add support for a new Framework by creating a Pull Request for this repository and following the steps below:
+
+1. Add the Framework to the `@vercel/frameworks` package: The file is located in `./packages/frameworks/frameworks.json`. You can copy the structure of an existing one and adjust the required fields. Note that the `settings` property either contains a `value` or a `placeholder`. The `value` property is used when something is not configurable, the `placeholder` is used when something is configurable and can be changed with configuration. An example would be the Output Directory for Hugo, it's `public` by default but can be changed through its config file, so we use `placeholder` with an explanation of what can be used.
+2. Add an example to the `./examples` directory: The name of the directory should equal the slug of the framework used in `@vercel/frameworks`. The `.github/EXAMPLE_README_TEMPLATE.md` file can be used to create a `README.md` file for the example.
+3. Update the `@vercel/static-build` package: The file `./packages/now-static-build/src/frameworks.ts` has to be extended. You can add default routes that will always be applied to projects that use this Framework or specify some paths that will be cached to speed up the build process.
+4. After your Pull Request has been merged and released, other users can select the example on the Vercel dashboard and deploy it.

.github/pull_request_template.md

@@ -1,20 +0,0 @@
-### Related Issues
-
-> Fixes #1
-> Related to #2
-
-### 📋 Checklist
-
-<!--
-  Please keep your PR as a Draft until the checklist is complete
--->
-
-#### Tests
-
-- [ ] The code changed/added as part of this PR has been covered with tests
-- [ ] All tests pass locally with `yarn test-unit`
-
-#### Code Review
-
-- [ ] This PR has a concise title and thorough description useful to a reviewer
-- [ ] Issue from task tracker has a link to this PR

.github/workflows/cancel.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 2
     steps:
-      - uses: styfle/cancel-workflow-action@0.4.1
+      - uses: styfle/cancel-workflow-action@0.3.2
         with:
           workflow_id: 849295, 849296, 849297, 849298
           access_token: ${{ github.token }}

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
       with:
-        node-version: 12
+        node-version: 10
     - name: Install
       run: yarn install --check-files --frozen-lockfile
     - name: Build

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

@@ -20,12 +20,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: 100
-      - run: git --version
-      - run: git fetch origin master --depth=100
-      - run: git fetch origin ${{ github.ref }} --depth=100
-      - run: git diff origin/master...HEAD --name-only
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
       - run: yarn install
       - run: yarn run build
       - uses: actions/setup-node@v1

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

@@ -20,12 +20,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: 100
-      - run: git --version
-      - run: git fetch origin master --depth=100
-      - run: git fetch origin ${{ github.ref }} --depth=100
-      - run: git diff origin/master...HEAD --name-only
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
       - 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/

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

@@ -15,12 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: 100
-      - run: git --version
-      - run: git fetch origin master --depth=100
-      - run: git fetch origin ${{ github.ref }} --depth=100
-      - run: git diff origin/master...HEAD --name-only
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
       - run: yarn install
       - run: yarn run build
       - run: yarn test-integration-once --clean false

.github/workflows/test-unit.yml

@@ -20,15 +20,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: 100
-      - run: git --version
-      - run: git fetch origin master --depth=100
-      - run: git fetch origin ${{ github.ref }} --depth=100
-      - run: git diff origin/master...HEAD --name-only
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
       - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
       - run: yarn install
       - run: yarn run build
       - run: yarn run lint

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+package-lock.json
 dist
 .vscode
 npm-debug.log

.kodiak.toml

@@ -1,7 +1,7 @@
 version = 1
 
 [merge]
-automerge_label = ["semver-major","semver-minor","semver-patch"]
+automerge_label = "automerge"
 blacklist_title_regex = "^WIP.*"
 blacklist_labels = ["work in progress"]
 method = "squash"

errors/deploy-invalid-dc.md

@@ -2,8 +2,8 @@
 
 #### Why This Error Occurred
 
-When supplying `regions` configuration, you
-used an unknown or invalid DC identifier.
+When supplying `regions` or `scale` settings, you
+used an unknown or invalid dc identifier.
 
 #### Possible Ways to Fix It
 
@@ -19,7 +19,7 @@ and DCs have to be in _lowercase_.
 - `gru`
 - `iad`
 
-In Vercel CLI, they currently are transformed to
+In `now-cli`, they currently are transformed to
 DC identifiers before being sent to our APIs.
 
 **Valid DC identifiers**:

errors/missing-dotenv-target.md

@@ -0,0 +1,9 @@
+# Missing `--dotenv` Target
+
+#### Why This Error Occurred
+
+You specified a path as the value for the `--dotenv` flag, but the target of the path doesn't exist.
+
+#### Possible Ways to Fix It
+
+Make sure the target file you've specified exists and is readable by Vercel CLI. In addition, please ensure that the filename starts with a dot (example: `.env`) - then it should work.

errors/no-credentials-found.md

@@ -6,5 +6,5 @@ You're running Vercel CLI in a non-terminal context and there are no credentials
 
 #### Possible Ways to Fix It
 
-- Specify a value for the `--token` flag (this needs to be the token of the user account as which you'd like to act). You can create a new token on your [Settings page](https://vercel.com/account/tokens).
-- Run `vercel login` to sign in and generate a new token
+- Specify a value for the `--token` flag (this needs to be the token of the user account as which you'd like to act). You can either get the token from the `./vercel/auth.json` file located in your user directory or [from the dashboard](https://vercel.com/account/tokens).
+- Ensure that both `~/vercel/auth.json` and `~/vercel/config.json` exist

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

@@ -2,7 +2,7 @@
 
 #### Why This Error Occurred
 
-This error occurs when your application is not configured for Serverless Next.js build output.
+This error occurs when you have your application is not configured for Serverless Next.js build output.
 
 #### Possible Ways to Fix It
 

errors/regions-and-scale-at-once.md

@@ -0,0 +1,32 @@
+# Can't Set `regions` and `scale` Options Simultaneously
+
+#### Why This Error Occurred
+
+Your deployment's configuration contains a `regions` and `scale`
+configuration simultaneously.
+
+#### Possible Ways to Fix It
+
+The `regions` setting is intended to be used to scale the
+deployment to the supplied regions or datacenters identifiers
+with default scale settings.
+
+```json
+{
+  "regions": ["sfo", "bru", "gru", "iad"]
+}
+```
+
+The `scale` object allows you to be more granular: you can decide a
+`min` and `max` number of instances per region:
+
+```json
+{
+  "scale": {
+    "sfo": { "min": 0, "max": 10 }
+  }
+}
+```
+
+To solve this problem, use only one of the two ways of deciding
+where to scale your deployment to.

errors/scale-invalid-dc.md

@@ -0,0 +1,36 @@
+# Invalid Region or DC Identifier
+
+#### Why This Error Occurred
+
+When supplying a region or DC identifier in `vercel scale`,
+we weren't able to recognize the value as valid.
+
+#### Possible Ways to Fix It
+
+Check your `vercel scale` command make sure you are using a
+valid string after the URL. Regions
+and DCs have to be in _lowercase_.
+
+**Valid region identifiers**:
+
+- `all` (special, used to scale to all DCs, can only appear once)
+- `sfo`
+- `bru`
+- `gru`
+- `iad`
+
+In Vercel CLI, they currently are transformed to
+DC identifiers before being sent to our APIs.
+
+**Valid DC identifiers**:
+
+- `sfo1`
+- `bru1`
+- `gru1`
+- `iad1`
+
+To pass multiple ones, use a comma:
+
+```
+vercel scale my-url-123.now.sh sfo,bru,gru 1 5
+```

errors/scale-ls.md

@@ -0,0 +1,30 @@
+# `vercel scale ls` is deprecated
+
+#### Why This Error Occurred
+
+We have stopped supporting this command, in favor of
+better alternatives.
+
+`vercel scale ls` used to list all the scaling rules
+for all your deployments. The output would be too long,
+and it would often be hard to find the information
+you needed in a long list of items.
+
+#### Possible Ways to Fix It
+
+Instead of using `vercel scale ls` to list all your deployments
+and their scaling rules, first use `vercel ls` to find
+your deployment:
+
+```console
+vercel ls
+```
+
+Then, select the URL of your deployment, which uniquely identifies it, and run:
+
+```console
+vercel inspect my-deployment-12345.now.sh
+```
+
+The `inspect` subcommand will give you your deployment's scale information, including what datacenters it's enabled on, the
+current number of instances and minimums/maximums.

errors/scaling-path-alias.md

@@ -0,0 +1,12 @@
+# Scaling path alias
+
+#### Why This Error Occurred
+
+You tried to use `vercel scale` on a path alias (`vercel alias -r rules.json`).
+
+#### Possible Ways to Fix It
+
+Path aliases are routes to instances. Instances can be scaled independent from each other.
+You can view path aliases by running `vercel alias ls <id>`.
+
+Documentation for Path Aliases can be found [here](https://vercel.com/docs/features/path-aliases).

errors/v2-no-min.md

@@ -0,0 +1,16 @@
+# No minimum scale settings on Cloud v2 deployments
+
+#### Why This Error Occurred
+
+An attempt was made at scaling a Cloud v2 deployment with a `min` scale
+setting. This isn't supported yet.
+
+#### Possible Ways to Fix It
+
+Ensure your scale settings (in `vercel.json`, the command you're running
+or from a previous deployment who's alias you're trying to overwrite) has
+the `min` scale setting set to `0`. You can do this by running
+
+```
+vercel scale <deployment> 0 10
+```

errors/verification-timeout.md

@@ -0,0 +1,29 @@
+# Verification Timeout
+
+#### Why This Error Occurred
+
+After the deployment build completed and the deployment state was set to `READY`,
+instances failed to initialize properly.
+
+The CLI attempted to verify that the scale settings of your instances matched,
+but it couldn't do so within the allotted time (defaults to 2 minutes).
+
+#### Possible Ways to Fix It
+
+Instance verification is the process of ensuring that after
+your deployment is ready, we can actually run (instantiate) your code.
+
+If you configured [regions or scale](https://vercel.com/docs/features/scaling),
+we ensure the minimums and maximums are met for the regions you enabled.
+
+If you think your code is taking too long to instantiate, this can be due
+to slow boot up times. You can supply `--no-verify` to skip verification
+if you are confident your code runs properly.
+
+If your application is not listening on a HTTP port, we might be failing to
+instantiate your deployment as well. It might not be showing any errors,
+but the deployment instance is effectively not routable and cannot be
+verified.
+
+If your instances are crashing before an HTTP port is exposed, verification
+will fail as well. Double check your logs (e.g.: by running `vercel logs <url>`)

examples/amp/README.md

@@ -17,3 +17,11 @@ To get started deploying AMP with Vercel, you can use the [Vercel CLI](https://v
 ```shell
 $ vercel init amp
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new AMP project with a single command from your terminal using Vercel CLI:
+
+```shell
+$ vercel
+```

examples/angular/README.md

@@ -19,3 +19,11 @@ To get started with Angular, you can use the [Angular CLI](https://cli.angular.i
 ```shell
 $ ng new
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Angular project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/blitzjs/README.md

@@ -1,19 +1,21 @@
 ![Blitz Logo](https://github.com/vercel/vercel/blob/master/packages/frameworks/logos/blitz.svg)
 
-# Blitz.js Example
+This is a [Blitz.js](https://blitzjs.com/) project bootstrapped with `npx blitz new`.
 
-This directory is a brief example of a [Blitz.js](https://blitzjs.com/) project that can be deployed with Vercel and zero configuration.
+## Getting Started
 
-## Deploy Your Own
+First, run the development server:
 
-Deploy your own Blitz.js project with Vercel by viewing the [documentation on deploying to Vercel](https://blitzjs.com/docs/deploy-vercel)
-
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/import/project?template=https://github.com/vercel/vercel/tree/master/examples/blitzjs)
-
-### How We Created This Example
-
-To get started with Blitz.js, you can use [npx](https://www.npmjs.com/package/npx) to initialize the project:
-
-```shell
-$ npx blitz new
+```bash
+npx blitz start
 ```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+## Learn More
+
+To learn more about Blitz.js, view [Blitzjs.com](https://blitzjs.com)
+
+## Deploy on Vercel
+
+View the [documentation on deploying to Vercel](https://blitzjs.com/docs/deploy-vercel)

examples/brunch/README.md

@@ -17,3 +17,11 @@ To get started deploying Brunch with Vercel, you can use the [Brunch CLI](https:
 ```shell
 $ brunch new project-name -s es6
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Brunch project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/create-react-app/README.md

@@ -19,3 +19,11 @@ To get started with React, along with [Serverless Functions](https://vercel.com/
 ```shell
 $ npx create-react-app my-app
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new React project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/custom-build/README.md

@@ -17,3 +17,11 @@ To get started deploying a Custom Built project with Vercel, you can use the [Ve
 ```shell
 $ vercel init custom-build
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Custom Built project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/docusaurus-2/README.md

@@ -15,3 +15,11 @@ To get started with Docusaurus on Vercel, you can use the [Docusaurus CLI](https
 ```shell
 $ npx @docusaurus/init@next init my-website classic
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Docusaurus project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/docusaurus/README.md

@@ -19,3 +19,11 @@ To get started with Docusaurus for deployment with Vercel, you can use the [Docu
 ```shell
 $ docusaurus-init
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Docusaurus project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/dojo/README.md

@@ -15,3 +15,11 @@ To get started with Dojo on Vercel, you can use the [Dojo CLI](https://github.co
 ```shell
 $ vercel init dojo
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Dojo project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/eleventy/README.md

@@ -19,3 +19,11 @@ To get started with Eleventy for deployment with Vercel, you can use [npx](https
 ```shell
 $ npx degit 11ty/eleventy-base-blog my-11ty-project
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Eleventy project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/ember/.gitignore

@@ -27,6 +27,3 @@
 # Environment Variables
 .env
 .env.build
-
-# Vercel
-.vercel

examples/ember/README.md

@@ -19,3 +19,11 @@ To get started with Ember for deployment with Vercel, you can use the [Ember CLI
 ```shell
 $ npx ember-cli new ember-project
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Ember project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/ember/public/robots.txt

@@ -1,3 +0,0 @@
-# http://www.robotstxt.org
-User-agent: *
-Disallow:

examples/gatsby/README.md

@@ -19,3 +19,11 @@ To get started with Gatsby on Vercel, you can use the [Gatsby CLI](https://www.g
 ```shell
 $ gatsby new gatsby-site
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Gatsby project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/gatsby/api/date.ts

@@ -1,4 +1,4 @@
-import { NowRequest, NowResponse } from '@vercel/node';
+import { NowRequest, NowResponse } from '@now/node';
 
 export default (_req: NowRequest, res: NowResponse) => {
   const date = new Date().toString();

examples/gatsby/package.json

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

examples/gatsby/src/pages/index.js

@@ -31,7 +31,7 @@ function Index() {
       </h2>
       <p>
         <a
-          href="https://github.com/vercel/vercel/tree/master/examples/gatsby"
+          href="https://github.com/vercel/vercel/blob/master/gatsby"
           target="_blank"
           rel="noreferrer noopener"
         >

examples/gatsby/yarn.lock

@@ -1107,6 +1107,15 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
+"@now/node@^1.3.0":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@now/node/-/node-1.7.1.tgz#764a0c6bcb24967f8014c4f73ad238c292996fe3"
+  integrity sha512-+srVKopsVTPDR3u9eOjJryZroLTrPp8XEOuIDGBdfFcJuS7qpAomctSbfyA7WNyjC0ExtUxELqBg5sAedG5+2g==
+  dependencies:
+    "@types/node" "*"
+    ts-node "8.9.1"
+    typescript "3.9.3"
+
 "@pieh/friendly-errors-webpack-plugin@1.7.0-chalk-2":
   version "1.7.0-chalk-2"
   resolved "https://registry.yarnpkg.com/@pieh/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0-chalk-2.tgz#2e9da9d3ade9d18d013333eb408c457d04eabac0"
@@ -1400,15 +1409,6 @@
   dependencies:
     wonka "^4.0.14"
 
-"@vercel/node@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@vercel/node/-/node-1.8.5.tgz#2c8b9532f1bb25734a9964c52973386ed78022d4"
-  integrity sha512-1iw7FSR8Oau6vZB1MWfBnA5q2a/IqRHiSZSbt8lz0dyTF599q8pc5GcSv/TvmrYaEGzh3+N0S4cbmuMCqVlwJg==
-  dependencies:
-    "@types/node" "*"
-    ts-node "8.9.1"
-    typescript "3.9.3"
-
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"

examples/gridsome/README.md

@@ -19,3 +19,11 @@ To get started with Gridsome for deployment with Vercel, you can use the [Gridso
 ```shell
 $ gridsome create my-website
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Gridsome project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/hexo/README.md

@@ -19,3 +19,11 @@ To get started with Hexo for deployment with Vercel, you can use the [Hexo CLI](
 ```shell
 $ hexo init project-name
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Hexo project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/hugo/README.md

@@ -17,3 +17,11 @@ To get started with Hugo for deployment with Vercel, you can use the [Hugo CLI](
 ```shell
 $ hugo new site project-name
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Hugo project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/ionic-angular/README.md

@@ -15,5 +15,13 @@ _Live Example: https://ionic-angular.now-examples.now.sh_
 To get started with Ionic Angular deployed with Vercel, you can use the [Ionic CLI](https://ionicframework.com/docs/cli) to initialize the project:
 
 ```shell
-$ npx @ionic/cli start [project-name] conference --type angular && cd [project-name]
+$ npx ionic start [project-name] conference --type angular && cd [project-name]
+```
+
+### Deploying From Your Terminal
+
+You can deploy your new Ionic Angular project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
 ```

examples/ionic-angular/package.json

@@ -31,7 +31,7 @@
     "@ionic-native/in-app-browser": "5.0.0-beta.15",
     "@ionic-native/splash-screen": "5.0.0-beta.15",
     "@ionic-native/status-bar": "5.0.0-beta.15",
-    "@ionic/angular": "^5.1.1",
+    "@ionic/angular": "^5.0.6",
     "@ionic/storage": "^2.1.3",
     "cordova-android": "^8.1.0",
     "cordova-ios": "^5.1.1",

examples/ionic-angular/src/app/pages/map/map.ts

@@ -27,7 +27,7 @@ export class MapPage implements AfterViewInit {
     }
 
     const googleMaps = await getGoogleMaps(
-      'YOUR_API_KEY_HERE'
+      'AIzaSyB8pf6ZdFQj5qw7rc_HSGrhUwQKfIe9ICw'
     );
 
     let map;

examples/ionic-react/readme.md

@@ -17,3 +17,11 @@ To get started with Ionic React deployed with Vercel, you can use the [Ionic CLI
 ```shell
 $ npx ionic start [project-name] conference --type react && cd [project-name]
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Ionic React project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/jekyll/README.md

@@ -17,3 +17,11 @@ To get started with Jekyll for deployment with Vercel, you can use the [Jekyll C
 ```shell
 $ jekyll new my-blog
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Jekyll project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/middleman/README.md

@@ -17,3 +17,11 @@ To get started with Middleman for deployment with Vercel, you can use the [Middl
 ```shell
 $ middleman init project-name
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Middleman project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/nextjs/.gitignore

@@ -11,24 +11,20 @@
 # next.js
 /.next/
 /out/
+!public/
 
 # production
 /build
 
 # misc
 .DS_Store
-*.pem
+.env*
 
 # debug
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# local env files
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-# vercel
-.vercel
+# Environment Variables
+.env
+.env.build

examples/nextjs/README.md

@@ -1,4 +1,4 @@
-This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
+This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/zeit/next.js/tree/canary/packages/create-next-app).
 
 ## Getting Started
 
@@ -21,7 +21,7 @@ To learn more about Next.js, take a look at the following resources:
 - [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
 - [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
 
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
+You can check out [the Next.js GitHub repository](https://github.com/zeit/next.js) - your feedback and contributions are welcome!
 
 ## Deploy on Vercel
 

examples/nextjs/package.json

@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "10.0.0",
-    "react": "17.0.1",
-    "react-dom": "17.0.1"
+    "next": "^9.3.3",
+    "react": "^16.13.0",
+    "react-dom": "^16.13.0"
   }
 }

examples/nextjs/pages/_app.js

@@ -1,7 +0,0 @@
-import '../styles/globals.css'
-
-function MyApp({ Component, pageProps }) {
-  return <Component {...pageProps} />
-}
-
-export default MyApp

examples/nextjs/pages/api/hello.js

@@ -1,6 +0,0 @@
-// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-
-export default (req, res) => {
-  res.statusCode = 200
-  res.json({ name: 'John Doe' })
-}

examples/nextjs/pages/index.js

@@ -1,65 +1,203 @@
 import Head from 'next/head'
-import styles from '../styles/Home.module.css'
 
-export default function Home() {
-  return (
-    <div className={styles.container}>
-      <Head>
-        <title>Create Next App</title>
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
+const Home = () => (
+  <div className="container">
+    <Head>
+      <title>Create Next App</title>
+      <link rel="icon" href="/favicon.ico" />
+    </Head>
 
-      <main className={styles.main}>
-        <h1 className={styles.title}>
-          Welcome to <a href="https://nextjs.org">Next.js!</a>
-        </h1>
+    <main>
+      <h1 className="title">
+        Welcome to <a href="https://nextjs.org">Next.js!</a>
+      </h1>
 
-        <p className={styles.description}>
-          Get started by editing{' '}
-          <code className={styles.code}>pages/index.js</code>
-        </p>
+      <p className="description">
+        Get started by editing <code>pages/index.js</code>
+      </p>
 
-        <div className={styles.grid}>
-          <a href="https://nextjs.org/docs" className={styles.card}>
-            <h3>Documentation &rarr;</h3>
-            <p>Find in-depth information about Next.js features and API.</p>
-          </a>
-
-          <a href="https://nextjs.org/learn" className={styles.card}>
-            <h3>Learn &rarr;</h3>
-            <p>Learn about Next.js in an interactive course with quizzes!</p>
-          </a>
-
-          <a
-            href="https://github.com/vercel/next.js/tree/master/examples"
-            className={styles.card}
-          >
-            <h3>Examples &rarr;</h3>
-            <p>Discover and deploy boilerplate example Next.js projects.</p>
-          </a>
-
-          <a
-            href="https://vercel.com/import?filter=next.js&utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app"
-            className={styles.card}
-          >
-            <h3>Deploy &rarr;</h3>
-            <p>
-              Instantly deploy your Next.js site to a public URL with Vercel.
-            </p>
-          </a>
-        </div>
-      </main>
-
-      <footer className={styles.footer}>
-        <a
-          href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Powered by{' '}
-          <img src="/vercel.svg" alt="Vercel Logo" className={styles.logo} />
+      <div className="grid">
+        <a href="https://nextjs.org/docs" className="card">
+          <h3>Documentation &rarr;</h3>
+          <p>Find in-depth information about Next.js features and API.</p>
         </a>
-      </footer>
-    </div>
-  )
-}
+
+        <a href="https://nextjs.org/learn" className="card">
+          <h3>Learn &rarr;</h3>
+          <p>Learn about Next.js in an interactive course with quizzes!</p>
+        </a>
+
+        <a
+          href="https://github.com/zeit/next.js/tree/master/examples"
+          className="card"
+        >
+          <h3>Examples &rarr;</h3>
+          <p>Discover and deploy boilerplate example Next.js projects.</p>
+        </a>
+
+        <a
+          href="https://vercel.com/new?filter=next.js&utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app"
+          className="card"
+        >
+          <h3>Deploy &rarr;</h3>
+          <p>
+            Instantly deploy your Next.js site to a public URL with Vercel.
+          </p>
+        </a>
+      </div>
+    </main>
+
+    <footer>
+      <a
+        href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Powered by <img src="/vercel.svg" alt="Vercel Logo" />
+      </a>
+    </footer>
+
+    <style jsx>{`
+      .container {
+        min-height: 100vh;
+        padding: 0 0.5rem;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+
+      main {
+        padding: 5rem 0;
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+
+      footer {
+        width: 100%;
+        height: 100px;
+        border-top: 1px solid #eaeaea;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      footer img {
+        margin-left: 0.5rem;
+      }
+
+      footer a {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      a {
+        color: inherit;
+        text-decoration: none;
+      }
+
+      .title a {
+        color: #0070f3;
+        text-decoration: none;
+      }
+
+      .title a:hover,
+      .title a:focus,
+      .title a:active {
+        text-decoration: underline;
+      }
+
+      .title {
+        margin: 0;
+        line-height: 1.15;
+        font-size: 4rem;
+      }
+
+      .title,
+      .description {
+        text-align: center;
+      }
+
+      .description {
+        line-height: 1.5;
+        font-size: 1.5rem;
+      }
+
+      code {
+        background: #fafafa;
+        border-radius: 5px;
+        padding: 0.75rem;
+        font-size: 1.1rem;
+        font-family: Menlo, Monaco, Lucida Console, Liberation Mono,
+          DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace;
+      }
+
+      .grid {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-wrap: wrap;
+
+        max-width: 800px;
+        margin-top: 3rem;
+      }
+
+      .card {
+        margin: 1rem;
+        flex-basis: 45%;
+        padding: 1.5rem;
+        text-align: left;
+        color: inherit;
+        text-decoration: none;
+        border: 1px solid #eaeaea;
+        border-radius: 10px;
+        transition: color 0.15s ease, border-color 0.15s ease;
+      }
+
+      .card:hover,
+      .card:focus,
+      .card:active {
+        color: #0070f3;
+        border-color: #0070f3;
+      }
+
+      .card h3 {
+        margin: 0 0 1rem 0;
+        font-size: 1.5rem;
+      }
+
+      .card p {
+        margin: 0;
+        font-size: 1.25rem;
+        line-height: 1.5;
+      }
+
+      @media (max-width: 600px) {
+        .grid {
+          width: 100%;
+          flex-direction: column;
+        }
+      }
+    `}</style>
+
+    <style jsx global>{`
+      html,
+      body {
+        padding: 0;
+        margin: 0;
+        font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
+          Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+      }
+
+      * {
+        box-sizing: border-box;
+      }
+    `}</style>
+  </div>
+)
+
+export default Home

examples/nextjs/public/vercel.svg

@@ -1,4 +1,3 @@
-<svg width="283" height="64" viewBox="0 0 283 64" fill="none" 
-    xmlns="http://www.w3.org/2000/svg">
-    <path d="M141.04 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.46 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM248.72 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.45 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM200.24 34c0 6 3.92 10 10 10 4.12 0 7.21-1.87 8.8-4.92l7.68 4.43c-3.18 5.3-9.14 8.49-16.48 8.49-11.05 0-19-7.2-19-18s7.96-18 19-18c7.34 0 13.29 3.19 16.48 8.49l-7.68 4.43c-1.59-3.05-4.68-4.92-8.8-4.92-6.07 0-10 4-10 10zm82.48-29v46h-9V5h9zM36.95 0L73.9 64H0L36.95 0zm92.38 5l-27.71 48L73.91 5H84.3l17.32 30 17.32-30h10.39zm58.91 12v9.69c-1-.29-2.06-.49-3.2-.49-5.81 0-10 4-10 10V51h-9V17h9v9.2c0-5.08 5.91-9.2 13.2-9.2z" fill="#000"/>
-</svg>
+<svg width="70" height="16" viewBox="0 0 70 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M9.255.05l9.108 15.753H.148L9.255.05zM39.434 8.418c0-2.535-1.87-4.307-4.554-4.307-2.683 0-4.554 1.772-4.554 4.307 0 2.487 2.019 4.308 4.8 4.308 1.526 0 2.905-.566 3.79-1.6l-1.673-.96c-.517.517-1.28.837-2.117.837-1.23 0-2.29-.665-2.658-1.674l-.074-.172h6.966a3.76 3.76 0 00.074-.739zm-7.065-.738l.05-.148c.32-1.058 1.255-1.698 2.436-1.698 1.207 0 2.117.64 2.437 1.698l.05.148h-4.973zM65.945 8.418c0-2.535-1.871-4.307-4.554-4.307-2.683 0-4.554 1.772-4.554 4.307 0 2.487 2.018 4.308 4.8 4.308 1.526 0 2.904-.566 3.79-1.6l-1.673-.96c-.517.517-1.28.837-2.117.837-1.23 0-2.29-.665-2.659-1.674l-.073-.172h6.966a3.76 3.76 0 00.074-.739zM58.88 7.68l.05-.148c.32-1.058 1.255-1.698 2.436-1.698 1.206 0 2.117.64 2.437 1.698l.05.148H58.88zM54.13 7.015l1.673-.96c-.788-1.23-2.19-1.92-3.89-1.92-2.682 0-4.553 1.773-4.553 4.308 0 2.536 1.87 4.308 4.554 4.308 1.698 0 3.101-.69 3.89-1.92l-1.675-.96c-.443.738-1.23 1.157-2.215 1.157-1.55 0-2.585-1.034-2.585-2.585 0-1.55 1.034-2.585 2.585-2.585.96 0 1.772.419 2.215 1.157zM69.637 1.428h-1.97v11.077h1.97V1.428zM31.779 1.428h-2.265L25.182 8.91l-4.333-7.483H18.56l6.622 11.421 6.597-11.421zM45.71 6.4c.222 0 .444.025.665.074V4.382c-1.673.049-3.249.984-3.249 2.141V4.382h-1.97v8.123h1.97v-3.52c0-1.527 1.059-2.585 2.585-2.585z" fill="#000"/>
+</svg>

examples/nextjs/styles/Home.module.css

@@ -1,123 +0,0 @@
-.container {
-  min-height: 100vh;
-  padding: 0 0.5rem;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.main {
-  padding: 5rem 0;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.footer {
-  width: 100%;
-  height: 100px;
-  border-top: 1px solid #eaeaea;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.footer img {
-  margin-left: 0.5rem;
-}
-
-.footer a {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.title a {
-  color: #0070f3;
-  text-decoration: none;
-}
-
-.title a:hover,
-.title a:focus,
-.title a:active {
-  text-decoration: underline;
-}
-
-.title {
-  margin: 0;
-  line-height: 1.15;
-  font-size: 4rem;
-}
-
-.title,
-.description {
-  text-align: center;
-}
-
-.description {
-  line-height: 1.5;
-  font-size: 1.5rem;
-}
-
-.code {
-  background: #fafafa;
-  border-radius: 5px;
-  padding: 0.75rem;
-  font-size: 1.1rem;
-  font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
-    Bitstream Vera Sans Mono, Courier New, monospace;
-}
-
-.grid {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-wrap: wrap;
-
-  max-width: 800px;
-  margin-top: 3rem;
-}
-
-.card {
-  margin: 1rem;
-  flex-basis: 45%;
-  padding: 1.5rem;
-  text-align: left;
-  color: inherit;
-  text-decoration: none;
-  border: 1px solid #eaeaea;
-  border-radius: 10px;
-  transition: color 0.15s ease, border-color 0.15s ease;
-}
-
-.card:hover,
-.card:focus,
-.card:active {
-  color: #0070f3;
-  border-color: #0070f3;
-}
-
-.card h3 {
-  margin: 0 0 1rem 0;
-  font-size: 1.5rem;
-}
-
-.card p {
-  margin: 0;
-  font-size: 1.25rem;
-  line-height: 1.5;
-}
-
-.logo {
-  height: 1em;
-}
-
-@media (max-width: 600px) {
-  .grid {
-    width: 100%;
-    flex-direction: column;
-  }
-}

examples/nextjs/styles/globals.css

@@ -1,16 +0,0 @@
-html,
-body {
-  padding: 0;
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
-    Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
-}
-
-a {
-  color: inherit;
-  text-decoration: none;
-}
-
-* {
-  box-sizing: border-box;
-}

examples/nuxtjs/README.md

@@ -19,3 +19,11 @@ $ npx create-nuxt-app my-app
 ```
 
 > The only change made is to amend the output directory in `nuxt.config.js` to `"/public"`.
+
+### Deploying From Your Terminal
+
+You can deploy your new Nuxt.js project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/polymer/README.md

@@ -19,3 +19,11 @@ To get started with Polymer deployed with Vercel, you can use the [Polymer CLI](
 ```shell
 $ polymer init
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Polymer project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/preact/README.md

@@ -19,3 +19,11 @@ To get started with Preact for deployment with Vercel, you can use the [Preact C
 ```shell
 $ preact create default my-project
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Preact project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/redwoodjs/README.md

@@ -1,4 +1,4 @@
-![RedwoodJS Logo](https://github.com/vercel/vercel/blob/master/packages/frameworks/logos/redwoodjs.svg)
+![RedwoodJS Logo](https://github.com/vercel/vercel/blob/master/packages/frameworks/logos/redwood.svg)
 
 # RedwoodJS Example
 
@@ -19,3 +19,11 @@ To get started with RedwoodJS on Vercel, you can [use Yarn to initialize](https:
 ```shell
 $ yarn create redwood-app ./my-redwood-app
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new RedwoodJS project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/redwoodjs/api/package.json

@@ -3,6 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "0.15.0"
+    "@redwoodjs/api": "0.14.0"
   }
 }

examples/redwoodjs/package.json

@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "0.15.0"
+    "@redwoodjs/core": "0.14.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config"

examples/redwoodjs/web/package.json

@@ -6,8 +6,8 @@
     "defaults"
   ],
   "dependencies": {
-    "@redwoodjs/router": "0.15.0",
-    "@redwoodjs/web": "0.15.0",
+    "@redwoodjs/router": "0.14.0",
+    "@redwoodjs/web": "0.14.0",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"

examples/saber/README.md

@@ -19,3 +19,11 @@ To get started with Saber on Vercel, you can use [`npm init`](https://docs.npmjs
 ```shell
 $ npm init site my-saber-site
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Saber project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/sapper/README.md

@@ -19,3 +19,11 @@ $ npx degit "sveltejs/sapper-template#webpack" my-sapper-app
 ```
 
 > The only change made is to change the build script in `package.json` to be `"sapper export"`.
+
+### Deploying From Your Terminal
+
+You can deploy your new Sapper project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/scully/README.md

@@ -19,3 +19,11 @@ To get started deploying Scully with Vercel, you can use the [Vercel CLI](https:
 ```shell
 $ vercel init scully
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Scully project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/stencil/readme.md

@@ -17,3 +17,11 @@ To get started with Stencil deployed with Vercel, you can use the [Stencil proje
 ```shell
 $ npm init stencil
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Stencil project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/svelte/.gitignore

@@ -1,8 +1,5 @@
-/node_modules/
-/public/build/
 .DS_Store
+node_modules
+public/bundle.*
 .env
-.env.local
 .env.build
-
-.vercel

examples/svelte/.nowignore

@@ -0,0 +1,2 @@
+yarn.lock
+README.md

examples/svelte/README.md

@@ -17,3 +17,11 @@ To get started with Svelte, along with [Serverless Functions](https://vercel.com
 ```shell
 $ npx degit sveltejs/template my-svelte-project
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new Svelte project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

examples/svelte/package.json

@@ -1,21 +1,24 @@
 {
   "name": "svelte-app",
-  "private": true,
-  "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -c -w",
-    "start": "sirv public"
-  },
+  "version": "1.0.0",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-node-resolve": "^8.0.0",
-    "rollup": "^2.3.4",
-    "rollup-plugin-livereload": "^2.0.0",
-    "rollup-plugin-svelte": "^6.0.0",
-    "rollup-plugin-terser": "^7.0.0",
+    "npm-run-all": "^4.1.5",
+    "rollup": "^1.10.1",
+    "rollup-plugin-commonjs": "^9.3.4",
+    "rollup-plugin-livereload": "^1.0.0",
+    "rollup-plugin-node-resolve": "^4.2.3",
+    "rollup-plugin-svelte": "^5.0.3",
+    "rollup-plugin-terser": "^4.0.4",
     "svelte": "^3.0.0"
   },
   "dependencies": {
-    "sirv-cli": "^1.0.0"
+    "sirv-cli": "^0.4.4"
+  },
+  "scripts": {
+    "build": "rollup -c",
+    "autobuild": "rollup -c -w",
+    "dev": "run-p start:dev autobuild",
+    "start": "sirv public --single",
+    "start:dev": "sirv public --single --dev"
   }
 }

examples/svelte/public/index.html

@@ -1,18 +1,17 @@
 <!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset='utf-8'>
-	<meta name='viewport' content='width=device-width,initial-scale=1'>
+<html>
+  <head>
+    <meta charset="utf8" />
+    <meta name="viewport" content="width=device-width" />
 
-	<title>Svelte + Node.js API</title>
+    <title>Svelte + Node.js API</title>
 
-	<link rel='icon' type='image/png' href='/favicon.png'>
-	<link rel='stylesheet' href='/global.css'>
-	<link rel='stylesheet' href='/build/bundle.css'>
+    <link rel="icon" type="image/png" href="/favicon.png" />
+    <link rel="stylesheet" href="/global.css" />
+    <link rel="stylesheet" href="/bundle.css" />
+  </head>
 
-	<script defer src='/build/bundle.js'></script>
-</head>
-
-<body>
-</body>
+  <body>
+    <script src="/bundle.js"></script>
+  </body>
 </html>

examples/svelte/rollup.config.js

@@ -1,75 +1,47 @@
 import svelte from 'rollup-plugin-svelte';
-import resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
 import livereload from 'rollup-plugin-livereload';
 import { terser } from 'rollup-plugin-terser';
 
 const production = !process.env.ROLLUP_WATCH;
 
-function serve() {
-	let server;
-	
-	function toExit() {
-		if (server) server.kill(0);
-	}
-
-	return {
-		writeBundle() {
-			if (server) return;
-			server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
-				stdio: ['ignore', 'inherit', 'inherit'],
-				shell: true
-			});
-
-			process.on('SIGTERM', toExit);
-			process.on('exit', toExit);
-		}
-	};
-}
-
 export default {
-	input: 'src/main.js',
-	output: {
-		sourcemap: true,
-		format: 'iife',
-		name: 'app',
-		file: 'public/build/bundle.js'
-	},
-	plugins: [
-		svelte({
-			// enable run-time checks when not in production
-			dev: !production,
-			// we'll extract any component CSS out into
-			// a separate file - better for performance
-			css: css => {
-				css.write('bundle.css');
-			}
-		}),
+  input: 'src/main.js',
+  output: {
+    sourcemap: true,
+    format: 'iife',
+    name: 'app',
+    file: 'public/bundle.js',
+  },
+  plugins: [
+    svelte({
+      // enable run-time checks when not in production
+      dev: !production,
+      // we'll extract any component CSS out into
+      // a separate file — better for performance
+      css: css => {
+        css.write('public/bundle.css');
+      },
+    }),
 
-		// If you have external dependencies installed from
-		// npm, you'll most likely need these plugins. In
-		// some cases you'll need additional configuration -
-		// consult the documentation for details:
-		// https://github.com/rollup/plugins/tree/master/packages/commonjs
-		resolve({
-			browser: true,
-			dedupe: ['svelte']
-		}),
-		commonjs(),
+    // If you have external dependencies installed from
+    // npm, you'll most likely need these plugins. In
+    // some cases you'll need additional configuration —
+    // consult the documentation for details:
+    // https://github.com/rollup/rollup-plugin-commonjs
+    resolve({ browser: true }),
+    commonjs(),
 
-		// In dev mode, call `npm run start` once
-		// the bundle has been generated
-		!production && serve(),
+    // Watch the `public` directory and refresh the
+    // browser on changes when not in production
+    !production && livereload('public'),
 
-		// Watch the `public` directory and refresh the
-		// browser on changes when not in production
-		!production && livereload('public'),
-
-		// If we're building for production (npm run build
-		// instead of npm run dev), minify
-		production && terser()
-	],
-	watch: {
-		clearScreen: false
-	}
+    // If we're building for production (npm run build
+    // instead of npm run dev), minify
+    production && terser(),
+  ],
+  watch: {
+    clearScreen: false,
+  },
 };

examples/svelte/scripts/setupTypeScript.js

@@ -1,128 +0,0 @@
-// @ts-check
-
-/** This script modifies the project to support TS code in .svelte files like:
-
-  <script lang="ts">
-  	export let name: string;
-  </script>
- 
-  As well as validating the code for CI.
-  */
-
-/**  To work on this script:
-  rm -rf test-template template && git clone sveltejs/template test-template && node scripts/setupTypeScript.js test-template
-*/
-
-const fs = require("fs")
-const path = require("path")
-const { argv } = require("process")
-
-const projectRoot = argv[2] || path.join(__dirname, "..")
-
-// Add deps to pkg.json
-const packageJSON = JSON.parse(fs.readFileSync(path.join(projectRoot, "package.json"), "utf8"))
-packageJSON.devDependencies = Object.assign(packageJSON.devDependencies, {
-  "svelte-check": "^1.0.0",
-  "svelte-preprocess": "^4.0.0",
-  "@rollup/plugin-typescript": "^6.0.0",
-  "typescript": "^3.9.3",
-  "tslib": "^2.0.0",
-  "@tsconfig/svelte": "^1.0.0"
-})
-
-// Add script for checking
-packageJSON.scripts = Object.assign(packageJSON.scripts, {
-  "validate": "svelte-check"
-})
-
-// Write the package JSON
-fs.writeFileSync(path.join(projectRoot, "package.json"), JSON.stringify(packageJSON, null, "  "))
-
-// mv src/main.js to main.ts - note, we need to edit rollup.config.js for this too
-const beforeMainJSPath = path.join(projectRoot, "src", "main.js")
-const afterMainTSPath = path.join(projectRoot, "src", "main.ts")
-fs.renameSync(beforeMainJSPath, afterMainTSPath)
-
-// Switch the app.svelte file to use TS
-const appSveltePath = path.join(projectRoot, "src", "App.svelte")
-let appFile = fs.readFileSync(appSveltePath, "utf8")
-appFile = appFile.replace("<script>", '<script lang="ts">')
-appFile = appFile.replace("export let name;", 'export let name: string;')
-fs.writeFileSync(appSveltePath, appFile)
-
-// Edit rollup config
-const rollupConfigPath = path.join(projectRoot, "rollup.config.js")
-let rollupConfig = fs.readFileSync(rollupConfigPath, "utf8")
-
-// Edit imports
-rollupConfig = rollupConfig.replace(`'rollup-plugin-terser';`, `'rollup-plugin-terser';
-import sveltePreprocess from 'svelte-preprocess';
-import typescript from '@rollup/plugin-typescript';`)
-
-// Replace name of entry point
-rollupConfig = rollupConfig.replace(`'src/main.js'`, `'src/main.ts'`)
-
-// Add preprocess to the svelte config, this is tricky because there's no easy signifier.
-// Instead we look for `css:` then the next `}` and add the preprocessor to that
-let foundCSS = false
-let match
-
-// https://regex101.com/r/OtNjwo/1
-const configEditor = new RegExp(/css:.|\n*}/gmi)
-while (( match = configEditor.exec(rollupConfig)) != null) {
-  if (foundCSS) {
-    const endOfCSSIndex = match.index + 1
-    rollupConfig = rollupConfig.slice(0, endOfCSSIndex) + ",\n			preprocess: sveltePreprocess()," + rollupConfig.slice(endOfCSSIndex);
-    break
-  }
-  if (match[0].includes("css:")) foundCSS = true
-}
-
-
-// Add TypeScript
-rollupConfig = rollupConfig.replace(
-  'commonjs(),',
-  'commonjs(),\n\t\ttypescript({\n\t\t\tsourceMap: !production,\n\t\t\tinlineSources: !production\n\t\t}),'
-);
-fs.writeFileSync(rollupConfigPath, rollupConfig)
-
-// Add TSConfig
-const tsconfig = `{
-  "extends": "@tsconfig/svelte/tsconfig.json",
-
-  "include": ["src/**/*"],
-  "exclude": ["node_modules/*", "__sapper__/*", "public/*"]
-}`
-const tsconfigPath =  path.join(projectRoot, "tsconfig.json")
-fs.writeFileSync(tsconfigPath, tsconfig)
-
-// Delete this script, but not during testing
-if (!argv[2]) {
-  // Remove the script
-  fs.unlinkSync(path.join(__filename))
-
-  // Check for Mac's DS_store file, and if it's the only one left remove it
-  const remainingFiles = fs.readdirSync(path.join(__dirname))
-  if (remainingFiles.length === 1 && remainingFiles[0] === '.DS_store') {
-    fs.unlinkSync(path.join(__dirname, '.DS_store'))
-  }
-
-  // Check if the scripts folder is empty
-  if (fs.readdirSync(path.join(__dirname)).length === 0) {
-    // Remove the scripts folder
-    fs.rmdirSync(path.join(__dirname))
-  }
-}
-
-// Adds the extension recommendation
-fs.mkdirSync(path.join(projectRoot, ".vscode"))
-fs.writeFileSync(path.join(projectRoot, ".vscode", "extensions.json"), `{
-  "recommendations": ["svelte.svelte-vscode"]
-}
-`)
-
-console.log("Converted to TypeScript.")
-
-if (fs.existsSync(path.join(projectRoot, "node_modules"))) {
-  console.log("\nYou will need to re-run your dependency manager to get started.")
-}

examples/svelte/src/main.js

@@ -1,10 +1,10 @@
 import App from './App.svelte';
 
 const app = new App({
-	target: document.body,
-	props: {
-		name: 'world'
-	}
+  target: document.body,
+  props: {
+    name: 'world',
+  },
 });
 
-export default app;
+export default app;

examples/svelte/yarn.lock

@@ -1,635 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/code-frame@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
-
-"@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@polka/url@^1.0.0-next.9":
-  version "1.0.0-next.11"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71"
-  integrity sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA==
-
-"@rollup/plugin-commonjs@^14.0.0":
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-14.0.0.tgz#4285f9ec2db686a31129e5a2b415c94aa1f836f0"
-  integrity sha512-+PSmD9ePwTAeU106i9FRdc+Zb3XUWyW26mo5Atr2mk82hor8+nPwkztEjFo8/B1fJKfaQDg9aM2bzQkjhi7zOw==
-  dependencies:
-    "@rollup/pluginutils" "^3.0.8"
-    commondir "^1.0.1"
-    estree-walker "^1.0.1"
-    glob "^7.1.2"
-    is-reference "^1.1.2"
-    magic-string "^0.25.2"
-    resolve "^1.11.0"
-
-"@rollup/plugin-node-resolve@^8.0.0":
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.4.0.tgz#261d79a680e9dc3d86761c14462f24126ba83575"
-  integrity sha512-LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    "@types/resolve" "1.17.1"
-    builtin-modules "^3.1.0"
-    deep-freeze "^0.0.1"
-    deepmerge "^4.2.2"
-    is-module "^1.0.0"
-    resolve "^1.17.0"
-
-"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
-  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
-  dependencies:
-    "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
-
-"@types/estree@*":
-  version "0.0.45"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
-  integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
-
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
-
-"@types/node@*":
-  version "14.14.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
-  integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==
-
-"@types/resolve@1.17.1":
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
-  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
-  dependencies:
-    "@types/node" "*"
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-binary-extensions@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
-  integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-builtin-modules@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
-  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
-
-chalk@^2.0.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chokidar@^3.3.0:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
-  integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
-  optionalDependencies:
-    fsevents "~2.1.2"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-console-clear@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/console-clear/-/console-clear-1.1.1.tgz#995e20cbfbf14dd792b672cde387bd128d674bf7"
-  integrity sha512-pMD+MVR538ipqkG5JXeOEbKWS5um1H4LUUccUQG68qpeqBYbzYy79Gh55jkd2TtPdRfUaLWdv6LPP//5Zt0aPQ==
-
-deep-freeze@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84"
-  integrity sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ=
-
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
-  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
-
-estree-walker@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
-  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@~2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
-  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-get-port@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
-  integrity sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=
-
-glob-parent@~5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
-  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@^7.1.2:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-core-module@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
-  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
-  dependencies:
-    has "^1.0.3"
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-reference@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
-  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
-  dependencies:
-    "@types/estree" "*"
-
-jest-worker@^26.2.1:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-kleur@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
-livereload-js@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-3.3.1.tgz#61f887468086762e61fb2987412cf9d1dda99202"
-  integrity sha512-CBu1gTEfzVhlOK1WASKAAJ9Qx1fHECTq0SUB67sfxwQssopTyvzqTlgl+c0h9pZ6V+Fzd2rc510ppuNusg9teQ==
-
-livereload@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/livereload/-/livereload-0.9.1.tgz#65125dabdf2db4fd3f1169e953fe56e3bcc6f477"
-  integrity sha512-9g7sua11kkyZNo2hLRCG3LuZZwqexoyEyecSlV8cAsfAVVCZqLzVir6XDqmH0r+Vzgnd5LrdHDMyjtFnJQLAYw==
-  dependencies:
-    chokidar "^3.3.0"
-    livereload-js "^3.1.0"
-    opts ">= 1.2.0"
-    ws "^6.2.1"
-
-local-access@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/local-access/-/local-access-1.0.1.tgz#5121258146d64e869046c642ea4f1dd39ff942bb"
-  integrity sha512-ykt2pgN0aqIy6KQC1CqdWTWkmUwNgaOS6dcpHVjyBJONA+Xi7AtSB1vuxC/U/0tjIP3wcRudwQk1YYzUvzk2bA==
-
-magic-string@^0.25.2:
-  version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-mime@^2.3.1:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
-  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
-
-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-mri@^1.1.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.6.tgz#49952e1044db21dbf90f6cd92bc9c9a777d415a6"
-  integrity sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-"opts@>= 1.2.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/opts/-/opts-2.0.2.tgz#a17e189fbbfee171da559edd8a42423bc5993ce1"
-  integrity sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
-  dependencies:
-    picomatch "^2.2.1"
-
-require-relative@^0.8.7:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-  integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
-
-resolve@^1.11.0, resolve@^1.17.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
-  dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
-
-rollup-plugin-livereload@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-livereload/-/rollup-plugin-livereload-2.0.0.tgz#d3928d74e8cf2ae4286c5dd46b770fd3f3b82313"
-  integrity sha512-oC/8NqumGYuphkqrfszOHUUIwzKsaHBICw6QRwT5uD07gvePTS+HW+GFwu6f9K8W02CUuTvtIM9AWJrbj4wE1A==
-  dependencies:
-    livereload "^0.9.1"
-
-rollup-plugin-svelte@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-6.1.1.tgz#66362cf0500fb7a848283ebcf19d289a60ef0871"
-  integrity sha512-ijnm0pH1ScrY4uxwaNXBpNVejVzpL2769hIEbAlnqNUWZrffLspu5/k9/l/Wsj3NrEHLQ6wCKGagVJonyfN7ow==
-  dependencies:
-    require-relative "^0.8.7"
-    rollup-pluginutils "^2.8.2"
-    sourcemap-codec "^1.4.8"
-
-rollup-plugin-terser@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
-  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    jest-worker "^26.2.1"
-    serialize-javascript "^4.0.0"
-    terser "^5.0.0"
-
-rollup-pluginutils@^2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
-  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
-  dependencies:
-    estree-walker "^0.6.1"
-
-rollup@^2.3.4:
-  version "2.33.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.1.tgz#802795164164ee63cd47769d8879c33ec8ae0c40"
-  integrity sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==
-  optionalDependencies:
-    fsevents "~2.1.2"
-
-sade@^1.6.0:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/sade/-/sade-1.7.4.tgz#ea681e0c65d248d2095c90578c03ca0bb1b54691"
-  integrity sha512-y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA==
-  dependencies:
-    mri "^1.1.0"
-
-safe-buffer@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-semiver@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/semiver/-/semiver-1.1.0.tgz#9c97fb02c21c7ce4fcf1b73e2c7a24324bdddd5f"
-  integrity sha512-QNI2ChmuioGC1/xjyYwyZYADILWyW6AmS1UH6gDj/SFUUUS4MBAWs/7mxnkRPc/F4iHezDP+O8t0dO8WHiEOdg==
-
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
-sirv-cli@^1.0.0:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/sirv-cli/-/sirv-cli-1.0.8.tgz#150c3f62694203a86cf5d71ec60e6ff4c34064a9"
-  integrity sha512-bJI+kkzQvMKfAOfgLzv09kWsdymLm39LgKmGjacB19GHIAQLCvXXg8e8HzcofTjDZlA8zVv4dQjU9SWkNzkJhw==
-  dependencies:
-    console-clear "^1.1.0"
-    get-port "^3.2.0"
-    kleur "^3.0.0"
-    local-access "^1.0.1"
-    sade "^1.6.0"
-    semiver "^1.0.0"
-    sirv "^1.0.7"
-    tinydate "^1.0.0"
-
-sirv@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.7.tgz#ad8ca1f84430777a59162592626c2b8e9b9f1384"
-  integrity sha512-QMT2OTD3CTr8de9VByPmvSEeyt6k8/Cxg0J2kQJ5HNhIWfhFg9ypcIWWzez9rPWnGj+WtJ7AZD/MdT/vdilV/A==
-  dependencies:
-    "@polka/url" "^1.0.0-next.9"
-    mime "^2.3.1"
-    totalist "^1.0.0"
-
-source-map-support@~0.5.19:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-svelte@^3.0.0:
-  version "3.29.7"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.29.7.tgz#e254eb2d0d609ce0fd60f052d444ac4a66d90f7d"
-  integrity sha512-rx0g311kBODvEWUU01DFBUl3MJuJven04bvTVFUG/w0On/wuj0PajQY/QlXcJndFxG+W1s8iXKaB418tdHWc3A==
-
-terser@^5.0.0:
-  version "5.3.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.8.tgz#991ae8ba21a3d990579b54aa9af11586197a75dd"
-  integrity sha512-zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
-
-tinydate@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/tinydate/-/tinydate-1.3.0.tgz#e6ca8e5a22b51bb4ea1c3a2a4fd1352dbd4c57fb"
-  integrity sha512-7cR8rLy2QhYHpsBDBVYnnWXm8uRTr38RoZakFSW7Bs7PzfMPNZthuMLkwqZv7MTu8lhQ91cOFYS5a7iFj2oR3w==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
-  dependencies:
-    async-limiter "~1.0.0"

examples/umijs/README.md

@@ -19,3 +19,11 @@ To get started with UmiJS deployed with Vercel, you can use the [Umi CLI](https:
 ```shell
 $ yarn create umi app-name
 ```
+
+### Deploying From Your Terminal
+
+You can deploy your new UmiJS project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
+
+```shell
+$ vercel
+```

package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "2.0.0",
     "@typescript-eslint/parser": "2.0.0",
-    "@vercel/ncc": "0.24.0",
+    "@zeit/ncc": "0.20.4",
     "async-retry": "1.2.3",
     "buffer-replace": "1.0.0",
     "cheerio": "1.0.0-rc.3",
@@ -27,7 +27,7 @@
     "husky": "3.0.4",
     "json5": "2.1.1",
     "lint-staged": "9.2.5",
-    "node-fetch": "2.6.1",
+    "node-fetch": "2.6.0",
     "npm-package-arg": "6.1.0",
     "prettier": "2.0.5"
   },

packages/frameworks/frameworks.json

@@ -7,7 +7,6 @@
     "tagline": "Blitz.js: The Fullstack React Framework",
     "description": "A brand new Blitz.js app - the result of running `npx blitz new`.",
     "website": "https://blitzjs.com",
-    "useRuntime": { "src": "package.json", "use": "@vercel/next" },
     "detectors": {
       "every": [
         {
@@ -17,9 +16,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `blitz build`"
       },
@@ -40,7 +36,6 @@
     "description": "A Next.js app and a Serverless Function API.",
     "website": "https://nextjs.org",
     "sort": 1,
-    "useRuntime": { "src": "package.json", "use": "@vercel/next" },
     "detectors": {
       "every": [
         {
@@ -50,9 +45,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `next build`"
       },
@@ -62,16 +54,10 @@
       "outputDirectory": {
         "placeholder": "Next.js default"
       }
-    },
-    "recommendedIntegrations": [
-      {
-        "id": "oac_5lUsiANun1DEzgLg0NZx5Es3",
-        "dependencies": ["next-plugin-sentry", "next-sentry-source-maps"]
-      }
-    ]
+    }
   },
   {
-    "name": "Gatsby.js",
+    "name": "Gatsby",
     "slug": "gatsby",
     "demo": "https://gatsby.now-examples.now.sh",
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/gatsby.svg",
@@ -88,9 +74,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `gatsby build`"
       },
@@ -120,9 +103,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `hexo generate`"
       },
@@ -152,9 +132,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `npx @11ty/eleventy`"
       },
@@ -183,9 +160,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `docusaurus build`"
       },
@@ -214,9 +188,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `docusaurus-build`"
       },
@@ -245,9 +216,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `preact build`"
       },
@@ -279,9 +247,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `dojo build`"
       },
@@ -294,7 +259,7 @@
     }
   },
   {
-    "name": "Ember.js",
+    "name": "Ember",
     "slug": "ember",
     "demo": "https://ember.now-examples.now.sh",
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/ember.svg",
@@ -310,9 +275,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `ember build`"
       },
@@ -341,9 +303,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `vue-cli-service build`"
       },
@@ -372,9 +331,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `ng build && scully`"
       },
@@ -403,9 +359,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `ng build`"
       },
@@ -434,9 +387,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `ng build`"
       },
@@ -465,9 +415,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `polymer build`"
       },
@@ -496,9 +443,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `rollup -c`"
       },
@@ -527,9 +471,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `react-scripts build`"
       },
@@ -562,9 +503,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `react-scripts build`"
       },
@@ -593,9 +531,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `gridsome build`"
       },
@@ -624,9 +559,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `umi build`"
       },
@@ -655,9 +587,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `sapper export`"
       },
@@ -686,9 +615,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `saber build`"
       },
@@ -717,9 +643,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `stencil build`"
       },
@@ -748,9 +671,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `nuxt generate`"
       },
@@ -765,13 +685,10 @@
   {
     "name": "RedwoodJS",
     "slug": "redwoodjs",
-    "demo": "https://redwoodjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/redwoodjs.svg",
+    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/redwood.svg",
     "tagline": "RedwoodJS is a full-stack framework for the Jamstack.",
     "description": "A RedwoodJS app, bootstraped with create-redwood-app.",
     "website": "https://redwoodjs.com",
-    "useRuntime": { "src": "package.json", "use": "@vercel/redwood" },
-    "ignoreRuntimes": ["@vercel/node"],
     "detectors": {
       "every": [
         {
@@ -781,17 +698,14 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
-        "value": "yarn rw build && yarn rw db up --no-db-client --auto-approve && yarn rw dataMigrate up"
+        "value": "yarn rw db up --no-db-client --auto-approve && yarn rw build"
       },
       "devCommand": {
-        "value": "yarn rw dev --fwd=\"--port=$PORT --open=false\""
+        "value": "yarn rw dev"
       },
       "outputDirectory": {
-        "placeholder": "RedwoodJS default"
+        "value": "RedwoodJS default"
       }
     }
   },
@@ -818,9 +732,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "None"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `hugo -D --gc`"
       },
@@ -848,9 +759,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "value": "bundle install"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `jekyll build`"
       },
@@ -878,9 +786,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
         "placeholder": "`npm run build` or `brunch build --production`"
       },
@@ -908,9 +813,6 @@
       ]
     },
     "settings": {
-      "installCommand": {
-        "value": "bundle install"
-      },
       "buildCommand": {
         "value": "`npm run build` or `bundle exec middleman build`"
       },
@@ -928,11 +830,8 @@
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/other.svg",
     "description": "No framework or a unoptimized framework.",
     "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
       "buildCommand": {
-        "placeholder": "`npm run vercel-build` or `npm run build`"
+        "placeholder": "`npm run now-build` or `npm run build`"
       },
       "devCommand": {
         "placeholder": "None"

packages/frameworks/index.d.ts

@@ -20,8 +20,6 @@ export interface Framework {
   website?: string;
   description: string;
   sort?: number;
-  useRuntime?: { src: string; use: string };
-  ignoreRuntimes?: string[];
   detectors?: {
     every?: FrameworkDetectionItem[];
     some?: FrameworkDetectionItem[];
@@ -31,8 +29,4 @@ export interface Framework {
     devCommand: Setting;
     outputDirectory: Setting;
   };
-  recommendedIntegrations?: {
-    id: string;
-    dependencies: string[];
-  }[];
 }

packages/frameworks/logos/redwood.svg

@@ -0,0 +1 @@
+<svg fill="none" height="1000" viewBox="0 0 917 1000" width="917" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m249.557 144.582 194.171 132.54c4.383 2.918 9.502 4.516 14.755 4.606 5.261-.038 10.394-1.641 14.755-4.606l194.319-132.986c7.55-5.406 11.714-14.418 10.957-23.717-.757-9.298-6.322-17.507-14.646-21.6024l-194.171-96.13614c-7.366-3.573948-15.947-3.573948-23.313 0l-193.581 96.13614c-8.474 4.1174-14.113 12.4854-14.783 21.9354-.67 9.451 3.73 18.541 11.537 23.83zm274.879 174.144c.016 8.789 4.318 17.01 11.509 21.991l155.662 106.389c9.965 6.87 23.298 6.012 32.313-2.081l130.579-116.789c5.819-5.199 9.051-12.729 8.823-20.56s-3.892-15.158-10.004-20.005l-124.677-99.702c-9.062-7.199-21.704-7.68-31.28-1.189l-161.416 110.401c-7.064 4.89-11.35 12.914-11.509 21.545zm-387.163 144.724c6.292 5.652 9.526 13.988 8.706 22.437-.817 8.499-5.726 16.052-13.132 20.208l-92.9545 55.72c-9.4227 5.633-21.32 4.82-29.90183-2.041-8.5818-6.861-12.06543-18.346-8.75546-28.865l34.37839-108.172c2.6969-8.57 9.5328-15.175 18.1483-17.533 8.609-2.505 17.8924-.309 24.4928 5.795zm504.168 11.293-168.056-115.007c-8.931-6.01-20.578-6.01-29.509 0l-168.056 115.007c-6.684 4.626-10.919 12.061-11.509 20.208-.435 8.203 2.816 16.169 8.853 21.693l167.909 150.222c4.842 4.319 11.089 6.698 17.558 6.687 6.465-.002 12.708-2.38 17.558-6.687l167.908-150.222c6.056-5.501 9.265-13.5 8.705-21.693-.469-8.146-4.666-15.612-11.361-20.208zm-448.247-29.718-130.4316-116.79c-5.8687-5.331-9.1073-12.995-8.8528-20.95.1419-7.841 3.7705-15.204 9.8856-20.06l124.6768-100.296c9.126-7.179 21.793-7.658 31.428-1.189l161.269 110.401c7.484 4.908 11.998 13.293 11.998 22.288 0 8.994-4.514 17.38-11.998 22.288l-155.515 106.388c-10.025 6.841-23.376 5.985-32.46-2.08zm669.715 167.756-132.792-79.495c-9.862-5.943-22.415-4.739-30.985 2.972l-162.301 144.873c-6.846 6.114-10.062 15.362-8.499 24.441 1.563 9.08 7.681 16.698 16.171 20.135l225.157 91.233c3.088 1.283 6.397 1.939 9.738 1.932 10.449.033 19.936-6.142 24.197-15.751l69.79-156.314c5.68-12.37 1.157-27.062-10.476-34.026zm18.443-190.043 34.379 108.171h-.295c2.542 8.091 1.097 16.919-3.889 23.761-4.986 6.841-12.915 10.876-21.342 10.86-4.728.016-9.37-1.269-13.427-3.715l-93.102-55.72c-7.254-4.243-11.992-11.789-12.689-20.208-.87-8.456 2.373-16.814 8.705-22.436l59.019-52.6c6.668-5.976 15.881-8.156 24.493-5.795 8.609 2.459 15.423 9.098 18.148 17.682zm-492.511 282.761c1.587-9.042-1.597-18.266-8.41-24.368l-162.302-144.873c-8.57-7.711-21.123-8.915-30.985-2.972l-132.7921 79.495c-11.4977 6.995-16.0467 21.502-10.6233 33.878l69.9374 156.314c5.794 13.034 20.774 19.134 33.936 13.818l225.009-91.232c8.492-3.407 14.632-10.995 16.23-20.06zm79.675 44.577 180.598 73.105c8.83 3.779 14.93 12.084 15.935 21.694 1.143 9.729-3.178 19.291-11.214 24.814l-180.745 125.556c-4.331 3.043-9.473 4.7-14.754 4.755-5.277-.082-10.411-1.737-14.755-4.755l-180.597-125.556c-8.066-5.508-12.439-15.061-11.362-24.814 1.206-9.71 7.526-18.006 16.526-21.694l180.597-73.105c6.351-2.532 13.421-2.532 19.771 0z" fill="#bf4722" fill-rule="evenodd"/></svg>

packages/frameworks/logos/redwoodjs.svg

@@ -1 +0,0 @@
-<svg fill="none" width="48" height="48" viewBox="0 0 917 1000" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m249.557 144.582 194.171 132.54c4.383 2.918 9.502 4.516 14.755 4.606 5.261-.038 10.394-1.641 14.755-4.606l194.319-132.986c7.55-5.406 11.714-14.418 10.957-23.717-.757-9.298-6.322-17.507-14.646-21.6024l-194.171-96.13614c-7.366-3.573948-15.947-3.573948-23.313 0l-193.581 96.13614c-8.474 4.1174-14.113 12.4854-14.783 21.9354-.67 9.451 3.73 18.541 11.537 23.83zm274.879 174.144c.016 8.789 4.318 17.01 11.509 21.991l155.662 106.389c9.965 6.87 23.298 6.012 32.313-2.081l130.579-116.789c5.819-5.199 9.051-12.729 8.823-20.56s-3.892-15.158-10.004-20.005l-124.677-99.702c-9.062-7.199-21.704-7.68-31.28-1.189l-161.416 110.401c-7.064 4.89-11.35 12.914-11.509 21.545zm-387.163 144.724c6.292 5.652 9.526 13.988 8.706 22.437-.817 8.499-5.726 16.052-13.132 20.208l-92.9545 55.72c-9.4227 5.633-21.32 4.82-29.90183-2.041-8.5818-6.861-12.06543-18.346-8.75546-28.865l34.37839-108.172c2.6969-8.57 9.5328-15.175 18.1483-17.533 8.609-2.505 17.8924-.309 24.4928 5.795zm504.168 11.293-168.056-115.007c-8.931-6.01-20.578-6.01-29.509 0l-168.056 115.007c-6.684 4.626-10.919 12.061-11.509 20.208-.435 8.203 2.816 16.169 8.853 21.693l167.909 150.222c4.842 4.319 11.089 6.698 17.558 6.687 6.465-.002 12.708-2.38 17.558-6.687l167.908-150.222c6.056-5.501 9.265-13.5 8.705-21.693-.469-8.146-4.666-15.612-11.361-20.208zm-448.247-29.718-130.4316-116.79c-5.8687-5.331-9.1073-12.995-8.8528-20.95.1419-7.841 3.7705-15.204 9.8856-20.06l124.6768-100.296c9.126-7.179 21.793-7.658 31.428-1.189l161.269 110.401c7.484 4.908 11.998 13.293 11.998 22.288 0 8.994-4.514 17.38-11.998 22.288l-155.515 106.388c-10.025 6.841-23.376 5.985-32.46-2.08zm669.715 167.756-132.792-79.495c-9.862-5.943-22.415-4.739-30.985 2.972l-162.301 144.873c-6.846 6.114-10.062 15.362-8.499 24.441 1.563 9.08 7.681 16.698 16.171 20.135l225.157 91.233c3.088 1.283 6.397 1.939 9.738 1.932 10.449.033 19.936-6.142 24.197-15.751l69.79-156.314c5.68-12.37 1.157-27.062-10.476-34.026zm18.443-190.043 34.379 108.171h-.295c2.542 8.091 1.097 16.919-3.889 23.761-4.986 6.841-12.915 10.876-21.342 10.86-4.728.016-9.37-1.269-13.427-3.715l-93.102-55.72c-7.254-4.243-11.992-11.789-12.689-20.208-.87-8.456 2.373-16.814 8.705-22.436l59.019-52.6c6.668-5.976 15.881-8.156 24.493-5.795 8.609 2.459 15.423 9.098 18.148 17.682zm-492.511 282.761c1.587-9.042-1.597-18.266-8.41-24.368l-162.302-144.873c-8.57-7.711-21.123-8.915-30.985-2.972l-132.7921 79.495c-11.4977 6.995-16.0467 21.502-10.6233 33.878l69.9374 156.314c5.794 13.034 20.774 19.134 33.936 13.818l225.009-91.232c8.492-3.407 14.632-10.995 16.23-20.06zm79.675 44.577 180.598 73.105c8.83 3.779 14.93 12.084 15.935 21.694 1.143 9.729-3.178 19.291-11.214 24.814l-180.745 125.556c-4.331 3.043-9.473 4.7-14.754 4.755-5.277-.082-10.411-1.737-14.755-4.755l-180.597-125.556c-8.066-5.508-12.439-15.061-11.362-24.814 1.206-9.71 7.526-18.006 16.526-21.694l180.597-73.105c6.351-2.532 13.421-2.532 19.771 0z" fill="#bf4722" fill-rule="evenodd"/></svg>

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.2.0",
+  "version": "0.0.18-canary.0",
   "main": "frameworks.json",
   "license": "UNLICENSED",
   "scripts": {

packages/frameworks/test/frameworks.unit.test.ts

@@ -64,21 +64,6 @@ const Schema = {
       tagline: { type: 'string' },
       website: { type: 'string' },
       description: { type: 'string' },
-      useRuntime: {
-        type: 'object',
-        required: ['src', 'use'],
-        additionalProperties: false,
-        properties: {
-          src: { type: 'string' },
-          use: { type: 'string' },
-        },
-      },
-      ignoreRuntimes: {
-        type: 'array',
-        items: {
-          type: 'string',
-        },
-      },
       detectors: {
         type: 'object',
         additionalProperties: false,
@@ -89,39 +74,14 @@ const Schema = {
       },
       settings: {
         type: 'object',
-        required: [
-          'installCommand',
-          'buildCommand',
-          'devCommand',
-          'outputDirectory',
-        ],
+        required: ['buildCommand', 'devCommand', 'outputDirectory'],
         additionalProperties: false,
         properties: {
-          installCommand: SchemaSettings,
           buildCommand: SchemaSettings,
           devCommand: SchemaSettings,
           outputDirectory: SchemaSettings,
         },
       },
-      recommendedIntegrations: {
-        type: 'array',
-        items: {
-          type: 'object',
-          required: ['id', 'dependencies'],
-          additionalProperties: false,
-          properties: {
-            id: {
-              type: 'string',
-            },
-            dependencies: {
-              type: 'array',
-              items: {
-                type: 'string',
-              },
-            },
-          },
-        },
-      },
     },
   },
 };

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.6.1-canary.2",
+  "version": "2.4.3-canary.2",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -29,8 +29,6 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.2.0",
-    "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
@@ -44,7 +42,7 @@
     "js-yaml": "3.13.1",
     "minimatch": "3.0.4",
     "multistream": "2.1.1",
-    "node-fetch": "2.6.1",
+    "node-fetch": "2.2.0",
     "semver": "6.1.1",
     "ts-jest": "24.1.0",
     "typescript": "3.9.3",

packages/now-build-utils/src/detect-builders.ts

@@ -2,13 +2,8 @@ import minimatch from 'minimatch';
 import { valid as validSemver } from 'semver';
 import { parse as parsePath, extname } from 'path';
 import { Route, Source } from '@vercel/routing-utils';
-import _frameworks, { Framework } from '@vercel/frameworks';
 import { PackageJson, Builder, Config, BuilderFunctions } from './types';
 import { isOfficialRuntime } from './';
-const frameworkList = _frameworks as Framework[];
-const slugToFramework = new Map<string | null, Framework>(
-  frameworkList.map(f => [f.slug, f])
-);
 
 interface ErrorResponse {
   code: string;
@@ -24,10 +19,8 @@ interface Options {
   projectSettings?: {
     framework?: string | null;
     devCommand?: string | null;
-    installCommand?: string | null;
     buildCommand?: string | null;
     outputDirectory?: string | null;
-    createdAt?: number;
   };
   cleanUrls?: boolean;
   trailingSlash?: boolean;
@@ -43,8 +36,9 @@ export function sortFiles(fileA: string, fileB: string) {
 export function detectApiExtensions(builders: Builder[]): Set<string> {
   return new Set<string>(
     builders
-      .filter((b): b is Builder & { src: string } =>
-        Boolean(b.config && b.config.zeroConfig && b.src?.startsWith('api/'))
+      .filter(
+        b =>
+          b.config && b.config.zeroConfig && b.src && b.src.startsWith('api/')
       )
       .map(b => extname(b.src))
       .filter(Boolean)
@@ -55,28 +49,22 @@ export function detectApiDirectory(builders: Builder[]): string | null {
   // TODO: We eventually want to save the api directory to
   // builder.config.apiDirectory so it is only detected once
   const found = builders.some(
-    b => b.config && b.config.zeroConfig && b.src?.startsWith('api/')
+    b => b.config && b.config.zeroConfig && b.src.startsWith('api/')
   );
   return found ? 'api' : null;
 }
 
 // TODO: Replace this function with `config.outputDirectory`
-function getPublicBuilder(
-  builders: Builder[]
-): (Builder & { src: string }) | null {
-  for (const builder of builders) {
-    if (
-      typeof builder.src === 'string' &&
+function getPublicBuilder(builders: Builder[]): Builder | null {
+  const builder = builders.find(
+    builder =>
       isOfficialRuntime('static', builder.use) &&
       /^.*\/\*\*\/\*$/.test(builder.src) &&
       builder.config &&
       builder.config.zeroConfig === true
-    ) {
-      return builder as Builder & { src: string };
-    }
-  }
+  );
 
-  return null;
+  return builder || null;
 }
 export function detectOutputDirectory(builders: Builder[]): string | null {
   // TODO: We eventually want to save the output directory to
@@ -118,6 +106,7 @@ export async function detectBuilders(
     };
   }
 
+  const apiMatches = getApiMatches(options);
   const sortedFiles = files.sort(sortFiles);
   const apiSortedFiles = files.sort(sortFilesBySegmentCount);
 
@@ -133,16 +122,6 @@ export async function detectBuilders(
 
   const { projectSettings = {} } = options;
   const { buildCommand, outputDirectory, framework } = projectSettings;
-  const ignoreRuntimes = new Set(
-    slugToFramework.get(framework || '')?.ignoreRuntimes
-  );
-  const withTag = options.tag ? `@${options.tag}` : '';
-  const apiMatches = getApiMatches()
-    .filter(b => !ignoreRuntimes.has(b.use))
-    .map(b => {
-      b.use = `${b.use}${withTag}`;
-      return b;
-    });
 
   // If either is missing we'll make the frontend static
   const makeFrontendStatic = buildCommand === '' || outputDirectory === '';
@@ -330,6 +309,13 @@ export async function detectBuilders(
     options
   );
 
+  if (frontendBuilder && framework === 'redwoodjs') {
+    // RedwoodJS uses the /api directory differently so we must
+    // clear any existing builders and only use `@vercel/redwood`.
+    builders.length = 0;
+    builders.push(frontendBuilder);
+  }
+
   return {
     warnings,
     builders: builders.length ? builders : null,
@@ -366,7 +352,7 @@ function maybeGetApiBuilder(
     return null;
   }
 
-  const match = apiMatches.find(({ src = '**' }) => {
+  const match = apiMatches.find(({ src }) => {
     return src === fileName || minimatch(fileName, src);
   });
 
@@ -415,15 +401,16 @@ function getFunction(fileName: string, { functions = {} }: Options) {
     : { fnPattern: null, func: null };
 }
 
-function getApiMatches() {
+function getApiMatches({ tag }: Options = {}) {
+  const withTag = tag ? `@${tag}` : '';
   const config = { zeroConfig: true };
 
   return [
-    { src: 'api/**/*.js', use: `@vercel/node`, config },
-    { src: 'api/**/*.ts', use: `@vercel/node`, config },
-    { src: 'api/**/!(*_test).go', use: `@vercel/go`, config },
-    { src: 'api/**/*.py', use: `@vercel/python`, config },
-    { src: 'api/**/*.rb', use: `@vercel/ruby`, config },
+    { src: 'api/**/*.js', use: `@vercel/node${withTag}`, config },
+    { src: 'api/**/*.ts', use: `@vercel/node${withTag}`, config },
+    { src: 'api/**/!(*_test).go', use: `@vercel/go${withTag}`, config },
+    { src: 'api/**/*.py', use: `@vercel/python${withTag}`, config },
+    { src: 'api/**/*.rb', use: `@vercel/ruby${withTag}`, config },
   ];
 }
 
@@ -441,7 +428,6 @@ function detectFrontBuilder(
 ): Builder {
   const { tag, projectSettings = {} } = options;
   const withTag = tag ? `@${tag}` : '';
-  const { createdAt = 0 } = projectSettings;
   let { framework } = projectSettings;
 
   const config: Config = {
@@ -456,10 +442,6 @@ function detectFrontBuilder(
     config.devCommand = projectSettings.devCommand;
   }
 
-  if (typeof projectSettings.installCommand === 'string') {
-    config.installCommand = projectSettings.installCommand;
-  }
-
   if (projectSettings.buildCommand) {
     config.buildCommand = projectSettings.buildCommand;
   }
@@ -468,10 +450,7 @@ function detectFrontBuilder(
     config.outputDirectory = projectSettings.outputDirectory;
   }
 
-  if (
-    pkg &&
-    (framework === undefined || createdAt < Date.parse('2020-03-01'))
-  ) {
+  if (pkg) {
     const deps: PackageJson['dependencies'] = {
       ...pkg.dependencies,
       ...pkg.devDependencies,
@@ -492,10 +471,12 @@ function detectFrontBuilder(
     });
   }
 
-  const f = slugToFramework.get(framework || '');
-  if (f && f.useRuntime) {
-    const { src, use } = f.useRuntime;
-    return { src, use: `${use}${withTag}`, config };
+  if (framework === 'nextjs' || framework === 'blitzjs') {
+    return { src: 'package.json', use: `@vercel/next${withTag}`, config };
+  }
+
+  if (framework === 'redwoodjs') {
+    return { src: 'package.json', use: `@vercel/redwood${withTag}`, config };
   }
 
   // Entrypoints for other frameworks
@@ -944,10 +925,11 @@ function getRouteResult(
   const redirectRoutes: Route[] = [];
   const rewriteRoutes: Route[] = [];
   const errorRoutes: Route[] = [];
-  const framework = frontendBuilder?.config?.framework || '';
-  const use = frontendBuilder?.use || '';
-  const isNextjs = framework === 'nextjs' || use.startsWith('@vercel/next');
-  const ignoreRuntimes = slugToFramework.get(framework)?.ignoreRuntimes;
+  const isNextjs =
+    frontendBuilder &&
+    ((frontendBuilder.use && frontendBuilder.use.startsWith('@vercel/next')) ||
+      (frontendBuilder.config &&
+        frontendBuilder.config.framework === 'nextjs'));
 
   if (apiRoutes && apiRoutes.length > 0) {
     if (options.featHandleMiss) {
@@ -985,17 +967,11 @@ function getRouteResult(
       }
 
       rewriteRoutes.push(...dynamicRoutes);
-
-      if (typeof ignoreRuntimes === 'undefined') {
-        // This route is only necessary to hide the directory listing
-        // to avoid enumerating serverless function names.
-        // But it causes issues in `vc dev` for frameworks that handle
-        // their own functions such as redwood, so we ignore.
-        rewriteRoutes.push({
-          src: '^/api(/.*)?$',
-          status: 404,
-        });
-      }
+      rewriteRoutes.push({
+        src: '^/api(/.*)?$',
+        status: 404,
+        continue: true,
+      });
     } else {
       defaultRoutes.push(...apiRoutes);
 
@@ -1065,5 +1041,5 @@ function sortFilesBySegmentCount(fileA: string, fileB: string): number {
     return -1;
   }
 
-  return fileA.localeCompare(fileB);
+  return 0;
 }

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

@@ -292,11 +292,6 @@ export async function runNpmInstall(
     opts.prettyCommand = 'yarn install';
     command = 'yarn';
     commandArgs = ['install', ...args];
-
-    // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
-    if (!env.YARN_NODE_LINKER) {
-      env.YARN_NODE_LINKER = 'node-modules';
-    }
   }
 
   if (process.env.NPM_ONLY_PRODUCTION) {
@@ -393,17 +388,10 @@ export async function runPackageJsonScript(
       prettyCommand,
     });
   } else {
-    // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
-    const env: typeof process.env = { ...spawnOpts?.env };
-    if (!env.YARN_NODE_LINKER) {
-      env.YARN_NODE_LINKER = 'node-modules';
-    }
-
     const prettyCommand = `yarn run ${scriptName}`;
     console.log(`Running "${prettyCommand}"`);
     await spawnAsync('yarn', ['run', scriptName], {
       ...spawnOpts,
-      env,
       cwd: destPath,
       prettyCommand,
     });

packages/now-build-utils/src/types.ts

@@ -41,7 +41,6 @@ export interface Config {
   import?: { [key: string]: string };
   functions?: BuilderFunctions;
   outputDirectory?: string;
-  installCommand?: string;
   buildCommand?: string;
   devCommand?: string;
   framework?: string;
@@ -108,13 +107,6 @@ export interface BuildOptions {
    */
   workPath: string;
 
-  /**
-   * The "Root Directory" is assigned to the `workPath` so the `repoRootPath`
-   * is the Git Repository Root. This is only relevant for Monorepos.
-   * See https://vercel.com/blog/monorepos
-   */
-  repoRootPath?: string;
-
   /**
    * An arbitrary object passed by the user in the build definition defined
    * in `vercel.json`.
@@ -336,7 +328,7 @@ export interface NodeVersion {
 
 export interface Builder {
   use: string;
-  src?: string;
+  src: string;
   config?: Config;
 }
 

packages/now-build-utils/test/fixtures/19-yarn-v2/api/index.js

@@ -1,5 +0,0 @@
-const { camelCase } = require('camel-case');
-
-module.exports = (req, res) => {
-  res.end(camelCase('camel-case module is working'));
-};

packages/now-build-utils/test/fixtures/19-yarn-v2/now.json

@@ -0,0 +1,5 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [{ "path": "/", "mustContain": "Svelte app" }]
+}

packages/now-build-utils/test/fixtures/19-yarn-v2/package.json

@@ -16,7 +16,6 @@
     "svelte": "^3.0.0"
   },
   "dependencies": {
-    "camel-case": "^4.1.2",
     "sirv-cli": "^0.4.4"
   }
 }

packages/now-build-utils/test/fixtures/19-yarn-v2/vercel.json

@@ -1,11 +0,0 @@
-{
-  "version": 2,
-  "builds": [
-    { "src": "package.json", "use": "@vercel/static-build" },
-    { "src": "api/index.js", "use": "@vercel/node" }
-  ],
-  "probes": [
-    { "path": "/", "mustContain": "Svelte app" },
-    { "path": "/api", "mustContain": "camelCaseModuleIsWorking" }
-  ]
-}

packages/now-build-utils/test/fixtures/19-yarn-v2/yarn.lock

@@ -270,16 +270,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camel-case@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "camel-case@npm:4.1.2"
-  dependencies:
-    pascal-case: ^3.1.2
-    tslib: ^2.0.3
-  checksum: 3/0b8dcfb424c9497e45984b88ef005c66bdf8e877e36365aedfc3cf73182684fde5a14cf2c526579c0351a5f27dc39a00f1edecc25d43606075fea948c504e37f
-  languageName: node
-  linkType: hard
-
 "caseless@npm:~0.12.0":
   version: 0.12.0
   resolution: "caseless@npm:0.12.0"
@@ -860,15 +850,6 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
-"lower-case@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "lower-case@npm:2.0.2"
-  dependencies:
-    tslib: ^2.0.3
-  checksum: 3/aabaca9cef65f7564a1005b625664527e4d169e363101e65773f8f6ff2fdcf09884a3bc02990cd7a62cf05f3538114af25ee7bef553f1ca3208c8a77ac75cbfa
-  languageName: node
-  linkType: hard
-
 "magic-string@npm:^0.25.2":
   version: 0.25.7
   resolution: "magic-string@npm:0.25.7"
@@ -963,16 +944,6 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
-"no-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "no-case@npm:3.0.4"
-  dependencies:
-    lower-case: ^2.0.2
-    tslib: ^2.0.3
-  checksum: 3/84db4909caec37504c6655f995a004067f8733be8cd8d849f1578661b60a1685e086325fa4e1a5e8ce94e7416c1d0f037e2a00f635a14457183de80ab4fc7612
-  languageName: node
-  linkType: hard
-
 "node-gyp@npm:latest":
   version: 6.1.0
   resolution: "node-gyp@npm:6.1.0"
@@ -1086,16 +1057,6 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
-"pascal-case@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "pascal-case@npm:3.1.2"
-  dependencies:
-    no-case: ^3.0.4
-    tslib: ^2.0.3
-  checksum: 3/31708cecab221482edc81e2bd9b9d8282d72d4f1443b31f39725aa23768c5e42d93c4c014f1bc90f7f074e2a70d5091e4892ea370e550affc9ccf1d33c900bcd
-  languageName: node
-  linkType: hard
-
 "path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
@@ -1486,7 +1447,6 @@ fsevents@~2.1.2:
   dependencies:
     "@rollup/plugin-commonjs": ^12.0.0
     "@rollup/plugin-node-resolve": ^8.0.0
-    camel-case: ^4.1.2
     rollup: ^2.3.4
     rollup-plugin-livereload: ^1.0.0
     rollup-plugin-svelte: ^5.0.3
@@ -1557,13 +1517,6 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "tslib@npm:2.0.3"
-  checksum: 3/447bfca5deaa157806c3f77eaba74d05dd0b38b014e47ce79d98b5c77ce7d91b00a687ba13ca1b5a74d35ca1098ac7a072c0a97fad06f0266612f2a03a6c8e8f
-  languageName: node
-  linkType: hard
-
 "tunnel-agent@npm:^0.6.0":
   version: 0.6.0
   resolution: "tunnel-agent@npm:0.6.0"

packages/now-build-utils/test/unit.builds-and-routes-detector.test.ts

@@ -182,7 +182,7 @@ describe('Test `detectBuilders`', () => {
 
     const { builders } = await detectBuilders(files);
     expect(builders!.length).toBe(7);
-    expect(builders!.some(b => b.src!.endsWith('_test.go'))).toBe(false);
+    expect(builders!.some(b => b.src.endsWith('_test.go'))).toBe(false);
   });
 
   it('just public', async () => {
@@ -833,50 +833,6 @@ describe('Test `detectBuilders`', () => {
 describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
   const featHandleMiss = true;
 
-  it('should select "installCommand"', async () => {
-    const pkg = {
-      scripts: { build: 'next build' },
-      dependencies: { next: '9.0.0' },
-    };
-    const files = ['package.json', 'pages/index.js', 'public/index.html'];
-    const { builders, errors } = await detectBuilders(files, pkg, {
-      featHandleMiss,
-      projectSettings: {
-        installCommand: 'npx pnpm install',
-      },
-    });
-    expect(errors).toBe(null);
-    expect(builders).toBeDefined();
-    expect(builders!.length).toStrictEqual(1);
-    expect(builders![0].src).toStrictEqual('package.json');
-    expect(builders![0].use).toStrictEqual('@vercel/next');
-    expect(builders![0].config!.zeroConfig).toStrictEqual(true);
-    expect(builders![0].config!.installCommand).toStrictEqual(
-      'npx pnpm install'
-    );
-  });
-
-  it('should select empty "installCommand"', async () => {
-    const pkg = {
-      scripts: { build: 'next build' },
-      dependencies: { next: '9.0.0' },
-    };
-    const files = ['package.json', 'pages/index.js', 'public/index.html'];
-    const { builders, errors } = await detectBuilders(files, pkg, {
-      featHandleMiss,
-      projectSettings: {
-        installCommand: '',
-      },
-    });
-    expect(errors).toBe(null);
-    expect(builders).toBeDefined();
-    expect(builders!.length).toStrictEqual(1);
-    expect(builders![0].src).toStrictEqual('package.json');
-    expect(builders![0].use).toStrictEqual('@vercel/next');
-    expect(builders![0].config!.zeroConfig).toStrictEqual(true);
-    expect(builders![0].config!.installCommand).toStrictEqual('');
-  });
-
   it('should never select now.json src', async () => {
     const files = ['docs/index.md', 'mkdocs.yml', 'now.json'];
     const { builders, errors } = await detectBuilders(files, null, {
@@ -1124,127 +1080,6 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     expect(errorRoutes).toStrictEqual([]);
   });
 
-  it('Using "Create React App" framework with `next` in dependencies should NOT autodetect Next.js for new projects', async () => {
-    const pkg = {
-      scripts: {
-        dev: 'react-scripts start',
-        build: 'react-scripts build',
-      },
-      dependencies: {
-        next: '9.3.5',
-        react: '16.13.1',
-        'react-dom': '16.13.1',
-        'react-scripts': '2.1.1',
-      },
-    };
-    const files = ['package.json', 'src/index.js', 'public/favicon.ico'];
-    const projectSettings = {
-      framework: 'create-react-app',
-      buildCommand: 'react-scripts build',
-      createdAt: Date.parse('2020-07-01'),
-    };
-
-    const { builders, errorRoutes } = await detectBuilders(files, pkg, {
-      projectSettings,
-      featHandleMiss,
-    });
-
-    expect(builders).toEqual([
-      {
-        use: '@vercel/static-build',
-        src: 'package.json',
-        config: {
-          zeroConfig: true,
-          framework: projectSettings.framework,
-          buildCommand: projectSettings.buildCommand,
-        },
-      },
-    ]);
-    expect(errorRoutes!.length).toBe(1);
-    expect((errorRoutes![0] as Source).status).toBe(404);
-  });
-
-  it('Using "Other" framework with Storybook should NOT autodetect Next.js for new projects', async () => {
-    const pkg = {
-      scripts: {
-        dev: 'next dev',
-        build: 'next build',
-        storybook: 'start-storybook -p 6006',
-        'build-storybook': 'build-storybook',
-      },
-      dependencies: {
-        next: '9.3.5',
-        react: '16.13.1',
-        'react-dom': '16.13.1',
-      },
-      devDependencies: {
-        '@babel/core': '7.9.0',
-        '@storybook/addon-links': '5.3.18',
-        '@storybook/addons': '5.3.18',
-        '@storybook/react': '5.3.18',
-      },
-    };
-    const files = ['package.json', 'pages/api/foo.js', 'index.html'];
-    const projectSettings = {
-      framework: null, // Selected "Other" framework
-      buildCommand: 'yarn build-storybook',
-      createdAt: Date.parse('2020-07-01'),
-    };
-
-    const { builders, errorRoutes } = await detectBuilders(files, pkg, {
-      projectSettings,
-      featHandleMiss,
-    });
-
-    expect(builders).toEqual([
-      {
-        use: '@vercel/static-build',
-        src: 'package.json',
-        config: {
-          zeroConfig: true,
-          buildCommand: projectSettings.buildCommand,
-        },
-      },
-    ]);
-    expect(errorRoutes!.length).toBe(1);
-    expect((errorRoutes![0] as Source).status).toBe(404);
-  });
-
-  it('Using "Other" framework should autodetect Next.js for old projects', async () => {
-    const pkg = {
-      scripts: {
-        dev: 'next dev',
-        build: 'next build',
-      },
-      dependencies: {
-        next: '9.3.5',
-        react: '16.13.1',
-        'react-dom': '16.13.1',
-      },
-    };
-    const files = ['package.json', 'pages/api/foo.js', 'index.html'];
-    const projectSettings = {
-      framework: null, // Selected "Other" framework
-      createdAt: Date.parse('2020-02-01'),
-    };
-
-    const { builders, errorRoutes } = await detectBuilders(files, pkg, {
-      projectSettings,
-      featHandleMiss,
-    });
-
-    expect(builders).toEqual([
-      {
-        use: '@vercel/next',
-        src: 'package.json',
-        config: {
-          zeroConfig: true,
-        },
-      },
-    ]);
-    expect(errorRoutes).toStrictEqual([]);
-  });
-
   it('api + raw static', async () => {
     const files = ['api/endpoint.js', 'index.html', 'favicon.ico'];
 
@@ -1341,7 +1176,7 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
       featHandleMiss,
     });
     expect(builders!.length).toBe(7);
-    expect(builders!.some(b => b.src!.endsWith('_test.go'))).toBe(false);
+    expect(builders!.some(b => b.src.endsWith('_test.go'))).toBe(false);
     expect(errorRoutes!.length).toBe(1);
     expect((errorRoutes![0] as Source).status).toBe(404);
   });
@@ -1973,38 +1808,23 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     expect((errorRoutes![0] as Source).status).toBe(404);
   });
 
-  const redwoodFiles = [
-    'package.json',
-    'web/package.json',
-    'web/public/robots.txt',
-    'web/src/index.html',
-    'web/src/index.css',
-    'web/src/index.js',
-    'api/package.json',
-    'api/prisma/seeds.js',
-    'api/src/functions/graphql.js',
-    'api/src/graphql/.keep',
-    'api/src/services/.keep',
-    'api/src/lib/db.js',
-  ];
-
-  it('RedwoodJS should only use Redwood builder and not Node builder', async () => {
-    const files = [...redwoodFiles].sort();
+  it('RedwoodJS should only use redwood builder', async () => {
+    const files = [
+      'package.json',
+      'web/index.html',
+      'api/one.js',
+      'api/two.js',
+    ];
     const projectSettings = {
       framework: 'redwoodjs',
     };
 
-    const {
-      builders,
-      defaultRoutes,
-      rewriteRoutes,
-      errorRoutes,
-    } = await detectBuilders(files, null, {
+    const { builders, errorRoutes } = await detectBuilders(files, null, {
       projectSettings,
       featHandleMiss,
     });
 
-    expect(builders).toStrictEqual([
+    expect(builders).toEqual([
       {
         use: '@vercel/redwood',
         src: 'package.json',
@@ -2014,73 +1834,8 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
         },
       },
     ]);
-    expect(defaultRoutes).toStrictEqual([]);
-    expect(rewriteRoutes).toStrictEqual([]);
-    expect(errorRoutes).toStrictEqual([
-      {
-        status: 404,
-        src: '^/(?!.*api).*$',
-        dest: '/404.html',
-      },
-    ]);
-  });
-
-  it('RedwoodJS should allow usage of non-js API and not add 404 api route', async () => {
-    const files = [...redwoodFiles, 'api/golang.go', 'api/python.py'].sort();
-    const projectSettings = {
-      framework: 'redwoodjs',
-    };
-
-    const {
-      builders,
-      defaultRoutes,
-      rewriteRoutes,
-      errorRoutes,
-    } = await detectBuilders(files, null, {
-      projectSettings,
-      featHandleMiss,
-    });
-
-    expect(builders).toStrictEqual([
-      {
-        use: '@vercel/go',
-        src: 'api/golang.go',
-        config: {
-          zeroConfig: true,
-        },
-      },
-      {
-        use: '@vercel/python',
-        src: 'api/python.py',
-        config: {
-          zeroConfig: true,
-        },
-      },
-      {
-        use: '@vercel/redwood',
-        src: 'package.json',
-        config: {
-          zeroConfig: true,
-          framework: 'redwoodjs',
-        },
-      },
-    ]);
-    expect(defaultRoutes).toStrictEqual([
-      { handle: 'miss' },
-      {
-        src: '^/api/(.+)(?:\\.(?:go|py))$',
-        dest: '/api/$1',
-        check: true,
-      },
-    ]);
-    expect(rewriteRoutes).toStrictEqual([]);
-    expect(errorRoutes).toStrictEqual([
-      {
-        status: 404,
-        src: '^/(?!.*api).*$',
-        dest: '/404.html',
-      },
-    ]);
+    expect(errorRoutes!.length).toBe(1);
+    expect((errorRoutes![0] as Source).status).toBe(404);
   });
 
   it('No framework, only package.json', async () => {
@@ -2393,6 +2148,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
     expect(errorRoutes).toStrictEqual([
@@ -2494,6 +2250,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2531,6 +2288,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2568,6 +2326,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2600,6 +2359,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2627,6 +2387,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2657,6 +2418,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2683,6 +2445,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2717,6 +2480,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
     expect(errorRoutes).toStrictEqual([
@@ -2811,6 +2575,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2843,6 +2608,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2876,6 +2642,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2901,6 +2668,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2924,6 +2692,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2948,6 +2717,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -2968,6 +2738,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -3002,6 +2773,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
 
@@ -3059,6 +2831,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -3091,6 +2864,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -3124,6 +2898,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -3142,6 +2917,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -3165,6 +2941,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -3189,6 +2966,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }
@@ -3209,6 +2987,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
+        continue: true,
       },
     ]);
   }

packages/now-build-utils/tsconfig.json

@@ -13,7 +13,7 @@
     "outDir": "./dist",
     "types": ["node", "jest"],
     "strict": true,
-    "target": "es2019"
+    "target": "esnext"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules"]

packages/now-cli/@types/which-promise/index.d.ts

@@ -0,0 +1,3 @@
+declare module 'which-promise' {
+  export default function (name: string): Promise<string>;
+}

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "21.0.2-canary.6",
+  "version": "20.0.0-canary.4",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -13,7 +13,8 @@
   "scripts": {
     "preinstall": "node ./scripts/preinstall.js",
     "test-unit": "nyc ava test/unit.js test/dev-builder.unit.js test/dev-router.unit.js test/dev-server.unit.js test/dev-validate.unit.js --serial --fail-fast --verbose",
-    "test-integration-cli": "rimraf test/fixtures/integration && ava test/integration.js --serial --fail-fast --verbose",
+    "test-integration-cli": "ava test/integration.js --serial --fail-fast --verbose",
+    "test-integration-v1": "ava test/integration-v1.js --serial --fail-fast",
     "test-integration-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
     "prepublishOnly": "yarn build",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
@@ -61,11 +62,14 @@
     "node": ">= 10"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.6.1-canary.2",
-    "@vercel/go": "1.1.6",
-    "@vercel/node": "1.8.6-canary.3",
-    "@vercel/python": "1.2.3",
-    "@vercel/ruby": "1.2.4",
+    "@vercel/build-utils": "2.4.3-canary.2",
+    "@vercel/go": "1.1.5-canary.0",
+    "@vercel/next": "2.6.14-canary.1",
+    "@vercel/node": "1.7.4-canary.0",
+    "@vercel/python": "1.2.2",
+    "@vercel/redwood": "0.0.2-canary.1",
+    "@vercel/ruby": "1.2.3",
+    "@vercel/static-build": "0.17.7-canary.1",
     "update-notifier": "4.1.0"
   },
   "devDependencies": {
@@ -100,9 +104,9 @@
     "@types/universal-analytics": "0.4.2",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.2.0",
-    "@vercel/ncc": "0.24.0",
+    "@zeit/dockerignore": "0.0.5",
     "@zeit/fun": "0.11.2",
+    "@zeit/ncc": "0.18.5",
     "@zeit/source-map-support": "0.6.2",
     "ajv": "6.12.2",
     "alpha-sort": "2.0.1",
@@ -121,9 +125,13 @@
     "cpy": "7.2.0",
     "credit-card": "3.0.1",
     "date-fns": "1.29.0",
+    "death": "1.1.0",
     "debug": "3.1.0",
+    "deployment-type": "1.0.1",
+    "docker-file-parser": "1.0.2",
     "dot": "1.1.3",
     "dotenv": "4.0.0",
+    "download": "6.2.5",
     "email-prompt": "0.3.2",
     "email-validator": "1.1.1",
     "epipebomb": "1.0.0",
@@ -134,7 +142,9 @@
     "fs-extra": "7.0.1",
     "get-port": "5.1.1",
     "glob": "7.1.2",
-    "http-proxy": "1.18.1",
+    "http-proxy": "1.17.0",
+    "ignore": "4.0.6",
+    "ini": "1.3.4",
     "inquirer": "7.0.4",
     "is-port-reachable": "3.0.0",
     "is-url": "1.2.2",
@@ -146,18 +156,21 @@
     "minimatch": "3.0.4",
     "mri": "1.1.5",
     "ms": "2.1.2",
-    "node-fetch": "2.6.1",
+    "nanoid": "3.0.2",
+    "node-fetch": "2.6.0",
     "npm-package-arg": "6.1.0",
     "nyc": "13.2.0",
     "ora": "3.4.0",
     "pcre-to-regexp": "1.0.0",
     "pluralize": "7.0.0",
+    "printf": "0.2.5",
     "progress": "2.0.3",
     "promisepipe": "3.0.0",
     "psl": "1.1.31",
     "qr-image": "3.2.0",
     "raw-body": "2.4.1",
-    "rimraf": "3.0.2",
+    "read-pkg": "2.0.0",
+    "rx-lite-aggregates": "4.0.8",
     "semver": "5.5.0",
     "serve-handler": "6.1.1",
     "sinon": "4.4.2",
@@ -166,14 +179,17 @@
     "tar-fs": "1.16.3",
     "test-listen": "1.1.0",
     "text-table": "0.2.0",
+    "then-sleep": "1.0.1",
+    "through2": "2.0.3",
     "title": "3.4.1",
     "tmp-promise": "1.0.3",
-    "tree-kill": "1.2.2",
+    "tree-kill": "1.2.1",
     "ts-node": "8.3.0",
     "typescript": "3.9.3",
     "universal-analytics": "0.4.20",
     "utility-types": "2.1.0",
     "which": "2.0.2",
+    "which-promise": "1.0.0",
     "write-json-file": "2.2.0",
     "xdg-app-paths": "5.1.0"
   }