Publish Canary

- @vercel/frameworks@0.2.1-canary.0
 - @vercel/build-utils@2.9.1-canary.0
 - vercel@21.2.4-canary.0
 - @vercel/client@9.0.7-canary.0

.eslintignore

@@ -34,6 +34,7 @@ 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.
 
-### @zeit/node-file-trace
+### @vercel/nft
 
-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:
+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:
 
 ```js
-const trace = require('@zeit/node-file-trace');
-trace(['path/to/entrypoint.js'], {
+const { nodeFileTrace } = require('@vercel/nft');
+nodeFileTrace(['path/to/entrypoint.js'], {
   ts: true,
   mixedModules: true,
 })
@@ -82,7 +82,7 @@ trace(['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 [@zeit/node-file-trace](https://github.com/vercel/node-file-trace) and not the Builder.
+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.
 
 ## Deploy a Builder with existing project
 
@@ -94,12 +94,3 @@ 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/ISSUE_TEMPLATE/config.yml

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

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+### 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/publish.yml

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

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

@@ -11,7 +11,7 @@ on:
 jobs:
   test:
     name: Dev
-    timeout-minutes: 45
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:

.kodiak.toml

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

api/frameworks.ts

@@ -12,6 +12,11 @@ const frameworks = (_frameworks as Framework[])
       ...frameworkItem,
       detectors: undefined,
       sort: undefined,
+      dependency: undefined,
+      defaultRoutes: undefined,
+      cachePattern: undefined,
+      devCommand: undefined,
+      buildCommand: undefined,
     };
 
     if (framework.logo) {

api/package.json

@@ -5,7 +5,7 @@
   "description": "API for the vercel/vercel repo",
   "main": "index.js",
   "scripts": {
-    "build": "yarn --cwd .. && node ../utils/run.js build all"
+    "vercel-build": "yarn --cwd .. && node ../utils/run.js build all"
   },
   "dependencies": {
     "@sentry/node": "5.11.1",

api/tsconfig.json

@@ -5,6 +5,7 @@
     "strict": false,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
+    "noEmitOnError": true,
     "esModuleInterop": true,
     "module": "commonjs",
     "moduleResolution": "node",

errors/deploy-invalid-dc.md

@@ -2,8 +2,8 @@
 
 #### Why This Error Occurred
 
-When supplying `regions` or `scale` settings, you
-used an unknown or invalid dc identifier.
+When supplying `regions` configuration, 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 `now-cli`, they currently are transformed to
+In Vercel CLI, they currently are transformed to
 DC identifiers before being sent to our APIs.
 
 **Valid DC identifiers**:

errors/missing-dotenv-target.md

@@ -1,9 +0,0 @@
-# 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 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
+- 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

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

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

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

@@ -1,32 +0,0 @@
-# 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

@@ -1,36 +0,0 @@
-# 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

@@ -1,30 +0,0 @@
-# `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

@@ -1,12 +0,0 @@
-# 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

@@ -1,16 +0,0 @@
-# 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

@@ -1,29 +0,0 @@
-# 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/ember/.gitignore

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

examples/gatsby/api/date.ts

@@ -1,4 +1,4 @@
-import { NowRequest, NowResponse } from '@now/node';
+import { NowRequest, NowResponse } from '@vercel/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": {
-    "@now/node": "^1.3.0"
+    "@vercel/node": "1.8.5"
   },
   "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/blob/master/gatsby"
+          href="https://github.com/vercel/vercel/tree/master/examples/gatsby"
           target="_blank"
           rel="noreferrer noopener"
         >

examples/gatsby/yarn.lock

@@ -1107,15 +1107,6 @@
     "@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"
@@ -1409,6 +1400,15 @@
   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/package.json

@@ -8,6 +8,6 @@
     "explore": "gridsome explore"
   },
   "dependencies": {
-    "gridsome": "^0.6.0"
+    "gridsome": "0.7.23"
   }
 }

examples/hexo/package.json

@@ -3,18 +3,18 @@
   "version": "0.0.0",
   "private": true,
   "hexo": {
-    "version": "3.9.0"
+    "version": "5.3.0"
   },
   "dependencies": {
-    "hexo": "^3.9.0",
-    "hexo-generator-archive": "^0.1.5",
-    "hexo-generator-category": "^0.1.3",
-    "hexo-generator-index": "^0.2.1",
-    "hexo-generator-tag": "^0.2.0",
-    "hexo-renderer-ejs": "^0.3.1",
-    "hexo-renderer-stylus": "^0.3.3",
-    "hexo-renderer-marked": "^1.0.1",
-    "hexo-server": "^0.3.3"
+    "hexo": "^5.3.0",
+    "hexo-generator-archive": "^1.0.0",
+    "hexo-generator-category": "^1.0.0",
+    "hexo-generator-index": "^2.0.0",
+    "hexo-generator-tag": "^1.0.0",
+    "hexo-renderer-ejs": "^1.0.0",
+    "hexo-renderer-marked": "^3.3.0",
+    "hexo-renderer-stylus": "^2.0.1",
+    "hexo-server": "^2.0.0"
   },
   "scripts": {
     "dev": "hexo server -p $PORT",

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

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

examples/nextjs/README.md

@@ -14,6 +14,10 @@ Open [http://localhost:3000](http://localhost:3000) with your browser to see the
 
 You can start editing the page by modifying `pages/index.js`. The page auto-updates as you edit the file.
 
+[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.js`.
+
+The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.
+
 ## Learn More
 
 To learn more about Next.js, take a look at the following resources:

examples/nextjs/package.json

@@ -8,8 +8,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "9.5.1",
-    "react": "16.13.1",
-    "react-dom": "16.13.1"
+    "next": "10.0.5",
+    "react": "17.0.1",
+    "react-dom": "17.0.1"
   }
 }

examples/nextjs/styles/Home.module.css

@@ -76,7 +76,6 @@
   align-items: center;
   justify-content: center;
   flex-wrap: wrap;
-
   max-width: 800px;
   margin-top: 3rem;
 }

examples/svelte/.gitignore

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

examples/svelte/.nowignore

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

examples/svelte/package.json

@@ -1,24 +1,21 @@
 {
   "name": "svelte-app",
-  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "build": "rollup -c",
+    "dev": "rollup -c -w",
+    "start": "sirv public"
+  },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^13.0.0",
-    "@rollup/plugin-node-resolve": "^8.1.0",
-    "npm-run-all": "^4.1.5",
-    "rollup": "^2.18.0",
-    "rollup-plugin-livereload": "^1.0.0",
-    "rollup-plugin-svelte": "^5.0.3",
-    "rollup-plugin-terser": "^6.1.0",
+    "@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",
     "svelte": "^3.0.0"
   },
   "dependencies": {
-    "sirv-cli": "^1.0.1"
-  },
-  "scripts": {
-    "build": "rollup -c",
-    "autobuild": "rollup -c -w",
-    "dev": "run-p start:dev autobuild",
-    "start": "sirv public --single",
-    "start:dev": "sirv public --single --dev"
+    "sirv-cli": "^1.0.0"
   }
 }

examples/svelte/public/index.html

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

examples/svelte/rollup.config.js

@@ -6,42 +6,70 @@ 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/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');
-      },
-    }),
+	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');
+			}
+		}),
 
-    // 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(),
+		// 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(),
 
-    // Watch the `public` directory and refresh the
-    // browser on changes when not in production
-    !production && livereload('public'),
+		// In dev mode, call `npm run start` once
+		// the bundle has been generated
+		!production && serve(),
 
-    // If we're building for production (npm run build
-    // instead of npm run dev), minify
-    production && terser(),
-  ],
-  watch: {
-    clearScreen: false,
-  },
+		// 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
+	}
 };

examples/svelte/scripts/setupTypeScript.js

@@ -0,0 +1,128 @@
+// @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

@@ -0,0 +1,635 @@
+# 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/zola/.gitignore

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

examples/zola/config.toml

@@ -0,0 +1,16 @@
+# The URL the site will be built for
+base_url = "/"
+
+# Whether to automatically compile all Sass files in the sass directory
+compile_sass = true
+
+# Whether to build a search index to be used later on by a JavaScript library
+build_search_index = false
+
+[markdown]
+# Whether to do syntax highlighting
+# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
+highlight_code = false
+
+[extra]
+# Put all your custom variables here

examples/zola/content/blog/_index.md

@@ -0,0 +1,6 @@
++++
+title = "List of blog posts"
+sort_by = "date"
+template = "blog.html"
+page_template = "blog-page.html"
++++

examples/zola/content/blog/first.md

@@ -0,0 +1,6 @@
++++
+title = "My first post"
+date = 2019-11-27
++++
+
+This is my first blog post.

examples/zola/content/blog/second.md

@@ -0,0 +1,6 @@
++++
+title = "My second post"
+date = 2019-11-28
++++
+
+This is my second blog post.

examples/zola/templates/base.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <title>MyBlog</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.8.0/css/bulma.min.css">
+</head>
+
+<body>
+  <section class="section">
+    <div class="container">
+      {% block content %} {% endblock %}
+    </div>
+  </section>
+</body>
+
+</html>

examples/zola/templates/blog-page.html

@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1 class="title">
+  {{ page.title }}
+</h1>
+<p class="subtitle"><strong>{{ page.date }}</strong></p>
+{{ page.content | safe }}
+{% endblock content %}

examples/zola/templates/blog.html

@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1 class="title">
+  {{ section.title }}
+</h1>
+<ul>
+  {% for page in section.pages %}
+  <li><a href="{{ page.permalink | safe }}">{{ page.title }}</a></li>
+  {% endfor %}
+</ul>
+{% endblock content %}

examples/zola/templates/index.html

@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1 class="title">
+  This is my blog made with Zola.
+</h1>
+<p>Click <a href="/blog/">here</a> to see my posts.</p>
+{% endblock content %}

package.json

@@ -27,7 +27,7 @@
     "husky": "3.0.4",
     "json5": "2.1.1",
     "lint-staged": "9.2.5",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "npm-package-arg": "6.1.0",
     "prettier": "2.0.5"
   },
@@ -39,7 +39,7 @@
     "publish-from-github": "./utils/publish.sh",
     "changelog": "node utils/changelog.js",
     "build": "node utils/run.js build all",
-    "now-build": "mkdir -p public && echo '<a href=\"https://vercel.com/import\">Import</a>' > public/output.html",
+    "vercel-build": "mkdir -p public && echo '<a href=\"https://vercel.com/import\">Import</a>' > public/output.html",
     "test-unit": "node utils/run.js test-unit",
     "test-integration-cli": "node utils/run.js test-integration-cli",
     "test-integration-once": "node utils/run.js test-integration-once",

packages/frameworks/frameworks.json

@@ -1,849 +0,0 @@
-[
-  {
-    "name": "Blitz.js",
-    "slug": "blitzjs",
-    "demo": "https://blitzjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/blitz.svg",
-    "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": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"blitz\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `blitz build`"
-      },
-      "devCommand": {
-        "value": "blitz start"
-      },
-      "outputDirectory": {
-        "placeholder": "Next.js default"
-      }
-    }
-  },
-  {
-    "name": "Next.js",
-    "slug": "nextjs",
-    "demo": "https://nextjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/next.svg",
-    "tagline": "Next.js makes you productive with React instantly — whether you want to build static or dynamic sites.",
-    "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": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"next\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `next build`"
-      },
-      "devCommand": {
-        "value": "next dev --port $PORT"
-      },
-      "outputDirectory": {
-        "placeholder": "Next.js default"
-      }
-    }
-  },
-  {
-    "name": "Gatsby.js",
-    "slug": "gatsby",
-    "demo": "https://gatsby.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/gatsby.svg",
-    "tagline": "Gatsby helps developers build blazing fast websites and apps with React.",
-    "description": "A Gatsby app, using the default starter theme and a Serverless Function API.",
-    "website": "https://gatsbyjs.org",
-    "sort": 2,
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"gatsby\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `gatsby build`"
-      },
-      "devCommand": {
-        "value": "gatsby develop --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Hexo",
-    "slug": "hexo",
-    "demo": "https://hexo.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/hexo.svg",
-    "tagline": "Hexo is a fast, simple & powerful blog framework powered by Node.js.",
-    "description": "A Hexo site, created with the Hexo CLI.",
-    "website": "https://hexo.io",
-    "sort": 3,
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"hexo\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `hexo generate`"
-      },
-      "devCommand": {
-        "value": "hexo server --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Eleventy",
-    "slug": "eleventy",
-    "demo": "https://eleventy.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/eleventy.svg",
-    "tagline": "11ty is a simpler static site generator written in JavaScript, created to be an alternative to Jekyll.",
-    "description": "An Eleventy site, created with npm init.",
-    "website": "https://www.11ty.dev",
-    "sort": 4,
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@11ty\\/eleventy\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `npx @11ty/eleventy`"
-      },
-      "devCommand": {
-        "value": "npx @11ty/eleventy --serve --watch --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "_site"
-      }
-    }
-  },
-  {
-    "name": "Docusaurus 2",
-    "slug": "docusaurus-2",
-    "demo": "https://docusaurus-2.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/docusaurus.svg",
-    "tagline": "Docusaurus makes it easy to maintain Open Source documentation websites.",
-    "description": "A static Docusaurus site that makes it easy to maintain OSS documentation.",
-    "website": "https://v2.docusaurus.io",
-    "detectors": {
-      "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@docusaurus\\/core\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `docusaurus build`"
-      },
-      "devCommand": {
-        "value": "docusaurus start --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Docusaurus 1",
-    "slug": "docusaurus",
-    "demo": "https://docusaurus.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/docusaurus.svg",
-    "tagline": "Docusaurus makes it easy to maintain Open Source documentation websites.",
-    "description": "A static Docusaurus site that makes it easy to maintain OSS documentation.",
-    "website": "https://docusaurus.io/",
-    "detectors": {
-      "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"docusaurus\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `docusaurus-build`"
-      },
-      "devCommand": {
-        "value": "docusaurus-start --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Preact",
-    "slug": "preact",
-    "demo": "https://preact.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/preact.svg",
-    "tagline": "Preact is a fast 3kB alternative to React with the same modern API.",
-    "description": "A Preact app, created with the Preact CLI.",
-    "website": "https://preactjs.com",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"preact-cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `preact build`"
-      },
-      "devCommand": {
-        "value": "preact watch --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Dojo",
-    "slug": "dojo",
-    "demo": "https://dojo.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/dojo.png",
-    "tagline": "Dojo is a modern progressive, TypeScript first framework.",
-    "description": "A Dojo app, created with the Dojo CLI's cli-create-app command.",
-    "website": "https://dojo.io",
-    "detectors": {
-      "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@dojo\\/framework\":\\s*\".+?\"[^}]*}"
-        },
-        {
-          "path": ".dojorc"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `dojo build`"
-      },
-      "devCommand": {
-        "value": "dojo build -m dev -w -s -p $PORT"
-      },
-      "outputDirectory": {
-        "value": "output/dist"
-      }
-    }
-  },
-  {
-    "name": "Ember.js",
-    "slug": "ember",
-    "demo": "https://ember.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/ember.svg",
-    "tagline": "Ember.js helps webapp developers be more productive out of the box.",
-    "description": "An Ember app, created with the Ember CLI.",
-    "website": "https://emberjs.com/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"ember-cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `ember build`"
-      },
-      "devCommand": {
-        "value": "ember serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Vue.js",
-    "slug": "vue",
-    "demo": "https://vue.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/vue.svg",
-    "tagline": "Vue.js is a versatile JavaScript framework that is as approachable as it is performant.",
-    "description": "A Vue.js app, created with the Vue CLI.",
-    "website": "https://vuejs.org",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@vue\\/cli-service\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `vue-cli-service build`"
-      },
-      "devCommand": {
-        "value": "vue-cli-service serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Scully",
-    "slug": "scully",
-    "demo": "https://scully.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/scullyio-logo.png",
-    "tagline": "Scully is a static site generator for Angular.",
-    "description": "The Static Site Generator for Angular apps.",
-    "website": "https://github.com/scullyio/scully",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@scullyio\\/init\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `ng build && scully`"
-      },
-      "devCommand": {
-        "value": "ng serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Ionic Angular",
-    "slug": "ionic-angular",
-    "demo": "https://ionic-angular.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/ionic.svg",
-    "tagline": "Ionic Angular allows you to build mobile PWAs with Angular and the Ionic Framework.",
-    "description": "An Ionic Angular site, created with the Ionic CLI.",
-    "website": "https://ionicframework.com",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@ionic\\/angular\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `ng build`"
-      },
-      "devCommand": {
-        "value": "ng start"
-      },
-      "outputDirectory": {
-        "value": "www"
-      }
-    }
-  },
-  {
-    "name": "Angular",
-    "slug": "angular",
-    "demo": "https://angular.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/angular.svg",
-    "tagline": "Angular is a TypeScript-based cross-platform framework from Google.",
-    "description": "An Angular app, created with the Angular CLI.",
-    "website": "https://angular.io",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@angular\\/cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `ng build`"
-      },
-      "devCommand": {
-        "value": "ng serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Polymer",
-    "slug": "polymer",
-    "demo": "https://polymer.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/polymer.svg",
-    "tagline": "Polymer is an open-source webapps library from Google, for building using Web Components.",
-    "description": "A Polymer app, created with the Polymer CLI.",
-    "website": "https://www.polymer-project.org/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"polymer-cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `polymer build`"
-      },
-      "devCommand": {
-        "value": "polymer serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Svelte",
-    "slug": "svelte",
-    "demo": "https://svelte.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/svelte.svg",
-    "tagline": "Svelte lets you write high performance reactive apps with significantly less boilerplate. ",
-    "description": "A Svelte app, using the Svelte template, and a Serverless Function API.",
-    "website": "https://svelte.dev",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"sirv-cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `rollup -c`"
-      },
-      "devCommand": {
-        "value": "sirv public --single --dev --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Ionic React",
-    "slug": "ionic-react",
-    "demo": "https://ionic-react.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/ionic.svg",
-    "tagline": "Ionic React allows you to build mobile PWAs with React and the Ionic Framework.",
-    "description": "An Ionic React site, created with the Ionic CLI.",
-    "website": "https://ionicframework.com",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@ionic\\/react\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `react-scripts build`"
-      },
-      "devCommand": {
-        "value": "react-scripts start"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Create React App",
-    "slug": "create-react-app",
-    "demo": "https://react-functions.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/react.svg",
-    "tagline": "Create React App allows you to get going with React in no time.",
-    "description": "A React app, bootstrapped with create-react-app, and a Serverless Function API.",
-    "website": "https://create-react-app.dev",
-    "detectors": {
-      "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"react-scripts\":\\s*\".+?\"[^}]*}"
-        },
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"react-dev-utils\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `react-scripts build`"
-      },
-      "devCommand": {
-        "value": "react-scripts start"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Gridsome",
-    "slug": "gridsome",
-    "demo": "https://gridsome.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/gridsome.svg",
-    "tagline": "Gridsome is a Vue.js-powered framework for building websites & apps that are fast by default.",
-    "description": "A Gridsome app, created with the Gridsome CLI.",
-    "website": "https://gridsome.org/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"gridsome\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `gridsome build`"
-      },
-      "devCommand": {
-        "value": "gridsome develop -p $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "UmiJS",
-    "slug": "umijs",
-    "demo": "https://umijs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/umi.svg",
-    "tagline": "UmiJS is an extensible enterprise-level React application framework.",
-    "description": "An UmiJS app, created using the Umi CLI.",
-    "website": "https://umijs.org",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"umi\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `umi build`"
-      },
-      "devCommand": {
-        "value": "umi dev --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Sapper",
-    "slug": "sapper",
-    "demo": "https://sapper.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/svelte.svg",
-    "tagline": "Sapper is a framework for building high-performance universal web apps with Svelte.",
-    "description": "A Sapper app, using the Sapper template.",
-    "website": "https://sapper.svelte.dev",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"sapper\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `sapper export`"
-      },
-      "devCommand": {
-        "value": "sapper dev --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "__sapper__/export"
-      }
-    }
-  },
-  {
-    "name": "Saber",
-    "slug": "saber",
-    "demo": "https://saber.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/saber.svg",
-    "tagline": "Saber is a framework for building static sites in Vue.js that supports data from any source.",
-    "description": "A Saber site, created with npm init.",
-    "website": "https://saber.land/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"saber\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `saber build`"
-      },
-      "devCommand": {
-        "value": "saber --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Stencil",
-    "slug": "stencil",
-    "demo": "https://stencil.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/stencil.svg",
-    "tagline": "Stencil is a powerful toolchain for building Progressive Web Apps and Design Systems.",
-    "description": "A Stencil site, created with the Stencil CLI.",
-    "website": "https://stenciljs.com/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@stencil\\/core\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `stencil build`"
-      },
-      "devCommand": {
-        "value": "stencil build --dev --watch --serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "www"
-      }
-    }
-  },
-  {
-    "name": "Nuxt.js",
-    "slug": "nuxtjs",
-    "demo": "https://nuxtjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/nuxt.svg",
-    "tagline": "Nuxt.js is the web comprehensive framework that lets you dream big with Vue.js.",
-    "description": "A Nuxt.js app, bootstrapped with create-nuxt-app.",
-    "website": "https://nuxtjs.org",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"nuxt(-edge)?\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `nuxt generate`"
-      },
-      "devCommand": {
-        "value": "nuxt"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "RedwoodJS",
-    "slug": "redwoodjs",
-    "demo": "https://redwoodjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/redwoodjs.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": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@redwoodjs\\/core\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "value": "yarn rw build && yarn rw db up --no-db-client --auto-approve && yarn rw dataMigrate up"
-      },
-      "devCommand": {
-        "value": "yarn rw dev --fwd=\"--port=$PORT --open=false\""
-      },
-      "outputDirectory": {
-        "placeholder": "RedwoodJS default"
-      }
-    }
-  },
-  {
-    "name": "Hugo",
-    "slug": "hugo",
-    "demo": "https://hugo.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/hugo.svg",
-    "tagline": "Hugo is the world’s fastest framework for building websites, written in Go.",
-    "description": "A Hugo site, created with the Hugo CLI.",
-    "website": "https://gohugo.io",
-    "sort": 5,
-    "detectors": {
-      "some": [
-        {
-          "path": "config.yaml"
-        },
-        {
-          "path": "config.toml"
-        },
-        {
-          "path": "config.json"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `hugo -D --gc`"
-      },
-      "devCommand": {
-        "value": "hugo server -D -w -p $PORT"
-      },
-      "outputDirectory": {
-        "placeholder": "`public` or `publishDir` from the `config` file"
-      }
-    }
-  },
-  {
-    "name": "Jekyll",
-    "slug": "jekyll",
-    "demo": "https://jekyll.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/jekyll.svg",
-    "tagline": "Jekyll makes it super easy to transform your plain text into static websites and blogs.",
-    "description": "A Jekyll site, created with the Jekyll CLI.",
-    "website": "https://jekyllrb.com/",
-    "detectors": {
-      "every": [
-        {
-          "path": "_config.yml"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `jekyll build`"
-      },
-      "devCommand": {
-        "value": "bundle exec jekyll serve --watch --port $PORT"
-      },
-      "outputDirectory": {
-        "placeholder": "`_site` or `destination` from `_config.yml`"
-      }
-    }
-  },
-  {
-    "name": "Brunch",
-    "slug": "brunch",
-    "demo": "https://brunch.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/brunch.svg",
-    "tagline": "Brunch is a fast and simple webapp build tool with seamless incremental compilation for rapid development.",
-    "description": "A Brunch app, created with the Brunch CLI.",
-    "website": "https://brunch.io/",
-    "detectors": {
-      "every": [
-        {
-          "path": "brunch-config.js"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run build` or `brunch build --production`"
-      },
-      "devCommand": {
-        "value": "brunch watch --server --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Middleman",
-    "slug": "middleman",
-    "demo": "https://middleman.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/middleman.svg",
-    "tagline": "Middleman is a static site generator that uses all the shortcuts and tools in modern web development.",
-    "description": "A Middleman app, created with the Middleman CLI.",
-    "website": "https://middlemanapp.com/",
-    "detectors": {
-      "every": [
-        {
-          "path": "config.rb"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "value": "`npm run build` or `bundle exec middleman build`"
-      },
-      "devCommand": {
-        "value": "bundle exec middleman server -p $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Other",
-    "slug": null,
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/other.svg",
-    "description": "No framework or a unoptimized framework.",
-    "settings": {
-      "buildCommand": {
-        "placeholder": "`npm run vercel-build` or `npm run build`"
-      },
-      "devCommand": {
-        "placeholder": "None"
-      },
-      "outputDirectory": {
-        "placeholder": "`public` if it exists, or `.`"
-      }
-    }
-  }
-]

packages/frameworks/package.json

@@ -1,14 +1,25 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.1.1",
-  "main": "frameworks.json",
+  "version": "0.2.1-canary.0",
+  "main": "./dist/frameworks.js",
+  "types": "./dist/frameworks.d.ts",
+  "files": [
+    "dist"
+  ],
   "license": "UNLICENSED",
   "scripts": {
+    "build": "tsc",
     "test-unit": "jest --env node --verbose --runInBand --bail"
   },
+  "dependencies": {
+    "@iarna/toml": "2.2.3",
+    "js-yaml": "3.13.1"
+  },
   "devDependencies": {
     "@types/jest": "24.0.22",
+    "@types/js-yaml": "3.12.1",
     "@types/node": "12.0.4",
+    "@vercel/routing-utils": "1.9.2",
     "ajv": "6.12.2",
     "jest": "24.9.0",
     "ts-jest": "24.1.0",

packages/frameworks/src/read-config-file.ts

@@ -0,0 +1,41 @@
+import yaml from 'js-yaml';
+import toml from '@iarna/toml';
+import { promises } from 'fs';
+
+const { readFile } = promises;
+
+async function readFileOrNull(file: string) {
+  try {
+    const data = await readFile(file);
+    return data;
+  } catch (err) {
+    if (err.code !== 'ENOENT') {
+      throw err;
+    }
+  }
+
+  return null;
+}
+
+export async function readConfigFile<T>(
+  files: string | string[]
+): Promise<T | null> {
+  files = Array.isArray(files) ? files : [files];
+
+  for (const name of files) {
+    const data = await readFileOrNull(name);
+
+    if (data) {
+      const str = data.toString('utf8');
+      if (name.endsWith('.json')) {
+        return JSON.parse(str) as T;
+      } else if (name.endsWith('.toml')) {
+        return (toml.parse(str) as unknown) as T;
+      } else if (name.endsWith('.yaml') || name.endsWith('.yml')) {
+        return yaml.safeLoad(str, { filename: name }) as T;
+      }
+    }
+  }
+
+  return null;
+}

packages/frameworks/src/types.ts

@@ -1,3 +1,5 @@
+import { Route } from '@vercel/routing-utils';
+
 export interface FrameworkDetectionItem {
   path: string;
   matchContent?: string;
@@ -6,9 +8,11 @@ export interface FrameworkDetectionItem {
 export interface SettingPlaceholder {
   placeholder: string;
 }
+
 export interface SettingValue {
   value: string;
 }
+
 export type Setting = SettingValue | SettingPlaceholder;
 
 export interface Framework {
@@ -27,8 +31,20 @@ export interface Framework {
     some?: FrameworkDetectionItem[];
   };
   settings: {
+    installCommand: Setting;
     buildCommand: Setting;
     devCommand: Setting;
     outputDirectory: Setting;
   };
+  recommendedIntegrations?: {
+    id: string;
+    dependencies: string[];
+  }[];
+
+  dependency?: string;
+  getOutputDirName: (dirPrefix: string) => Promise<string>;
+  defaultRoutes?: Route[] | ((dirPrefix: string) => Promise<Route[]>);
+  cachePattern?: string;
+  buildCommand: string | null;
+  devCommand: string | null;
 }

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

@@ -1,9 +1,9 @@
 import Ajv from 'ajv';
+import assert from 'assert';
 import { join } from 'path';
 import { existsSync } from 'fs';
 import { isString } from 'util';
-import { Framework } from '../';
-const frameworkList = require('../frameworks.json') as Framework[];
+import frameworkList from '../src/frameworks';
 
 const SchemaFrameworkDetectionItem = {
   type: 'array',
@@ -53,8 +53,15 @@ const Schema = {
   type: 'array',
   items: {
     type: 'object',
-    required: ['name', 'slug', 'logo', 'description', 'settings'],
-    additionalProperties: false,
+    required: [
+      'name',
+      'slug',
+      'logo',
+      'description',
+      'settings',
+      'buildCommand',
+      'devCommand',
+    ],
     properties: {
       name: { type: 'string' },
       slug: { type: ['string', 'null'] },
@@ -89,14 +96,44 @@ const Schema = {
       },
       settings: {
         type: 'object',
-        required: ['buildCommand', 'devCommand', 'outputDirectory'],
+        required: [
+          'installCommand',
+          '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',
+              },
+            },
+          },
+        },
+      },
+
+      dependency: { type: 'string' },
+      cachePattern: { type: 'string' },
+      buildCommand: { type: ['string', 'null'] },
+      devCommand: { type: ['string', 'null'] },
     },
   },
 };
@@ -148,4 +185,14 @@ describe('frameworks', () => {
       }
     });
   });
+
+  it('ensure unique slug', async () => {
+    const slugs = new Set<string>();
+    for (const { slug } of frameworkList) {
+      if (typeof slug === 'string') {
+        assert(!slugs.has(slug), `Slug "${slug}" is not unique`);
+        slugs.add(slug);
+      }
+    }
+  });
 });

packages/frameworks/tsconfig.json

@@ -15,6 +15,6 @@
     "strict": true,
     "target": "esnext"
   },
-  "include": ["src/**/*", "test/**/*"],
+  "include": ["src/*.ts"],
   "exclude": ["node_modules"]
 }

packages/now-build-utils/build.js

@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+const fs = require('fs-extra');
+const execa = require('execa');
+const { join } = require('path');
+
+async function main() {
+  const outDir = join(__dirname, 'dist');
+
+  // Start fresh
+  await fs.remove(outDir);
+
+  // Compile TypeScript
+  await execa('tsc', [], { stdio: 'inherit' });
+
+  // Run `ncc`
+  const mainDir = join(outDir, 'main');
+  await execa('ncc', ['build', 'src/index.ts', '-o', mainDir], {
+    stdio: 'inherit',
+  });
+  // Move compiled ncc file to out dir
+  await fs.rename(join(mainDir, 'index.js'), join(outDir, 'index.js'));
+
+  // Delete leftover "main" dir
+  await fs.remove(mainDir);
+}
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

packages/now-build-utils/build.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-out="dist"
-
-rm -rf "$out"
-
-tsc
-
-rm "$out/index.js"
-ncc build "src/index.ts" -o "$out/main"
-mv "$out/main/index.js" "$out/index.js"
-rm -rf "$out/main"

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.5.1",
+  "version": "2.9.1-canary.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -11,10 +11,10 @@
     "directory": "packages/now-build-utils"
   },
   "scripts": {
-    "build": "./build.sh",
+    "build": "node build",
     "test-unit": "jest --env node --verbose --runInBand --bail test/unit.*test.*",
     "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.js",
-    "prepublishOnly": "./build.sh"
+    "prepublishOnly": "node build"
   },
   "devDependencies": {
     "@iarna/toml": "2.2.3",
@@ -29,7 +29,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.1.1",
+    "@vercel/frameworks": "0.2.1-canary.0",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
@@ -44,7 +44,7 @@
     "js-yaml": "3.13.1",
     "minimatch": "3.0.4",
     "multistream": "2.1.1",
-    "node-fetch": "2.2.0",
+    "node-fetch": "2.6.1",
     "semver": "6.1.1",
     "ts-jest": "24.1.0",
     "typescript": "3.9.3",

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

@@ -24,6 +24,7 @@ interface Options {
   projectSettings?: {
     framework?: string | null;
     devCommand?: string | null;
+    installCommand?: string | null;
     buildCommand?: string | null;
     outputDirectory?: string | null;
     createdAt?: number;
@@ -42,9 +43,8 @@ export function sortFiles(fileA: string, fileB: string) {
 export function detectApiExtensions(builders: Builder[]): Set<string> {
   return new Set<string>(
     builders
-      .filter(
-        b =>
-          b.config && b.config.zeroConfig && b.src && b.src.startsWith('api/')
+      .filter((b): b is Builder & { src: string } =>
+        Boolean(b.config && b.config.zeroConfig && b.src?.startsWith('api/'))
       )
       .map(b => extname(b.src))
       .filter(Boolean)
@@ -55,22 +55,28 @@ 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 | null {
-  const builder = builders.find(
-    builder =>
+function getPublicBuilder(
+  builders: Builder[]
+): (Builder & { src: string }) | null {
+  for (const builder of builders) {
+    if (
+      typeof builder.src === 'string' &&
       isOfficialRuntime('static', builder.use) &&
       /^.*\/\*\*\/\*$/.test(builder.src) &&
       builder.config &&
       builder.config.zeroConfig === true
-  );
+    ) {
+      return builder as Builder & { src: string };
+    }
+  }
 
-  return builder || null;
+  return null;
 }
 export function detectOutputDirectory(builders: Builder[]): string | null {
   // TODO: We eventually want to save the output directory to
@@ -360,7 +366,7 @@ function maybeGetApiBuilder(
     return null;
   }
 
-  const match = apiMatches.find(({ src }) => {
+  const match = apiMatches.find(({ src = '**' }) => {
     return src === fileName || minimatch(fileName, src);
   });
 
@@ -450,6 +456,10 @@ function detectFrontBuilder(
     config.devCommand = projectSettings.devCommand;
   }
 
+  if (typeof projectSettings.installCommand === 'string') {
+    config.installCommand = projectSettings.installCommand;
+  }
+
   if (projectSettings.buildCommand) {
     config.buildCommand = projectSettings.buildCommand;
   }
@@ -458,7 +468,10 @@ function detectFrontBuilder(
     config.outputDirectory = projectSettings.outputDirectory;
   }
 
-  if (pkg && (framework !== null || createdAt < Date.parse('2020-03-01'))) {
+  if (
+    pkg &&
+    (framework === undefined || createdAt < Date.parse('2020-03-01'))
+  ) {
     const deps: PackageJson['dependencies'] = {
       ...pkg.dependencies,
       ...pkg.devDependencies,
@@ -981,7 +994,6 @@ function getRouteResult(
         rewriteRoutes.push({
           src: '^/api(/.*)?$',
           status: 404,
-          continue: true,
         });
       }
     } else {

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

@@ -4,28 +4,34 @@ import { NodeVersion } from '../types';
 import { NowBuildError } from '../errors';
 import debug from '../debug';
 
-const allOptions: NodeVersion[] = [
+const allOptions = [
+  { major: 14, range: '14.x', runtime: 'nodejs14.x' },
   { major: 12, range: '12.x', runtime: 'nodejs12.x' },
-  { major: 10, range: '10.x', runtime: 'nodejs10.x' },
+  {
+    major: 10,
+    range: '10.x',
+    runtime: 'nodejs10.x',
+    discontinueDate: new Date('2021-03-30'),
+  },
   {
     major: 8,
     range: '8.10.x',
     runtime: 'nodejs8.10',
     discontinueDate: new Date('2020-01-06'),
   },
-];
+] as const;
 
 const pleaseSet =
-  'Please set "engines": { "node": "' +
+  'Please change your Project Settings or set "engines": { "node": "' +
   getLatestNodeVersion().range +
-  '" } in your `package.json` file to upgrade to Node.js ' +
+  '" } in your `package.json` file to use Node.js ' +
   getLatestNodeVersion().major +
   '.';
 const upstreamProvider =
   'This change is the result of a decision made by an upstream infrastructure provider (AWS).' +
   '\nRead more: https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html';
 
-export function getLatestNodeVersion(): NodeVersion {
+export function getLatestNodeVersion() {
   return allOptions[0];
 }
 
@@ -37,7 +43,7 @@ export async function getSupportedNodeVersion(
   engineRange?: string,
   isAuto?: boolean
 ): Promise<NodeVersion> {
-  let selection = getLatestNodeVersion();
+  let selection: NodeVersion = getLatestNodeVersion();
 
   if (engineRange) {
     const found =

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

@@ -165,8 +165,8 @@ export function getSpawnOptions(
 export async function getNodeVersion(
   destPath: string,
   _nodeVersion?: string,
-  _config?: Config,
-  meta?: Meta
+  config: Config = {},
+  meta: Meta = {}
 ): Promise<NodeVersion> {
   if (meta && meta.isDev) {
     // Use the system-installed version of `node` in PATH for `vercel dev`
@@ -174,13 +174,22 @@ export async function getNodeVersion(
     return { ...latest, runtime: 'nodejs' };
   }
   const { packageJson } = await scanParentDirs(destPath, true);
-  let range: string | undefined;
+  let { nodeVersion } = config;
   let isAuto = true;
   if (packageJson && packageJson.engines && packageJson.engines.node) {
-    range = packageJson.engines.node;
+    if (
+      nodeVersion &&
+      nodeVersion !== packageJson.engines.node &&
+      !meta.isDev
+    ) {
+      console.warn(
+        'Warning: Due to `engines` existing in your `package.json` file, the Node.js Version defined in your Project Settings will not apply. Learn More: http://vercel.link/node-version'
+      );
+    }
+    nodeVersion = packageJson.engines.node;
     isAuto = false;
   }
-  return getSupportedNodeVersion(range, isAuto);
+  return getSupportedNodeVersion(nodeVersion, isAuto);
 }
 
 async function scanParentDirs(destPath: string, readPackageJson = false) {
@@ -292,6 +301,11 @@ 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) {
@@ -388,10 +402,17 @@ 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,6 +41,7 @@ export interface Config {
   import?: { [key: string]: string };
   functions?: BuilderFunctions;
   outputDirectory?: string;
+  installCommand?: string;
   buildCommand?: string;
   devCommand?: string;
   framework?: string;
@@ -107,6 +108,13 @@ 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`.
@@ -328,7 +336,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

@@ -0,0 +1,5 @@
+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

@@ -1,5 +0,0 @@
-{
-  "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,6 +16,7 @@
     "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

@@ -0,0 +1,11 @@
+{
+  "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,6 +270,16 @@ __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"
@@ -850,6 +860,15 @@ 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"
@@ -944,6 +963,16 @@ 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"
@@ -1057,6 +1086,16 @@ 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"
@@ -1447,6 +1486,7 @@ 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
@@ -1517,6 +1557,13 @@ 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/integration.test.js

@@ -39,7 +39,7 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
 
 // few foreign tests
 
-const buildersToTestWith = ['now-next', 'now-node', 'now-static-build'];
+const buildersToTestWith = ['now-node'];
 
 // eslint-disable-next-line no-restricted-syntax
 for (const builder of buildersToTestWith) {

packages/now-build-utils/test/pkg-engine-node/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "engines": {
+    "node": "14.x"
+  }
+}

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,6 +833,50 @@ 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, {
@@ -1080,6 +1124,46 @@ 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: {
@@ -1257,7 +1341,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);
   });
@@ -2309,7 +2393,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
     expect(errorRoutes).toStrictEqual([
@@ -2411,7 +2494,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2449,7 +2531,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2487,7 +2568,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2520,7 +2600,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2548,7 +2627,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2579,7 +2657,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2606,7 +2683,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2641,7 +2717,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
     expect(errorRoutes).toStrictEqual([
@@ -2736,7 +2811,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2769,7 +2843,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2803,7 +2876,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2829,7 +2901,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2853,7 +2924,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2878,7 +2948,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2899,7 +2968,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2934,7 +3002,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
 
@@ -2992,7 +3059,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3025,7 +3091,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3059,7 +3124,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3078,7 +3142,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3102,7 +3165,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3127,7 +3189,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3148,7 +3209,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }

packages/now-build-utils/test/unit.test.js

@@ -24,6 +24,19 @@ async function expectBuilderError(promise, pattern) {
   );
 }
 
+let warningMessages;
+const originalConsoleWarn = console.warn;
+beforeEach(() => {
+  warningMessages = [];
+  console.warn = m => {
+    warningMessages.push(m);
+  };
+});
+
+afterEach(() => {
+  console.warn = originalConsoleWarn;
+});
+
 it('should re-create symlinks properly', async () => {
   if (process.platform === 'win32') {
     console.log('Skipping test on windows');
@@ -81,6 +94,10 @@ it('should only match supported node versions', async () => {
     'major',
     12
   );
+  expect(await getSupportedNodeVersion('14.x', false)).toHaveProperty(
+    'major',
+    14
+  );
   expect(getSupportedNodeVersion('8.11.x', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('6.x', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('999.x', false)).rejects.toThrow();
@@ -104,6 +121,10 @@ it('should only match supported node versions', async () => {
     'major',
     12
   );
+  expect(await getSupportedNodeVersion('14.x', true)).toHaveProperty(
+    'major',
+    14
+  );
   const foundMessage = /Found `engines` in `package\.json` with an invalid Node\.js version range/;
   await expectBuilderError(
     getSupportedNodeVersion('8.11.x', false),
@@ -125,8 +146,8 @@ it('should match all semver ranges', async () => {
   // See https://docs.npmjs.com/files/package.json#engines
   expect(await getSupportedNodeVersion('10.0.0')).toHaveProperty('major', 10);
   expect(await getSupportedNodeVersion('10.x')).toHaveProperty('major', 10);
-  expect(await getSupportedNodeVersion('>=10')).toHaveProperty('major', 12);
-  expect(await getSupportedNodeVersion('>=10.3.0')).toHaveProperty('major', 12);
+  expect(await getSupportedNodeVersion('>=10')).toHaveProperty('major', 14);
+  expect(await getSupportedNodeVersion('>=10.3.0')).toHaveProperty('major', 14);
   expect(await getSupportedNodeVersion('8.5.0 - 10.5.0')).toHaveProperty(
     'major',
     10
@@ -150,20 +171,57 @@ it('should ignore node version in vercel dev getNodeVersion()', async () => {
   ).toHaveProperty('runtime', 'nodejs');
 });
 
+it('should select project setting from config when no package.json is found', async () => {
+  expect(
+    await getNodeVersion('/tmp', undefined, { nodeVersion: '14.x' }, {})
+  ).toHaveProperty('range', '14.x');
+  expect(warningMessages).toStrictEqual([]);
+});
+
+it('should prefer package.json engines over project setting from config and warn', async () => {
+  expect(
+    await getNodeVersion(
+      path.join(__dirname, 'pkg-engine-node'),
+      undefined,
+      { nodeVersion: '12.x' },
+      {}
+    )
+  ).toHaveProperty('range', '14.x');
+  expect(warningMessages).toStrictEqual([
+    'Warning: Due to `engines` existing in your `package.json` file, the Node.js Version defined in your Project Settings will not apply. Learn More: http://vercel.link/node-version',
+  ]);
+});
+
+it('should not warn when package.json engines matches project setting from config', async () => {
+  expect(
+    await getNodeVersion(
+      path.join(__dirname, 'pkg-engine-node'),
+      undefined,
+      { nodeVersion: '14.x' },
+      {}
+    )
+  ).toHaveProperty('range', '14.x');
+  expect(warningMessages).toStrictEqual([]);
+});
+
 it('should get latest node version', async () => {
-  expect(await getLatestNodeVersion()).toHaveProperty('major', 12);
+  expect(await getLatestNodeVersion()).toHaveProperty('major', 14);
 });
 
 it('should throw for discontinued versions', async () => {
   // Mock a future date so that Node 8 becomes discontinued
   const realDateNow = Date.now.bind(global.Date);
-  global.Date.now = () => new Date('2020-02-14').getTime();
+  global.Date.now = () => new Date('2021-04-01').getTime();
 
   expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
+  expect(getSupportedNodeVersion('10.x', false)).rejects.toThrow();
+  expect(getSupportedNodeVersion('10.x', true)).rejects.toThrow();
 
-  expect(getDiscontinuedNodeVersions().length).toBe(1);
-  expect(getDiscontinuedNodeVersions()[0]).toHaveProperty('range', '8.10.x');
+  const discontinued = getDiscontinuedNodeVersions();
+  expect(discontinued.length).toBe(2);
+  expect(discontinued[0]).toHaveProperty('range', '10.x');
+  expect(discontinued[1]).toHaveProperty('range', '8.10.x');
 
   global.Date.now = realDateNow;
 });

packages/now-cgi/build.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+const execa = require('execa');
+const { join } = require('path');
+const { homedir } = require('os');
+
+async function main() {
+  process.env.GOOS = 'linux';
+  process.env.GOARCH = 'amd64';
+  process.env.GOPATH = join(homedir(), 'go');
+
+  await execa('go', ['get', 'github.com/aws/aws-lambda-go/events'], {
+    stdio: 'inherit',
+  });
+  await execa('go', ['get', 'github.com/aws/aws-lambda-go/lambda'], {
+    stdio: 'inherit',
+  });
+  await execa('go', ['build', '-o', 'handler', 'main.go'], {
+    stdio: 'inherit',
+  });
+}
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

packages/now-cgi/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-export GOOS=linux
-export GOARCH=amd64
-export GOPATH=$HOME/go
-go get github.com/aws/aws-lambda-go/events
-go get github.com/aws/aws-lambda-go/lambda
-go build -o handler main.go

packages/now-cgi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/cgi",
-  "version": "1.0.6",
+  "version": "1.0.7-canary.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,7 +8,8 @@
     "directory": "packages/now-cgi"
   },
   "scripts": {
-    "prepublish": "./build.sh"
+    "build": "node build",
+    "prepublishOnly": "node build"
   },
   "files": [
     "index.js",

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.1.0",
+  "version": "21.2.4-canary.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -13,7 +13,7 @@
   "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": "ava test/integration.js --serial --fail-fast --verbose",
+    "test-integration-cli": "rimraf test/fixtures/integration && ava test/integration.js --serial --fail-fast --verbose",
     "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 +61,11 @@
     "node": ">= 10"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.5.1",
-    "@vercel/go": "1.1.6",
-    "@vercel/node": "1.8.1",
-    "@vercel/python": "1.2.3",
-    "@vercel/ruby": "1.2.4",
+    "@vercel/build-utils": "2.9.1-canary.0",
+    "@vercel/go": "1.1.8",
+    "@vercel/node": "1.9.1-canary.0",
+    "@vercel/python": "1.2.5-canary.1",
+    "@vercel/ruby": "1.2.6-canary.0",
     "update-notifier": "4.1.0"
   },
   "devDependencies": {
@@ -100,7 +100,7 @@
     "@types/universal-analytics": "0.4.2",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.1.1",
+    "@vercel/frameworks": "0.2.1-canary.0",
     "@vercel/ncc": "0.24.0",
     "@zeit/fun": "0.11.2",
     "@zeit/source-map-support": "0.6.2",
@@ -134,7 +134,7 @@
     "fs-extra": "7.0.1",
     "get-port": "5.1.1",
     "glob": "7.1.2",
-    "http-proxy": "1.17.0",
+    "http-proxy": "1.18.1",
     "inquirer": "7.0.4",
     "is-port-reachable": "3.0.0",
     "is-url": "1.2.2",
@@ -146,8 +146,7 @@
     "minimatch": "3.0.4",
     "mri": "1.1.5",
     "ms": "2.1.2",
-    "nanoid": "3.0.2",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "npm-package-arg": "6.1.0",
     "nyc": "13.2.0",
     "ora": "3.4.0",
@@ -158,6 +157,7 @@
     "psl": "1.1.31",
     "qr-image": "3.2.0",
     "raw-body": "2.4.1",
+    "rimraf": "3.0.2",
     "semver": "5.5.0",
     "serve-handler": "6.1.1",
     "sinon": "4.4.2",
@@ -168,7 +168,7 @@
     "text-table": "0.2.0",
     "title": "3.4.1",
     "tmp-promise": "1.0.3",
-    "tree-kill": "1.2.1",
+    "tree-kill": "1.2.2",
     "ts-node": "8.3.0",
     "typescript": "3.9.3",
     "universal-analytics": "0.4.20",

packages/now-cli/src/commands/alias/index.js

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 
 import { handleError } from '../../util/error';
 
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import logo from '../../util/output/logo';
@@ -18,7 +17,7 @@ const help = () => {
 
   ${chalk.dim('Commands:')}
 
-    ls    [app]                  Show all aliases (or per app name)
+    ls                           Show all aliases
     set   <deployment> <alias>   Create a new alias
     rm    <alias>                Remove an alias using its hostname
 
@@ -39,19 +38,19 @@ const help = () => {
     -N, --next                          Show next page of results
   ${chalk.dim('Examples:')}
 
-  ${chalk.gray('–')} Add a new alias to ${chalk.underline('my-api.now.sh')}
+  ${chalk.gray('–')} Add a new alias to ${chalk.underline('my-api.vercel.app')}
 
       ${chalk.cyan(
         `$ ${getPkgName()} alias set ${chalk.underline(
-          'api-ownv3nc9f8.now.sh'
-        )} ${chalk.underline('my-api.now.sh')}`
+          'api-ownv3nc9f8.vercel.app'
+        )} ${chalk.underline('my-api.vercel.app')}`
       )}
 
       Custom domains work as alias targets
 
       ${chalk.cyan(
         `$ ${getPkgName()} alias set ${chalk.underline(
-          'api-ownv3nc9f8.now.sh'
+          'api-ownv3nc9f8.vercel.app'
         )} ${chalk.underline('my-api.com')}`
       )}
 
@@ -92,15 +91,14 @@ export default async function main(ctx) {
     return 2;
   }
 
-  const output = createOutput({ debug: argv['--debug'] });
   const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
 
   switch (subcommand) {
     case 'ls':
-      return ls(ctx, argv, args, output);
+      return ls(ctx, argv, args);
     case 'rm':
-      return rm(ctx, argv, args, output);
+      return rm(ctx, argv, args);
     default:
-      return set(ctx, argv, args, output);
+      return set(ctx, argv, args);
   }
 }

packages/now-cli/src/commands/alias/ls.js

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import plural from 'pluralize';
 import table from 'text-table';
 import Now from '../../util';
 import Client from '../../util/client.ts';
@@ -11,9 +10,10 @@ import strlen from '../../util/strlen.ts';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name.ts';
 
-export default async function ls(ctx, opts, args, output) {
+export default async function ls(ctx, opts, args) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
@@ -24,6 +24,7 @@ export default async function ls(ctx, opts, args, output) {
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
   let contextName = null;
 
@@ -48,60 +49,28 @@ export default async function ls(ctx, opts, args, output) {
     token,
     debug: debugEnabled,
     currentTeam,
+    output,
   });
   const lsStamp = stamp();
-  let cancelWait;
 
-  if (args.length > 1) {
+  if (args.length > 0) {
     output.error(
       `Invalid number of arguments. Usage: ${chalk.cyan(
-        `${getCommandName('alias ls [alias]')}`
+        `${getCommandName('alias ls')}`
       )}`
     );
     return 1;
   }
 
-  cancelWait = output.spinner(
-    args[0]
-      ? `Fetching alias details for "${args[0]}" under ${chalk.bold(
-          contextName
-        )}`
-      : `Fetching aliases under ${chalk.bold(contextName)}`
-  );
+  output.spinner(`Fetching aliases under ${chalk.bold(contextName)}`);
 
   const { aliases, pagination } = await getAliases(
     now,
     undefined,
     nextTimestamp
   );
-  if (cancelWait) cancelWait();
-
-  if (args[0]) {
-    const alias = aliases.find(
-      item => item.uid === args[0] || item.alias === args[0]
-    );
-    if (!alias) {
-      output.error(`Could not match path alias for: ${args[0]}`);
-      now.close();
-      return 1;
-    }
-
-    if (opts['--json']) {
-      console.log(JSON.stringify({ rules: alias.rules }, null, 2));
-    } else {
-      const rules = alias.rules || [];
-      output.log(
-        `${rules.length} path alias ${plural(
-          'rule',
-          rules.length
-        )} found under ${chalk.bold(contextName)} ${lsStamp()}`
-      );
-      output.print(`${printPathAliasTable(rules)}\n`);
-    }
-  } else {
-    output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
-    console.log(printAliasTable(aliases));
-  }
+  output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
+  console.log(printAliasTable(aliases));
 
   if (pagination && pagination.count === 20) {
     const flags = getCommandFlags(opts, ['_', '--next']);
@@ -121,14 +90,10 @@ function printAliasTable(aliases) {
     [
       ['source', 'url', 'age'].map(h => chalk.gray(h)),
       ...aliases.map(a => [
-        a.rules && a.rules.length
-          ? chalk.cyan(`[${plural('rule', a.rules.length, true)}]`)
-          : // for legacy reasons, we might have situations
-          // where the deployment was deleted and the alias
-          // not collected appropriately, and we need to handle it
-          a.deployment && a.deployment.url
-          ? a.deployment.url
-          : chalk.gray('–'),
+        // for legacy reasons, we might have situations
+        // where the deployment was deleted and the alias
+        // not collected appropriately, and we need to handle it
+        a.deployment && a.deployment.url ? a.deployment.url : chalk.gray('–'),
         a.alias,
         ms(Date.now() - new Date(a.createdAt)),
       ]),
@@ -140,21 +105,3 @@ function printAliasTable(aliases) {
     }
   ).replace(/^/gm, '  ')}\n\n`;
 }
-
-function printPathAliasTable(rules) {
-  const header = [['pathname', 'method', 'dest'].map(s => chalk.gray(s))];
-  return `${table(
-    header.concat(
-      rules.map(rule => [
-        rule.pathname ? rule.pathname : chalk.cyan('[fallthrough]'),
-        rule.method ? rule.method : '*',
-        rule.dest,
-      ])
-    ),
-    {
-      align: ['l', 'l', 'l', 'l'],
-      hsep: ' '.repeat(6),
-      stringLength: strlen,
-    }
-  ).replace(/^(.*)/gm, '  $1')}\n`;
-}

packages/now-cli/src/commands/alias/rm.js

@@ -7,14 +7,15 @@ import getScope from '../../util/get-scope.ts';
 import removeAliasById from '../../util/alias/remove-alias-by-id';
 import stamp from '../../util/output/stamp.ts';
 import strlen from '../../util/strlen.ts';
-import promptBool from '../../util/prompt-bool';
+import confirm from '../../util/input/confirm';
 import { isValidName } from '../../util/is-valid-name';
 import findAliasByAliasOrId from '../../util/alias/find-alias-by-alias-or-id';
 import { getCommandName } from '../../util/pkg-name.ts';
 
-export default async function rm(ctx, opts, args, output) {
+export default async function rm(ctx, opts, args) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
@@ -25,6 +26,7 @@ export default async function rm(ctx, opts, args, output) {
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
   let contextName = null;
 
@@ -39,8 +41,13 @@ export default async function rm(ctx, opts, args, output) {
     throw err;
   }
 
-  // $FlowFixMe
-  const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
+  const now = new Now({
+    apiUrl,
+    token,
+    debug: debugEnabled,
+    currentTeam,
+    output,
+  });
   const [aliasOrId] = args;
 
   if (args.length !== 1) {
@@ -108,5 +115,5 @@ async function confirmAliasRemove(output, alias) {
 
   output.log(`The following alias will be removed permanently`);
   output.print(`  ${tbl}\n`);
-  return promptBool(output, chalk.red('Are you sure?'));
+  return confirm(chalk.red('Are you sure?'), false);
 }

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

@@ -29,11 +29,11 @@ type Options = {
 export default async function set(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
     localConfig,
   } = ctx;
@@ -49,6 +49,7 @@ export default async function set(
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
 
   let user: User;
@@ -96,7 +97,7 @@ export default async function set(
     return 1;
   }
 
-  // For `now alias set <argument>`
+  // For `vercel alias set <argument>`
   if (args.length === 1) {
     const deployment = handleCertError(
       output,
@@ -261,7 +262,7 @@ function handleSetupDomainError<T>(
         { extraSpace: '     ' }
       )}\n\n`
     );
-    output.print('  Read more: https://err.sh/now/domain-verification\n');
+    output.print('  Read more: https://err.sh/vercel/domain-verification\n');
     return 1;
   }
 
@@ -388,7 +389,7 @@ function handleCreateAliasError<T>(
   }
   if (error instanceof ERRORS.InvalidAlias) {
     output.error(
-      `Invalid alias. Please confirm that the alias you provided is a valid hostname. Note: For \`now.sh\`, only sub and sub-sub domains are supported.`
+      `Invalid alias. Please confirm that the alias you provided is a valid hostname. Note: For \`vercel.app\`, only sub and sub-sub domains are supported.`
     );
     return 1;
   }

packages/now-cli/src/commands/billing/index.js

@@ -14,7 +14,6 @@ import addBilling from './add';
 import exit from '../../util/exit';
 import Client from '../../util/client.ts';
 import getScope from '../../util/get-scope.ts';
-import createOutput from '../../util/output';
 import { getPkgName } from '../../util/pkg-name.ts';
 
 const help = () => {
@@ -90,8 +89,9 @@ function buildInquirerChoices(cards) {
     const _default =
       source.id === cards.defaultSource ? ` ${chalk.bold('(default)')}` : '';
     const id = `${chalk.cyan(`ID: ${source.id}`)}${_default}`;
-    const number = `${chalk.gray('#### ').repeat(3)}${source.last4 ||
-      source.card.last4}`;
+    const number = `${chalk.gray('#### ').repeat(3)}${
+      source.last4 || source.card.last4
+    }`;
     const str = [
       id,
       indent(source.name || source.owner.name, 2),
@@ -106,11 +106,16 @@ function buildInquirerChoices(cards) {
   });
 }
 
-async function run({ token, config: { currentTeam } }) {
+async function run({ token, output, config: { currentTeam } }) {
   const start = new Date();
-  const creditCards = new NowCreditCards({ apiUrl, token, debug, currentTeam });
-  const output = createOutput({ debug });
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const creditCards = new NowCreditCards({
+    apiUrl,
+    token,
+    debug,
+    currentTeam,
+    output,
+  });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {
@@ -147,8 +152,9 @@ async function run({ token, config: { currentTeam } }) {
           const id = `${chalk.gray('-')} ${chalk.cyan(
             `ID: ${source.id}`
           )}${_default}`;
-          const number = `${chalk.gray('#### ').repeat(3)}${source.last4 ||
-            source.card.last4}`;
+          const number = `${chalk.gray('#### ').repeat(3)}${
+            source.last4 || source.card.last4
+          }`;
 
           return [
             id,
@@ -231,8 +237,9 @@ async function run({ token, config: { currentTeam } }) {
         const elapsed = ms(new Date() - start);
         console.log(
           success(
-            `${card.brand || card.card.brand} ending in ${card.last4 ||
-              card.card.last4} is now the default ${chalk.gray(`[${elapsed}]`)}`
+            `${card.brand || card.card.brand} ending in ${
+              card.last4 || card.card.last4
+            } is now the default ${chalk.gray(`[${elapsed}]`)}`
           )
         );
       } else {
@@ -301,9 +308,9 @@ async function run({ token, config: { currentTeam } }) {
         const deletedCard = cards.sources.find(card => card.id === cardId);
         const remainingCards = cards.sources.filter(card => card.id !== cardId);
 
-        let text = `${deletedCard.brand ||
-          deletedCard.card.brand} ending in ${deletedCard.last4 ||
-          deletedCard.card.last4} was deleted`;
+        let text = `${deletedCard.brand || deletedCard.card.brand} ending in ${
+          deletedCard.last4 || deletedCard.card.last4
+        } was deleted`;
         //  ${chalk.gray(`[${elapsed}]`)}
 
         if (cardId === cards.defaultSource) {
@@ -317,11 +324,11 @@ async function run({ token, config: { currentTeam } }) {
               card => card.id === cards.defaultCardId
             );
 
-            text += `\n${newDefaultCard.brand ||
-              newDefaultCard.card.brand} ending in ${newDefaultCard.last4 ||
-              newDefaultCard.card.last4} in now default for ${chalk.bold(
-              contextName
-            )}`;
+            text += `\n${
+              newDefaultCard.brand || newDefaultCard.card.brand
+            } ending in ${
+              newDefaultCard.last4 || newDefaultCard.card.last4
+            } in now default for ${chalk.bold(contextName)}`;
           }
         }
 

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

@@ -8,7 +8,6 @@ import stamp from '../../util/output/stamp';
 import createCertFromFile from '../../util/certs/create-cert-from-file';
 import createCertForCns from '../../util/certs/create-cert-for-cns';
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import { getCommandName } from '../../util/pkg-name';
 
 interface Options {
@@ -22,11 +21,11 @@ interface Options {
 async function add(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ): Promise<number> {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
@@ -49,6 +48,7 @@ async function add(
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
 
   try {
@@ -62,7 +62,13 @@ async function add(
     throw err;
   }
 
-  const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
+  const now = new Now({
+    apiUrl,
+    token,
+    debug: debugEnabled,
+    currentTeam,
+    output,
+  });
 
   if (overwite) {
     output.error('Overwrite option is deprecated');
@@ -71,7 +77,7 @@ async function add(
   }
 
   if (crtPath || keyPath || caPath) {
-    if (args.length !== 0 || (!crtPath || !keyPath || !caPath)) {
+    if (args.length !== 0 || !crtPath || !keyPath || !caPath) {
       output.error(
         `Invalid number of arguments to create a custom certificate entry. Usage:`
       );
@@ -113,12 +119,12 @@ async function add(
       (res, item) => res.concat(item.split(',')),
       []
     );
-    const cancelWait = output.spinner(
+    output.spinner(
       `Generating a certificate for ${chalk.bold(cns.join(', '))}`
     );
 
     cert = await createCertForCns(now, cns, contextName);
-    cancelWait();
+    output.stopSpinner();
   }
 
   if (cert instanceof Error) {

packages/now-cli/src/commands/certs/index.ts

@@ -3,7 +3,6 @@ import chalk from 'chalk';
 // @ts-ignore
 import { handleError } from '../../util/error';
 
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import logo from '../../util/output/logo';
@@ -104,17 +103,17 @@ export default async function main(ctx: NowContext) {
     return 0;
   }
 
-  const output = createOutput({ debug: argv['--debug'] });
+  const { output } = ctx;
   const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
   switch (subcommand) {
     case 'issue':
-      return issue(ctx, argv, args, output);
+      return issue(ctx, argv, args);
     case 'ls':
-      return ls(ctx, argv, args, output);
+      return ls(ctx, argv, args);
     case 'rm':
-      return rm(ctx, argv, args, output);
+      return rm(ctx, argv, args);
     case 'add':
-      return add(ctx, argv, args, output);
+      return add(ctx, argv, args);
     case 'renew':
       output.error('Renewing certificates is deprecated, issue a new one.');
       return 1;

packages/now-cli/src/commands/certs/issue.ts

@@ -28,11 +28,11 @@ type Options = {
 export default async function issue(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
@@ -55,6 +55,7 @@ export default async function issue(
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
   let contextName = null;
 
@@ -75,7 +76,7 @@ export default async function issue(
   }
 
   if (crtPath || keyPath || caPath) {
-    if (args.length !== 0 || (!crtPath || !keyPath || !caPath)) {
+    if (args.length !== 0 || !crtPath || !keyPath || !caPath) {
       output.error(
         `Invalid number of arguments to create a custom certificate entry. Usage:`
       );
@@ -230,6 +231,8 @@ async function runStartOrder(
   output.print(
     `  ${chalk.cyan(getCommandName(`certs issue ${cns.join(' ')}`))}\n`
   );
-  output.print('  Read more: https://err.sh/now/solve-challenges-manually\n');
+  output.print(
+    '  Read more: https://err.sh/vercel/solve-challenges-manually\n'
+  );
   return 0;
 }

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

@@ -8,7 +8,6 @@ import getScope from '../../util/get-scope';
 import stamp from '../../util/output/stamp';
 import getCerts from '../../util/certs/get-certs';
 import strlen from '../../util/strlen';
-import { Output } from '../../util/output';
 import { NowContext, Cert } from '../../types';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
@@ -21,17 +20,17 @@ interface Options {
 async function ls(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ): Promise<number> {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const { '--debug': debug, '--next': nextTimestamp } = opts;
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {
@@ -48,7 +47,7 @@ async function ls(
     output.error('Please provide a number for flag --next');
     return 1;
   }
-  const now = new Now({ apiUrl, token, debug, currentTeam });
+  const now = new Now({ apiUrl, token, debug, currentTeam, output });
   const lsStamp = stamp();
 
   if (args.length !== 0) {

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

@@ -18,21 +18,17 @@ type Options = {
   '--debug': boolean;
 };
 
-async function rm(
-  ctx: NowContext,
-  opts: Options,
-  args: string[],
-  output: Output
-) {
+async function rm(ctx: NowContext, opts: Options, args: string[]) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const rmStamp = stamp();
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
 
   let contextName = null;
 

packages/now-cli/src/commands/deploy/args.js

@@ -1,7 +1,5 @@
 import chalk from 'chalk';
 import logo from '../../util/output/logo';
-import code from '../../util/output/code';
-import note from '../../util/output/note';
 import { getPkgName } from '../../util/pkg-name.ts';
 
 export const help = () => `
@@ -70,12 +68,6 @@ export const help = () => `
     --prod                         Create a production deployment
     -c, --confirm                  Confirm default options and skip questions
 
-  ${note(
-    `To view the usage information for Now 1.0, run ${code(
-      `${getPkgName()} help deploy-v1`
-    )}`
-  )}
-
   ${chalk.dim('Examples:')}
 
   ${chalk.gray('–')} Deploy the current directory

packages/now-cli/src/commands/deploy/index.js

@@ -3,7 +3,6 @@ import { resolve, basename } from 'path';
 import { fileNameSymbol } from '@vercel/client';
 import Client from '../../util/client.ts';
 import getScope from '../../util/get-scope.ts';
-import createOutput from '../../util/output';
 import code from '../../util/output/code';
 import highlight from '../../util/output/highlight';
 import { readLocalConfig } from '../../util/config/files';
@@ -15,6 +14,7 @@ import deploy from './latest';
 export default async ctx => {
   const {
     authConfig,
+    output,
     config: { currentTeam },
     apiUrl,
   } = ctx;
@@ -48,7 +48,6 @@ export default async ctx => {
     localConfig = readLocalConfig(paths[0]);
   }
   const debugEnabled = argv['--debug'];
-  const output = createOutput({ debug: debugEnabled });
   const stats = {};
 
   if (argv['--help']) {
@@ -74,6 +73,7 @@ export default async ctx => {
       apiUrl,
       token: authConfig.token,
       currentTeam,
+      output,
       debug: debugEnabled,
     });
     try {

packages/now-cli/src/commands/deploy/latest.js

@@ -104,7 +104,7 @@ const printDeploymentStatus = async (
 
   if (readyState !== 'READY') {
     output.error(
-      `Your deployment failed. Please retry later. More: https://err.sh/now/deployment-error`
+      `Your deployment failed. Please retry later. More: https://err.sh/vercel/deployment-error`
     );
     return 1;
   }
@@ -157,17 +157,21 @@ const printDeploymentStatus = async (
   }
 
   if (indications) {
+    const indent = process.stdout.isTTY ? '    ' : ''; // if using emojis
+    const newline = '\n';
     for (let indication of indications) {
-      output.print(
-        prependEmoji(
-          `${chalk.dim(indication.payload)}`,
-          emoji(indication.type)
-        ) +
-          `\n` +
-          (indication.link
-            ? `${indication.action || 'Learn More'}: ${indication.link}\n\n`
-            : '')
-      );
+      const message =
+        prependEmoji(chalk.dim(indication.payload), emoji(indication.type)) +
+        newline;
+      let link = '';
+      if (indication.link)
+        link =
+          indent +
+          chalk.dim(
+            `${indication.action || 'Learn More'}: ${indication.link}`
+          ) +
+          newline;
+      output.print(message + link);
     }
   }
 };
@@ -229,8 +233,7 @@ export default async function main(
   const paths = Object.keys(stats);
   const debugEnabled = argv['--debug'];
 
-  // $FlowFixMe
-  const isTTY = process.stdout.isTTY;
+  const { isTTY } = process.stdout;
   const quiet = !isTTY;
 
   // check paths
@@ -243,11 +246,6 @@ export default async function main(
   const { isFile, path } = pathValidation;
   const autoConfirm = argv['--confirm'] || isFile;
 
-  // --no-scale
-  if (argv['--no-scale']) {
-    warn(`The option --no-scale is only supported on Now 1.0 deployments`);
-  }
-
   // deprecate --name
   if (argv['--name']) {
     output.print(
@@ -264,6 +262,7 @@ export default async function main(
     apiUrl: ctx.apiUrl,
     token: ctx.authConfig.token,
     debug: debugEnabled,
+    output,
   });
 
   // retrieve `project` and `org` from .vercel
@@ -646,6 +645,7 @@ export default async function main(
           token: ctx.authConfig.token,
           currentTeam: org.id,
           debug: debugEnabled,
+          output,
         }),
         err.meta.domain,
         contextName
@@ -728,6 +728,7 @@ export default async function main(
       token: ctx.authConfig.token,
       currentTeam: org.type === 'team' ? org.id : null,
       debug: debugEnabled,
+      output,
     }),
     deployment,
     deployStamp,

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

@@ -2,16 +2,15 @@ import { resolve, join } from 'path';
 
 import DevServer from '../../util/dev/server';
 import parseListen from '../../util/dev/parse-listen';
-import { Output } from '../../util/output';
-import { NowContext } from '../../types';
+import { NowContext, ProjectEnvVariable } from '../../types';
 import Client from '../../util/client';
 import { getLinkedProject } from '../../util/projects/link';
 import { getFrameworks } from '../../util/get-frameworks';
 import { isSettingValue } from '../../util/is-setting-value';
-import { ProjectSettings, ProjectEnvTarget } from '../../types';
+import { ProjectSettings } from '../../types';
 import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
-import { Env } from '@vercel/build-utils';
 import setupAndLink from '../../util/link/setup-and-link';
+import getSystemEnvValues from '../../util/env/get-system-env-values';
 
 type Options = {
   '--debug'?: boolean;
@@ -22,9 +21,9 @@ type Options = {
 export default async function dev(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
+  const { output } = ctx;
   const [dir = '.'] = args;
   let cwd = resolve(dir);
   const listen = parseListen(opts['--listen'] || '3000');
@@ -35,6 +34,7 @@ export default async function dev(
     token: ctx.authConfig.token,
     currentTeam: ctx.config.currentTeam,
     debug,
+    output,
   });
 
   // retrieve dev command
@@ -49,7 +49,6 @@ export default async function dev(
 
     link = await setupAndLink(
       ctx,
-      output,
       cwd,
       forceDelete,
       autoConfirm,
@@ -70,7 +69,8 @@ export default async function dev(
   let devCommand: string | undefined;
   let frameworkSlug: string | undefined;
   let projectSettings: ProjectSettings | undefined;
-  let environmentVars: Env | undefined;
+  let projectEnvs: ProjectEnvVariable[] = [];
+  let systemEnvValues: string[] = [];
   if (link.status === 'linked') {
     const { project, org } = link;
     client.currentTeam = org.type === 'team' ? org.id : undefined;
@@ -98,12 +98,12 @@ export default async function dev(
       cwd = join(cwd, project.rootDirectory);
     }
 
-    environmentVars = await getDecryptedEnvRecords(
-      output,
-      client,
-      project,
-      ProjectEnvTarget.Development
-    );
+    [{ envs: projectEnvs }, { systemEnvValues }] = await Promise.all([
+      getDecryptedEnvRecords(output, client, project.id),
+      project.autoExposeSystemEnvs
+        ? getSystemEnvValues(output, client, project.id)
+        : { systemEnvValues: [] },
+    ]);
   }
 
   const devServer = new DevServer(cwd, {
@@ -112,7 +112,8 @@ export default async function dev(
     devCommand,
     frameworkSlug,
     projectSettings,
-    environmentVars,
+    projectEnvs,
+    systemEnvValues,
   });
 
   process.once('SIGINT', () => devServer.stop());

packages/now-cli/src/commands/dev/index.ts

@@ -7,7 +7,6 @@ import getSubcommand from '../../util/get-subcommand';
 import { NowContext } from '../../types';
 import { NowError } from '../../util/now-error';
 import handleError from '../../util/handle-error';
-import createOutput from '../../util/output/create-output';
 import logo from '../../util/output/logo';
 import cmd from '../../util/output/cmd';
 import highlight from '../../util/output/highlight';
@@ -51,7 +50,7 @@ const help = () => {
 export default async function main(ctx: NowContext) {
   let argv;
   let args;
-  let output;
+  const { output } = ctx;
 
   try {
     argv = getArgs(ctx.argv.slice(2), {
@@ -63,9 +62,7 @@ export default async function main(ctx: NowContext) {
       '--port': Number,
       '-p': '--port',
     });
-    const debug = argv['--debug'];
     args = getSubcommand(argv._.slice(1), COMMAND_CONFIG).args;
-    output = createOutput({ debug });
 
     if ('--port' in argv) {
       output.warn('`--port` is deprecated, please use `--listen` instead');
@@ -99,7 +96,7 @@ export default async function main(ctx: NowContext) {
             'package.json'
           )} must not contain ${cmd('now dev')}`
         );
-        output.error(`Learn More: http://err.sh/now/now-dev-as-dev-script`);
+        output.error(`Learn More: http://err.sh/vercel/now-dev-as-dev-script`);
         return 1;
       }
       if (scripts && scripts.dev && /\bvercel\b\W+\bdev\b/.test(scripts.dev)) {
@@ -108,7 +105,7 @@ export default async function main(ctx: NowContext) {
             'package.json'
           )} must not contain ${cmd('vercel dev')}`
         );
-        output.error(`Learn More: http://err.sh/now/now-dev-as-dev-script`);
+        output.error(`Learn More: http://err.sh/vercel/now-dev-as-dev-script`);
         return 1;
       }
     }
@@ -120,7 +117,7 @@ export default async function main(ctx: NowContext) {
   }
 
   try {
-    return await dev(ctx, argv, args, output);
+    return await dev(ctx, argv, args);
   } catch (err) {
     if (err.code === 'ENOTFOUND') {
       // Error message will look like the following:

packages/now-cli/src/commands/dns/add.ts

@@ -6,7 +6,6 @@ import {
   DNSInvalidType,
 } from '../../util/errors-ts';
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import addDNSRecord from '../../util/dns/add-dns-record';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
@@ -22,17 +21,17 @@ type Options = {
 export default async function add(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
+    apiUrl,
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

packages/now-cli/src/commands/dns/import.ts

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
 import { DomainNotFound, InvalidDomain } from '../../util/errors-ts';
@@ -15,17 +14,17 @@ type Options = {
 export default async function add(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
+    apiUrl,
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

packages/now-cli/src/commands/dns/index.ts

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 
 import { NowContext } from '../../types';
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import handleError from '../../util/handle-error';
@@ -112,16 +111,15 @@ export default async function main(ctx: NowContext) {
     return 2;
   }
 
-  const output = createOutput({ debug: argv['--debug'] });
   const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
   switch (subcommand) {
     case 'add':
-      return add(ctx, argv, args, output);
+      return add(ctx, argv, args);
     case 'import':
-      return importZone(ctx, argv, args, output);
+      return importZone(ctx, argv, args);
     case 'rm':
-      return rm(ctx, argv, args, output);
+      return rm(ctx, argv, args);
     default:
-      return ls(ctx, argv, args, output);
+      return ls(ctx, argv, args);
   }
 }

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

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import { Output } from '../../util/output';
 import { DomainNotFound } from '../../util/errors-ts';
 import { DNSRecord, NowContext } from '../../types';
 import Client from '../../util/client';
@@ -22,17 +21,17 @@ type Options = {
 export default async function ls(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
+    apiUrl,
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
   const { '--debug': debug, '--next': nextTimestamp } = opts;
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

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

@@ -17,17 +17,17 @@ type Options = {
 export default async function rm(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
+    apiUrl,
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
 
   try {
     await getScope(client);
@@ -100,12 +100,7 @@ function readConfirmation(
     process.stdin
       .on('data', d => {
         process.stdin.pause();
-        resolve(
-          d
-            .toString()
-            .trim()
-            .toLowerCase() === 'y'
-        );
+        resolve(d.toString().trim().toLowerCase() === 'y');
       })
       .resume();
   });

packages/now-cli/src/commands/domains/add.ts

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import * as ERRORS from '../../util/errors-ts';
 import Client from '../../util/client';
 import formatNSTable from '../../util/format-ns-table';
@@ -24,18 +23,18 @@ type Options = {
 export default async function add(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const debug = opts['--debug'];
   const force = opts['--force'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

packages/now-cli/src/commands/domains/buy.ts

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 import psl from 'psl';
 
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import * as ERRORS from '../../util/errors-ts';
 import Client from '../../util/client';
 import getDomainPrice from '../../util/domains/get-domain-price';
@@ -21,17 +20,17 @@ type Options = {
 export default async function buy(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {
@@ -70,7 +69,10 @@ export default async function buy(
   }
 
   const availableStamp = stamp();
-  const domainPrice = await getDomainPrice(client, domainName);
+  const [domainPrice, renewalPrice] = await Promise.all([
+    getDomainPrice(client, domainName),
+    getDomainPrice(client, domainName, 'renewal'),
+  ]);
 
   if (domainPrice instanceof Error) {
     output.prettyError(domainPrice);
@@ -102,14 +104,22 @@ export default async function buy(
     return 0;
   }
 
+  const autoRenew = await promptBool(
+    renewalPrice.period === 1
+      ? `Auto renew yearly for ${chalk.bold(`$${price}`)}?`
+      : `Auto renew every ${renewalPrice.period} years for ${chalk.bold(
+          `$${price}`
+        )}?`,
+    { defaultValue: true }
+  );
+
   let buyResult;
   const purchaseStamp = stamp();
-  const stopPurchaseSpinner = output.spinner('Purchasing');
+  output.spinner('Purchasing');
 
   try {
-    buyResult = await purchaseDomain(client, domainName, price);
+    buyResult = await purchaseDomain(client, domainName, price, autoRenew);
   } catch (err) {
-    stopPurchaseSpinner();
     output.error(
       'An unexpected error occurred while purchasing your domain. Please try again later.'
     );
@@ -117,7 +127,7 @@ export default async function buy(
     return 1;
   }
 
-  stopPurchaseSpinner();
+  output.stopSpinner();
 
   if (buyResult instanceof ERRORS.SourceNotFound) {
     output.error(