Publish Stable

- @now/frameworks@0.0.13
 - @now/build-utils@2.2.1
 - now@18.0.0
 - now-client@7.1.0
 - @now/go@1.0.7
 - @now/next@2.5.3
 - @now/node@1.5.1
 - @now/python@1.1.6
 - @now/routing-utils@1.8.1
 - @now/static-build@0.16.0

.github/CODEOWNERS

@@ -8,6 +8,7 @@
 /packages/now-cli/src/util/dev/          @tootallnate @leo @styfle @AndyBitz
 /packages/now-cli/src/commands/domains/  @javivelasco @mglagola @anatrajkovska
 /packages/now-cli/src/commands/certs/    @javivelasco @mglagola @anatrajkovska
+/packages/now-cli/src/commands/env       @styfle @lucleray
 /packages/now-client                     @leo @rdev
 /packages/now-build-utils                @styfle @AndyBitz
 /packages/now-node                       @styfle @tootallnate @lucleray

.github/workflows/cancel.yml

@@ -1,7 +1,7 @@
 name: Cancel
 on:
   push:
-    branches:    
+    branches:
     - '*'
     - '!master'
 
@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - uses: styfle/cancel-workflow-action@0.2.0
+      - uses: styfle/cancel-workflow-action@0.3.1
         with:
-          workflow_id: 435869
+          workflow_id: 849295, 849296, 849297, 849298
           access_token: ${{ secrets.GITHUB_WORKFLOW_TOKEN }}
 

.github/workflows/continuous-integration.yml

@@ -1,117 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-    - master
-    tags:
-    - '!*'
-  pull_request:
-
-jobs:
-  test-unit:
-    name: Unit Tests
-    timeout-minutes: 15
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        node: [10, 12]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - run: git fetch origin master --depth=10
-      - run: git fetch origin ${{ github.ref }} --depth=10
-      - uses: actions/setup-node@v1
-      - run: yarn install
-      - run: yarn run build
-      - run: yarn run test-lint
-      - run: yarn run test-unit --clean false
-      - name: Upload Artifact
-        if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run once
-        uses: actions/upload-artifact@v1
-        with:
-          name: test-unit-output
-          path: packages/now-cli/.nyc_output
-
-  test-integration:
-    name: Integration Tests
-    timeout-minutes: 120
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: git fetch origin master --depth=10
-      - run: git fetch origin ${{ github.ref }} --depth=10
-      - run: yarn install
-      - run: yarn run build
-      - run: yarn test-integration-once --clean false
-        env:
-          ZEIT_TEAM_TOKEN: ${{ secrets.ZEIT_TEAM_TOKEN }}
-          ZEIT_REGISTRATION_URL: ${{ secrets.ZEIT_REGISTRATION_URL }}
-
-  test-now-cli:
-    name: Now CLI Tests
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        node: [10, 12]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - run: git fetch origin master --depth=10
-      - run: git fetch origin ${{ github.ref }} --depth=10
-      - name: Install Hugo
-        if: matrix.os == 'macos-latest'
-        run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
-      - run: yarn install
-      - run: yarn run build
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-      - run: yarn test-integration --clean false
-        env:
-          ZEIT_TEAM_TOKEN: ${{ secrets.ZEIT_TEAM_TOKEN }}
-          ZEIT_REGISTRATION_URL: ${{ secrets.ZEIT_REGISTRATION_URL }}
-
-  test-now-dev:
-    name: "`now dev` Tests"
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        node: [10, 12]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - run: git fetch origin master --depth=10
-      - run: git fetch origin ${{ github.ref }} --depth=10
-      - name: Install Hugo
-        if: matrix.os == 'macos-latest'
-        run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
-      - run: yarn install
-      - run: yarn run build
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-      - run: yarn test-integration-now-dev --clean false
-
-  coverage:
-    name: Coverage
-    timeout-minutes: 5
-    needs: [test-unit, test-now-cli, test-now-dev, test-integration]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: git fetch origin master --depth=10
-      - run: git fetch origin ${{ github.ref }} --depth=10
-      - uses: actions/download-artifact@v1
-        with:
-          name: test-unit-output
-          path: packages/now-cli/.nyc_output
-      - run: yarn install
-      - run: yarn workspace now run coverage
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

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

@@ -0,0 +1,36 @@
+name: CLI
+
+on:
+  push:
+    branches:
+    - master
+    tags:
+    - '!*'
+  pull_request:
+
+jobs:
+  test:
+    name: CLI
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node: [10, 12]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - name: Install Hugo
+        if: matrix.os == 'macos-latest'
+        run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
+      - run: yarn install
+      - run: yarn run build
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - run: yarn test-integration-cli --clean false
+        env:
+          ZEIT_TEAM_TOKEN: ${{ secrets.ZEIT_TEAM_TOKEN }}
+          ZEIT_REGISTRATION_URL: ${{ secrets.ZEIT_REGISTRATION_URL }}

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

@@ -0,0 +1,33 @@
+name: Dev
+
+on:
+  push:
+    branches:
+    - master
+    tags:
+    - '!*'
+  pull_request:
+
+jobs:
+  test:
+    name: Dev
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        node: [10, 12]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - name: Install Hugo
+        if: matrix.os == 'macos-latest'
+        run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
+      - run: yarn install
+      - run: yarn run build
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - run: yarn test-integration-dev --clean false

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

@@ -0,0 +1,25 @@
+name: E2E
+
+on:
+  push:
+    branches:
+    - master
+    tags:
+    - '!*'
+  pull_request:
+
+jobs:
+  test:
+    name: E2E
+    timeout-minutes: 120
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - run: yarn install
+      - run: yarn run build
+      - run: yarn test-integration-once --clean false
+        env:
+          ZEIT_TEAM_TOKEN: ${{ secrets.ZEIT_TEAM_TOKEN }}
+          ZEIT_REGISTRATION_URL: ${{ secrets.ZEIT_REGISTRATION_URL }}

.github/workflows/test-unit.yml

@@ -0,0 +1,33 @@
+name: Unit
+
+on:
+  push:
+    branches:
+    - master
+    tags:
+    - '!*'
+  pull_request:
+
+jobs:
+  test:
+    name: Unit
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        node: [10, 12]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - uses: actions/setup-node@v1
+      - run: yarn install
+      - run: yarn run build
+      - run: yarn run test-lint
+      - run: yarn run test-unit --clean false
+      - run: yarn workspace now run coverage
+        if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run once
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

examples/dojo/.dojorc

@@ -0,0 +1,6 @@
+{
+	"build-app": {},
+	"test-intern": {},
+	"create-app": {},
+	"create-widget": {}
+}

examples/dojo/.gitignore

@@ -0,0 +1,4 @@
+node_modules/
+_build/
+output/
+.cert/

examples/dojo/README.md

@@ -0,0 +1,25 @@
+# Dojo Example
+
+This directory is a brief example of a [Dojo](https://dojo.io) site that can be deployed with ZEIT Now and zero configuration.
+
+## Deploy Your Own
+
+Deploy your own Dojo project with ZEIT Now.
+
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now-examples/tree/master/dojo)
+
+### How We Created This Example
+
+To get started with Dojo on Now, you can use the [Dojo CLI](https://github.com/dojo/cli) to initialize the project:
+
+```shell
+$ now init dojo
+```
+
+### Deploying From Your Terminal
+
+Once initialized, you can deploy the Dojo example with just a single command:
+
+```shell
+$ now
+```

examples/dojo/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "dojo",
+  "version": "1.0.0",
+  "scripts": {
+    "dev": "dojo build --mode dev --watch --serve",
+    "build": "dojo build --mode dist",
+    "build:dev": "dojo build --mode dev",
+    "test": "dojo test",
+    "test:unit": "dojo build --mode unit && dojo test --unit --config local",
+    "test:functional": "dojo build --mode functional && dojo test --functional --config local",
+    "test:all": "dojo build --mode unit && dojo build --mode functional && dojo test --all --config local"
+  },
+  "dependencies": {
+    "@dojo/framework": "^6.0.0",
+    "@dojo/themes": "^6.0.0",
+    "@dojo/widgets": "^6.0.0",
+    "tslib": "~1.9.1"
+  },
+  "devDependencies": {
+    "@dojo/cli": "^6.0.0",
+    "@dojo/cli-build-app": "^6.0.0",
+    "@dojo/cli-test-intern": "^6.0.0",
+    "@types/node": "~9.6.5",
+    "typescript": "~3.4.5"
+  }
+}

examples/dojo/src/App.m.css

@@ -0,0 +1,3 @@
+.root {
+
+}

examples/dojo/src/App.m.css.d.ts

@@ -0,0 +1 @@
+export const root: string;

examples/dojo/src/App.ts

@@ -0,0 +1,27 @@
+import { create, v, w } from '@dojo/framework/core/vdom';
+import theme from '@dojo/framework/core/middleware/theme';
+import Outlet from '@dojo/framework/routing/Outlet';
+import dojo from '@dojo/themes/dojo';
+
+import Menu from './widgets/Menu';
+import Home from './widgets/Home';
+import About from './widgets/About';
+import Profile from './widgets/Profile';
+
+import * as css from './App.m.css';
+
+const factory = create({ theme });
+
+export default factory(function App({ middleware: { theme } }) {
+	if (!theme.get()) {
+		theme.set(dojo);
+	}
+	return v('div', { classes: [css.root] }, [
+		w(Menu, {}),
+		v('div', [
+			w(Outlet, { key: 'home', id: 'home', renderer: () => w(Home, {}) }),
+			w(Outlet, { key: 'about', id: 'about', renderer: () => w(About, {}) }),
+			w(Outlet, { key: 'profile', id: 'profile', renderer: () => w(Profile, { username: 'Dojo User' }) })
+		])
+	]);
+});

examples/dojo/src/index.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en-us" dir="ltr">
+<head>
+	<meta charset="utf-8">
+	<title>dojo</title>
+	<meta name="theme-color" content="#222127">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+</body>
+</html>

examples/dojo/src/main.css

@@ -0,0 +1,6 @@
+/* Put your styles and imports here */
+body {
+	margin: 0;
+	padding: 0;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}

examples/dojo/src/main.ts

@@ -0,0 +1,13 @@
+import renderer, { w } from '@dojo/framework/core/vdom';
+import Registry from '@dojo/framework/core/Registry';
+import { registerRouterInjector } from '@dojo/framework/routing/RouterInjector';
+import '@dojo/themes/dojo/index.css';
+
+import routes from './routes';
+import App from './App';
+
+const registry = new Registry();
+registerRouterInjector(routes, registry);
+
+const r = renderer(() => w(App, {}));
+r.mount({ registry });

examples/dojo/src/routes.ts

@@ -0,0 +1,15 @@
+export default [
+	{
+		path: 'home',
+		outlet: 'home',
+		defaultRoute: true
+	},
+	{
+		path: 'about',
+		outlet: 'about'
+	},
+	{
+		path: 'profile',
+		outlet: 'profile'
+	}
+];

examples/dojo/src/widgets/About.ts

@@ -0,0 +1,9 @@
+import { v, create } from '@dojo/framework/core/vdom';
+
+import * as css from './styles/About.m.css';
+
+const factory = create();
+
+export default factory(function Profile() {
+	return v('h1', { classes: [css.root] }, ['About Page']);
+});

examples/dojo/src/widgets/Home.ts

@@ -0,0 +1,9 @@
+import { v, create } from '@dojo/framework/core/vdom';
+
+import * as css from './styles/Home.m.css';
+
+const factory = create();
+
+export default factory(function Profile() {
+	return v('h1', { classes: [css.root] }, ['Home Page']);
+});

examples/dojo/src/widgets/Menu.ts

@@ -0,0 +1,39 @@
+import { create, w } from '@dojo/framework/core/vdom';
+import Link from '@dojo/framework/routing/ActiveLink';
+import Toolbar from '@dojo/widgets/toolbar';
+
+import * as css from './styles/Menu.m.css';
+
+const factory = create();
+
+export default factory(function Menu() {
+	return w(Toolbar, { heading: 'My Dojo App!', collapseWidth: 600 }, [
+		w(
+			Link,
+			{
+				to: 'home',
+				classes: [css.link],
+				activeClasses: [css.selected]
+			},
+			['Home']
+		),
+		w(
+			Link,
+			{
+				to: 'about',
+				classes: [css.link],
+				activeClasses: [css.selected]
+			},
+			['About']
+		),
+		w(
+			Link,
+			{
+				to: 'profile',
+				classes: [css.link],
+				activeClasses: [css.selected]
+			},
+			['Profile']
+		)
+	]);
+});

examples/dojo/src/widgets/Profile.ts

@@ -0,0 +1,14 @@
+import { v, create } from '@dojo/framework/core/vdom';
+
+import * as css from './styles/Profile.m.css';
+
+export interface ProfileProperties {
+	username: string;
+}
+
+const factory = create().properties<ProfileProperties>();
+
+export default factory(function Profile({ properties }) {
+	const { username } = properties();
+	return v('h1', { classes: [css.root] }, [`Welcome ${username}!`]);
+});

examples/dojo/src/widgets/styles/About.m.css

@@ -0,0 +1,3 @@
+.root {
+
+}

examples/dojo/src/widgets/styles/About.m.css.d.ts

@@ -0,0 +1 @@
+export const root: string;

examples/dojo/src/widgets/styles/Home.m.css

@@ -0,0 +1,3 @@
+.root {
+
+}

examples/dojo/src/widgets/styles/Home.m.css.d.ts

@@ -0,0 +1 @@
+export const root: string;

examples/dojo/src/widgets/styles/Menu.m.css

@@ -0,0 +1,23 @@
+.root {
+	flex: 1;
+	overflow: hidden;
+}
+
+.link:hover {
+	color: #4db3ff;
+	background-color:#ccddee;
+}
+
+.link {
+	min-width: 140px;
+	text-align: center;
+	text-transform: uppercase;
+	text-decoration: none;
+	padding: 18px;
+	color: black;
+	box-sizing: border-box;
+}
+
+.selected {
+	color: darkorange;
+}

examples/dojo/src/widgets/styles/Menu.m.css.d.ts

@@ -0,0 +1,3 @@
+export const root: string;
+export const link: string;
+export const selected: string;

examples/dojo/src/widgets/styles/Profile.m.css

@@ -0,0 +1,3 @@
+.root {
+
+}

examples/dojo/src/widgets/styles/Profile.m.css.d.ts

@@ -0,0 +1 @@
+export const root: string;

examples/dojo/tests/functional/all.ts

@@ -0,0 +1 @@
+import './main';

examples/dojo/tests/functional/main.ts

@@ -0,0 +1 @@
+/* Write your app tests here */

examples/dojo/tests/unit/App.ts

@@ -0,0 +1,46 @@
+const { describe, it } = intern.getInterface('bdd');
+import harness from '@dojo/framework/testing/harness';
+import { v, w } from '@dojo/framework/core/vdom';
+import Outlet from '@dojo/framework/routing/Outlet';
+
+import Menu from '../../src/widgets/Menu';
+import Home from '../../src/widgets/Home';
+import About from '../../src/widgets/About';
+import Profile from '../../src/widgets/Profile';
+
+import App from '../../src/App';
+import * as css from '../../src/App.m.css';
+
+describe('App', () => {
+	it('default renders correctly', () => {
+		const h = harness(() => w(App, {}));
+		h.expect(() =>
+			v('div', { classes: [css.root] }, [
+				w(Menu, {}),
+				v('div', [
+					w(Outlet, { key: 'home', id: 'home', renderer: () => w(Home, {}) }),
+					w(Outlet, { key: 'about', id: 'about', renderer: () => w(About, {}) }),
+					w(Outlet, { key: 'profile', id: 'profile', renderer: () => w(Profile, { username: 'Dojo User' }) })
+				])
+			])
+		);
+	});
+
+	it('home outlet renderer', () => {
+		const h = harness(() => w(App, {}));
+		const renderer = h.trigger('@home', 'renderer');
+		h.expect(() => w(Home, {}), () => renderer);
+	});
+
+	it('about outlet renderer', () => {
+		const h = harness(() => w(App, {}));
+		const renderer = h.trigger('@about', 'renderer');
+		h.expect(() => w(About, {}), () => renderer);
+	});
+
+	it('profile outlet renderer', () => {
+		const h = harness(() => w(App, {}));
+		const renderer = h.trigger('@profile', 'renderer');
+		h.expect(() => w(Profile, { username: 'Dojo User' }), () => renderer);
+	});
+});

examples/dojo/tests/unit/all.ts

@@ -0,0 +1,2 @@
+import './App';
+import './widgets/all';

examples/dojo/tests/unit/main.ts

@@ -0,0 +1 @@
+/* Write your app tests here */

examples/dojo/tests/unit/widgets/About.ts

@@ -0,0 +1,13 @@
+const { describe, it } = intern.getInterface('bdd');
+import harness from '@dojo/framework/testing/harness';
+import { w, v } from '@dojo/framework/core/vdom';
+
+import About from '../../../src/widgets/About';
+import * as css from '../../../src/widgets/styles/About.m.css';
+
+describe('About', () => {
+	it('default renders correctly', () => {
+		const h = harness(() => w(About, {}));
+		h.expect(() => v('h1', { classes: [css.root] }, ['About Page']));
+	});
+});

examples/dojo/tests/unit/widgets/Home.ts

@@ -0,0 +1,13 @@
+const { describe, it } = intern.getInterface('bdd');
+import harness from '@dojo/framework/testing/harness';
+import { w, v } from '@dojo/framework/core/vdom';
+
+import Home from '../../../src/widgets/Home';
+import * as css from '../../../src/widgets/styles/Home.m.css';
+
+describe('Home', () => {
+	it('default renders correctly', () => {
+		const h = harness(() => w(Home, {}));
+		h.expect(() => v('h1', { classes: [css.root] }, ['Home Page']));
+	});
+});

examples/dojo/tests/unit/widgets/Menu.ts

@@ -0,0 +1,45 @@
+const { describe, it } = intern.getInterface('bdd');
+import harness from '@dojo/framework/testing/harness';
+import { w } from '@dojo/framework/core/vdom';
+import Link from '@dojo/framework/routing/ActiveLink';
+import Toolbar from '@dojo/widgets/toolbar';
+
+import Menu from '../../../src/widgets/Menu';
+import * as css from '../../../src/widgets/styles/Menu.m.css';
+
+describe('Menu', () => {
+	it('default renders correctly', () => {
+		const h = harness(() => w(Menu, {}));
+		h.expect(() =>
+			w(Toolbar, { heading: 'My Dojo App!', collapseWidth: 600 }, [
+				w(
+					Link,
+					{
+						to: 'home',
+						classes: [css.link],
+						activeClasses: [css.selected]
+					},
+					['Home']
+				),
+				w(
+					Link,
+					{
+						to: 'about',
+						classes: [css.link],
+						activeClasses: [css.selected]
+					},
+					['About']
+				),
+				w(
+					Link,
+					{
+						to: 'profile',
+						classes: [css.link],
+						activeClasses: [css.selected]
+					},
+					['Profile']
+				)
+			])
+		);
+	});
+});

examples/dojo/tests/unit/widgets/Profile.ts

@@ -0,0 +1,13 @@
+const { describe, it } = intern.getInterface('bdd');
+import harness from '@dojo/framework/testing/harness';
+import { w, v } from '@dojo/framework/core/vdom';
+
+import Profile from '../../../src/widgets/Profile';
+import * as css from '../../../src/widgets/styles/Profile.m.css';
+
+describe('Profile', () => {
+	it('default renders correctly', () => {
+		const h = harness(() => w(Profile, { username: 'Dojo User' }));
+		h.expect(() => v('h1', { classes: [css.root] }, ['Welcome Dojo User!']));
+	});
+});

examples/dojo/tests/unit/widgets/all.ts

@@ -0,0 +1,4 @@
+import './About';
+import './Home';
+import './Profile';
+import './Menu';

examples/dojo/tsconfig.json

@@ -0,0 +1,31 @@
+{
+	"compilerOptions": {
+		"declaration": false,
+		"experimentalDecorators": true,
+		"jsx": "react",
+		"jsxFactory": "tsx",
+		"lib": [
+			"dom",
+			"es5",
+			"es2015.promise",
+			"es2015.iterable",
+			"es2015.symbol",
+			"es2015.symbol.wellknown"
+		],
+		"module": "umd",
+		"moduleResolution": "node",
+		"noUnusedLocals": true,
+		"outDir": "_build/",
+		"removeComments": false,
+		"importHelpers": true,
+		"downlevelIteration": true,
+		"sourceMap": true,
+		"strict": true,
+		"target": "es5",
+		"types": [ "intern" ]
+	},
+	"include": [
+		"./src/**/*.ts",
+		"./tests/**/*.ts"
+	]
+}

examples/ionic-react/package.json

@@ -20,7 +20,7 @@
     "react-router": "^5.1.2",
     "react-router-dom": "^5.1.2",
     "react-scripts": "3.3.0",
-    "typescript": "3.7.4"
+    "typescript": "3.8.3"
   },
   "scripts": {
     "start": "react-scripts start",

examples/nextjs/package.json

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

now.json

@@ -9,10 +9,6 @@
       "destination": "/api/frameworks"
     }
   ],
-  "env": {
-    "GITHUB_ACCESS_TOKEN": "@now-api-examples-github-token",
-    "SENTRY_DSN": "@sentry-product-dsn"
-  },
   "github": {
     "silent": true,
     "autoJobCancelation": true

package.json

@@ -38,9 +38,9 @@
     "build": "node utils/run.js build all",
     "test-lint": "node utils/run.js test-lint",
     "test-unit": "node utils/run.js test-unit",
-    "test-integration": "node utils/run.js test-integration",
+    "test-integration-cli": "node utils/run.js test-integration-cli",
     "test-integration-once": "node utils/run.js test-integration-once",
-    "test-integration-now-dev": "node utils/run.js test-integration-now-dev",
+    "test-integration-dev": "node utils/run.js test-integration-dev",
     "lint": "eslint . --ext .ts,.js"
   },
   "lint-staged": {
@@ -59,9 +59,6 @@
       "pre-commit": "lint-staged"
     }
   },
-  "resolutions": {
-    "signal-exit": "TooTallNate/signal-exit#update/sighub-to-sigint-on-windows"
-  },
   "prettier": {
     "trailingComma": "es5",
     "singleQuote": true

packages/frameworks/frameworks.json

@@ -195,6 +195,37 @@
       }
     }
   },
+  {
+    "name": "Dojo",
+    "slug": "dojo",
+    "demo": "https://dojo.now-examples.now.sh",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/dojo.svg",
+    "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",
     "slug": "ember",
@@ -278,6 +309,34 @@
       }
     }
   },
+  {
+    "name": "Ionic Angular",
+    "slug": "ionic-angular",
+    "demo": "https://ionic-angular.now-examples.now.sh",
+    "logo": "https://raw.githubusercontent.com/zeit/now/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",
@@ -366,7 +425,7 @@
     "name": "Ionic React",
     "slug": "ionic-react",
     "demo": "https://ionic-react.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/ionic-react.svg",
+    "logo": "https://raw.githubusercontent.com/zeit/now/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",
@@ -380,13 +439,13 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "npm run build"
+        "placeholder": "`npm run build` or `react-scripts build`"
       },
       "devCommand": {
-        "value": "stencil build --dev --watch --serve --port $PORT"
+        "value": "react-scripts start"
       },
       "outputDirectory": {
-        "value": "public"
+        "value": "build"
       }
     }
   },

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/frameworks",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "main": "frameworks.json",
   "license": "UNLICENSED"
 }

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/build-utils",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

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

@@ -190,7 +190,12 @@ export async function detectBuilders(
       hasNextApiFiles = true;
     }
 
-    if (!fallbackEntrypoint && buildCommand && !fileName.includes('/')) {
+    if (
+      !fallbackEntrypoint &&
+      buildCommand &&
+      !fileName.includes('/') &&
+      fileName !== 'now.json'
+    ) {
       fallbackEntrypoint = fileName;
     }
   }

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

@@ -6,13 +6,18 @@ 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';
 
+interface SpawnOptionsExtended extends SpawnOptions {
+  prettyCommand?: string;
+}
+
 export function spawnAsync(
   command: string,
   args: string[],
-  opts: SpawnOptions = {}
+  opts: SpawnOptionsExtended = {}
 ) {
   return new Promise<void>((resolve, reject) => {
     const stderrLogs: Buffer[] = [];
@@ -29,12 +34,18 @@ export function spawnAsync(
         return resolve();
       }
 
-      const errorLogs = stderrLogs.map(line => line.toString()).join('');
-      if (opts.stdio !== 'inherit') {
-        reject(new Error(`Exited with ${code || signal}\n${errorLogs}`));
-      } else {
-        reject(new Error(`Exited with ${code || signal}`));
-      }
+      const cmd = opts.prettyCommand
+        ? `Command "${opts.prettyCommand}"`
+        : 'Command';
+      reject(
+        new NowBuildError({
+          code: `NOW_BUILD_UTILS_SPAWN_${code || signal}`,
+          message:
+            opts.stdio === 'inherit'
+              ? `${cmd} exited with ${code || signal}`
+              : stderrLogs.map(line => line.toString()).join(''),
+        })
+      );
     });
   });
 }
@@ -42,7 +53,7 @@ export function spawnAsync(
 export function execAsync(
   command: string,
   args: string[],
-  opts: SpawnOptions = {}
+  opts: SpawnOptionsExtended = {}
 ) {
   return new Promise<{ stdout: string; stderr: string; code: number }>(
     (resolve, reject) => {
@@ -64,10 +75,15 @@ export function execAsync(
       child.on('error', reject);
       child.on('close', (code, signal) => {
         if (code !== 0) {
+          const cmd = opts.prettyCommand
+            ? `Command "${opts.prettyCommand}"`
+            : 'Command';
+
           return reject(
-            new Error(
-              `Program "${command}" exited with non-zero exit code ${code} ${signal}.`
-            )
+            new NowBuildError({
+              code: `NOW_BUILD_UTILS_EXEC_${code || signal}`,
+              message: `${cmd} exited with ${code || signal}`,
+            })
           );
         }
 
@@ -82,18 +98,20 @@ export function execAsync(
 }
 
 export function spawnCommand(command: string, options: SpawnOptions = {}) {
+  const opts = { ...options, prettyCommand: command };
   if (process.platform === 'win32') {
-    return spawn('cmd.exe', ['/C', command], options);
+    return spawn('cmd.exe', ['/C', command], opts);
   }
 
-  return spawn('sh', ['-c', command], options);
+  return spawn('sh', ['-c', command], opts);
 }
 
 export async function execCommand(command: string, options: SpawnOptions = {}) {
+  const opts = { ...options, prettyCommand: command };
   if (process.platform === 'win32') {
-    await spawnAsync('cmd.exe', ['/C', command], options);
+    await spawnAsync('cmd.exe', ['/C', command], opts);
   } else {
-    await spawnAsync('sh', ['-c', command], options);
+    await spawnAsync('sh', ['-c', command], opts);
   }
 
   return true;
@@ -120,9 +138,11 @@ export async function runShellScript(
   assert(path.isAbsolute(fsPath));
   const destPath = path.dirname(fsPath);
   await chmodPlusX(fsPath);
-  await spawnAsync(`./${path.basename(fsPath)}`, args, {
-    cwd: destPath,
+  const command = `./${path.basename(fsPath)}`;
+  await spawnAsync(command, args, {
     ...spawnOpts,
+    cwd: destPath,
+    prettyCommand: command,
   });
   return true;
 }
@@ -249,7 +269,7 @@ export async function runNpmInstall(
   debug(`Installing to ${destPath}`);
 
   const { hasPackageLockJson } = await scanParentDirs(destPath);
-  const opts: SpawnOptions = { cwd: destPath, ...spawnOpts };
+  const opts: SpawnOptionsExtended = { cwd: destPath, ...spawnOpts };
   const env = opts.env ? { ...opts.env } : { ...process.env };
   delete env.NODE_ENV;
   opts.env = env;
@@ -258,11 +278,13 @@ export async function runNpmInstall(
   let commandArgs: string[];
 
   if (hasPackageLockJson) {
+    opts.prettyCommand = 'npm install';
     command = 'npm';
     commandArgs = args
       .filter(a => a !== '--prefer-offline')
       .concat(['install', '--no-audit', '--unsafe-perm']);
   } else {
+    opts.prettyCommand = 'yarn install';
     command = 'yarn';
     commandArgs = args.concat(['install', '--ignore-engines']);
   }
@@ -285,7 +307,7 @@ export async function runBundleInstall(
   }
 
   assert(path.isAbsolute(destPath));
-  const opts = { cwd: destPath, ...spawnOpts };
+  const opts = { ...spawnOpts, cwd: destPath, prettyCommand: 'bundle install' };
 
   await spawnAsync(
     'bundle',
@@ -313,7 +335,7 @@ export async function runPipInstall(
   }
 
   assert(path.isAbsolute(destPath));
-  const opts = { cwd: destPath, ...spawnOpts };
+  const opts = { ...spawnOpts, cwd: destPath, prettyCommand: 'pip3 install' };
 
   await spawnAsync(
     'pip3',
@@ -340,18 +362,22 @@ export async function runPackageJsonScript(
   );
   if (!hasScript) return false;
 
-  const opts = { cwd: destPath, ...spawnOpts };
-
   if (hasPackageLockJson) {
-    console.log(`Running "npm run ${scriptName}"`);
-    await spawnAsync('npm', ['run', scriptName], opts);
+    const prettyCommand = `npm run ${scriptName}`;
+    console.log(`Running "${prettyCommand}"`);
+    await spawnAsync('npm', ['run', scriptName], {
+      ...spawnOpts,
+      cwd: destPath,
+      prettyCommand,
+    });
   } else {
-    console.log(`Running "yarn run ${scriptName}"`);
-    await spawnAsync(
-      'yarn',
-      ['--ignore-engines', '--cwd', destPath, 'run', scriptName],
-      opts
-    );
+    const prettyCommand = `yarn run ${scriptName}`;
+    console.log(`Running "${prettyCommand}"`);
+    await spawnAsync('yarn', ['--ignore-engines', 'run', scriptName], {
+      ...spawnOpts,
+      cwd: destPath,
+      prettyCommand,
+    });
   }
 
   return true;

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

@@ -7,6 +7,19 @@ import {
 } from '../';
 
 describe('Test `detectBuilders`', () => {
+  it('should never select now.json src', async () => {
+    const files = ['docs/index.md', 'mkdocs.yml', 'now.json'];
+    const { builders, errors } = await detectBuilders(files, null, {
+      projectSettings: {
+        buildCommand: 'mkdocs build',
+        outputDirectory: 'site',
+      },
+    });
+    expect(errors).toBe(null);
+    expect(builders).toBeDefined();
+    expect(builders![0].src).not.toBe('now.json');
+  });
+
   it('package.json + no build', async () => {
     const pkg = { dependencies: { next: '9.0.0' } };
     const files = ['package.json', 'pages/index.js', 'public/index.html'];
@@ -817,6 +830,21 @@ describe('Test `detectBuilders`', () => {
 
 describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
   const featHandleMiss = true;
+
+  it('should never select now.json src', async () => {
+    const files = ['docs/index.md', 'mkdocs.yml', 'now.json'];
+    const { builders, errors } = await detectBuilders(files, null, {
+      featHandleMiss,
+      projectSettings: {
+        buildCommand: 'mkdocs build',
+        outputDirectory: 'site',
+      },
+    });
+    expect(errors).toBe(null);
+    expect(builders).toBeDefined();
+    expect(builders![0].src).not.toBe('now.json');
+  });
+
   it('package.json + no build', async () => {
     const pkg = { dependencies: { next: '9.0.0' } };
     const files = ['package.json', 'pages/index.js', 'public/index.html'];

packages/now-build-utils/test/unit.walk.test.ts

@@ -21,7 +21,6 @@ describe('Test `walkParentDirs`', () => {
       await walkParentDirs({ base, start, filename });
       fail('Expected error');
     } catch (error) {
-      console.log(error);
       deepEqual(
         (error as Error).message,
         'Expected "base" to be absolute path'
@@ -36,7 +35,6 @@ describe('Test `walkParentDirs`', () => {
       await walkParentDirs({ base, start, filename });
       fail('Expected error');
     } catch (error) {
-      console.log(error);
       deepEqual(
         (error as Error).message,
         'Expected "start" to be absolute path'

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now",
-  "version": "17.1.2-canary.3",
+  "version": "18.0.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Now",
@@ -13,9 +13,9 @@
   "scripts": {
     "preinstall": "node ./scripts/preinstall.js",
     "test-unit": "nyc ava test/unit.js test/dev-builder.unit.js test/dev-router.unit.js test/dev-server.unit.js --serial --fail-fast --verbose",
-    "test-integration": "ava test/integration.js --serial --fail-fast",
+    "test-integration-cli": "ava test/integration.js --serial --fail-fast --verbose",
     "test-integration-v1": "ava test/integration-v1.js --serial --fail-fast",
-    "test-integration-now-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
+    "test-integration-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
     "prepublishOnly": "yarn build",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "build": "ts-node ./scripts/build.ts",
@@ -63,7 +63,7 @@
   },
   "devDependencies": {
     "@sentry/node": "5.5.0",
-    "@sindresorhus/slugify": "0.10.0",
+    "@sindresorhus/slugify": "0.11.0",
     "@types/ansi-escapes": "3.0.0",
     "@types/ansi-regex": "4.0.0",
     "@types/async-retry": "1.2.1",
@@ -141,8 +141,9 @@
     "micro": "9.1.2",
     "mime-types": "2.1.24",
     "minimatch": "3.0.4",
-    "mri": "1.1.0",
+    "mri": "1.1.5",
     "ms": "2.1.2",
+    "nanoid": "3.0.2",
     "node-fetch": "2.6.0",
     "npm-package-arg": "6.1.0",
     "nyc": "13.2.0",

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

@@ -8,6 +8,8 @@ import getAliases from '../../util/alias/get-aliases';
 import getScope from '../../util/get-scope.ts';
 import stamp from '../../util/output/stamp.ts';
 import strlen from '../../util/strlen.ts';
+import getCommandFlags from '../../util/get-command-flags';
+import cmd from '../../util/output/cmd.ts';
 
 export default async function ls(ctx, opts, args, output) {
   const {
@@ -101,9 +103,12 @@ export default async function ls(ctx, opts, args, output) {
     console.log(printAliasTable(aliases));
   }
 
-  if (pagination && aliases.length === 20) {
+  if (pagination && pagination.count === 20) {
+    const flags = getCommandFlags(opts, ['_', '--next']);
     output.log(
-      `To display the next page use the flag --next ${pagination.next}`
+      `To display the next page run ${cmd(
+        `now alias ls${flags} --next ${pagination.next}`
+      )}`
     );
   }
 

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

@@ -14,6 +14,7 @@ export const latestHelp = () => `
         '(default)'
       )}
       dev                              Start a local development server
+      env                              Manages the Environment Variables for your current Project
       init                 [example]   Initialize an example project
       ls | list            [app]       Lists deployments
       inspect              [id]        Displays information related to a deployment
@@ -28,7 +29,7 @@ export const latestHelp = () => `
       domains              [name]      Manages your domain names
       dns                  [name]      Manages your DNS records
       certs                [cmd]       Manages your SSL certificates
-      secrets              [name]      Manages your secret environment variables
+      secrets              [name]      Manages your global Secrets, for use in Environment Variables
       logs                 [url]       Displays the logs for a deployment
       teams                            Manages your teams
       whoami                           Shows the username of the currently logged in user
@@ -46,7 +47,7 @@ export const latestHelp = () => `
 )}    Path to the global ${'`.now`'} directory
     -d, --debug                    Debug mode [off]
     -f, --force                    Force a new deployment even if nothing has changed
-    --force-with-cache             Force a new deployment even if nothing has changed but retain build cache
+    --with-cache                   Retain build cache when using "--force"
     -t ${chalk.underline('TOKEN')}, --token=${chalk.underline(
   'TOKEN'
 )}        Login token
@@ -84,7 +85,7 @@ export const latestHelp = () => `
 
     ${chalk.cyan('$ now /usr/src/project')}
 
-  ${chalk.gray('–')} Deploy with environment variables
+  ${chalk.gray('–')} Deploy with Environment Variables
 
     ${chalk.cyan('$ now -e NODE_ENV=production -e SECRET=@mysql-secret')}
 
@@ -98,7 +99,7 @@ export const latestHelp = () => `
 
 export const latestArgs = {
   '--force': Boolean,
-  '--force-with-cache': Boolean,
+  '--with-cache': Boolean,
   '--public': Boolean,
   '--no-clipboard': Boolean,
   '--env': [String],

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

@@ -506,7 +506,7 @@ export default async function main(
       env: deploymentEnv,
       build: { env: deploymentBuildEnv },
       forceNew: argv['--force'],
-      forceNewWithCache: argv['--force-with-cache'],
+      withCache: argv['--with-cache'],
       quiet,
       wantsPublic: argv['--public'] || localConfig.public,
       isFile,
@@ -666,7 +666,7 @@ export default async function main(
     if (err instanceof BuildError) {
       output.error('Build failed');
       output.error(
-        `Check your logs at ${now.url}/_logs or run ${code(
+        `Check your logs at https://${now.url}/_logs or run ${code(
           `now logs ${now.url}`,
           {
             // Backticks are interpreted as part of the URL, causing CMD+Click

packages/now-cli/src/commands/deploy/legacy.ts

@@ -93,7 +93,7 @@ let paths: string[];
 
 // Options
 let forceNew: boolean;
-let forceNewWithCache: boolean;
+let withCache: boolean;
 let deploymentName: string;
 let sessionAffinity: string;
 let log: any;
@@ -239,7 +239,7 @@ export default async function main(
 
   // Options
   forceNew = argv.force;
-  forceNewWithCache = argv['force-with-cache'];
+  withCache = argv['with-cache'];
   deploymentName = argv.name;
   sessionAffinity = argv['session-affinity'];
   debugEnabled = argv.debug;
@@ -743,7 +743,7 @@ async function sync({
           meta: metadata,
           followSymlinks,
           forceNew,
-          forceNewWithCache,
+          withCache,
           forwardNpm,
           quiet,
           scale,

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

@@ -9,6 +9,8 @@ import stamp from '../../util/output/stamp';
 import strlen from '../../util/strlen';
 import { Output } from '../../util/output';
 import { Domain, NowContext } from '../../types';
+import getCommandFlags from '../../util/get-command-flags';
+import cmd from '../../util/output/cmd';
 
 type Options = {
   '--debug': boolean;
@@ -68,9 +70,12 @@ export default async function ls(
     console.log(`${formatDomainsTable(domains)}\n`);
   }
 
-  if (pagination && domains.length === 20) {
+  if (pagination && pagination.count === 20) {
+    const flags = getCommandFlags(opts, ['_', '--next']);
     output.log(
-      `To display the next page use the flag --next ${pagination.next}`
+      `To display the next page run ${cmd(
+        `now domains ls${flags} --next ${pagination.next}`
+      )}`
     );
   }
 

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

@@ -0,0 +1,172 @@
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { NowContext, ProjectEnvTarget } from '../../types';
+import { Output } from '../../util/output';
+import Client from '../../util/client';
+import stamp from '../../util/output/stamp';
+import { getLinkedProject } from '../../util/projects/link';
+import addEnvRecord from '../../util/env/add-env-record';
+import getEnvVariables from '../../util/env/get-env-records';
+import {
+  isValidEnvTarget,
+  getEnvTargetPlaceholder,
+  getEnvTargetChoices,
+} from '../../util/env/env-target';
+import readStandardInput from '../../util/input/read-standard-input';
+import cmd from '../../util/output/cmd';
+import param from '../../util/output/param';
+import withSpinner from '../../util/with-spinner';
+import { emoji, prependEmoji } from '../../util/emoji';
+import { isKnownError } from '../../util/env/known-error';
+
+type Options = {
+  '--debug': boolean;
+};
+
+export default async function add(
+  ctx: NowContext,
+  opts: Options,
+  args: string[],
+  output: Output
+) {
+  const {
+    authConfig: { token },
+    config,
+  } = ctx;
+  const { currentTeam } = config;
+  const { apiUrl } = ctx;
+  const debug = opts['--debug'];
+  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const link = await getLinkedProject(output, client);
+
+  if (link.status === 'error') {
+    return link.exitCode;
+  } else if (link.status === 'not_linked') {
+    output.print(
+      `${chalk.red(
+        'Error!'
+      )} Your codebase isn’t linked to a project on ZEIT Now. Run ${cmd(
+        'now'
+      )} to link it.\n`
+    );
+    return 1;
+  } else {
+    const { project } = link;
+    const stdInput = await readStandardInput();
+    let [envName, envTarget] = args;
+
+    if (args.length > 2) {
+      output.error(
+        `Invalid number of arguments. Usage: ${cmd(
+          `now env add <name> ${getEnvTargetPlaceholder()}`
+        )}`
+      );
+      return 1;
+    }
+
+    if (stdInput && (!envName || !envTarget)) {
+      output.error(
+        `Invalid number of arguments. Usage: ${cmd(
+          `now env add <name> <target> < <file>`
+        )}`
+      );
+      return 1;
+    }
+
+    let envTargets: ProjectEnvTarget[] = [];
+    if (envTarget) {
+      if (!isValidEnvTarget(envTarget)) {
+        output.error(
+          `The Environment ${param(
+            envTarget
+          )} is invalid. It must be one of: ${getEnvTargetPlaceholder()}.`
+        );
+        return 1;
+      }
+      envTargets.push(envTarget);
+    }
+
+    while (!envName) {
+      const { inputName } = await inquirer.prompt({
+        type: 'input',
+        name: 'inputName',
+        message: `What’s the name of the variable?`,
+      });
+
+      envName = inputName;
+
+      if (!inputName) {
+        output.error('Name cannot be empty');
+      }
+    }
+
+    const envs = await getEnvVariables(output, client, project.id);
+    const existing = new Set(
+      envs.filter(r => r.key === envName).map(r => r.target)
+    );
+    const choices = getEnvTargetChoices().filter(c => !existing.has(c.value));
+
+    if (choices.length === 0) {
+      output.error(
+        `The variable ${param(
+          envName
+        )} has already been added to all Environments. To remove, run ${cmd(
+          `now env rm ${envName}`
+        )}.`
+      );
+      return 1;
+    }
+
+    let envValue: string;
+
+    if (stdInput) {
+      envValue = stdInput;
+    } else {
+      const { inputValue } = await inquirer.prompt({
+        type: 'password',
+        name: 'inputValue',
+        message: `What’s the value of ${envName}?`,
+      });
+      envValue = inputValue || '';
+    }
+
+    while (envTargets.length === 0) {
+      const { inputTargets } = await inquirer.prompt({
+        name: 'inputTargets',
+        type: 'checkbox',
+        message: `Add ${envName} to which Environments (select multiple)?`,
+        choices,
+      });
+
+      envTargets = inputTargets;
+
+      if (inputTargets.length === 0) {
+        output.error('Please select at least one Environment');
+      }
+    }
+
+    const addStamp = stamp();
+    try {
+      await withSpinner('Saving', () =>
+        addEnvRecord(output, client, project.id, envName, envValue, envTargets)
+      );
+    } catch (error) {
+      if (isKnownError(error) && error.serverMessage) {
+        output.error(error.serverMessage);
+        return 1;
+      }
+      throw error;
+    }
+
+    output.print(
+      `${prependEmoji(
+        `Added Environment Variable ${chalk.bold(
+          envName
+        )} to Project ${chalk.bold(project.name)} ${chalk.gray(addStamp())}`,
+        emoji('success')
+      )}\n`
+    );
+
+    return 0;
+  }
+}

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

@@ -0,0 +1,114 @@
+import chalk from 'chalk';
+
+import { NowContext } from '../../types';
+import createOutput from '../../util/output';
+import getArgs from '../../util/get-args';
+import getSubcommand from '../../util/get-subcommand';
+import getInvalidSubcommand from '../../util/get-invalid-subcommand';
+import { getEnvTargetPlaceholder } from '../../util/env/env-target';
+import handleError from '../../util/handle-error';
+import logo from '../../util/output/logo';
+
+import add from './add';
+import pull from './pull';
+import ls from './ls';
+import rm from './rm';
+
+const help = () => {
+  const placeholder = getEnvTargetPlaceholder();
+  console.log(`
+  ${chalk.bold(`${logo} now env`)} [options] <command>
+
+  ${chalk.dim('Commands:')}
+
+    ls      [environment]              List all variables for the specified Environment
+    add     [name] [environment]       Add an Environment Variable (see examples below)
+    rm      [name] [environment]       Remove an Environment Variable (see examples below)
+    pull    [filename]                 Pull all Development Environment Variables from the cloud and write to a file [.env]
+
+  ${chalk.dim('Options:')}
+
+    -h, --help                     Output usage information
+    -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
+    'FILE'
+  )}   Path to the local ${'`now.json`'} file
+    -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
+    'DIR'
+  )}    Path to the global ${'`.now`'} directory
+    -d, --debug                    Debug mode [off]
+    -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
+    'TOKEN'
+  )}        Login token
+
+  ${chalk.dim('Examples:')}
+
+  ${chalk.gray('–')} Add a new variable to multiple Environments
+
+      ${chalk.cyan('$ now env add <name>')}
+      ${chalk.cyan('$ now env add API_TOKEN')}
+
+  ${chalk.gray('–')} Add a new variable for a specific Environment
+
+      ${chalk.cyan(`$ now env add <name> ${placeholder}`)}
+      ${chalk.cyan('$ now env add DB_CONNECTION production')}
+
+  ${chalk.gray('–')} Add a new Environment Variable from stdin
+
+      ${chalk.cyan(`$ cat <file> | now env add <name> ${placeholder}`)}
+      ${chalk.cyan('$ cat ~/.npmrc | now env add NPM_RC preview')}
+      ${chalk.cyan('$ now env add DB_PASS production < secret.txt')}
+
+  ${chalk.gray('–')} Remove an variable from multiple Environments
+
+      ${chalk.cyan('$ now env rm <name>')}
+      ${chalk.cyan('$ now env rm API_TOKEN')}
+
+  ${chalk.gray('–')} Remove a variable from a specific Environment
+
+      ${chalk.cyan(`$ now env rm <name> ${placeholder}`)}
+      ${chalk.cyan('$ now env rm NPM_RC preview')}
+`);
+};
+
+const COMMAND_CONFIG = {
+  ls: ['ls', 'list'],
+  add: ['add'],
+  rm: ['rm', 'remove'],
+  pull: ['pull'],
+};
+
+export default async function main(ctx: NowContext) {
+  let argv;
+
+  try {
+    argv = getArgs(ctx.argv.slice(2), {
+      '--yes': Boolean,
+      '-y': '--yes',
+    });
+  } catch (error) {
+    handleError(error);
+    return 1;
+  }
+
+  if (argv['--help']) {
+    help();
+    return 2;
+  }
+
+  const output = createOutput({ debug: argv['--debug'] });
+  const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
+  switch (subcommand) {
+    case 'ls':
+      return ls(ctx, argv, args, output);
+    case 'add':
+      return add(ctx, argv, args, output);
+    case 'rm':
+      return rm(ctx, argv, args, output);
+    case 'pull':
+      return pull(ctx, argv, args, output);
+    default:
+      output.error(getInvalidSubcommand(COMMAND_CONFIG));
+      help();
+      return 2;
+  }
+}

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

@@ -0,0 +1,117 @@
+import chalk from 'chalk';
+import ms from 'ms';
+import plural from 'pluralize';
+import { Output } from '../../util/output';
+import { ProjectEnvVariable, ProjectEnvTarget, NowContext } from '../../types';
+import Client from '../../util/client';
+import formatTable from '../../util/format-table';
+import getEnvVariables from '../../util/env/get-env-records';
+import {
+  isValidEnvTarget,
+  getEnvTargetPlaceholder,
+} from '../../util/env/env-target';
+import { getLinkedProject } from '../../util/projects/link';
+import stamp from '../../util/output/stamp';
+import cmd from '../../util/output/cmd';
+import param from '../../util/output/param';
+
+type Options = {
+  '--debug': boolean;
+};
+
+export default async function ls(
+  ctx: NowContext,
+  opts: Options,
+  args: string[],
+  output: Output
+) {
+  const {
+    authConfig: { token },
+    config,
+  } = ctx;
+  const { currentTeam } = config;
+  const { apiUrl } = ctx;
+  const debug = opts['--debug'];
+  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const link = await getLinkedProject(output, client);
+
+  if (link.status === 'error') {
+    return link.exitCode;
+  } else if (link.status === 'not_linked') {
+    output.print(
+      `${chalk.red(
+        'Error!'
+      )} Your codebase isn’t linked to a project on ZEIT Now. Run ${cmd(
+        'now'
+      )} to link it.\n`
+    );
+    return 1;
+  } else {
+    if (args.length > 1) {
+      output.error(
+        `Invalid number of arguments. Usage: ${cmd(
+          `now env ls ${getEnvTargetPlaceholder()}`
+        )}`
+      );
+      return 1;
+    }
+
+    const { project } = link;
+    const envTarget = args[0] as ProjectEnvTarget | undefined;
+
+    if (!isValidEnvTarget(envTarget)) {
+      output.error(
+        `The Environment ${param(
+          envTarget
+        )} is invalid. It must be one of: ${getEnvTargetPlaceholder()}.`
+      );
+      return 1;
+    }
+
+    const lsStamp = stamp();
+
+    const records = await getEnvVariables(
+      output,
+      client,
+      project.id,
+      envTarget
+    );
+    output.log(
+      `${plural(
+        'Environment Variable',
+        records.length,
+        true
+      )} found in Project ${chalk.bold(project.name)} ${chalk.gray(lsStamp())}`
+    );
+    console.log(getTable(records));
+    return 0;
+  }
+}
+
+function getTable(records: ProjectEnvVariable[]) {
+  return formatTable(
+    ['name', 'value', 'environment', 'created'],
+    ['l', 'l', 'l', 'l', 'l'],
+    [
+      {
+        name: '',
+        rows: records.map(getRow),
+      },
+    ]
+  );
+}
+
+function getRow({
+  key,
+  system = false,
+  target,
+  createdAt = 0,
+}: ProjectEnvVariable) {
+  const now = Date.now();
+  return [
+    chalk.bold(key),
+    chalk.gray(chalk.italic(system ? 'Populated by System' : 'Encrypted')),
+    target || '',
+    `${ms(now - createdAt)} ago`,
+  ];
+}

packages/now-cli/src/commands/env/pull.ts

@@ -0,0 +1,120 @@
+import chalk from 'chalk';
+import { NowContext, ProjectEnvTarget } from '../../types';
+import { Output } from '../../util/output';
+import promptBool from '../../util/prompt-bool';
+import Client from '../../util/client';
+import stamp from '../../util/output/stamp';
+import getEnvVariables from '../../util/env/get-env-records';
+import getDecryptedSecret from '../../util/env/get-decrypted-secret';
+import { getLinkedProject } from '../../util/projects/link';
+import cmd from '../../util/output/cmd';
+import param from '../../util/output/param';
+import withSpinner from '../../util/with-spinner';
+import { join } from 'path';
+import { promises, existsSync } from 'fs';
+import { emoji, prependEmoji } from '../../util/emoji';
+const { writeFile } = promises;
+
+type Options = {
+  '--debug': boolean;
+  '--yes': boolean;
+};
+
+export default async function pull(
+  ctx: NowContext,
+  opts: Options,
+  args: string[],
+  output: Output
+) {
+  const {
+    authConfig: { token },
+    config,
+  } = ctx;
+  const { currentTeam } = config;
+  const { apiUrl } = ctx;
+  const debug = opts['--debug'];
+  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const link = await getLinkedProject(output, client);
+
+  if (link.status === 'error') {
+    return link.exitCode;
+  } else if (link.status === 'not_linked') {
+    output.print(
+      `${chalk.red(
+        'Error!'
+      )} Your codebase isn’t linked to a project on ZEIT Now. Run ${cmd(
+        'now'
+      )} to link it.\n`
+    );
+    return 1;
+  } else {
+    if (args.length > 1) {
+      output.error(
+        `Invalid number of arguments. Usage: ${cmd('now env pull <file>')}`
+      );
+      return 1;
+    }
+
+    const { project } = link;
+    const [filename = '.env'] = args;
+    const fullPath = join(process.cwd(), filename);
+    const exists = existsSync(fullPath);
+    const skipConfirmation = opts['--yes'];
+
+    if (
+      exists &&
+      !skipConfirmation &&
+      !(await promptBool(
+        output,
+        `Found existing file ${param(filename)}. Do you want to overwrite?`
+      ))
+    ) {
+      output.log('Aborted');
+      return 0;
+    }
+
+    output.print(
+      `Downloading Development Environment Variables for Project ${chalk.bold(
+        project.name
+      )}\n`
+    );
+    const pullStamp = stamp();
+
+    const records = await withSpinner('Downloading', async () => {
+      const dev = ProjectEnvTarget.Development;
+      const envs = await getEnvVariables(output, client, project.id, dev);
+      const values = await Promise.all(
+        envs.map(env => getDecryptedSecret(output, client, env.value))
+      );
+      const results: { key: string; value: string }[] = [];
+      for (let i = 0; i < values.length; i++) {
+        results.push({ key: envs[i].key, value: values[i] });
+      }
+      return results;
+    });
+
+    const contents =
+      records
+        .map(({ key, value }) => `${key}="${escapeValue(value)}"`)
+        .join('\n') + '\n';
+
+    await writeFile(fullPath, contents, 'utf8');
+
+    output.print(
+      `${prependEmoji(
+        `${exists ? 'Updated' : 'Created'} ${chalk.bold(
+          filename
+        )} file ${chalk.gray(pullStamp())}`,
+        emoji('success')
+      )}\n`
+    );
+    return 0;
+  }
+}
+
+function escapeValue(value: string) {
+  return value
+    .replace(new RegExp('\\"', 'g'), '\\"') // escape quotes
+    .replace(new RegExp('\n', 'g'), '\\n') // combine newlines (unix) into one line
+    .replace(new RegExp('\r', 'g'), '\\r'); // combine newlines (windows) into one line
+}

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

@@ -0,0 +1,168 @@
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { NowContext, ProjectEnvTarget } from '../../types';
+import { Output } from '../../util/output';
+import promptBool from '../../util/prompt-bool';
+import { getLinkedProject } from '../../util/projects/link';
+import removeEnvRecord from '../../util/env/remove-env-record';
+import getEnvVariables from '../../util/env/get-env-records';
+import {
+  isValidEnvTarget,
+  getEnvTargetPlaceholder,
+  getEnvTargetChoices,
+} from '../../util/env/env-target';
+import Client from '../../util/client';
+import stamp from '../../util/output/stamp';
+import cmd from '../../util/output/cmd';
+import param from '../../util/output/param';
+import withSpinner from '../../util/with-spinner';
+import { emoji, prependEmoji } from '../../util/emoji';
+import { isKnownError } from '../../util/env/known-error';
+
+type Options = {
+  '--debug': boolean;
+  '--yes': boolean;
+};
+
+export default async function rm(
+  ctx: NowContext,
+  opts: Options,
+  args: string[],
+  output: Output
+) {
+  const {
+    authConfig: { token },
+    config,
+  } = ctx;
+  const { currentTeam } = config;
+  const { apiUrl } = ctx;
+  const debug = opts['--debug'];
+  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const link = await getLinkedProject(output, client);
+
+  if (link.status === 'error') {
+    return link.exitCode;
+  } else if (link.status === 'not_linked') {
+    output.print(
+      `${chalk.red(
+        'Error!'
+      )} Your codebase isn’t linked to a project on ZEIT Now. Run ${cmd(
+        'now'
+      )} to link it.\n`
+    );
+    return 1;
+  } else {
+    if (args.length > 2) {
+      output.error(
+        `Invalid number of arguments. Usage: ${cmd(
+          `now env rm <name> ${getEnvTargetPlaceholder()}`
+        )}`
+      );
+      return 1;
+    }
+
+    const { project } = link;
+    let [envName, envTarget] = args;
+    let envTargets: ProjectEnvTarget[] = [];
+
+    if (envTarget) {
+      if (!isValidEnvTarget(envTarget)) {
+        output.error(
+          `The Environment ${param(
+            envTarget
+          )} is invalid. It must be one of: ${getEnvTargetPlaceholder()}.`
+        );
+        return 1;
+      }
+      envTargets.push(envTarget);
+    }
+
+    while (!envName) {
+      const { inputName } = await inquirer.prompt({
+        type: 'input',
+        name: 'inputName',
+        message: `What’s the name of the variable?`,
+      });
+
+      if (!inputName) {
+        output.error(`Name cannot be empty`);
+        continue;
+      }
+
+      envName = inputName;
+    }
+
+    const envs = await getEnvVariables(output, client, project.id);
+    const existing = new Set(
+      envs.filter(r => r.key === envName).map(r => r.target)
+    );
+
+    if (existing.size === 0) {
+      output.error(
+        `The Environment Variable ${param(envName)} was not found.\n`
+      );
+      return 1;
+    }
+
+    if (envTargets.length === 0) {
+      const choices = getEnvTargetChoices().filter(c => existing.has(c.value));
+      if (choices.length === 0) {
+        output.error(
+          `The Environment Variable ${param(
+            envName
+          )} was found but it is not assigned to any Environments.\n`
+        );
+        return 1;
+      } else if (choices.length === 1) {
+        envTargets = [choices[0].value];
+      } else {
+        const { inputTargets } = await inquirer.prompt({
+          name: 'inputTargets',
+          type: 'checkbox',
+          message: `Remove ${envName} from which Environments (select multiple)?`,
+          choices,
+        });
+        envTargets = inputTargets;
+      }
+    }
+
+    const skipConfirmation = opts['--yes'];
+    if (
+      !skipConfirmation &&
+      !(await promptBool(
+        output,
+        `Removing Environment Variable ${param(
+          envName
+        )} from Project ${chalk.bold(project.name)}. Are you sure?`
+      ))
+    ) {
+      output.log('Aborted');
+      return 0;
+    }
+
+    const rmStamp = stamp();
+
+    try {
+      await withSpinner('Removing', async () => {
+        for (const target of envTargets) {
+          await removeEnvRecord(output, client, project.id, envName, target);
+        }
+      });
+    } catch (error) {
+      if (isKnownError(error) && error.serverMessage) {
+        output.error(error.serverMessage);
+        return 1;
+      }
+      throw error;
+    }
+
+    output.print(
+      `${prependEmoji(
+        `Removed Environment Variable ${chalk.gray(rmStamp())}`,
+        emoji('success')
+      )}\n`
+    );
+
+    return 0;
+  }
+}

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

@@ -13,6 +13,7 @@ export default new Map([
   ['domain', 'domains'],
   ['domains', 'domains'],
   ['downgrade', 'upgrade'],
+  ['env', 'env'],
   ['help', 'help'],
   ['init', 'init'],
   ['inspect', 'inspect'],

packages/now-cli/src/commands/list.js

@@ -17,6 +17,7 @@ import getScope from '../util/get-scope.ts';
 import toHost from '../util/to-host';
 import parseMeta from '../util/parse-meta';
 import { isValidName } from '../util/is-valid-name';
+import getCommandFlags from '../util/get-command-flags';
 
 const help = () => {
   console.log(`
@@ -332,11 +333,16 @@ export default async function main(ctx) {
         hsep: ' '.repeat(4),
         stringLength: strlen,
       }
-    ).replace(/^/gm, '  ')}\n\n`
+    ).replace(/^/gm, '  ')}\n`
   );
 
-  if (pagination && deployments.length === 20) {
-    log(`To display the next page use the flag --next ${pagination.next}`);
+  if (pagination && pagination.count === 20) {
+    const flags = getCommandFlags(argv, ['_', '--next']);
+    log(
+      `To display the next page run ${cmd(
+        `now ls${app ? ' ' + app : ''}${flags} --next ${pagination.next}`
+      )}`
+    );
   }
 }
 

packages/now-cli/src/commands/remove.js

@@ -190,7 +190,10 @@ export default async function main(ctx) {
     }
 
     aliases = await Promise.all(
-      deployments.map(depl => getAliases(client, depl.uid))
+      deployments.map(async depl => {
+        const { aliases } = await getAliases(client, depl.uid);
+        return aliases;
+      })
     );
   } finally {
     cancelWait();

packages/now-cli/src/commands/secrets.js

@@ -110,7 +110,7 @@ const main = async ctx => {
   }
 
   try {
-    await run({ output, token, contextName, currentTeam });
+    await run({ output, token, contextName, currentTeam, ctx });
   } catch (err) {
     handleError(err);
     exit(1);
@@ -126,7 +126,7 @@ export default async ctx => {
   }
 };
 
-async function run({ output, token, contextName, currentTeam }) {
+async function run({ output, token, contextName, currentTeam, ctx }) {
   const secrets = new NowSecrets({ apiUrl, token, debug, currentTeam });
   const args = argv._.slice(1);
   const start = Date.now();
@@ -260,7 +260,28 @@ async function run({ output, token, contextName, currentTeam }) {
       return exit(1);
     }
 
-    const [name, value] = args;
+    const [name, parsedValue] = args;
+    const [originalName, originalValue] = ctx.argv.slice(-2);
+
+    let value = parsedValue;
+    if (
+      name === originalName &&
+      typeof parsedValue === 'boolean' &&
+      parsedValue !== originalValue
+    ) {
+      // Corner case where `mri` transforms the secret value into a boolean because
+      // it starts with a `-` so it thinks its a flag, so we use the original value instead.
+      value = originalValue;
+    }
+
+    if (typeof value === 'boolean') {
+      const example = chalk.cyan(`$ now secret add -- "${name}"`);
+      console.log(
+        `If your secret starts with '-', make sure to terminate command options with double dash and wrap it in quotes. Example: \n  ${example} `
+      );
+      return exit(1);
+    }
+
     await secrets.add(name, value);
     const elapsed = ms(new Date() - start);
 

packages/now-cli/src/types.ts

@@ -216,6 +216,33 @@ export type DNSRecordData =
   | SRVRecordData
   | MXRecordData;
 
+export interface Secret {
+  uid: string;
+  name: string;
+  value: string;
+  teamId?: string;
+  userId?: string;
+  projectId?: string;
+  created: string;
+  createdAt: number;
+}
+
+export enum ProjectEnvTarget {
+  Production = 'production',
+  Preview = 'preview',
+  Development = 'development',
+}
+
+export interface ProjectEnvVariable {
+  key: string;
+  value: string;
+  configurationId?: string | null;
+  createdAt?: number;
+  updatedAt?: number;
+  target?: ProjectEnvTarget;
+  system?: boolean;
+}
+
 export interface Project {
   id: string;
   name: string;

packages/now-cli/src/util/client.ts

@@ -21,7 +21,7 @@ export default class Client extends EventEmitter {
   _apiUrl: string;
   _debug: boolean;
   _forceNew: boolean;
-  _forceNewWithCache: boolean;
+  _withCache: boolean;
   _output: Output;
   _token: string;
   currentTeam?: string;
@@ -31,21 +31,21 @@ export default class Client extends EventEmitter {
     token,
     currentTeam,
     forceNew = false,
-    forceNewWithCache = false,
+    withCache = false,
     debug = false,
   }: {
     apiUrl: string;
     token: string;
     currentTeam?: string;
     forceNew?: boolean;
-    forceNewWithCache?: boolean;
+    withCache?: boolean;
     debug?: boolean;
   }) {
     super();
     this._token = token;
     this._debug = debug;
     this._forceNew = forceNew;
-    this._forceNewWithCache = forceNewWithCache;
+    this._withCache = withCache;
     this._output = createOutput({ debug });
     this._apiUrl = apiUrl;
     this._onRetry = this._onRetry.bind(this);

packages/now-cli/src/util/deploy/process-deployment.ts

@@ -66,7 +66,7 @@ export default async function processDeployment({
   quiet: boolean;
   nowConfig?: NowConfig;
   force?: boolean;
-  forceNewWithCache?: boolean;
+  withCache?: boolean;
   org: Org;
   projectName: string;
   isSettingUpProject: boolean;
@@ -83,7 +83,7 @@ export default async function processDeployment({
     requestBody,
     deployStamp,
     force,
-    forceNewWithCache,
+    withCache,
     nowConfig,
     quiet,
   } = args;
@@ -101,7 +101,7 @@ export default async function processDeployment({
     userAgent: ua,
     path: paths[0],
     force,
-    forceNewWithCache,
+    withCache,
     skipAutoDetectionConfirmation,
   };
 

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

@@ -27,6 +27,8 @@ import {
   BuilderOutput,
   BuildResultV3,
   BuilderOutputs,
+  BuilderParams,
+  EnvConfigs,
 } from './types';
 import { normalizeRoutes } from '@now/routing-utils';
 import getUpdateCommand from '../get-update-command';
@@ -45,7 +47,7 @@ const treeKill = promisify(_treeKill);
 
 async function createBuildProcess(
   match: BuildMatch,
-  buildEnv: EnvConfig,
+  envConfigs: EnvConfigs,
   workPath: string,
   output: Output,
   yarnPath?: string
@@ -64,7 +66,7 @@ async function createBuildProcess(
   const env: EnvConfig = {
     ...process.env,
     PATH,
-    ...buildEnv,
+    ...envConfigs.allEnv,
     NOW_REGION: 'dev1',
   };
 
@@ -109,7 +111,7 @@ export async function executeBuild(
     builderWithPkg: { runInProcess, builder, package: pkg },
   } = match;
   const { entrypoint } = match;
-  const { env, debug, buildEnv, yarnPath, cwd: workPath } = devServer;
+  const { debug, envConfigs, yarnPath, cwd: workPath } = devServer;
 
   const startTime = Date.now();
   const showBuildTimestamp =
@@ -131,14 +133,14 @@ export async function executeBuild(
     devServer.output.debug(`Creating build process for ${entrypoint}`);
     buildProcess = await createBuildProcess(
       match,
-      buildEnv,
+      envConfigs,
       workPath,
       devServer.output,
       yarnPath
     );
   }
 
-  const buildParams = {
+  const buildParams: BuilderParams = {
     files,
     entrypoint,
     workPath,
@@ -148,8 +150,10 @@ export async function executeBuild(
       requestPath,
       filesChanged,
       filesRemoved,
-      env,
-      buildEnv,
+      // This env distiniction is only necessary to maintain
+      // backwards compatibility with the `@now/next` builder.
+      env: envConfigs.runEnv,
+      buildEnv: envConfigs.buildEnv,
     },
   };
 
@@ -361,7 +365,7 @@ export async function executeBuild(
             Variables: {
               ...nowConfig.env,
               ...asset.environment,
-              ...env,
+              ...envConfigs.runEnv,
               NOW_REGION: 'dev1',
             },
           },

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

@@ -54,16 +54,18 @@ export async function devRouter(
   missRoutes?: RouteConfig[],
   phase?: HandleValue | null
 ): Promise<RouteResult> {
-  let found: RouteResult | undefined;
+  let result: RouteResult | undefined;
   let { query, pathname: reqPathname = '/' } = url.parse(reqUrl, true);
   const combinedHeaders: HttpHeadersConfig = { ...previousHeaders };
   let status: number | undefined;
+  let isContinue = false;
 
   // Try route match
   if (routes) {
     let idx = -1;
     for (const routeConfig of routes) {
       idx++;
+      isContinue = false;
 
       if (isHandler(routeConfig)) {
         // We don't expect any Handle, only Source routes
@@ -110,6 +112,7 @@ export async function devRouter(
             status = routeConfig.status;
           }
           reqPathname = destPath;
+          isContinue = true;
           continue;
         }
 
@@ -149,9 +152,10 @@ export async function devRouter(
 
         const isDestUrl = isURL(destPath);
         if (isDestUrl) {
-          found = {
+          result = {
             found: true,
             dest: destPath,
+            continue: isContinue,
             userDest: false,
             isDestUrl,
             status: routeConfig.status || status,
@@ -167,9 +171,10 @@ export async function devRouter(
             destPath = `/${destPath}`;
           }
           const { pathname, query } = url.parse(destPath, true);
-          found = {
+          result = {
             found: true,
             dest: pathname || '/',
+            continue: isContinue,
             userDest: Boolean(routeConfig.dest),
             isDestUrl,
             status: routeConfig.status || status,
@@ -185,10 +190,11 @@ export async function devRouter(
     }
   }
 
-  if (!found) {
-    found = {
+  if (!result) {
+    result = {
       found: false,
       dest: reqPathname,
+      continue: isContinue,
       status,
       isDestUrl: false,
       uri_args: query,
@@ -197,5 +203,5 @@ export async function devRouter(
     };
   }
 
-  return found;
+  return result;
 }

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

@@ -85,6 +85,8 @@ import {
   ListenSpec,
   RouteConfig,
   RouteResult,
+  HttpHeadersConfig,
+  EnvConfigs,
 } from './types';
 
 interface FSEvent {
@@ -108,8 +110,7 @@ export default class DevServer {
   public cwd: string;
   public debug: boolean;
   public output: Output;
-  public env: EnvConfig;
-  public buildEnv: EnvConfig;
+  public envConfigs: EnvConfigs;
   public frameworkSlug: string | null;
   public files: BuilderInputs;
   public yarnPath: string;
@@ -141,8 +142,7 @@ export default class DevServer {
     this.cwd = cwd;
     this.debug = options.debug;
     this.output = options.output;
-    this.env = {};
-    this.buildEnv = {};
+    this.envConfigs = { buildEnv: {}, runEnv: {}, allEnv: {} };
     this.files = {};
     this.address = '';
     this.devCommand = options.devCommand;
@@ -739,13 +739,13 @@ export default class DevServer {
     // Retrieve the path of the native module
     const nowConfig = await this.getNowConfig(false);
     const nowConfigBuild = nowConfig.build || {};
-    const [env, buildEnv] = await Promise.all([
+    const [runEnv, buildEnv] = await Promise.all([
       this.getLocalEnv('.env', nowConfig.env),
       this.getLocalEnv('.env.build', nowConfigBuild.env),
     ]);
-    Object.assign(process.env, buildEnv);
-    this.env = env;
-    this.buildEnv = buildEnv;
+    const allEnv = { ...buildEnv, ...runEnv };
+    Object.assign(process.env, allEnv);
+    this.envConfigs = { buildEnv, runEnv, allEnv };
 
     const opts = { output: this.output, isBuilds: true };
     const files = await getFiles(this.cwd, nowConfig, opts);
@@ -1264,19 +1264,25 @@ export default class DevServer {
     let routeResult: RouteResult | null = null;
     let match: BuildMatch | null = null;
     let statusCode: number | undefined;
+    let prevUrl = req.url;
+    let prevHeaders: HttpHeadersConfig = {};
 
     for (const phase of phases) {
       statusCode = undefined;
       const phaseRoutes = handleMap.get(phase) || [];
       routeResult = await devRouter(
-        req.url,
+        prevUrl,
         req.method,
         phaseRoutes,
         this,
-        undefined,
+        prevHeaders,
         missRoutes,
         phase
       );
+      prevUrl =
+        routeResult.continue && routeResult.dest ? routeResult.dest : req.url;
+      prevHeaders =
+        routeResult.continue && routeResult.headers ? routeResult.headers : {};
 
       if (routeResult.isDestUrl) {
         // Mix the `routes` result dest query params into the req path
@@ -1682,8 +1688,7 @@ export default class DevServer {
       FORCE_COLOR: process.stdout.isTTY ? '1' : '0',
       ...(this.frameworkSlug === 'create-react-app' ? { BROWSER: 'none' } : {}),
       ...process.env,
-      ...this.buildEnv,
-      ...(this.frameworkSlug === 'nextjs' ? this.env : {}),
+      ...this.envConfigs.allEnv,
       NOW_REGION: 'dev1',
       PORT: `${port}`,
     };

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

@@ -26,6 +26,23 @@ export interface EnvConfig {
   [name: string]: string | undefined;
 }
 
+export interface EnvConfigs {
+  /**
+   * environment variables from `.env.build` file (deprecated)
+   */
+  buildEnv: EnvConfig;
+
+  /**
+   * environment variables from `.env` file
+   */
+  runEnv: EnvConfig;
+
+  /**
+   * environment variables from `.env` and `.env.build`
+   */
+  allEnv: EnvConfig;
+}
+
 export interface BuildMatch extends BuildConfig {
   entrypoint: string;
   builderWithPkg: BuilderWithPackage;
@@ -147,6 +164,8 @@ export interface RouteResult {
   found: boolean;
   // "dest": <string of the dest, either file for lambda or full url for remote>
   dest: string;
+  // `true` if last route in current phase matched but set `continue: true`
+  continue: boolean;
   // "status": <integer in case exit code is intended to be changed>
   status?: number;
   // "headers": <object of the added response header values>

packages/now-cli/src/util/env/add-env-record.ts

@@ -0,0 +1,61 @@
+import { Output } from '../output';
+import Client from '../client';
+import { Secret, ProjectEnvTarget, ProjectEnvVariable } from '../../types';
+import { customAlphabet } from 'nanoid';
+import slugify from '@sindresorhus/slugify';
+
+export default async function addEnvRecord(
+  output: Output,
+  client: Client,
+  projectId: string,
+  envName: string,
+  envValue: string | undefined,
+  targets: ProjectEnvTarget[]
+): Promise<void> {
+  output.debug(
+    `Adding Environment Variable ${envName} to ${targets.length} targets`
+  );
+
+  let values: string[] | undefined;
+
+  if (envValue) {
+    const urlSecret = `/v2/now/secrets/${encodeURIComponent(envName)}`;
+    const secrets = await Promise.all(
+      targets.map(target =>
+        client.fetch<Secret>(urlSecret, {
+          method: 'POST',
+          body: JSON.stringify({
+            name: generateSecretName(envName, target),
+            value: envValue,
+            projectId: projectId,
+            decryptable: target === ProjectEnvTarget.Development,
+          }),
+        })
+      )
+    );
+    values = secrets.map(secret => secret.uid);
+  }
+
+  const body = targets.map((target, i) => ({
+    key: envName,
+    value: values ? values[i] : '',
+    target,
+  }));
+
+  const urlProject = `/v4/projects/${projectId}/env`;
+  await client.fetch<ProjectEnvVariable>(urlProject, {
+    method: 'POST',
+    body: JSON.stringify(body),
+  });
+}
+
+const randomSecretSuffix = customAlphabet(
+  '123456789abcdefghijklmnopqrstuvwxyz',
+  4
+);
+
+function generateSecretName(envName: string, target: ProjectEnvTarget) {
+  return `${
+    slugify(envName).substring(0, 80) // we truncate because the max secret length is 100
+  }-${target}-${randomSecretSuffix()}`;
+}

packages/now-cli/src/util/env/env-target.ts

@@ -0,0 +1,22 @@
+import { ProjectEnvTarget } from '../../types';
+
+function envTargets(): string[] {
+  return Object.values(ProjectEnvTarget);
+}
+
+export function getEnvTargetChoices() {
+  return Object.entries(ProjectEnvTarget).map(([key, value]) => ({
+    name: key,
+    value: value,
+  }));
+}
+
+export function isValidEnvTarget(
+  target?: string
+): target is ProjectEnvTarget | undefined {
+  return typeof target === 'undefined' || envTargets().includes(target);
+}
+
+export function getEnvTargetPlaceholder() {
+  return `<${envTargets().join(' | ')}>`;
+}

packages/now-cli/src/util/env/get-decrypted-secret.ts

@@ -0,0 +1,17 @@
+import { Output } from '../output';
+import Client from '../client';
+import { Secret } from '../../types';
+
+export default async function getDecryptedSecret(
+  output: Output,
+  client: Client,
+  secretId: string
+): Promise<string> {
+  if (!secretId) {
+    return '';
+  }
+  output.debug(`Fetching decrypted secret ${secretId}`);
+  const url = `/v2/now/secrets/${secretId}?decrypt=true`;
+  const secret = await client.fetch<Secret>(url);
+  return secret.value;
+}

packages/now-cli/src/util/env/get-env-records.ts

@@ -0,0 +1,18 @@
+import { Output } from '../output';
+import Client from '../client';
+import { ProjectEnvVariable, ProjectEnvTarget } from '../../types';
+
+export default async function getEnvVariables(
+  output: Output,
+  client: Client,
+  projectId: string,
+  target?: ProjectEnvTarget
+): Promise<ProjectEnvVariable[]> {
+  output.debug(
+    `Fetching Environment Variables of project ${projectId} and target ${target}`
+  );
+  const qs = target ? `?target=${encodeURIComponent(target)}` : '';
+  const url = `/v4/projects/${projectId}/env${qs}`;
+  const records = await client.fetch<ProjectEnvVariable[]>(url);
+  return records;
+}

packages/now-cli/src/util/env/known-error.ts

@@ -0,0 +1,13 @@
+const knownErrorsCodes = new Set([
+  'PAYMENT_REQUIRED',
+  'BAD_REQUEST',
+  'SYSTEM_ENV_WITH_VALUE',
+  'RESERVED_ENV_VARIABLE',
+  'ENV_ALREADY_EXISTS',
+  'ENV_SHOULD_BE_A_SECRET',
+]);
+
+export function isKnownError(error: { code?: string }) {
+  const code = error && typeof error.code === 'string' ? error.code : '';
+  return knownErrorsCodes.has(code.toUpperCase());
+}

packages/now-cli/src/util/env/remove-env-record.ts

@@ -0,0 +1,38 @@
+import { Output } from '../output';
+import Client from '../client';
+import { ProjectEnvTarget, Secret, ProjectEnvVariable } from '../../types';
+
+export default async function removeEnvRecord(
+  output: Output,
+  client: Client,
+  projectId: string,
+  envName: string,
+  target?: ProjectEnvTarget
+): Promise<void> {
+  output.debug(
+    `Removing Environment Variable ${envName} from target ${target}`
+  );
+
+  const qs = target ? `?target=${encodeURIComponent(target)}` : '';
+  const urlProject = `/v4/projects/${projectId}/env/${encodeURIComponent(
+    envName
+  )}${qs}`;
+
+  const env = await client.fetch<ProjectEnvVariable>(urlProject, {
+    method: 'DELETE',
+  });
+
+  if (env && env.value) {
+    const idOrName = env.value.startsWith('@') ? env.value.slice(1) : env.value;
+    const urlSecret = `/v2/now/secrets/${idOrName}`;
+    const secret = await client.fetch<Secret>(urlSecret);
+
+    // Since integrations add global secrets, we must only delete if the secret was
+    // specifically added to this project
+    if (secret && secret.projectId === projectId) {
+      await client.fetch<Secret>(urlSecret, {
+        method: 'DELETE',
+      });
+    }
+  }
+}

packages/now-cli/src/util/get-command-flags.ts

@@ -0,0 +1,20 @@
+/* 
+    This function returns the provided arguments from a command in a string format.
+
+    Example: if `argv` is { '--debug': true, '--all': true, '--scope': 'zeit' },
+    the output will be '--debug --all --scope zeit'.
+
+    Flags can be excluded using the `excludeFlags` param.
+*/
+export default function getCommandFlags(
+  argv: { [key: string]: any },
+  excludeFlags: string[] = []
+) {
+  const flags = Object.keys(argv)
+    .filter(key => !excludeFlags.includes(key))
+    .map(
+      key => `${key}${typeof argv[key] !== 'boolean' ? ' ' + argv[key] : ''}`
+    );
+
+  return flags.length > 0 ? ` ${flags.join(' ')}` : '';
+}

packages/now-cli/src/util/get-invalid-subcommand.ts

@@ -0,0 +1,9 @@
+type CommandConfig = {
+  [command: string]: string[];
+};
+
+export default function getInvalidSubcommand(config: CommandConfig) {
+  return `Please specify a valid subcommand: ${Object.keys(config).join(
+    ' | '
+  )}`;
+}

packages/now-cli/src/util/index.js

@@ -34,7 +34,7 @@ export default class Now extends EventEmitter {
     token,
     currentTeam,
     forceNew = false,
-    forceNewWithCache = false,
+    withCache = false,
     debug = false,
   }) {
     super();
@@ -42,7 +42,7 @@ export default class Now extends EventEmitter {
     this._token = token;
     this._debug = debug;
     this._forceNew = forceNew;
-    this._forceNewWithCache = forceNewWithCache;
+    this._withCache = withCache;
     this._output = createOutput({ debug });
     this._apiUrl = apiUrl;
     this._onRetry = this._onRetry.bind(this);
@@ -72,7 +72,7 @@ export default class Now extends EventEmitter {
       env,
       build,
       forceNew = false,
-      forceNewWithCache = false,
+      withCache = false,
       target = null,
       deployStamp,
       projectSettings,
@@ -164,7 +164,7 @@ export default class Now extends EventEmitter {
         meta,
         public: wantsPublic || nowConfig.public,
         forceNew,
-        forceNewWithCache,
+        withCache,
         name,
         project,
         description,
@@ -190,7 +190,7 @@ export default class Now extends EventEmitter {
       quiet,
       nowConfig,
       force: forceNew,
-      forceNewWithCache: forceNewWithCache,
+      withCache,
       org,
       projectName: name,
       isSettingUpProject,
@@ -388,7 +388,12 @@ export default class Now extends EventEmitter {
     if (!app && !Object.keys(meta).length) {
       // Get the 20 latest projects and their latest deployment
       const query = new URLSearchParams({ limit: (20).toString() });
-      const projects = await fetchRetry(`/v2/projects/?${query}`);
+      if (nextTimestamp) {
+        query.set('until', String(nextTimestamp));
+      }
+      const { projects, pagination } = await fetchRetry(
+        `/v4/projects/?${query}`
+      );
 
       const deployments = await Promise.all(
         projects.map(async ({ id: projectId }) => {
@@ -400,7 +405,7 @@ export default class Now extends EventEmitter {
         })
       );
 
-      return { deployments: deployments.filter(x => x) };
+      return { deployments: deployments.filter(x => x), pagination };
     }
 
     const query = new URLSearchParams();

packages/now-cli/src/util/input/read-standard-input.ts

@@ -0,0 +1,13 @@
+export default async function readStandardInput(): Promise<string> {
+  return new Promise<string>(resolve => {
+    setTimeout(() => resolve(''), 500);
+
+    if (process.stdin.isTTY) {
+      // found tty so we know there is nothing piped to stdin
+      resolve('');
+    } else {
+      process.stdin.setEncoding('utf8');
+      process.stdin.once('data', resolve);
+    }
+  });
+}

packages/now-cli/src/util/prompt-bool.ts

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import { Output } from './output';
 
-async function promptBool(output: Output, message: string) {
-  return new Promise(resolve => {
+async function promptBool(output: Output, message: string): Promise<boolean> {
+  return new Promise<boolean>(resolve => {
     output.print(`${chalk.gray('>')} ${message} ${chalk.gray('[y/N] ')}`);
     process.stdin
       .on('data', d => {

packages/now-cli/test/dev-router.unit.js

@@ -10,6 +10,7 @@ test('[dev-router] 301 redirection', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/redirect',
+    continue: false,
     status: 301,
     headers: { location: 'https://zeit.co' },
     uri_args: {},
@@ -28,6 +29,7 @@ test('[dev-router] captured groups', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/endpoints/user.js',
+    continue: false,
     status: undefined,
     headers: {},
     uri_args: {},
@@ -46,6 +48,7 @@ test('[dev-router] named groups', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/user.js',
+    continue: false,
     status: undefined,
     headers: {},
     uri_args: { id: '123' },
@@ -69,6 +72,7 @@ test('[dev-router] optional named groups', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/api/functions/hello/index.js',
+    continue: false,
     status: undefined,
     headers: {},
     uri_args: { name: '' },
@@ -88,6 +92,7 @@ test('[dev-router] proxy_pass', async t => {
   t.deepEqual(result, {
     found: true,
     dest: 'https://zeit.co',
+    continue: false,
     status: undefined,
     headers: {},
     uri_args: {},
@@ -109,6 +114,7 @@ test('[dev-router] methods', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/get',
+    continue: false,
     status: undefined,
     headers: {},
     uri_args: {},
@@ -123,6 +129,7 @@ test('[dev-router] methods', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/post',
+    continue: false,
     status: undefined,
     headers: {},
     uri_args: {},
@@ -141,6 +148,7 @@ test('[dev-router] match without prefix slash', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/endpoints/user.js',
+    continue: false,
     status: undefined,
     headers: {},
     uri_args: {},
@@ -164,6 +172,7 @@ test('[dev-router] match with needed prefixed slash', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/some/dest',
+    continue: false,
     userDest: true,
     isDestUrl: false,
     phase: undefined,
@@ -197,6 +206,7 @@ test('[dev-router] `continue: true` with fallthrough', async t => {
   t.deepEqual(result, {
     found: false,
     dest: '/_next/static/chunks/0.js',
+    continue: true,
     isDestUrl: false,
     phase: undefined,
     status: undefined,
@@ -230,6 +240,7 @@ test('[dev-router] `continue: true` with match', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/hi',
+    continue: false,
     status: undefined,
     userDest: true,
     isDestUrl: false,
@@ -253,6 +264,7 @@ test('[dev-router] match with catch-all with prefix slash', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/www/',
+    continue: false,
     userDest: true,
     isDestUrl: false,
     phase: undefined,
@@ -271,6 +283,7 @@ test('[dev-router] match with catch-all with no prefix slash', async t => {
   t.deepEqual(result, {
     found: true,
     dest: '/www/',
+    continue: false,
     userDest: true,
     isDestUrl: false,
     phase: undefined,
@@ -295,6 +308,7 @@ test('[dev-router] `continue: true` with `dest`', async t => {
   t.deepEqual(result, {
     found: true,
     dest: 'http://localhost:5000/a/foo',
+    continue: false,
     status: undefined,
     headers: {},
     uri_args: {},

packages/now-cli/test/dev/fixtures/04-create-react-app/.env

@@ -1 +1,2 @@
 SKIP_PREFLIGHT_CHECK=true
+BROWSER=none

packages/now-cli/test/dev/fixtures/18-marko/package.json

@@ -19,7 +19,7 @@
     "url": "https://github.com/marko-js-samples/marko-starter-demo"
   },
   "scripts": {
-    "build": "NODE_ENV=production marko-starter build && mv dist public",
+    "build": "NODE_ENV=production marko-starter build && rm -rf public && mv dist public",
     "format": "prettier src/**/*.{js,css,less} --write && marko-prettyprint src",
     "lint": "eslint src",
     "serve": "NODE_ENV=production marko-starter serve-static",

packages/now-cli/test/dev/fixtures/23-docusaurus/.env

@@ -0,0 +1 @@
+BROWSER=none

packages/now-cli/test/dev/fixtures/27-zero-config-env/.env

@@ -0,0 +1 @@
+FOO="build-and-runtime"

packages/now-cli/test/dev/fixtures/27-zero-config-env/.nowignore

@@ -0,0 +1,2 @@
+public
+.now

packages/now-cli/test/dev/fixtures/27-zero-config-env/api/print.js

@@ -0,0 +1 @@
+module.exports = (_req, res) => res.end(process.env.FOO);

packages/now-cli/test/dev/fixtures/27-zero-config-env/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "scripts": {
+    "build": "mkdir public && echo $FOO > public/index.html"
+  }
+}

packages/now-cli/test/dev/fixtures/test-zero-config-rewrite/api/echo/[id].js

@@ -0,0 +1 @@
+module.exports = (req, res) => res.json(req.query)

packages/now-cli/test/dev/fixtures/test-zero-config-rewrite/index.html

@@ -0,0 +1 @@
+Index Page should not be served

packages/now-cli/test/dev/fixtures/test-zero-config-rewrite/now.json

@@ -0,0 +1,13 @@
+{
+  "routes": [
+    {
+      "src": "/(.*)",
+      "dest": "/api/$1",
+      "headers": {
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Headers": "*"
+      },
+      "continue": true
+    }
+  ]
+}

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

@@ -137,7 +137,7 @@ async function getPackedBuilderPath(builderDirName) {
 }
 
 async function testPath(t, port, status, path, expectedText, headers = {}) {
-  const opts = { redirect: 'manual' };
+  const opts = { redirect: 'manual-dont-change' };
   const res = await fetch(`http://localhost:${port}${path}`, opts);
   const msg = `Testing path ${path}`;
   t.is(res.status, status, msg);
@@ -146,9 +146,15 @@ async function testPath(t, port, status, path, expectedText, headers = {}) {
     t.is(actualText.trim(), expectedText.trim(), msg);
   }
   if (headers) {
-    Object.keys(headers).forEach(key => {
-      const k = key.toLowerCase();
-      t.is(headers[k], res.headers[k], msg);
+    Object.entries(headers).forEach(([key, expectedValue]) => {
+      let actualValue = res.headers.get(key);
+      if (key.toLowerCase() === 'location' && actualValue === '//') {
+        // HACK: `node-fetch` has strang behavior for location header so fix it
+        // with `manual-dont-change` opt and convert double slash to single.
+        // See https://github.com/node-fetch/node-fetch/issues/417#issuecomment-587233352
+        actualValue = '/';
+      }
+      t.is(actualValue, expectedValue, msg);
     });
   }
 }
@@ -468,6 +474,19 @@ test(
   })
 );
 
+test(
+  '[now dev] should allow user rewrites for path segment files',
+  testFixtureStdio('test-zero-config-rewrite', async (t, port, testPath) => {
+    await testPath(404, '/');
+    await testPath(200, '/echo/1', '{"id":"1"}', {
+      'Access-Control-Allow-Origin': '*',
+    });
+    await testPath(200, '/echo/2', '{"id":"2"}', {
+      'Access-Control-Allow-Headers': '*',
+    });
+  })
+);
+
 test('[now dev] validate builds', async t => {
   const directory = fixture('invalid-builds');
   const output = await exec(directory);
@@ -717,18 +736,15 @@ test(
   })
 );
 
-test('[now dev] 01-node', async t => {
-  const tester = testFixtureStdio('01-node', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+test(
+  '[now dev] 01-node',
+  testFixtureStdio('01-node', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /A simple deployment with the Now API!/gm);
-  });
-
-  await tester(t);
-});
+  })
+);
 
 // Angular has `engines: { node: "10.x" }` in its `package.json`
 test('[now dev] 02-angular-node', async t => {
@@ -768,26 +784,21 @@ test('[now dev] 02-angular-node', async t => {
   }
 });
 
-test('[now dev] 03-aurelia', async t => {
-  const tester = testFixtureStdio('03-aurelia', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+test(
+  '[now dev] 03-aurelia',
+  testFixtureStdio('03-aurelia', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Aurelia Navigation Skeleton/gm);
-  });
-
-  await tester(t);
-});
+  })
+);
 
 test(
   '[now dev] 04-create-react-app',
   testFixtureStdio('04-create-react-app', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /React App/gm);
   })
@@ -797,10 +808,8 @@ test('[now dev] 05-gatsby', async t => {
   if (shouldSkip(t, '05-gatsby', '>^6.14.0 || ^8.10.0 || >=9.10.0')) return;
 
   const tester = testFixtureStdio('05-gatsby', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Gatsby Default Starter/gm);
   });
@@ -808,24 +817,20 @@ test('[now dev] 05-gatsby', async t => {
   await tester(t);
 });
 
-test('[now dev] 06-gridsome', async t => {
-  const tester = testFixtureStdio('06-gridsome', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+test(
+  '[now dev] 06-gridsome',
+  testFixtureStdio('06-gridsome', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
     t.is(response.status, 200, await response.text());
-  });
-
-  await tester(t);
-});
+  })
+);
 
 test(
   '[now dev] 07-hexo-node',
   testFixtureStdio('07-hexo-node', async (t, port) => {
     const response = await fetchWithRetry(`http://localhost:${port}`, 180);
-
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Hexo \+ Node.js API/gm);
   })
@@ -834,175 +839,77 @@ test(
 test(
   '[now dev] 08-hugo',
   testFixtureStdio('08-hugo', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     // const body = await response.text();
     // t.regex(body, /Hugo on ZEIT Now/gm);
     t.is(response.status, 200, await response.text());
   })
 );
 
-test('[now dev] 10-nextjs-node', async t => {
-  const tester = testFixtureStdio('10-nextjs-node', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+test(
+  '[now dev] 10-nextjs-node',
+  testFixtureStdio('10-nextjs-node', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Next.js \+ Node.js API/gm);
-  });
-
-  await tester(t);
-});
-
-// test('[now dev] 11-nuxtjs-node', async t => {
-//   const directory = fixture('11-nuxtjs-node');
-//   const { dev, port } = await testFixture(directory);
-
-//   try {
-//     // start `now dev` detached in child_process
-//     dev.unref();
-
-//     const response = await fetchWithRetry(`http://localhost:${port}`, 180);
-
-//     validateResponseHeaders(t, response);
-
-//     const body = await response.text();
-//     t.regex(body, /Nuxt.js \+ Node.js API/gm);
-
-//   } finally {
-//     dev.kill('SIGTERM')
-//   }
-// });
-
-test('[now dev] 12-polymer-node', async t => {
-  const directory = fixture('12-polymer-node');
-  const { dev, port } = await testFixture(directory);
-
-  try {
-    // start `now dev` detached in child_process
-    dev.unref();
-
-    const response = await fetchWithRetry(`http://localhost:${port}`, 180);
+  })
+);
 
+test(
+  '[now dev] 12-polymer-node',
+  testFixtureStdio('12-polymer-node', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Polymer \+ Node.js API/gm);
-  } finally {
-    await dev.kill('SIGTERM');
-  }
-});
-
-test('[now dev] 13-preact-node', async t => {
-  const directory = fixture('13-preact-node');
-  const { dev, port } = await testFixture(directory);
-
-  try {
-    // start `now dev` detached in child_process
-    dev.unref();
-
-    const response = await fetchWithRetry(`http://localhost:${port}`, 180);
+  })
+);
 
+test(
+  '[now dev] 13-preact-node',
+  testFixtureStdio('13-preact-node', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Preact \+ Node.js API/gm);
-  } finally {
-    await dev.kill('SIGTERM');
-  }
-});
-
-test('[now dev] 14-svelte-node', async t => {
-  const directory = fixture('14-svelte-node');
-  const { dev, port } = await testFixture(directory);
-
-  try {
-    // start `now dev` detached in child_process
-    dev.unref();
-
-    const response = await fetchWithRetry(`http://localhost:${port}`, 80);
+  })
+);
 
+test(
+  '[now dev] 14-svelte-node',
+  testFixtureStdio('14-svelte-node', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Svelte \+ Node.js API/gm);
-  } finally {
-    await dev.kill('SIGTERM');
-  }
-});
-
-// test('[now dev] 15-umijs-node', async t => {
-//   const directory = fixture('15-umijs-node');
-//   const { dev, port } = await testFixture(directory);
-
-//   try {
-//     // start `now dev` detached in child_process
-//     dev.unref();
-
-//     const response = await fetchWithRetry(`http://localhost:${port}`, 80);
-
-//     validateResponseHeaders(t, response);
-
-//     const body = await response.text();
-//     t.regex(body, /UmiJS \+ Node.js API/gm);
-
-//   } finally {
-//     dev.kill('SIGTERM')
-//   }
-// });
-
-test('[now dev] 16-vue-node', async t => {
-  const directory = fixture('16-vue-node');
-  const { dev, port } = await testFixture(directory);
-
-  try {
-    // start `now dev` detached in child_process
-    dev.unref();
-
-    const response = await fetchWithRetry(`http://localhost:${port}`, 180);
+  })
+);
 
+test(
+  '[now dev] 16-vue-node',
+  testFixtureStdio('16-vue-node', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Vue.js \+ Node.js API/gm);
-  } finally {
-    await dev.kill('SIGTERM');
-  }
-});
-
-test('[now dev] 17-vuepress-node', async t => {
-  const directory = fixture('17-vuepress-node');
-  const { dev, port } = await testFixture(directory);
-
-  try {
-    // start `now dev` detached in child_process
-    dev.unref();
-
-    const response = await fetchWithRetry(`http://localhost:${port}`, 180);
+  })
+);
 
+test(
+  '[now dev] 17-vuepress-node',
+  testFixtureStdio('17-vuepress-node', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /VuePress \+ Node.js API/gm);
-  } finally {
-    await dev.kill('SIGTERM');
-  }
-});
-
-test('[now dev] double slashes redirect', async t => {
-  const directory = fixture('01-node');
-  const { dev, port } = await testFixture(directory);
-
-  try {
-    // start `now dev` detached in child_process
-    dev.unref();
-
-    // Wait for `now dev` to boot up
-    await sleep(ms('10s'));
+  })
+);
 
+test(
+  '[now dev] double slashes redirect',
+  testFixtureStdio('01-node', async (t, port) => {
     {
       const res = await fetch(`http://localhost:${port}////?foo=bar`, {
         redirect: 'manual',
@@ -1041,31 +948,24 @@ test('[now dev] double slashes redirect', async t => {
           body.startsWith('December')
       );
     }
-  } finally {
-    await dev.kill('SIGTERM');
-  }
-});
-
-test('[now dev] 18-marko', async t => {
-  const tester = testFixtureStdio('18-marko', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
+  })
+);
 
+test(
+  '[now dev] 18-marko',
+  testFixtureStdio('18-marko', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Marko Starter/gm);
-  });
-
-  await tester(t);
-});
+  })
+);
 
 test(
   '[now dev] 19-mithril',
   testFixtureStdio('19-mithril', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Mithril on ZEIT Now/gm);
   })
@@ -1074,52 +974,42 @@ test(
 test(
   '[now dev] 20-riot',
   testFixtureStdio('20-riot', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Riot on ZEIT Now/gm);
   })
 );
 
-test('[now dev] 21-charge', async t => {
-  const tester = testFixtureStdio('21-charge', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+test(
+  '[now dev] 21-charge',
+  testFixtureStdio('21-charge', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Welcome to my new Charge site/gm);
-  });
-
-  await tester(t);
-});
+  })
+);
 
 test(
   '[now dev] 22-brunch',
   testFixtureStdio('22-brunch', async (t, port) => {
     const response = await fetchWithRetry(`http://localhost:${port}`, 50);
-
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Bon Appétit./gm);
   })
 );
 
-test('[now dev] 23-docusaurus', async t => {
-  const tester = testFixtureStdio('23-docusaurus', async (t, port) => {
-    const response = await fetch(`http://localhost:${port}`);
-
+test(
+  '[now dev] 23-docusaurus',
+  testFixtureStdio('23-docusaurus', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /My Site/gm);
-  });
-
-  await tester(t);
-});
+  })
+);
 
 test('[now dev] 24-ember', async t => {
   if (shouldSkip(t, '24-ember', '>^6.14.0 || ^8.10.0 || >=9.10.0')) return;
@@ -1136,16 +1026,12 @@ test('[now dev] 24-ember', async t => {
   tester(t);
 });
 
-test('[now dev] temporary directory listing', async t => {
-  const directory = fixture('temporary-directory-listing');
-  const { dev, port } = await testFixture(directory);
-
-  try {
+test(
+  '[now dev] temporary directory listing',
+  testFixtureStdio('temporary-directory-listing', async (t, port) => {
+    const directory = fixture('temporary-directory-listing');
     await fs.unlink(path.join(directory, 'index.txt')).catch(() => null);
 
-    // start `now dev` detached in child_process
-    dev.unref();
-
     await sleep(ms('20s'));
 
     const firstResponse = await fetch(`http://localhost:${port}`);
@@ -1166,10 +1052,8 @@ test('[now dev] temporary directory listing', async t => {
 
       await sleep(ms('1s'));
     }
-  } finally {
-    await dev.kill('SIGTERM');
-  }
-});
+  })
+);
 
 test('[now dev] add a `package.json` to trigger `@now/static-build`', async t => {
   const directory = fixture('trigger-static-build');
@@ -1240,13 +1124,9 @@ test('[now dev] no build matches warning', async t => {
   }
 });
 
-test('[now dev] do not recursivly check the path', async t => {
-  const directory = fixture('handle-filesystem-missing');
-  const { dev, port } = await testFixture(directory);
-
-  try {
-    dev.unref();
-
+test(
+  '[now dev] do not recursivly check the path',
+  testFixtureStdio('handle-filesystem-missing', async (t, port) => {
     {
       const response = await fetchWithRetry(`http://localhost:${port}`, 180);
       validateResponseHeaders(t, response);
@@ -1259,10 +1139,8 @@ test('[now dev] do not recursivly check the path', async t => {
       validateResponseHeaders(t, response);
       t.is(response.status, 404);
     }
-  } finally {
-    dev.kill('SIGTERM');
-  }
-});
+  })
+);
 
 test('[now dev] render warning for empty cwd dir', async t => {
   const directory = fixture('empty');
@@ -1356,24 +1234,15 @@ test('[now dev] do not rebuild for changes in the output directory', async t =>
   }
 });
 
-test('[now dev] 25-nextjs-src-dir', async t => {
-  const directory = fixture('25-nextjs-src-dir');
-  const { dev, port } = await testFixture(directory);
-
-  try {
-    // start `now dev` detached in child_process
-    dev.unref();
-
-    const response = await fetchWithRetry(`http://localhost:${port}`, 80);
-
+test(
+  '[now dev] 25-nextjs-src-dir',
+  testFixtureStdio('25-nextjs-src-dir', async (t, port) => {
+    const response = await fetchWithRetry(`http://localhost:${port}`, 10);
     validateResponseHeaders(t, response);
-
     const body = await response.text();
     t.regex(body, /Next.js \+ Node.js API/gm);
-  } finally {
-    dev.kill('SIGTERM');
-  }
-});
+  })
+);
 
 test(
   '[now dev] 26-nextjs-secrets',
@@ -1389,6 +1258,16 @@ test(
   })
 );
 
+test(
+  '[now dev] 27-zero-config-env',
+  testFixtureStdio('27-zero-config-env', async (t, port) => {
+    const api = await fetchWithRetry(`http://localhost:${port}/api/print`);
+    const index = await fetchWithRetry(`http://localhost:${port}`);
+    t.regex(await api.text(), new RegExp('build-and-runtime'));
+    t.regex(await index.text(), new RegExp('build-and-runtime'));
+  })
+);
+
 test(
   '[now dev] Use `@now/python` with Flask requirements.txt',
   testFixtureStdio('python-flask', async (t, port) => {

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

@@ -323,6 +323,31 @@ CMD ["node", "index.js"]`,
       'index.html': 'Home page',
       'secret/file.txt': 'my secret',
     },
+    'build-secret': {
+      'package.json': JSON.stringify({
+        private: true,
+        scripts: {
+          build: 'mkdir public && echo $MY_SECRET > public/index.txt',
+        },
+      }),
+      'now.json': JSON.stringify({
+        build: {
+          env: {
+            MY_SECRET: '@mysecret',
+          },
+        },
+      }),
+    },
+    'api-env': {
+      'api/get-env.js': 'module.exports = (_, res) => res.json(process.env)',
+      'print.js': 'console.log(JSON.stringify(process.env))',
+      'package.json': JSON.stringify({
+        private: true,
+        scripts: {
+          build: 'mkdir public && node print.js > public/index.json',
+        },
+      }),
+    },
     'alias-rules': {
       'rules.json': JSON.stringify({
         rules: [