try bumping version to 2 in tests

.eslintignore

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

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

@@ -1,7 +0,0 @@
-# These environment variables will be used by default if you do not create any
-# yourself in .env. This file should be safe to check into your version control
-# system. Any custom values should go in .env and .env should *not* be checked
-# into version control.
-
-DATABASE_URL=file:./dev.db
-BINARY_TARGET=native

examples/redwoodjs/.gitignore

@@ -1,10 +0,0 @@
-.DS_Store
-.env
-.netlify
-dev.db
-dist
-dist-babel
-node_modules
-yarn-error.log
-
-.vercel

examples/redwoodjs/.nvmrc

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

examples/redwoodjs/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Redwood
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

examples/redwoodjs/README.md

@@ -1,29 +0,0 @@
-![RedwoodJS Logo](https://github.com/vercel/vercel/blob/master/packages/frameworks/logos/redwood.svg)
-
-# RedwoodJS Example
-
-This directory is a brief example of a [RedwoodJS](https://redwoodjs.com) app with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction) that can be deployed with Vercel and zero configuration.
-
-## Deploy Your Own
-
-Deploy your own RedwoodJS project, along with Serverless Functions, with Vercel.
-
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/import/project?template=https://github.com/vercel/vercel/tree/master/examples/redwoodjs)
-
-_Live Example: https://redwoodjs.now-examples.now.sh_
-
-### How We Created This Example
-
-To get started with RedwoodJS on Vercel, you can [use Yarn to initialize](https://redwoodjs.com/tutorial/installation-starting-development) the project:
-
-```shell
-$ yarn create redwood-app ./my-redwood-app
-```
-
-### Deploying From Your Terminal
-
-You can deploy your new RedwoodJS project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/redwoodjs/api/.babelrc.js

@@ -1 +0,0 @@
-module.exports = { extends: '../babel.config.js' }

examples/redwoodjs/api/jsconfig.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "src/*": ["./src/*"]
-    }
-  },
-  "include": ["src/**/*"]
-}

examples/redwoodjs/api/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "api",
-  "version": "0.0.0",
-  "private": true,
-  "dependencies": {
-    "@redwoodjs/api": "0.14.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/prisma/seeds.js

@@ -1,26 +0,0 @@
-/* eslint-disable no-console */
-const { PrismaClient } = require('@prisma/client')
-const dotenv = require('dotenv')
-
-dotenv.config()
-const db = new PrismaClient()
-
-async function main() {
-  // 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
-  // existence of a record before trying to create it). For example:
-  //
-  //   const existing = await db.user.findMany({ where: { email: 'admin@email.com' }})
-  //   if (!existing.length) {
-  //     await db.user.create({ data: { name: 'Admin', email: 'admin@email.com' }})
-  //   }
-
-  console.info('No data to seed. See api/prisma/seeds.js for info.')
-}
-
-main()
-  .catch((e) => console.error(e))
-  .finally(async () => {
-    await db.disconnect()
-  })

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

@@ -1,19 +0,0 @@
-import {
-  createGraphQLHandler,
-  makeMergedSchema,
-  makeServices,
-} from '@redwoodjs/api'
-import importAll from '@redwoodjs/api/importAll.macro'
-
-import { db } from 'src/lib/db'
-
-const schemas = importAll('api', 'graphql')
-const services = importAll('api', 'services')
-
-export const handler = createGraphQLHandler({
-  schema: makeMergedSchema({
-    schemas,
-    services: makeServices({ services }),
-  }),
-  db,
-})

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

@@ -1,6 +0,0 @@
-// See https://github.com/prisma/prisma2/blob/master/docs/prisma-client-js/api.md#constructor
-// for options.
-
-import { PrismaClient } from '@prisma/client'
-
-export const db = new PrismaClient()

examples/redwoodjs/babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  presets: ['@redwoodjs/core/config/babel-preset'],
-}

examples/redwoodjs/package.json

@@ -1,19 +0,0 @@
-{
-  "private": true,
-  "workspaces": {
-    "packages": [
-      "api",
-      "web"
-    ]
-  },
-  "devDependencies": {
-    "@redwoodjs/core": "0.14.0"
-  },
-  "eslintConfig": {
-    "extends": "@redwoodjs/eslint-config"
-  },
-  "engines": {
-    "node": ">=12",
-    "yarn": ">=1.15"
-  }
-}

examples/redwoodjs/prettier.config.js

@@ -1,9 +0,0 @@
-// https://prettier.io/docs/en/options.html
-module.exports = {
-  trailingComma: 'es5',
-  bracketSpacing: true,
-  tabWidth: 2,
-  semi: false,
-  singleQuote: true,
-  arrowParens: 'always',
-}

examples/redwoodjs/redwood.toml

@@ -1,7 +0,0 @@
-[web]
-  port = 8910
-  apiProxyPath = "/api"
-[api]
-  port = 8911
-[browser]
-  open = false

examples/redwoodjs/web/.babelrc.js

@@ -1 +0,0 @@
-module.exports = { extends: '../babel.config.js' }

examples/redwoodjs/web/jsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "src/*": ["./src/*"]
-    },
-    "jsx": "preserve"
-  },
-  "include": ["src/**/*"]
-}

examples/redwoodjs/web/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "web",
-  "version": "0.0.0",
-  "private": true,
-  "browserslist": [
-    "defaults"
-  ],
-  "dependencies": {
-    "@redwoodjs/router": "0.14.0",
-    "@redwoodjs/web": "0.14.0",
-    "prop-types": "^15.7.2",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1"
-  }
-}

examples/redwoodjs/web/public/README.md

@@ -1,36 +0,0 @@
-# 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.
-
-### 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" />
-```
-
-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"
-
-
-function Header() {
-  return <img src={logo} alt="Logo" />
-}
-
-export default Header
-```
-
-Behind the scenes, we are using Webpack's ["file-loader"](https://webpack.js.org/loaders/file-loader/) and ["url-loader](https://webpack.js.org/loaders/url-loader/) (for files smaller than 10kb).

examples/redwoodjs/web/public/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow:

examples/redwoodjs/web/src/Routes.js

@@ -1,22 +0,0 @@
-// In this file, all Page components from 'src/pages` are auto-imported. Nested
-// directories are supported, and should be uppercase. Each subdirectory will be
-// prepended onto the component name.
-//
-// Examples:
-//
-// 'src/pages/HomePage/HomePage.js'         -> HomePage
-// 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage
-
-import { Router, Route } from '@redwoodjs/router'
-
-const Routes = () => {
-  return (
-    <Router>
-      <Route path="/" page={HomePage} name="home" />
-      <Route path="/about" page={AboutPage} name="about" />
-      <Route notfound page={NotFoundPage} />
-    </Router>
-  )
-}
-
-export default Routes

examples/redwoodjs/web/src/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="icon" type="image/png" href="/favicon.png" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
-  </head>
-  <body>
-    <div id="redwood-app"></div>
-  </body>
-</html>

examples/redwoodjs/web/src/index.js

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

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

@@ -1,44 +0,0 @@
-export default () => (
-  <main>
-    <style
-      dangerouslySetInnerHTML={{
-        __html: `
-              html, body {
-                margin: 0;
-              }
-              html * {
-                box-sizing: border-box;
-              }
-              main {
-                display: flex;
-                align-items: center;
-                font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
-                text-align: center;
-                background-color: #E2E8F0;
-                height: 100vh;
-              }
-              section {
-                background-color: white;
-                border-radius: 0.25rem;
-                width: 32rem;
-                padding: 1rem;
-                margin: 0 auto;
-                box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
-              }
-              h1 {
-                font-size: 2rem;
-                margin: 0;
-                font-weight: 500;
-                line-height: 1;
-                color: #2D3748;
-              }
-            `,
-      }}
-    />
-    <section>
-      <h1>
-        <span>About RedwoodJS</span>
-      </h1>
-    </section>
-  </main>
-)

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

@@ -1,53 +0,0 @@
-// This page will be rendered when an error makes it all the way to the top of the
-// application without being handled by a Javascript catch statement or React error
-// boundary.
-//
-// You can modify this page as you wish, but it is important to keep things simple to
-// avoid the possibility that it will cause its own error. If it does, Redwood will
-// still render a generic error page, but your users will prefer something a bit more
-// thoughtful. =)
-
-export default () => (
-  <main>
-    <style
-      dangerouslySetInnerHTML={{
-        __html: `
-              html, body {
-                margin: 0;
-              }
-              html * {
-                box-sizing: border-box;
-              }
-              main {
-                display: flex;
-                align-items: center;
-                font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
-                text-align: center;
-                background-color: #E2E8F0;
-                height: 100vh;
-              }
-              section {
-                background-color: white;
-                border-radius: 0.25rem;
-                width: 32rem;
-                padding: 1rem;
-                margin: 0 auto;
-                box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
-              }
-              h1 {
-                font-size: 2rem;
-                margin: 0;
-                font-weight: 500;
-                line-height: 1;
-                color: #2D3748;
-              }
-            `,
-      }}
-    />
-    <section>
-      <h1>
-        <span>Something went wrong</span>
-      </h1>
-    </section>
-  </main>
-)

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

@@ -1,44 +0,0 @@
-export default () => (
-  <main>
-    <style
-      dangerouslySetInnerHTML={{
-        __html: `
-              html, body {
-                margin: 0;
-              }
-              html * {
-                box-sizing: border-box;
-              }
-              main {
-                display: flex;
-                align-items: center;
-                font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
-                text-align: center;
-                background-color: #E2E8F0;
-                height: 100vh;
-              }
-              section {
-                background-color: white;
-                border-radius: 0.25rem;
-                width: 32rem;
-                padding: 1rem;
-                margin: 0 auto;
-                box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
-              }
-              h1 {
-                font-size: 2rem;
-                margin: 0;
-                font-weight: 500;
-                line-height: 1;
-                color: #2D3748;
-              }
-            `,
-      }}
-    />
-    <section>
-      <h1>
-        <span>Welcome to RedwoodJS!</span>
-      </h1>
-    </section>
-  </main>
-)

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

@@ -1,44 +0,0 @@
-export default () => (
-  <main>
-    <style
-      dangerouslySetInnerHTML={{
-        __html: `
-              html, body {
-                margin: 0;
-              }
-              html * {
-                box-sizing: border-box;
-              }
-              main {
-                display: flex;
-                align-items: center;
-                font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
-                text-align: center;
-                background-color: #E2E8F0;
-                height: 100vh;
-              }
-              section {
-                background-color: white;
-                border-radius: 0.25rem;
-                width: 32rem;
-                padding: 1rem;
-                margin: 0 auto;
-                box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
-              }
-              h1 {
-                font-size: 2rem;
-                margin: 0;
-                font-weight: 500;
-                line-height: 1;
-                color: #2D3748;
-              }
-            `,
-      }}
-    />
-    <section>
-      <h1>
-        <span>404 Page Not Found</span>
-      </h1>
-    </section>
-  </main>
-)

packages/frameworks/frameworks.json

@@ -682,34 +682,6 @@
       }
     }
   },
-  {
-    "name": "RedwoodJS",
-    "slug": "redwoodjs",
-    "demo": "https://redwoodjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/redwood.svg",
-    "tagline": "RedwoodJS is a full-stack framework for the Jamstack.",
-    "description": "A RedwoodJS app, bootstraped with create-redwood-app.",
-    "website": "https://redwoodjs.com",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@redwoodjs\\/core\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "buildCommand": {
-        "value": "yarn rw db up --no-db-client --auto-approve && yarn rw build"
-      },
-      "devCommand": {
-        "value": "yarn rw dev"
-      },
-      "outputDirectory": {
-        "value": "RedwoodJS default"
-      }
-    }
-  },
   {
     "name": "Hugo",
     "slug": "hugo",
@@ -832,7 +804,7 @@
     "description": "No framework or a unoptimized framework.",
     "settings": {
       "buildCommand": {
-        "placeholder": "`npm run vercel-build` or `npm run build`"
+        "placeholder": "`npm run now-build` or `npm run build`"
       },
       "devCommand": {
         "placeholder": "None"

packages/frameworks/logos/redwood.svg

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

packages/frameworks/package.json

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

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.4.3-canary.2",
+  "version": "2.4.2",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

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

@@ -309,13 +309,6 @@ export async function detectBuilders(
     options
   );
 
-  if (frontendBuilder && framework === 'redwoodjs') {
-    // RedwoodJS uses the /api directory differently so we must
-    // clear any existing builders and only use `@vercel/redwood`.
-    builders.length = 0;
-    builders.push(frontendBuilder);
-  }
-
   return {
     warnings,
     builders: builders.length ? builders : null,
@@ -475,10 +468,6 @@ function detectFrontBuilder(
     return { src: 'package.json', use: `@vercel/next${withTag}`, config };
   }
 
-  if (framework === 'redwoodjs') {
-    return { src: 'package.json', use: `@vercel/redwood${withTag}`, config };
-  }
-
   // Entrypoints for other frameworks
   // TODO - What if just a build script is provided, but no entrypoint.
   const entrypoints = new Set([

packages/now-build-utils/src/fs/read-config-file.ts

@@ -15,9 +15,7 @@ async function readFileOrNull(file: string) {
   return null;
 }
 
-export async function readConfigFile<T>(
-  files: string | string[]
-): Promise<T | null> {
+export async function readConfigFile<T>(files: string | string[]) {
   files = Array.isArray(files) ? files : [files];
 
   for (const name of files) {
@@ -26,11 +24,11 @@ export async function readConfigFile<T>(
     if (data) {
       const str = data.toString('utf8');
       if (name.endsWith('.json')) {
-        return JSON.parse(str) as T;
+        return JSON.parse(str);
       } 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 yaml.safeLoad(str, { filename: name });
       }
     }
   }

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

@@ -1808,36 +1808,6 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     expect((errorRoutes![0] as Source).status).toBe(404);
   });
 
-  it('RedwoodJS should only use redwood builder', async () => {
-    const files = [
-      'package.json',
-      'web/index.html',
-      'api/one.js',
-      'api/two.js',
-    ];
-    const projectSettings = {
-      framework: 'redwoodjs',
-    };
-
-    const { builders, errorRoutes } = await detectBuilders(files, null, {
-      projectSettings,
-      featHandleMiss,
-    });
-
-    expect(builders).toEqual([
-      {
-        use: '@vercel/redwood',
-        src: 'package.json',
-        config: {
-          zeroConfig: true,
-          framework: 'redwoodjs',
-        },
-      },
-    ]);
-    expect(errorRoutes!.length).toBe(1);
-    expect((errorRoutes![0] as Source).status).toBe(404);
-  });
-
   it('No framework, only package.json', async () => {
     const files = ['package.json'];
     const pkg = {

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.0.0-canary.6",
+  "version": "20.0.0-canary.1",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -62,14 +62,13 @@
     "node": ">= 10"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.4.3-canary.2",
+    "@vercel/build-utils": "2.4.2",
     "@vercel/go": "1.1.5-canary.0",
-    "@vercel/next": "2.6.14",
-    "@vercel/node": "1.7.4-canary.1",
+    "@vercel/next": "2.6.14-canary.1",
+    "@vercel/node": "1.7.4-canary.0",
     "@vercel/python": "1.2.2",
-    "@vercel/redwood": "0.0.2-canary.1",
     "@vercel/ruby": "1.2.3",
-    "@vercel/static-build": "0.17.7-canary.1",
+    "@vercel/static-build": "0.17.7-canary.0",
     "update-notifier": "4.1.0"
   },
   "devDependencies": {

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

@@ -669,7 +669,7 @@ export default async function main(
     }
 
     if (err instanceof BuildError) {
-      output.error(err.message || 'Build failed');
+      output.error('Build failed');
       output.error(
         `Check your logs at https://${now.url}/_logs or run ${getCommandName(
           `logs ${now.url}`,

packages/now-cli/src/util/dev/router.ts

@@ -118,16 +118,7 @@ export async function devRouter(
           continue;
         }
 
-        // if the destination is an external URL (rewrite or redirect)
-        const isDestUrl = isURL(destPath);
-
-        if (
-          routeConfig.check &&
-          devServer &&
-          nowConfig &&
-          phase !== 'hit' &&
-          !isDestUrl
-        ) {
+        if (routeConfig.check && devServer && nowConfig && phase !== 'hit') {
           const { pathname = '/' } = url.parse(destPath);
           const hasDestFile = await devServer.hasFilesystem(
             pathname,
@@ -165,6 +156,7 @@ export async function devRouter(
           }
         }
 
+        const isDestUrl = isURL(destPath);
         if (isDestUrl) {
           result = {
             found: true,

packages/now-cli/src/util/link/setup-and-link.ts

@@ -1,7 +1,7 @@
 import { join, basename } from 'path';
 import chalk from 'chalk';
 import { remove } from 'fs-extra';
-import { NowContext, ProjectLinkResult, ProjectSettings } from '../../types';
+import { NowContext, ProjectLinkResult } from '../../types';
 import { NowConfig } from '../dev/types';
 import { Output } from '../output';
 import {
@@ -142,75 +142,69 @@ export default async function setupAndLink(
   if (ctx.localConfig && !(ctx.localConfig instanceof Error)) {
     localConfig = ctx.localConfig;
   }
-
   client.currentTeam = org.type === 'team' ? org.id : undefined;
-  const isZeroConfig = !localConfig.builds || localConfig.builds.length === 0;
+  const now = new Now({
+    apiUrl,
+    token,
+    debug,
+    currentTeam: client.currentTeam,
+  });
+  let deployment = null;
 
   try {
-    let settings: ProjectSettings = {};
+    const createArgs: any = {
+      name: newProjectName,
+      env: {},
+      build: { env: {} },
+      forceNew: undefined,
+      withCache: undefined,
+      quiet,
+      wantsPublic: localConfig.public,
+      isFile,
+      type: null,
+      nowConfig: localConfig,
+      regions: undefined,
+      meta: {},
+      deployStamp: stamp(),
+      target: undefined,
+      skipAutoDetectionConfirmation: false,
+    };
 
-    if (isZeroConfig) {
-      const now = new Now({
-        apiUrl,
-        token,
-        debug,
-        currentTeam: client.currentTeam,
-      });
-      const createArgs: any = {
-        name: newProjectName,
-        env: {},
-        build: { env: {} },
-        forceNew: undefined,
-        withCache: undefined,
-        quiet,
-        wantsPublic: localConfig.public,
-        isFile,
-        type: null,
-        nowConfig: localConfig,
-        regions: undefined,
-        meta: {},
-        deployStamp: stamp(),
-        target: undefined,
-        skipAutoDetectionConfirmation: false,
-      };
+    deployment = await createDeploy(
+      output,
+      now,
+      client.currentTeam || 'current user',
+      [sourcePath],
+      createArgs,
+      org,
+      !isFile,
+      path
+    );
 
-      const deployment = await createDeploy(
-        output,
-        now,
-        client.currentTeam || 'current user',
-        [sourcePath],
-        createArgs,
-        org,
-        !isFile,
-        path
-      );
-
-      if (
-        !deployment ||
-        !('code' in deployment) ||
-        deployment.code !== 'missing_project_settings'
-      ) {
-        output.error('Failed to detect project settings. Please try again.');
-        if (output.isDebugEnabled()) {
-          console.log(deployment);
-        }
-        return { status: 'error', exitCode: 1 };
+    if (
+      !deployment ||
+      !('code' in deployment) ||
+      deployment.code !== 'missing_project_settings'
+    ) {
+      output.error('Failed to detect project settings. Please try again.');
+      if (output.isDebugEnabled()) {
+        console.log(deployment);
       }
-
-      const { projectSettings, framework } = deployment;
-
-      settings = await editProjectSettings(
-        output,
-        projectSettings,
-        framework,
-        autoConfirm
-      );
+      return { status: 'error', exitCode: 1 };
     }
 
+    const { projectSettings, framework } = deployment;
+
     if (rootDirectory) {
-      settings.rootDirectory = rootDirectory;
+      projectSettings.rootDirectory = rootDirectory;
     }
 
+    const settings = await editProjectSettings(
+      output,
+      projectSettings,
+      framework,
+      autoConfirm
+    );
     const project = await createProject(client, newProjectName);
     await updateProject(client, project.id, settings);
     Object.assign(project, settings);

packages/now-cli/test/dev/fixtures/test-external-rewrites-and-redirects/vercel.json

@@ -1,14 +0,0 @@
-{
-  "version": 2,
-  "rewrites": [
-    { "source": "/rewrite", "destination": "https://vercel.com/robots.txt" }
-  ],
-  "redirects": [
-    { "source": "/redirect", "destination": "https://vercel.com/robots.txt" },
-    {
-      "source": "/tempRedirect",
-      "destination": "https://vercel.com/robots.txt",
-      "permanent": false
-    }
-  ]
-}

packages/now-cli/test/dev/integration.js

@@ -111,7 +111,7 @@ async function exec(directory, args = []) {
 }
 
 async function runNpmInstall(fixturePath) {
-  if (await fs.pathExists(join(fixturePath, 'package.json'))) {
+  if (await fs.exists(join(fixturePath, 'package.json'))) {
     await execa('yarn', ['install'], {
       cwd: fixturePath,
       shell: true,
@@ -817,20 +817,6 @@ test(
   })
 );
 
-test(
-  '[vercel dev] test rewrites and redirects serve correct external content',
-  testFixtureStdio('test-external-rewrites-and-redirects', async testPath => {
-    const vcRobots = `https://vercel.com/robots.txt`;
-    await testPath(200, '/rewrite', /User-Agent: \*/m);
-    await testPath(308, '/redirect', `Redirecting to ${vcRobots} (308)`, {
-      Location: vcRobots,
-    });
-    await testPath(307, '/tempRedirect', `Redirecting to ${vcRobots} (307)`, {
-      Location: vcRobots,
-    });
-  })
-);
-
 test(
   '[vercel dev] test rewrites and redirects is case sensitive',
   testFixtureStdio('test-routing-case-sensitive', async testPath => {

packages/now-cli/test/helpers/prepare.js

@@ -50,7 +50,7 @@ const getConfigFile = builds =>
   ]
 }`
     : `{
-  "version": 1
+  "version": 2
 }`;
 
 const getIndexHTMLFile = session => `
@@ -500,21 +500,14 @@ CMD ["node", "index.js"]`,
         },
       }),
     },
-    'project-link-deploy': {
-      'package.json': '{}',
-    },
-    'project-link-zeroconf': {
-      'package.json': '{}',
+    'project-link': {
+      'package.json': JSON.stringify({}),
     },
     'project-link-confirm': {
-      'package.json': '{}',
+      'package.json': JSON.stringify({}),
     },
     'project-link-dev': {
-      'package.json': '{}',
-    },
-    'project-link-legacy': {
-      'index.html': 'Hello',
-      'vercel.json': '{"builds":[{"src":"*.html","use":"@vercel/static"}]}',
+      'package.json': JSON.stringify({}),
     },
     'dev-proxy-headers-and-env': {
       'package.json': JSON.stringify({}),

packages/now-cli/test/integration.js

@@ -2321,11 +2321,7 @@ test('render build errors', async t => {
   console.log(output.exitCode);
 
   t.is(output.exitCode, 1, formatOutput(output));
-  t.regex(
-    output.stderr,
-    /Command "yarn run build" exited with 1/gm,
-    formatOutput(output)
-  );
+  t.regex(output.stderr, /Build failed/gm, formatOutput(output));
 });
 
 test('invalid deployment, projects and alias names', async t => {
@@ -2661,9 +2657,9 @@ test('ensure `github` and `scope` are not sent to the API', async t => {
   t.is(output.exitCode, 0, formatOutput(output));
 });
 
-test('should show prompts to set up project during first deploy', async t => {
-  const directory = fixture('project-link-deploy');
-  const projectName = `project-link-deploy-${
+test('should show prompts to set up project', async t => {
+  const directory = fixture('project-link');
+  const projectName = `project-link-${
     Math.random().toString(36).split('.')[1]
   }`;
 
@@ -3288,8 +3284,8 @@ test('reject deploying with wrong team .vercel config', async t => {
 });
 
 test('[vc link] should show prompts to set up project', async t => {
-  const dir = fixture('project-link-zeroconf');
-  const projectName = `project-link-zeroconf-${
+  const dir = fixture('project-link');
+  const projectName = `project-link-${
     Math.random().toString(36).split('.')[1]
   }`;
 
@@ -3498,61 +3494,6 @@ test('[vc dev] should show prompts to set up project', async t => {
   }
 });
 
-test('[vc link] should show project prompts but not framework when `builds` defined', async t => {
-  const dir = fixture('project-link-legacy');
-  const projectName = `project-link-legacy-${
-    Math.random().toString(36).split('.')[1]
-  }`;
-
-  // remove previously linked project if it exists
-  await remove(path.join(dir, '.vercel'));
-
-  const vc = execa(binaryPath, ['link', ...defaultArgs], { cwd: dir });
-
-  await waitForPrompt(vc, chunk => /Set up [^?]+\?/.test(chunk));
-  vc.stdin.write('yes\n');
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('Which scope should contain your project?')
-  );
-  vc.stdin.write('\n');
-
-  await waitForPrompt(vc, chunk => chunk.includes('Link to existing project?'));
-  vc.stdin.write('no\n');
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('What’s your project’s name?')
-  );
-  vc.stdin.write(`${projectName}\n`);
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('In which directory is your code located?')
-  );
-  vc.stdin.write('\n');
-
-  await waitForPrompt(vc, chunk => chunk.includes('Linked to'));
-
-  const output = await vc;
-
-  // Ensure the exit code is right
-  t.is(output.exitCode, 0, formatOutput(output));
-
-  // Ensure .gitignore is created
-  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel');
-
-  // Ensure .vercel/project.json and .vercel/README.txt are created
-  t.is(
-    await exists(path.join(dir, '.vercel', 'project.json')),
-    true,
-    'project.json should be created'
-  );
-  t.is(
-    await exists(path.join(dir, '.vercel', 'README.txt')),
-    true,
-    'README.txt should be created'
-  );
-});
-
 test('[vc dev] should send the platform proxy request headers to frontend dev server ', async t => {
   const dir = fixture('dev-proxy-headers-and-env');
   const port = 58353;

packages/now-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "8.2.2-canary.4",
+  "version": "8.2.2-canary.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -38,7 +38,7 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.4.3-canary.2",
+    "@vercel/build-utils": "2.4.2",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",

packages/now-client/src/create-deployment.ts

@@ -80,11 +80,7 @@ export default function buildCreateDeployment(version: number) {
       rootFiles = [path];
     }
 
-    let { fileList } = await buildFileTree(
-      path,
-      clientOptions.isDirectory,
-      debug
-    );
+    let fileList = await buildFileTree(path, clientOptions.isDirectory, debug);
 
     let configPath: string | undefined;
     if (!nowConfig) {

packages/now-client/src/index.ts

@@ -1,6 +1,6 @@
 import buildCreateDeployment from './create-deployment';
 
-export { getVercelIgnore, buildFileTree } from './utils/index';
+export { getVercelIgnore } from './utils/index';
 export const createDeployment = buildCreateDeployment(2);
 export const createLegacyDeployment = buildCreateDeployment(1);
 export * from './errors';

packages/now-client/src/utils/index.ts

@@ -35,7 +35,7 @@ const EVENTS_ARRAY = [
   'canceled',
 ] as const;
 
-export type DeploymentEventType = typeof EVENTS_ARRAY[number];
+export type DeploymentEventType = (typeof EVENTS_ARRAY)[number];
 export const EVENTS = new Set(EVENTS_ARRAY);
 
 export function getApiDeploymentsUrl(
@@ -69,7 +69,7 @@ export async function parseVercelConfig(filePath?: string): Promise<NowConfig> {
   }
 }
 
-const maybeRead = async function <T>(path: string, default_: T) {
+const maybeRead = async function<T>(path: string, default_: T) {
   try {
     return await readFile(path, 'utf8');
   } catch (err) {
@@ -81,26 +81,19 @@ export async function buildFileTree(
   path: string | string[],
   isDirectory: boolean,
   debug: Debug
-): Promise<{ fileList: string[]; ignoreList: string[] }> {
-  const ignoreList: string[] = [];
+): Promise<string[]> {
   let fileList: string[];
-  let { ig, ignores } = await getVercelIgnore(path);
+  let { ig } = await getVercelIgnore(path);
 
-  debug(`Found ${ignores.length} rules in .vercelignore`);
+  debug(`Found ${ig.ignores.length} rules in .vercelignore`);
   debug('Building file tree...');
 
   if (isDirectory && !Array.isArray(path)) {
     // Directory path
-    const ignores = (absPath: string) => {
-      const rel = relative(path, absPath);
-      const ignored = ig.ignores(rel);
-      if (ignored) {
-        ignoreList.push(rel);
-      }
-      return ignored;
-    };
+    const cwd = process.cwd();
+    const ignores = (absPath: string) => ig.ignores(relative(cwd, absPath));
     fileList = await readdir(path, [ignores]);
-    debug(`Found ${fileList.length} files in the specified directory`);
+    debug(`Read ${fileList.length} files in the specified directory`);
   } else if (Array.isArray(path)) {
     // Array of file paths
     fileList = path;
@@ -111,7 +104,7 @@ export async function buildFileTree(
     debug(`Deploying the provided path as single file`);
   }
 
-  return { fileList, ignoreList };
+  return fileList;
 }
 
 export async function getVercelIgnore(

packages/now-client/tests/unit.utils.test.ts

@@ -14,30 +14,18 @@ const normalizeWindowsPaths = (files: string[]) => {
 const toAbsolutePaths = (cwd: string, files: string[]) =>
   files.map(p => join(cwd, p));
 
-describe('buildFileTree()', () => {
+describe('buildFileTree', () => {
   it('should exclude files using `.nowignore` blocklist', async () => {
     const cwd = fixture('nowignore');
-    const { fileList, ignoreList } = await buildFileTree(cwd, true, noop);
-
-    const expectedFileList = toAbsolutePaths(cwd, ['.nowignore', 'index.txt']);
-    expect(normalizeWindowsPaths(expectedFileList).sort()).toEqual(
-      normalizeWindowsPaths(fileList).sort()
-    );
-
-    const expectedIgnoreList = [
-      'ignore.txt',
-      'folder/ignore.txt',
-      'node_modules/ignore.txt',
-    ];
-    expect(normalizeWindowsPaths(expectedIgnoreList).sort()).toEqual(
-      normalizeWindowsPaths(ignoreList).sort()
+    const expected = toAbsolutePaths(cwd, ['.nowignore', 'index.txt']);
+    const actual = await buildFileTree(cwd, true, noop);
+    expect(normalizeWindowsPaths(expected).sort()).toEqual(
+      normalizeWindowsPaths(actual).sort()
     );
   });
 
   it('should include the node_modules using `.vercelignore` allowlist', async () => {
     const cwd = fixture('vercelignore-allow-nodemodules');
-    const { fileList, ignoreList } = await buildFileTree(cwd, true, noop);
-
     const expected = toAbsolutePaths(cwd, [
       'node_modules/one.txt',
       'sub/node_modules/two.txt',
@@ -45,13 +33,9 @@ describe('buildFileTree()', () => {
       '.vercelignore',
       'hello.txt',
     ]);
+    const actual = await buildFileTree(cwd, true, noop);
     expect(normalizeWindowsPaths(expected).sort()).toEqual(
-      normalizeWindowsPaths(fileList).sort()
-    );
-
-    const expectedIgnoreList = ['.env.local', 'exclude.txt'];
-    expect(normalizeWindowsPaths(expectedIgnoreList).sort()).toEqual(
-      normalizeWindowsPaths(ignoreList).sort()
+      normalizeWindowsPaths(actual).sort()
     );
   });
 });

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "2.6.14",
+  "version": "2.6.14-canary.1",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -26,7 +26,7 @@
     "@types/resolve-from": "5.0.1",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.1",
-    "@zeit/node-file-trace": "0.8.1",
+    "@zeit/node-file-trace": "0.8.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "escape-string-regexp": "3.0.0",

packages/now-next/test/fixtures/01-cache-headers/now.json

@@ -3,13 +3,13 @@
   "builds": [{ "src": "package.json", "use": "@vercel/next" }],
   "probes": [
     {
-      "path": "/_next/__NEXT_SCRIPT__(/)",
+      "path": "/_next/static/testing-build-id/pages/index.js",
       "responseHeaders": {
         "cache-control": "public,max-age=31536000,immutable"
       }
     },
     {
-      "path": "/_next/static/invalid-build-id/pages/non-existent.js",
+      "path": "/_next/static/invalid-build-id/pages/index.js",
       "notResponseHeaders": {
         "cache-control": "public,max-age=31536000,immutable"
       }

packages/now-next/test/fixtures/01-cache-headers/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "latest",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/06-lambda-with-memory/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "^9.1.2-canary.8",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/17-static-404/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "9.2.1-canary.3",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/19-pages-404/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "latest",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/24-custom-output-dir/package.json

@@ -3,7 +3,7 @@
     "build": "next build"
   },
   "dependencies": {
-    "next": "canary",
+    "next": "^9.1.2-canary.8",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "1.7.4-canary.1",
+  "version": "1.7.4-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -33,7 +33,7 @@
     "@types/etag": "1.8.0",
     "@types/test-listen": "1.1.0",
     "@zeit/ncc": "0.20.4",
-    "@zeit/node-file-trace": "0.8.1",
+    "@zeit/node-file-trace": "0.8.0",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
     "etag": "1.8.1",

packages/now-static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "0.17.7-canary.1",
+  "version": "0.17.7-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/static-builds",

packages/now-static-build/src/frameworks.ts

@@ -542,8 +542,7 @@ const frameworkList: Framework[] = [
     slug: 'hugo',
     buildCommand: 'hugo -D --gc',
     getOutputDirName: async (dirPrefix: string): Promise<string> => {
-      type HugoConfig = { publishDir?: string };
-      const config = await readConfigFile<HugoConfig>(
+      const config = await readConfigFile(
         ['config.json', 'config.yaml', 'config.toml'].map(fileName => {
           return join(dirPrefix, fileName);
         })
@@ -557,10 +556,7 @@ const frameworkList: Framework[] = [
     slug: 'jekyll',
     buildCommand: 'jekyll build',
     getOutputDirName: async (dirPrefix: string): Promise<string> => {
-      type JekyllConfig = { destination?: string };
-      const config = await readConfigFile<JekyllConfig>(
-        join(dirPrefix, '_config.yml')
-      );
+      const config = await readConfigFile(join(dirPrefix, '_config.yml'));
       return (config && config.destination) || '_site';
     },
   },

packages/redwood/.gitignore

@@ -1,3 +0,0 @@
-/dist
-/src/bridge.ts
-/src/launcher.ts

packages/redwood/build.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Copy shared dependencies
-bridge_defs="$(dirname $(pwd))/now-node-bridge/src/bridge.ts"
-launcher_defs="$(dirname $(pwd))/now-node/src/launcher.ts"
-
-cp -v "$bridge_defs" src
-cp -v "$launcher_defs" src
-
-# Start fresh
-rm -rf dist
-
-## Build ts files
-tsc
-
-# Build with `ncc`
-#ncc build src/index.ts -e @vercel/build-utils -e @now/build-utils -o dist

packages/redwood/package.json

@@ -1,29 +0,0 @@
-{
-  "name": "@vercel/redwood",
-  "version": "0.0.2-canary.1",
-  "main": "./dist/index.js",
-  "license": "MIT",
-  "homepage": "https://vercel.com/docs",
-  "files": [
-    "dist"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/vercel/vercel.git",
-    "directory": "packages/redwood"
-  },
-  "scripts": {
-    "build": "./build.sh",
-    "test-integration-once": "jest --env node --verbose --runInBand --bail",
-    "prepublishOnly": "./build.sh"
-  },
-  "dependencies": {
-    "@netlify/zip-it-and-ship-it": "1.2.0",
-    "is-port-reachable": "3.0.0"
-  },
-  "devDependencies": {
-    "@types/aws-lambda": "8.10.19",
-    "@types/node": "*",
-    "typescript": "3.9.3"
-  }
-}

packages/redwood/src/index.ts

@@ -1,228 +0,0 @@
-import { join, dirname, relative, parse as parsePath, sep } from 'path';
-import { ChildProcess, SpawnOptions } from 'child_process';
-import {
-  BuildOptions,
-  Lambda,
-  Files,
-  PrepareCacheOptions,
-  createLambda,
-  download,
-  glob,
-  debug,
-  getNodeVersion,
-  getSpawnOptions,
-  runNpmInstall,
-  execCommand,
-  spawnCommand,
-  readConfigFile,
-  FileBlob,
-  FileFsRef,
-  NowBuildError,
-} from '@vercel/build-utils';
-import { makeAwsLauncher } from './launcher';
-const {
-  getDependencies,
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-} = require('@netlify/zip-it-and-ship-it/src/dependencies.js');
-//@ts-ignore
-import isPortReachable from 'is-port-reachable';
-
-interface RedwoodConfig {
-  web?: {
-    port?: number;
-    apiProxyPath?: string;
-  };
-  api?: {
-    port?: number;
-  };
-  browser?: {
-    open?: boolean;
-  };
-}
-
-const LAUNCHER_FILENAME = '___vc_launcher';
-const BRIDGE_FILENAME = '___vc_bridge';
-const HELPERS_FILENAME = '___vc_helpers';
-const SOURCEMAP_SUPPORT_FILENAME = '__vc_sourcemap_support';
-
-const entrypointToPort = new Map<string, number>();
-const childProcesses = new Set<ChildProcess>();
-export const version = 2;
-
-const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
-
-async function waitForPort(port: number): Promise<boolean> {
-  for (let i = 0; i < 500; i++) {
-    if (await isPortReachable(port)) {
-      return true;
-    }
-    await sleep(100);
-  }
-  return false;
-}
-
-export async function build({
-  workPath,
-  files,
-  entrypoint,
-  meta = {},
-  config = {},
-}: BuildOptions) {
-  await download(files, workPath, meta);
-
-  const mountpoint = dirname(entrypoint);
-  const entrypointFsDirname = join(workPath, mountpoint);
-  const nodeVersion = await getNodeVersion(
-    entrypointFsDirname,
-    undefined,
-    config,
-    meta
-  );
-
-  const spawnOpts = getSpawnOptions(meta, nodeVersion);
-  await runNpmInstall(
-    entrypointFsDirname,
-    ['--prefer-offline'],
-    spawnOpts,
-    meta
-  );
-
-  const {
-    buildCommand = 'yarn rw db up --no-db-client --auto-approve && yarn rw build',
-    devCommand = 'yarn rw dev',
-  } = config;
-
-  if (meta.isDev) {
-    const toml = await readConfigFile<RedwoodConfig>(
-      join(mountpoint, 'redwood.toml')
-    );
-    const webPort = toml?.web?.port || 8910;
-    const apiPort = toml?.web?.port || 8911;
-    let devPort = entrypointToPort.get(entrypoint);
-
-    if (typeof devPort === 'number') {
-      debug('`%s` server already running for %j', devCommand, entrypoint);
-    } else {
-      devPort = webPort;
-      entrypointToPort.set(entrypoint, devPort);
-
-      const opts: SpawnOptions = {
-        cwd: mountpoint,
-        stdio: 'inherit',
-        env: { ...spawnOpts.env, PORT: String(devPort) },
-      };
-
-      const child = spawnCommand(devCommand, opts);
-      child.on('exit', () => entrypointToPort.delete(entrypoint));
-      childProcesses.add(child);
-
-      const found = await waitForPort(devPort);
-      if (!found) {
-        throw new NowBuildError({
-          code: 'REDWOOD_PORT_UNAVAILABLE',
-          message: `Failed to detect a server running on port ${devPort}`,
-          action: 'More Details',
-          link:
-            'https://err.sh/vercel/vercel/now-static-build-failed-to-detect-a-server',
-        });
-      }
-
-      debug('Detected dev server for %j', entrypoint);
-    }
-
-    let srcBase = mountpoint.replace(/^\.\/?/, '');
-
-    if (srcBase.length > 0) {
-      srcBase = `/${srcBase}`;
-    }
-
-    return {
-      routes: [
-        {
-          src: `${srcBase}/api/(.*)`,
-          dest: `http://localhost:${apiPort}/$1`,
-        },
-        {
-          src: `${srcBase}/(.*)`,
-          dest: `http://localhost:${webPort}/$1`,
-        },
-      ],
-      watch: [join(srcBase, '**/*')],
-      output: {},
-    };
-  }
-
-  debug('Running build command...');
-  await execCommand(buildCommand, {
-    ...spawnOpts,
-    cwd: workPath,
-  });
-
-  const apiDistPath = join(workPath, 'api', 'dist', 'functions');
-  const webDistPath = join(workPath, 'web', 'dist');
-  const lambdaOutputs: { [filePath: string]: Lambda } = {};
-  const staticOutputs = await glob('**', webDistPath);
-
-  // Each file in the `functions` dir will become a lambda
-  const functionFiles = await glob('*.js', apiDistPath);
-
-  for (const [funcName, fileFsRef] of Object.entries(functionFiles)) {
-    const outputName = join('api', parsePath(funcName).name); // remove `.js` extension
-    const absEntrypoint = fileFsRef.fsPath;
-    const dependencies: string[] = await getDependencies(
-      absEntrypoint,
-      workPath
-    );
-    const relativeEntrypoint = relative(workPath, absEntrypoint);
-    const awsLambdaHandler = getAWSLambdaHandler(relativeEntrypoint, 'handler');
-
-    const lambdaFiles: Files = {
-      [`${LAUNCHER_FILENAME}.js`]: new FileBlob({
-        data: makeAwsLauncher({
-          entrypointPath: `./${relativeEntrypoint}`,
-          bridgePath: `./${BRIDGE_FILENAME}`,
-          helpersPath: `./${HELPERS_FILENAME}`,
-          sourcemapSupportPath: `./${SOURCEMAP_SUPPORT_FILENAME}`,
-          shouldAddHelpers: false,
-          shouldAddSourcemapSupport: false,
-          awsLambdaHandler,
-        }),
-      }),
-      [`${BRIDGE_FILENAME}.js`]: new FileFsRef({
-        fsPath: join(__dirname, 'bridge.js'),
-      }),
-    };
-
-    dependencies.forEach(fsPath => {
-      lambdaFiles[relative(workPath, fsPath)] = new FileFsRef({ fsPath });
-    });
-
-    lambdaFiles[relative(workPath, fileFsRef.fsPath)] = fileFsRef;
-
-    const lambda = await createLambda({
-      files: lambdaFiles,
-      handler: `${LAUNCHER_FILENAME}.launcher`,
-      runtime: nodeVersion.runtime,
-      environment: {},
-    });
-    lambdaOutputs[outputName] = lambda;
-  }
-
-  return {
-    output: { ...staticOutputs, ...lambdaOutputs },
-    routes: [{ handle: 'filesystem' }, { src: '/.*', dest: '/index.html' }],
-    watch: [],
-  };
-}
-
-function getAWSLambdaHandler(filePath: string, handlerName: string) {
-  const { dir, name } = parsePath(filePath);
-  return `${dir}${dir ? sep : ''}${name}.${handlerName}`;
-}
-
-export async function prepareCache({
-  workPath,
-}: PrepareCacheOptions): Promise<Files> {
-  const cache = await glob('node_modules/**', workPath);
-  return cache;
-}

packages/redwood/test/fixtures/01-create-redwood-app/.env.defaults

@@ -1,7 +0,0 @@
-# These environment variables will be used by default if you do not create any
-# yourself in .env. This file should be safe to check into your version control
-# system. Any custom values should go in .env and .env should *not* be checked
-# into version control.
-
-DATABASE_URL=file:./dev.db
-BINARY_TARGET=native

packages/redwood/test/fixtures/01-create-redwood-app/.gitignore

@@ -1,10 +0,0 @@
-.DS_Store
-.env
-.netlify
-dev.db
-dist
-dist-babel
-node_modules
-yarn-error.log
-
-.vercel

packages/redwood/test/fixtures/01-create-redwood-app/.nvmrc

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

packages/redwood/test/fixtures/01-create-redwood-app/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Redwood
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

packages/redwood/test/fixtures/01-create-redwood-app/README.md

@@ -1,44 +0,0 @@
-# Redwood
-
-> **HEADS UP:** RedwoodJS is _NOT_ ready for use in Production. It relies heavily on Prisma2, which is currently in testing with an expected production release coming soon. See status at ["Is Prisma2 Ready?"](https://isprisma2ready.com)
-
-## Getting Started
-
-- [Redwoodjs.com](https://redwoodjs.com): home to all things RedwoodJS.
-- [Tutorial](https://redwoodjs.com/tutorial/welcome-to-redwood): getting started and complete overview guide.
-- [Docs](https://redwoodjs.com/docs/introduction): using the Redwood Router, handling assets and files, list of command-line tools, and more.
-- [Redwood Community](https://community.redwoodjs.com): get help, share tips and tricks, and collaborate on everything about RedwoodJS.
-
-### Setup
-
-We use Yarn as our package manager. To get the dependencies installed, just do this in the root directory:
-
-```terminal
-yarn install
-```
-
-### Fire it up
-
-```terminal
-yarn redwood dev
-```
-
-Your browser should open automatically to `http://localhost:8910` to see the web app. Lambda functions run on `http://localhost:8911` and are also proxied to `http://localhost:8910/api/functions/*`.
-
-## Development
-
-### Database
-
-We're using [Prisma2](https://github.com/prisma/prisma2), a modern DB toolkit to query, migrate and model your database.
-
-Prisma2 is [not ready for production](https://isprisma2ready.com) at the moment.
-
-To create a development database:
-
-```terminal
-yarn redwood db up
-```
-
-This will read the schema definition in `api/prisma/schema.prisma` and generate a sqlite database in `api/prisma/dev.db`
-
-If you've made changes to the schema run `yarn redwood db save` to generate a migration, and `yarn redwood db up` to apply the migration/ generate a new ORM client.

packages/redwood/test/fixtures/01-create-redwood-app/api/.babelrc.js

@@ -1 +0,0 @@
-module.exports = { extends: '../babel.config.js' }

packages/redwood/test/fixtures/01-create-redwood-app/api/jsconfig.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "src/*": ["./src/*"]
-    }
-  },
-  "include": ["src/**/*"]
-}

packages/redwood/test/fixtures/01-create-redwood-app/api/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "api",
-  "version": "0.0.0",
-  "private": true,
-  "dependencies": {
-    "@redwoodjs/api": "0.14.0"
-  }
-}

packages/redwood/test/fixtures/01-create-redwood-app/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?
-}

packages/redwood/test/fixtures/01-create-redwood-app/api/prisma/seeds.js

@@ -1,26 +0,0 @@
-/* eslint-disable no-console */
-const { PrismaClient } = require('@prisma/client')
-const dotenv = require('dotenv')
-
-dotenv.config()
-const db = new PrismaClient()
-
-async function main() {
-  // 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
-  // existence of a record before trying to create it). For example:
-  //
-  //   const existing = await db.user.findMany({ where: { email: 'admin@email.com' }})
-  //   if (!existing.length) {
-  //     await db.user.create({ data: { name: 'Admin', email: 'admin@email.com' }})
-  //   }
-
-  console.info('No data to seed. See api/prisma/seeds.js for info.')
-}
-
-main()
-  .catch((e) => console.error(e))
-  .finally(async () => {
-    await db.disconnect()
-  })

packages/redwood/test/fixtures/01-create-redwood-app/api/src/functions/graphql.js

@@ -1,19 +0,0 @@
-import {
-  createGraphQLHandler,
-  makeMergedSchema,
-  makeServices,
-} from '@redwoodjs/api'
-import importAll from '@redwoodjs/api/importAll.macro'
-
-import { db } from 'src/lib/db'
-
-const schemas = importAll('api', 'graphql')
-const services = importAll('api', 'services')
-
-export const handler = createGraphQLHandler({
-  schema: makeMergedSchema({
-    schemas,
-    services: makeServices({ services }),
-  }),
-  db,
-})

packages/redwood/test/fixtures/01-create-redwood-app/api/src/lib/db.js

@@ -1,6 +0,0 @@
-// See https://github.com/prisma/prisma2/blob/master/docs/prisma-client-js/api.md#constructor
-// for options.
-
-import { PrismaClient } from '@prisma/client'
-
-export const db = new PrismaClient()

packages/redwood/test/fixtures/01-create-redwood-app/babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  presets: ['@redwoodjs/core/config/babel-preset'],
-}

packages/redwood/test/fixtures/01-create-redwood-app/package.json

@@ -1,16 +0,0 @@
-{
-  "private": true,
-  "workspaces": {
-    "packages": [
-      "api",
-      "web"
-    ]
-  },
-  "devDependencies": {
-    "@redwoodjs/core": "0.14.0"
-  },
-  "engines": {
-    "node": ">=12",
-    "yarn": ">=1.15"
-  }
-}

packages/redwood/test/fixtures/01-create-redwood-app/prettier.config.js

@@ -1,9 +0,0 @@
-// https://prettier.io/docs/en/options.html
-module.exports = {
-  trailingComma: 'es5',
-  bracketSpacing: true,
-  tabWidth: 2,
-  semi: false,
-  singleQuote: true,
-  arrowParens: 'always',
-}

packages/redwood/test/fixtures/01-create-redwood-app/redwood.toml

@@ -1,7 +0,0 @@
-[web]
-  port = 8910
-  apiProxyPath = "/api"
-[api]
-  port = 8911
-[browser]
-  open = false

packages/redwood/test/fixtures/01-create-redwood-app/vercel.json

@@ -1,20 +0,0 @@
-{
-  "version": 2,
-  "builds": [{ "src": "package.json", "use": "@vercel/redwood" }],
-  "probes": [
-    { "path": "/", "mustContain": "<div id=\"redwood-app\">" },
-    { "path": "/about", "mustContain": "<div id=\"redwood-app\">" },
-    {
-      "path": "/api/graphql",
-      "headers": { "Accept": "text/html" },
-      "mustContain": "<title>GraphQL Playground</title>"
-    },
-    {
-      "path": "/api/graphql",
-      "method": "POST",
-      "headers": { "Accept": "application/json" },
-      "body": { "query": "{ redwood { version } }" },
-      "mustContain": "0.14.0"
-    }
-  ]
-}

packages/redwood/test/fixtures/01-create-redwood-app/web/.babelrc.js

@@ -1 +0,0 @@
-module.exports = { extends: '../babel.config.js' }

packages/redwood/test/fixtures/01-create-redwood-app/web/jsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "src/*": ["./src/*"]
-    },
-    "jsx": "preserve"
-  },
-  "include": ["src/**/*"]
-}

packages/redwood/test/fixtures/01-create-redwood-app/web/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "web",
-  "version": "0.0.0",
-  "private": true,
-  "browserslist": [
-    "defaults"
-  ],
-  "dependencies": {
-    "@redwoodjs/router": "0.14.0",
-    "@redwoodjs/web": "0.14.0",
-    "prop-types": "^15.7.2",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1"
-  }
-}

packages/redwood/test/fixtures/01-create-redwood-app/web/public/README.md

@@ -1,45 +0,0 @@
-# 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.
-
-### 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" />
-```
-
-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"
-
-
-function Header() {
-  return <img src={logo} alt="Logo" />
-}
-
-export default Header
-```
-
-Behind the scenes, we are using Webpack's ["file-loader"](https://webpack.js.org/loaders/file-loader/) and ["url-loader](https://webpack.js.org/loaders/url-loader/) (for files smaller than 10kb).

packages/redwood/test/fixtures/01-create-redwood-app/web/public/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow:

packages/redwood/test/fixtures/01-create-redwood-app/web/src/Routes.js

@@ -1,22 +0,0 @@
-// In this file, all Page components from 'src/pages` are auto-imported. Nested
-// directories are supported, and should be uppercase. Each subdirectory will be
-// prepended onto the component name.
-//
-// Examples:
-//
-// 'src/pages/HomePage/HomePage.js'         -> HomePage
-// 'src/pages/Admin/BooksPage/BooksPage.js' -> AdminBooksPage
-
-import { Router, Route } from '@redwoodjs/router'
-
-const Routes = () => {
-  return (
-    <Router>
-      <Route path="/" page={HomePage} name="home" />
-      <Route path="/about" page={AboutPage} name="about" />
-      <Route notfound page={NotFoundPage} />
-    </Router>
-  )
-}
-
-export default Routes

packages/redwood/test/fixtures/01-create-redwood-app/web/src/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="icon" type="image/png" href="/favicon.png" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
-  </head>
-  <body>
-    <div id="redwood-app"></div>
-  </body>
-</html>

packages/redwood/test/fixtures/01-create-redwood-app/web/src/index.js

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