Publish Stable

- vercel@21.3.2
 - @vercel/python@2.0.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

@@ -73,8 +73,8 @@ The logs of this deployment will contain the actual error which may help you to
 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('@vercel/nft');
-trace(['path/to/entrypoint.js'], {
+const { nodeFileTrace } = require('@vercel/nft');
+nodeFileTrace(['path/to/entrypoint.js'], {
   ts: true,
   mixedModules: true,
 })
@@ -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

@@ -17,7 +17,7 @@ jobs:
       with:
         node-version: 12
     - name: Install
-      run: yarn install --check-files --frozen-lockfile
+      run: yarn install --check-files --frozen-lockfile --network-timeout 1000000
     - name: Build
       run: yarn build
       env:

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

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        node: [10, 12]
+        node: [12]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
       - run: git fetch origin master --depth=100
       - run: git fetch origin ${{ github.ref }} --depth=100
       - run: git diff origin/master...HEAD --name-only
-      - run: yarn install
+      - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - uses: actions/setup-node@v1
         with:

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

@@ -11,12 +11,12 @@ on:
 jobs:
   test:
     name: Dev
-    timeout-minutes: 45
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        node: [10, 12]
+        node: [12]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
       - name: Install Hugo
         if: matrix.os == 'macos-latest'
         run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
-      - run: yarn install
+      - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - uses: actions/setup-node@v1
         with:

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

@@ -21,7 +21,7 @@ jobs:
       - run: git fetch origin master --depth=100
       - run: git fetch origin ${{ github.ref }} --depth=100
       - run: git diff origin/master...HEAD --name-only
-      - run: yarn install
+      - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - run: yarn test-integration-once --clean false
         env:

.github/workflows/test-unit.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        node: [10, 12]
+        node: [12]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
-      - run: yarn install
+      - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - run: yarn run lint
         if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run lint once

.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/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

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/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/jekyll/.gitignore

@@ -1,6 +1,9 @@
 _site
-public
 .sass-cache
+.jekyll-cache
 .jekyll-metadata
+vendor
+public
 .env
 .env.build
+.vercel

examples/jekyll/.nowignore

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

examples/jekyll/404.html

@@ -1,4 +1,5 @@
 ---
+permalink: /404.html
 layout: default
 ---
 

examples/jekyll/Gemfile

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
-
 # Hello! This is where you manage which Jekyll version is used to run.
 # When you want to use a different version, change it below, save the
 # file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
@@ -8,27 +7,23 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 3.8.6"
-
+gem "jekyll", "~> 4.2.0"
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
-
+gem "minima", "~> 2.5"
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 # gem "github-pages", group: :jekyll_plugins
-
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.12"
 end
 
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library.
-install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+platforms :mingw, :x64_mingw, :mswin, :jruby do
   gem "tzinfo", "~> 1.2"
   gem "tzinfo-data"
 end
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
-
+gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]

examples/jekyll/Gemfile.lock

@@ -1,82 +1,80 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.8)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.11.1)
+    ffi (1.14.2)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.6)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.12.1)
+      terminal-table (~> 2.0)
+    jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.6.1)
-      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.7.1)
+      jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
-    minima (2.5.0)
-      jekyll (~> 3.5)
+    listen (3.4.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.1.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (4.0.6)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.6.0)
-    ruby_dep (1.5.0)
+    rexml (3.2.4)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2019.2)
-      tzinfo (>= 1.0.0)
-    wdm (0.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  jekyll (~> 3.8.6)
-  jekyll-feed (~> 0.6)
-  minima (~> 2.0)
+  jekyll (~> 4.2.0)
+  jekyll-feed (~> 0.12)
+  minima (~> 2.5)
   tzinfo (~> 1.2)
   tzinfo-data
-  wdm (~> 0.1.0)
+  wdm (~> 0.1.1)
 
 BUNDLED WITH
-   2.1.4
+   2.2.4

examples/jekyll/_config.yml

@@ -7,12 +7,17 @@
 #
 # For technical reasons, this file is *NOT* reloaded automatically when you use
 # 'bundle exec jekyll serve'. If you change this file, please restart the server process.
-
+#
+# If you need help with YAML syntax, here are some quick references for you:
+# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
+# https://learnxinyminutes.com/docs/yaml/
+#
 # Site settings
 # These are used to personalize your new site. If you look in the HTML files,
 # you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
+
 title: Your awesome title
 email: your-email@example.com
 description: >- # this means to ignore newlines until "baseurl:"
@@ -23,21 +28,27 @@ baseurl: "" # the subpath of your site, e.g. /blog
 url: "" # the base hostname & protocol for your site, e.g. http://example.com
 twitter_username: jekyllrb
 github_username:  jekyll
-permalink: pretty
 
 # Build settings
-markdown: kramdown
 theme: minima
 plugins:
   - jekyll-feed
 
 # Exclude from processing.
-# The following items will not be processed, by default. Create a custom list
-# to override the default setting.
+# The following items will not be processed, by default.
+# Any item listed under the `exclude:` key here will be automatically added to
+# the internal "default list".
+#
+# Excluded items can be processed by explicitly listing the directories or
+# their entries' file path in the `include:` list.
+#
 # exclude:
+#   - .sass-cache/
+#   - .jekyll-cache/
+#   - gemfiles/
 #   - Gemfile
 #   - Gemfile.lock
-#   - node_modules
+#   - node_modules/
 #   - vendor/bundle/
 #   - vendor/cache/
 #   - vendor/gems/

examples/jekyll/_posts/2021-02-19-welcome-to-jekyll.md

@@ -1,18 +1,23 @@
 ---
 layout: post
-title:  "Welcome to Jekyll!"
-date:   2019-07-18 00:15:52 +0100
+title: 'Welcome to Jekyll!'
+date: 2021-02-19 23:17:16 +0000
 categories: jekyll update
 ---
+
 You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
 
-To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
+Jekyll requires blog post files to be named according to the following format:
+
+`YEAR-MONTH-DAY-title.MARKUP`
+
+Where `YEAR` is a four-digit number, `MONTH` and `DAY` are both two-digit numbers, and `MARKUP` is the file extension representing the format used in the file. After that, include the necessary front matter. Take a look at the source for this post to get an idea about how it works.
 
 Jekyll also offers powerful support for code snippets:
 
 {% highlight ruby %}
 def print_hi(name)
-  puts "Hi, #{name}"
+puts "Hi, #{name}"
 end
 print_hi('Tom')
 #=> prints 'Hi, Tom' to STDOUT.
@@ -21,5 +26,5 @@ print_hi('Tom')
 Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
 
 [jekyll-docs]: https://jekyllrb.com/docs/home
-[jekyll-gh]:   https://github.com/jekyll/jekyll
+[jekyll-gh]: https://github.com/jekyll/jekyll
 [jekyll-talk]: https://talk.jekyllrb.com/

examples/middleman/.gitignore

@@ -3,3 +3,4 @@
 .DS_Store
 .sass-cache
 build/
+.vercel

examples/middleman/Gemfile.lock

@@ -1,29 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.7.2)
+    activesupport (5.2.4.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    autoprefixer-rails (9.6.1.1)
+    autoprefixer-rails (9.8.6.5)
       execjs
-    backports (3.15.0)
+    backports (3.20.2)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.8)
     contracts (0.13.0)
-    dotenv (2.7.5)
+    dotenv (2.7.6)
     erubis (2.7.0)
     execjs (2.7.0)
     fast_blank (1.0.0)
-    fastimage (2.1.7)
-    ffi (1.11.1)
-    haml (5.1.2)
+    fastimage (2.2.2)
+    ffi (1.14.2)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
@@ -31,24 +31,25 @@ GEM
     hashie (3.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    kramdown (1.17.0)
+    kramdown (2.3.0)
+      rexml
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    memoist (0.16.0)
-    middleman (4.3.5)
+    memoist (0.16.2)
+    middleman (4.3.11)
       coffee-script (~> 2.2)
       haml (>= 4.0.5)
-      kramdown (~> 1.2)
-      middleman-cli (= 4.3.5)
-      middleman-core (= 4.3.5)
+      kramdown (>= 2.3.0)
+      middleman-cli (= 4.3.11)
+      middleman-core (= 4.3.11)
     middleman-autoprefixer (2.10.1)
       autoprefixer-rails (~> 9.1)
       middleman-core (>= 3.3.3)
-    middleman-cli (4.3.5)
+    middleman-cli (4.3.11)
       thor (>= 0.17.0, < 2.0)
-    middleman-core (4.3.5)
-      activesupport (>= 4.2, < 5.1)
+    middleman-core (4.3.11)
+      activesupport (>= 4.2, < 6.0)
       addressable (~> 2.3)
       backports (~> 3.6)
       bundler
@@ -70,33 +71,34 @@ GEM
       servolux
       tilt (~> 2.0.9)
       uglifier (~> 3.0)
-    minitest (5.12.2)
+    minitest (5.14.3)
     padrino-helpers (0.13.3.4)
       i18n (~> 0.6, >= 0.6.7)
       padrino-support (= 0.13.3.4)
       tilt (>= 1.4.1, < 3)
     padrino-support (0.13.3.4)
       activesupport (>= 3.1)
-    parallel (1.17.0)
-    public_suffix (4.0.1)
-    rack (2.0.7)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    parallel (1.20.1)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    sassc (2.2.1)
+    rexml (3.2.4)
+    sassc (2.4.0)
       ffi (~> 1.9)
     servolux (0.13.0)
     temple (0.8.2)
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   middleman (~> 4.2)
@@ -105,4 +107,4 @@ DEPENDENCIES
   wdm (~> 0.1)
 
 BUNDLED WITH
-   2.1.4
+   2.2.4

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/nuxtjs/.nowignore

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

examples/nuxtjs/.vercelignore

@@ -1,2 +1 @@
 README.md
-build

examples/nuxtjs/package.json

@@ -13,6 +13,6 @@
     "nuxt": "^2.0.0"
   },
   "devDependencies": {
-    "nodemon": "^1.18.9"
+    "nodemon": "^2.0.7"
   }
 }

examples/redwoodjs/.editorconfig

@@ -1,10 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true

examples/redwoodjs/.env.defaults

@@ -3,5 +3,11 @@
 # system. Any custom values should go in .env and .env should *not* be checked
 # into version control.
 
+# schema.prisma defaults
 DATABASE_URL=file:./dev.db
-BINARY_TARGET=native
+
+# location of the test database for api service scenarios (defaults to ./.redwood/test.db if not set)
+# TEST_DATABASE_URL=file:./.redwood/test.db
+
+# disables Prisma CLI update notifier
+PRISMA_HIDE_UPDATE_MESSAGE=true

examples/redwoodjs/.gitignore

@@ -1,10 +1,13 @@
+.idea
 .DS_Store
 .env
 .netlify
+.redwood
 dev.db
 dist
 dist-babel
 node_modules
 yarn-error.log
+web/public/mockServiceWorker.js
 
 .vercel

examples/redwoodjs/.nvmrc

@@ -1 +0,0 @@
-lts/*

examples/redwoodjs/api/db/schema.prisma

@@ -8,8 +8,8 @@ generator client {
   binaryTargets = "native"
 }
 
-// Define your own datamodels here and run `yarn redwood db save` to create
-// migrations for them.
+// Define your own datamodels here and run `yarn redwood prisma migrate dev`
+// to create migrations for them and apply to your dev DB.
 // TODO: Please remove the following example:
 model UserExample {
   id    Int     @id @default(autoincrement())

examples/redwoodjs/api/db/seed.js

@@ -6,6 +6,8 @@ dotenv.config()
 const db = new PrismaClient()
 
 async function main() {
+  // https://www.prisma.io/docs/guides/prisma-guides/seed-database
+  //
   // Seed data is database data that needs to exist for your app to run.
   // Ideally this file should be idempotent: running it multiple times
   // will result in the same database state (usually by checking for the
@@ -16,11 +18,11 @@ async function main() {
   //     await db.user.create({ data: { name: 'Admin', email: 'admin@email.com' }})
   //   }
 
-  console.info('No data to seed. See api/prisma/seeds.js for info.')
+  console.info('No data to seed. See api/db/seed.js for info.')
 }
 
 main()
   .catch((e) => console.error(e))
   .finally(async () => {
-    await db.disconnect()
+    await db.$disconnect()
   })

examples/redwoodjs/api/jsconfig.json

@@ -5,5 +5,5 @@
       "src/*": ["./src/*"]
     }
   },
-  "include": ["src/**/*"]
+  "include": ["src/**/*", "../.redwood/index.d.ts"]
 }

examples/redwoodjs/api/package.json

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

examples/redwoodjs/api/prisma/schema.prisma

@@ -1,18 +0,0 @@
-datasource DS {
-  provider = "sqlite"
-  url      = env("DATABASE_URL")
-}
-
-generator client {
-  provider      = "prisma-client-js"
-  binaryTargets = env("BINARY_TARGET")
-}
-
-// Define your own datamodels here and run `yarn redwood db save` to create
-// migrations for them.
-// TODO: Please remove the following example:
-model UserExample {
-  id    Int     @id @default(autoincrement())
-  email String  @unique
-  name  String?
-}

examples/redwoodjs/api/src/functions/graphql.js

@@ -3,17 +3,18 @@ import {
   makeMergedSchema,
   makeServices,
 } from '@redwoodjs/api'
-import importAll from '@redwoodjs/api/importAll.macro'
 
+import schemas from 'src/graphql/**/*.{js,ts}'
 import { db } from 'src/lib/db'
-
-const schemas = importAll('api', 'graphql')
-const services = importAll('api', 'services')
+import services from 'src/services/**/*.{js,ts}'
 
 export const handler = createGraphQLHandler({
   schema: makeMergedSchema({
     schemas,
     services: makeServices({ services }),
   }),
-  db,
+  onException: () => {
+    // Disconnect from your database with an unhandled exception.
+    db.$disconnect()
+  },
 })

examples/redwoodjs/api/src/lib/db.js

@@ -1,4 +1,4 @@
-// See https://github.com/prisma/prisma2/blob/master/docs/prisma-client-js/api.md#constructor
+// See https://www.prisma.io/docs/reference/tools-and-interfaces/prisma-client/constructor
 // for options.
 
 import { PrismaClient } from '@prisma/client'

examples/redwoodjs/graphql.config.js

@@ -0,0 +1,7 @@
+const { getConfig } = require('@redwoodjs/internal')
+
+const config = getConfig()
+
+module.exports = {
+  schema: `http://${config.api.host}:${config.api.port}/graphql`,
+}

examples/redwoodjs/package.json

@@ -3,11 +3,12 @@
   "workspaces": {
     "packages": [
       "api",
-      "web"
+      "web",
+      "packages/*"
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "0.15.0"
+    "@redwoodjs/core": "^0.25.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config"

examples/redwoodjs/prettier.config.js

@@ -6,4 +6,12 @@ module.exports = {
   semi: false,
   singleQuote: true,
   arrowParens: 'always',
+  overrides: [
+    {
+      files: 'Routes.js',
+      options: {
+        printWidth: 200,
+      },
+    },
+  ],
 }

examples/redwoodjs/redwood.toml

@@ -1,7 +1,15 @@
+# This file contains the configuration settings for your Redwood app.
+# This file is also what makes your Redwood app a Redwood app.
+# If you remove it and try to run `yarn rw dev`, you'll get an error.
+#
+# For the full list of options, see the "App Configuration: redwood.toml" doc:
+# https://redwoodjs.com/docs/app-configuration-redwood-toml
+
 [web]
   port = 8910
   apiProxyPath = "/api"
 [api]
   port = 8911
+  schemaPath = "./api/db/schema.prisma"
 [browser]
   open = false

examples/redwoodjs/web/jsconfig.json

@@ -6,5 +6,5 @@
     },
     "jsx": "preserve"
   },
-  "include": ["src/**/*"]
+  "include": ["src/**/*", "../.redwood/index.d.ts"]
 }

examples/redwoodjs/web/package.json

@@ -2,12 +2,20 @@
   "name": "web",
   "version": "0.0.0",
   "private": true,
-  "browserslist": [
-    "defaults"
-  ],
+  "browserslist": {
+    "development": [
+      "last 1 version"
+    ],
+    "production": [
+      "defaults",
+      "not IE 11",
+      "not IE_Mob 11"
+    ]
+  },
   "dependencies": {
-    "@redwoodjs/router": "0.15.0",
-    "@redwoodjs/web": "0.15.0",
+    "@redwoodjs/forms": "^0.25.0",
+    "@redwoodjs/router": "^0.25.0",
+    "@redwoodjs/web": "^0.25.0",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"

examples/redwoodjs/web/public/README.md

@@ -1,13 +1,19 @@
 # Static Assets
+
 Use this folder to add static files directly to your app. All included files and folders will be copied directly into the `/dist` folder (created when Webpack builds for production). They will also be available during development when you run `yarn rw dev`.
->Note: files will *not* hot reload while the development server is running. You'll need to manually stop/start to access file changes.
+
+> Note: files will _not_ hot reload while the development server is running. You'll need to manually stop/start to access file changes.
 
 ### Example Use
+
 A file like `favicon.png` will be copied to `/dist/favicon.png`. A folder containing a file such as `static-files/my-logo.jpg` will be copied to `/dist/static-files/my-logo.jpg`. These can be referenced in your code directly without any special handling, e.g.
+
 ```
 <link rel="icon" type="image/png" href="/favicon.png" />
 ```
+
 and
+
 ```
 <img src="/static-files/my-logo.jpg"> alt="Logo" />
 ```
@@ -15,12 +21,15 @@ and
 Behind the scenes, we are using Webpack's ["copy-webpack-plugin"](https://github.com/webpack-contrib/copy-webpack-plugin).
 
 ## Best Practices
+
 Because assets in this folder are bypassing the javascript module system, **this folder should be used sparingly** for assets such as favicons, robots.txt, manifests, libraries incompatible with Webpack, etc.
 
 In general, it's best to import files directly into a template, page, or component. This allows Webpack to include that file in the bundle, which ensures Webpack will correctly process and move assets into the distribution folder, providing error checks and correct paths along the way.
 
 ### Example Asset Import with Webpack
+
 Instead of handling our logo image as a static file per the example above, we can do the following:
+
 ```
 import React from "react"
 import logo from "./my-logo.jpg"

examples/redwoodjs/web/src/index.js

@@ -1,16 +1,18 @@
 import ReactDOM from 'react-dom'
-import { RedwoodProvider, FatalErrorBoundary } from '@redwoodjs/web'
-import FatalErrorPage from 'src/pages/FatalErrorPage'
 
+import { FatalErrorBoundary } from '@redwoodjs/web'
+import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'
+
+import FatalErrorPage from 'src/pages/FatalErrorPage'
 import Routes from 'src/Routes'
 
 import './index.css'
 
 ReactDOM.render(
   <FatalErrorBoundary page={FatalErrorPage}>
-    <RedwoodProvider>
+    <RedwoodApolloProvider>
       <Routes />
-    </RedwoodProvider>
+    </RedwoodApolloProvider>
   </FatalErrorBoundary>,
   document.getElementById('redwood-app')
 )

examples/redwoodjs/web/src/pages/AboutPage/AboutPage.js

@@ -1,4 +1,6 @@
-export default () => (
+import { Link, routes } from '@redwoodjs/router'
+
+const AboutPage = () => (
   <main>
     <style
       dangerouslySetInnerHTML={{
@@ -36,9 +38,16 @@ export default () => (
       }}
     />
     <section>
-      <h1>
-        <span>About RedwoodJS</span>
-      </h1>
+      <h1>About</h1>
+      <p>
+        Find me in <code>./web/src/pages/AboutPage/AboutPage.js</code>
+      </p>
+      <p>
+        My default route is named <code>about</code>, link to me with `
+        <Link to={routes.about()}>About</Link>`
+      </p>
     </section>
   </main>
 )
+
+export default AboutPage

examples/redwoodjs/web/src/pages/HomePage/HomePage.js

@@ -1,4 +1,6 @@
-export default () => (
+import { Link, routes } from '@redwoodjs/router'
+
+const HomePage = () => (
   <main>
     <style
       dangerouslySetInnerHTML={{
@@ -36,9 +38,16 @@ export default () => (
       }}
     />
     <section>
-      <h1>
-        <span>Welcome to RedwoodJS!</span>
-      </h1>
+      <h1>Welcome to RedwoodJS!</h1>
+      <p>
+        Find me in <code>./web/src/pages/HomePage/HomePage.js</code>
+      </p>
+      <p>
+        My default route is named <code>home</code>, link to me with `
+        <Link to={routes.home()}>Home</Link>`
+      </p>
     </section>
   </main>
 )
+
+export default HomePage

examples/redwoodjs/web/src/pages/HomePage/HomePage.stories.js

@@ -0,0 +1,7 @@
+import HomePage from './HomePage'
+
+export const generated = () => {
+  return <HomePage />
+}
+
+export default { title: 'Pages/HomePage' }

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

@@ -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/index.d.ts

@@ -1,34 +0,0 @@
-export interface FrameworkDetectionItem {
-  path: string;
-  matchContent?: string;
-}
-
-export interface SettingPlaceholder {
-  placeholder: string;
-}
-export interface SettingValue {
-  value: string;
-}
-export type Setting = SettingValue | SettingPlaceholder;
-
-export interface Framework {
-  name: string;
-  slug: string | null;
-  logo: string;
-  demo?: string;
-  tagline?: string;
-  website?: string;
-  description: string;
-  sort?: number;
-  useRuntime?: { src: string; use: string };
-  ignoreRuntimes?: string[];
-  detectors?: {
-    every?: FrameworkDetectionItem[];
-    some?: FrameworkDetectionItem[];
-  };
-  settings: {
-    buildCommand: Setting;
-    devCommand: Setting;
-    outputDirectory: Setting;
-  };
-}

packages/frameworks/package.json

@@ -1,14 +1,26 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.1.1",
-  "main": "frameworks.json",
+  "version": "0.3.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",
+    "@types/node-fetch": "2.5.8",
+    "@vercel/routing-utils": "1.10.0",
     "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

@@ -0,0 +1,179 @@
+import { Route } from '@vercel/routing-utils';
+
+export interface FrameworkDetectionItem {
+  /**
+   * A file path
+   * @example "package.json"
+   */
+  path: string;
+  /**
+   * A matcher
+   * @example "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"next\":\\s*\".+?\"[^}]*}"
+   */
+  matchContent?: string;
+}
+
+export interface SettingPlaceholder {
+  /**
+   * A placeholder value for when the framework has not a predefined one
+   * @example "`npm run build` or `next build`"
+   */
+  placeholder: string;
+}
+
+export interface SettingValue {
+  /**
+   * A predefined setting for the detected framework
+   * @example "next dev --port $PORT"
+   */
+  value: string;
+}
+
+export type Setting = SettingValue | SettingPlaceholder;
+
+/**
+ * Framework detection information.
+ */
+export interface Framework {
+  /**
+   * Name of the framework
+   * @example "Next.js"
+   */
+  name: string;
+  /**
+   * A unique identifier for the framework
+   * @example "nextjs"
+   */
+  slug: string | null;
+  /**
+   * A URL to the logo of the framework
+   * @example "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/next.svg"
+   */
+  logo: string;
+  /**
+   * A URL to a deployed example of the framework
+   * @example "https://nextjs.now-examples.vercel.app"
+   */
+  demo?: string;
+  /**
+   * A marketing tagline for the framework
+   * @example "Next.js makes you productive with React instantly — whether you want to build static or dynamic sites."
+   */
+  tagline?: string;
+  /**
+   * A URL to the official website of the framework
+   * @example "https://nextjs.org"
+   */
+  website?: string;
+  /**
+   * Short description of the framework
+   * @example "A Next.js app and a Serverless Function API."
+   */
+  description: string;
+  /**
+   * A ponderated value to sort matching frameworks
+   * @example 1
+   */
+  sort?: number;
+  /**
+   * Runtime configuration required to run the framework in Vercel
+   */
+  useRuntime?: {
+    /**
+     * Runtime source
+     * @example "package.json"
+     */
+    src: string;
+    /**
+     * Runtime
+     * @example "@vercel/next"
+     */
+    use: string;
+  };
+  ignoreRuntimes?: string[];
+  /**
+   * Detectors used to find out the framework
+   */
+  detectors?: {
+    /**
+     * Collection of detectors that must be matched for the framework
+     * to be detected.
+     */
+    every?: FrameworkDetectionItem[];
+    /**
+     * Collection of detectors where one match triggers the framework
+     * to be detected.
+     */
+    some?: FrameworkDetectionItem[];
+  };
+  settings: {
+    /**
+     * Default Install Command or a placeholder
+     */
+    installCommand: Setting;
+    /**
+     * Default Build Command or a placeholder
+     */
+    buildCommand: Setting;
+    /**
+     * Default Development Command or a placeholder
+     */
+    devCommand: Setting;
+    /**
+     * Default Output Directory
+     */
+    outputDirectory: Setting;
+  };
+  /**
+   * A list of recommended integrations for the framework
+   */
+  recommendedIntegrations?: {
+    /**
+     * Id of the recommended integration
+     * @example "oac_5lUsiANun1DEzgLg0NZx5Es3"
+     */
+    id: string;
+    /**
+     * Dependencies of the recommended integration
+     * @example ["next-plugin-sentry", "next-sentry-source-maps"]
+     */
+    dependencies: string[];
+  }[];
+  /**
+   * Name of a dependency in `package.json` to detect this framework.
+   * @example "hexo"
+   */
+  dependency?: string;
+  /**
+   * Function that returns the name of the directory that the framework outputs
+   * its build results to. In some cases this is read from a configuration file.
+   */
+  getOutputDirName: (dirPrefix: string) => Promise<string>;
+  /**
+   * An array (or a function that returns an array) of default `Route` rules that
+   * the framework uses.
+   * @example [{ handle: 'filesystem' }, { src: '.*', status: 404, dest: '404.html' }]
+   */
+  defaultRoutes?: Route[] | ((dirPrefix: string) => Promise<Route[]>);
+  /**
+   * A glob string of files to cache for future deployments.
+   * @example ".cache/**"
+   */
+  cachePattern?: string;
+  /**
+   * The default build command for the framework.
+   * @example "next build"
+   */
+  buildCommand: string | null;
+  /**
+   * The default development command for the framework.
+   * @example "next dev"
+   */
+  devCommand: string | null;
+  /**
+   * The default version of the framework command that is available within the
+   * build image. Usually an environment variable can be set to override this.
+   * @example "0.13.0"
+   */
+  defaultVersion?: string;
+}

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

@@ -1,9 +1,11 @@
 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 fetch from 'node-fetch';
+import { URL, URLSearchParams } from 'url';
+import frameworkList from '../src/frameworks';
 
 const SchemaFrameworkDetectionItem = {
   type: 'array',
@@ -53,8 +55,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,18 +98,58 @@ 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'] },
     },
   },
 };
 
+async function getDeployment(host: string) {
+  const query = new URLSearchParams();
+  query.set('url', host);
+  const res = await fetch(
+    `https://api.vercel.com/v11/deployments/get?${query}`
+  );
+  const body = await res.json();
+  return body;
+}
+
 describe('frameworks', () => {
   it('ensure there is an example for every framework', async () => {
     const root = join(__dirname, '..', '..', '..');
@@ -148,4 +197,30 @@ 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);
+      }
+    }
+  });
+
+  it('ensure all demo URLs are "public"', async () => {
+    await Promise.all(
+      frameworkList
+        .filter(f => typeof f.demo === 'string')
+        .map(async f => {
+          const url = new URL(f.demo!);
+          const deployment = await getDeployment(url.hostname);
+          assert.equal(
+            deployment.public,
+            true,
+            `Demo URL ${f.demo} is not "public"`
+          );
+        })
+    );
+  });
 });

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.4",
+  "version": "2.10.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.3.0",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",

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

@@ -2,10 +2,9 @@ import minimatch from 'minimatch';
 import { valid as validSemver } from 'semver';
 import { parse as parsePath, extname } from 'path';
 import { Route, Source } from '@vercel/routing-utils';
-import _frameworks, { Framework } from '@vercel/frameworks';
+import frameworkList, { Framework } from '@vercel/frameworks';
 import { PackageJson, Builder, Config, BuilderFunctions } from './types';
 import { isOfficialRuntime } from './';
-const frameworkList = _frameworks as Framework[];
 const slugToFramework = new Map<string | null, Framework>(
   frameworkList.map(f => [f.slug, f])
 );
@@ -24,6 +23,7 @@ interface Options {
   projectSettings?: {
     framework?: string | null;
     devCommand?: string | null;
+    installCommand?: string | null;
     buildCommand?: string | null;
     outputDirectory?: string | null;
     createdAt?: number;
@@ -42,9 +42,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 +54,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
@@ -306,11 +311,16 @@ export async function detectBuilders(
   if (frontendBuilder) {
     builders.push(frontendBuilder);
 
-    if (hasNextApiFiles && apiBuilders.length) {
+    if (
+      hasNextApiFiles &&
+      apiBuilders.some(b => isOfficialRuntime('node', b.use))
+    ) {
       warnings.push({
         code: 'conflicting_files',
         message:
-          'It is not possible to use `api` and `pages/api` at the same time, please only use one option',
+          'When using Next.js, it is recommended to place Node.js Serverless Functions inside of the `pages/api` (provided by Next.js) directory instead of `api` (provided by Vercel).',
+        link: 'https://nextjs.org/docs/api-routes/introduction',
+        action: 'Learn More',
       });
     }
   }
@@ -360,7 +370,7 @@ function maybeGetApiBuilder(
     return null;
   }
 
-  const match = apiMatches.find(({ src }) => {
+  const match = apiMatches.find(({ src = '**' }) => {
     return src === fileName || minimatch(fileName, src);
   });
 
@@ -450,6 +460,10 @@ function detectFrontBuilder(
     config.devCommand = projectSettings.devCommand;
   }
 
+  if (typeof projectSettings.installCommand === 'string') {
+    config.installCommand = projectSettings.installCommand;
+  }
+
   if (projectSettings.buildCommand) {
     config.buildCommand = projectSettings.buildCommand;
   }
@@ -935,8 +949,8 @@ function getRouteResult(
   const rewriteRoutes: Route[] = [];
   const errorRoutes: Route[] = [];
   const framework = frontendBuilder?.config?.framework || '';
-  const use = frontendBuilder?.use || '';
-  const isNextjs = framework === 'nextjs' || use.startsWith('@vercel/next');
+  const isNextjs =
+    framework === 'nextjs' || isOfficialRuntime('next', frontendBuilder?.use);
   const ignoreRuntimes = slugToFramework.get(framework)?.ignoreRuntimes;
 
   if (apiRoutes && apiRoutes.length > 0) {
@@ -984,7 +998,6 @@ function getRouteResult(
         rewriteRoutes.push({
           src: '^/api(/.*)?$',
           status: 404,
-          continue: true,
         });
       }
     } else {

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

@@ -3,7 +3,7 @@ import { DetectorFilesystem } from './detectors/filesystem';
 
 export interface DetectFrameworkOptions {
   fs: DetectorFilesystem;
-  frameworkList: Framework[];
+  frameworkList: readonly Framework[];
 }
 
 async function matches(fs: DetectorFilesystem, framework: Framework) {

packages/now-build-utils/src/fs/glob.ts

@@ -51,8 +51,8 @@ export default async function glob(
       stat,
       `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`
     );
-    if (stat.isFile()) {
-      const isSymlink = options.symlinks![fsPath];
+    const isSymlink = options.symlinks![fsPath];
+    if (isSymlink || stat.isFile()) {
       if (isSymlink) {
         stat = await lstat(fsPath);
       }

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

@@ -1,31 +1,36 @@
 import { intersects, validRange } from 'semver';
-import boxen from 'boxen';
 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-04-20'),
+  },
   {
     major: 8,
     range: '8.10.x',
     runtime: 'nodejs8.10',
     discontinueDate: new Date('2020-01-06'),
   },
-];
+] as const;
+
+function getHint(isAuto: boolean) {
+  const { major, range } = getLatestNodeVersion();
+  return isAuto
+    ? `Please set Node.js Version to ${range} in your Project Settings to use Node.js ${major}.`
+    : `Please set "engines": { "node": "${range}" } in your \`package.json\` file to use Node.js ${major}.`;
+}
 
-const pleaseSet =
-  'Please set "engines": { "node": "' +
-  getLatestNodeVersion().range +
-  '" } in your `package.json` file to upgrade to 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';
+  'This change is the result of a decision made by an upstream infrastructure provider (AWS).';
 
-export function getLatestNodeVersion(): NodeVersion {
+export function getLatestNodeVersion() {
   return allOptions[0];
 }
 
@@ -34,10 +39,10 @@ export function getDiscontinuedNodeVersions(): NodeVersion[] {
 }
 
 export async function getSupportedNodeVersion(
-  engineRange?: string,
-  isAuto?: boolean
+  engineRange: string | undefined,
+  isAuto: boolean
 ): Promise<NodeVersion> {
-  let selection = getLatestNodeVersion();
+  let selection: NodeVersion = getLatestNodeVersion();
 
   if (engineRange) {
     const found =
@@ -49,60 +54,35 @@ export async function getSupportedNodeVersion(
         return intersects(o.range, engineRange);
       });
     if (!found) {
-      const intro =
-        isAuto || !engineRange
-          ? 'This project is using an invalid version of Node.js and must be changed.'
-          : 'Found `engines` in `package.json` with an invalid Node.js version range: "' +
-            engineRange +
-            '".';
       throw new NowBuildError({
         code: 'BUILD_UTILS_NODE_VERSION_INVALID',
-        link:
-          'https://vercel.com/docs/runtimes#official-runtimes/node-js/node-js-version',
-        message: intro + '\n' + pleaseSet,
+        link: 'http://vercel.link/node-version',
+        message: `Found invalid Node.js Version: "${engineRange}". ${getHint(
+          isAuto
+        )}`,
       });
     }
   }
 
   if (isDiscontinued(selection)) {
-    const intro =
-      isAuto || !engineRange
-        ? 'This project is using a discontinued version of Node.js (' +
-          selection.range +
-          ') and must be upgraded.'
-        : 'Found `engines` in `package.json` with a discontinued Node.js version range: "' +
-          engineRange +
-          '".';
+    const intro = `Node.js Version "${selection.range}" is discontinued and must be upgraded.`;
     throw new NowBuildError({
       code: 'BUILD_UTILS_NODE_VERSION_DISCONTINUED',
-      link:
-        'https://vercel.com/docs/runtimes#official-runtimes/node-js/node-js-version',
-      message: intro + '\n' + pleaseSet + '\n' + upstreamProvider,
+      link: 'http://vercel.link/node-version',
+      message: `${intro} ${getHint(isAuto)} ${upstreamProvider}`,
     });
   }
 
-  debug(
-    isAuto || !engineRange
-      ? 'Using default Node.js range: "' + selection.range + '".'
-      : 'Found `engines` in `package.json`, selecting range: "' +
-          selection.range +
-          '".'
-  );
+  debug(`Selected Node.js ${selection.range}`);
 
   if (selection.discontinueDate) {
     const d = selection.discontinueDate.toISOString().split('T')[0];
     console.warn(
-      boxen(
-        'NOTICE' +
-          '\n' +
-          `\nNode.js version ${selection.range} has reached end-of-life.` +
-          `\nAs a result, deployments created on or after ${d} will fail to build.` +
-          '\n' +
-          pleaseSet +
-          '\n' +
-          upstreamProvider,
-        { padding: 1 }
-      )
+      `Error: Node.js version ${
+        selection.range
+      } is deprecated. Deployments created on or after ${d} will fail to build. ${getHint(
+        isAuto
+      )} ${upstreamProvider}`
     );
   }
 

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

@@ -5,7 +5,6 @@ import debug from '../debug';
 import spawn from 'cross-spawn';
 import { SpawnOptions } from 'child_process';
 import { deprecate } from 'util';
-import { cpus } from 'os';
 import { NowBuildError } from '../errors';
 import { Meta, PackageJson, NodeVersion, Config } from '../types';
 import { getSupportedNodeVersion, getLatestNodeVersion } from './node-version';
@@ -165,8 +164,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 +173,19 @@ 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;
+    const { node } = packageJson.engines;
+    if (nodeVersion && nodeVersion !== node && !meta.isDev) {
+      console.warn(
+        `Warning: Due to "engines": { "node": "${node}" } in your \`package.json\` file, the Node.js Version defined in your Project Settings ("${nodeVersion}") will not apply. Learn More: http://vercel.link/node-version`
+      );
+    }
+    nodeVersion = node;
     isAuto = false;
   }
-  return getSupportedNodeVersion(range, isAuto);
+  return getSupportedNodeVersion(nodeVersion, isAuto);
 }
 
 async function scanParentDirs(destPath: string, readPackageJson = false) {
@@ -292,6 +297,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) {
@@ -314,18 +324,7 @@ export async function runBundleInstall(
   assert(path.isAbsolute(destPath));
   const opts = { ...spawnOpts, cwd: destPath, prettyCommand: 'bundle install' };
 
-  await spawnAsync(
-    'bundle',
-    args.concat([
-      'install',
-      '--no-prune',
-      '--retry',
-      '3',
-      '--jobs',
-      String(cpus().length || 1),
-    ]),
-    opts
-  );
+  await spawnAsync('bundle', args.concat(['install']), opts);
 }
 
 export async function runPipInstall(
@@ -388,10 +387,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 = { ...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;
@@ -335,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/.gitignore

@@ -1,3 +1,4 @@
+/env.txt
 /node_modules/
 /public/build/
 

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

@@ -4,7 +4,8 @@
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",
-    "start": "sirv public"
+    "start": "sirv public",
+    "env": "echo \"$PATH\" > env.txt"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^12.0.0",
@@ -16,6 +17,7 @@
     "svelte": "^3.0.0"
   },
   "dependencies": {
+    "camel-case": "^4.1.2",
     "sirv-cli": "^0.4.4"
   }
 }