Publish Stable

- @now/next@2.5.4

.gitattributes

@@ -1,5 +1,8 @@
 # Ignore test fixtures in GitHub Languages
 # See https://github.com/github/linguist#vendored-code
+examples/* linguist-vendored
+utils/* linguist-vendored
+test/* linguist-vendored
 packages/*/test/* linguist-vendored
 
 # Go build fails with Windows line endings.

.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,111 +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
-
-  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
-
-  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/publish.yml

@@ -27,3 +27,5 @@ jobs:
       run: yarn publish-from-github
       env:
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}

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

.gitignore

@@ -23,5 +23,5 @@ packages/now-cli/test/fixtures/integration
 test/lib/deployment/failed-page.txt
 .DS_Store
 .next
-.env
-public
+/.env
+/public

codecov.yml

@@ -0,0 +1,8 @@
+codecov:
+  require_ci_to_pass: yes
+
+coverage:
+  status:
+    project: off
+    patch: off
+

examples/brunch/app/assets/brunch-napkin.svg

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="256px" height="256px" viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
+<rect x="65" y="68" fill="#7C7C7C" width="127" height="124"/>
+<rect x="83.392" y="22.163" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 266.9294 23.9747)" fill="#86AD8A" width="90.215" height="90.215"/>
+<path fill="#FFFFFF" d="M117.601,167.637c3.788-11.191,5.795-45.647,4.728-62.795c-0.128-2.057-0.333-4.445-0.692-6.351
+	c-0.112-0.607-0.244-1.168-0.391-1.651c0-6.672,0-62.892,0-67.02c0-5.717,5.242-8.419,10.166,4.128
+	c4.925,12.547,3.495,57.175,3.495,60.348c0,0.673-0.611,1.469-1.57,2.25c-0.383,0.247-0.73,0.499-1.051,0.754
+	c-2.949,2.366-3.379,5.095-3.533,7.542c-1.067,17.148-1.554,51.604,2.234,62.795c4.438,13.112-4.004,14.759-6.691,14.759
+	C121.605,182.395,113.163,180.748,117.601,167.637z"/>
+<path fill="#FFFFFF" d="M103.019,47.413c-0.472,0.049-1.062,9.387-1.257,16.131c-0.238,8.194-0.607,15.482-2.908,15.482
+	c-1.728,0-2.8-2.853-2.517-10.094c0.407-10.427,0.395-21.519-0.219-21.519c-0.774,0-4.358,22.999-4.358,31.09
+	c0,5.803,2.487,11.269,5.603,14.115c0.01,0.008,0.019,0.019,0.033,0.027c0.093,0.081,0.191,0.166,0.278,0.247
+	c0.005,0.004,0.01,0.004,0.01,0.008c2.252,2.053,2.819,4.283,2.971,6.32c1.286,17.143-1.128,59.614-5.678,70.804
+	c-5.33,13.108,4.811,14.759,8.042,14.759c3.227,0,13.368-1.651,8.037-14.759c-4.55-11.191-6.96-53.661-5.678-70.804
+	c0.153-2.037,0.719-4.267,2.971-6.32c0-0.004,0.005-0.004,0.01-0.008c0.088-0.081,0.185-0.166,0.278-0.247
+	c0.014-0.008,0.023-0.019,0.033-0.027c3.116-2.845,5.764-8.314,5.604-14.115c-0.635-23.017-3.263-31.09-4.037-31.09
+	c-0.614,0-0.613,12.286-0.438,21.024c0.143,7.158-0.471,10.383-2.49,10.383c-1.923,0-2.504-6.972-2.748-15.368
+	c-0.196-6.762-0.804-16.039-1.54-16.039"/>
+<path fill="#FFFFFF" d="M154.075,179.591c-2.546,0-10.532-1.562-6.332-13.967c3.585-10.59,5.483-50.779,4.474-67.007
+	c-0.051-0.826-0.256-1.664-0.413-2.55c-0.443-2.504-3.543-4.555-5.338-6.356c-3.486-3.498-5.725-9.38-5.725-16.013
+	c0-10.77,5.97-24.4,13.334-24.4c7.364,0,13.334,13.63,13.334,24.4c0,6.633-2.24,12.515-5.725,16.013
+	c-1.795,1.801-4.895,3.852-5.338,6.356c-0.157,0.886-0.361,1.724-0.413,2.55c-1.01,16.227,0.889,56.416,4.474,67.007
+	C164.607,178.03,156.621,179.591,154.075,179.591z"/>
+<polyline fill="#CECCAE" points="65,68 65,192 192,192 "/>
+<polygon fill="#3F894A" points="65,191.835 65,253 192,253 192,191.835 192,66.938 "/>
+<g>
+	<g>
+		
+			<line fill="none" stroke="#FFFFFF" stroke-width="0.5" stroke-miterlimit="10" x1="191.658" y1="82.55" x2="190.946" y2="83.253"/>
+		
+			<line fill="none" stroke="#FFFFFF" stroke-width="0.5" stroke-miterlimit="10" stroke-dasharray="2.02,2.02" x1="189.509" y1="84.672" x2="66.629" y2="206.035"/>
+		
+			<line fill="none" stroke="#FFFFFF" stroke-width="0.5" stroke-miterlimit="10" x1="65.91" y1="206.745" x2="65.199" y2="207.448"/>
+	</g>
+</g>
+<g>
+	<path fill="#FFFFFF" d="M85.353,211.117h6.328c0.827,0,1.665,0.067,2.513,0.201c0.848,0.135,1.608,0.414,2.28,0.838
+		c0.672,0.424,1.22,1.014,1.644,1.768c0.424,0.756,0.636,1.753,0.636,2.994c0,1.116-0.331,2.089-0.993,2.916
+		c-0.662,0.827-1.644,1.376-2.947,1.645v0.062c0.724,0.062,1.385,0.232,1.985,0.512c0.6,0.279,1.117,0.651,1.551,1.117
+		c0.434,0.465,0.77,1.019,1.008,1.659c0.238,0.642,0.357,1.345,0.357,2.109c0,1.262-0.243,2.291-0.729,3.087
+		c-0.486,0.797-1.097,1.422-1.83,1.877c-0.734,0.455-1.531,0.766-2.389,0.931c-0.858,0.166-1.66,0.248-2.404,0.248h-7.011V211.117z
+		 M87.4,220.609h4.25c1.055,0,1.913-0.129,2.575-0.388c0.662-0.259,1.179-0.574,1.551-0.946c0.373-0.372,0.621-0.771,0.745-1.194
+		s0.186-0.812,0.186-1.163c0-0.765-0.129-1.401-0.388-1.908c-0.259-0.506-0.605-0.909-1.039-1.21
+		c-0.435-0.299-0.941-0.512-1.52-0.636c-0.579-0.124-1.189-0.186-1.831-0.186H87.4V220.609z M87.4,231.219h4.684
+		c1.199,0,2.166-0.145,2.9-0.435c0.734-0.289,1.298-0.651,1.691-1.085c0.393-0.435,0.656-0.895,0.791-1.381
+		c0.134-0.485,0.202-0.926,0.202-1.318c0-0.807-0.155-1.499-0.465-2.078s-0.713-1.05-1.21-1.412c-0.496-0.361-1.06-0.625-1.69-0.791
+		c-0.631-0.165-1.267-0.248-1.908-0.248H87.4V231.219z"/>
+	<path fill="#FFFFFF" d="M103.73,222.781c0-0.269-0.011-0.595-0.031-0.978c-0.021-0.383-0.036-0.771-0.046-1.163
+		c-0.011-0.393-0.026-0.76-0.047-1.102c-0.021-0.341-0.031-0.604-0.031-0.791h1.861c0.021,0.538,0.036,1.055,0.046,1.551
+		c0.01,0.497,0.036,0.817,0.078,0.962c0.476-0.848,1.086-1.54,1.83-2.078c0.745-0.538,1.654-0.807,2.73-0.807
+		c0.186,0,0.367,0.016,0.543,0.047c0.175,0.03,0.357,0.067,0.543,0.108l-0.217,1.83c-0.248-0.082-0.486-0.124-0.713-0.124
+		c-0.807,0-1.504,0.129-2.094,0.388c-0.589,0.259-1.075,0.615-1.458,1.07s-0.667,0.987-0.853,1.598s-0.279,1.267-0.279,1.97v7.817
+		h-1.861V222.781z"/>
+	<path fill="#FFFFFF" d="M126,229.047c0,0.27,0.01,0.595,0.031,0.978c0.021,0.383,0.036,0.771,0.046,1.163
+		c0.01,0.394,0.026,0.761,0.047,1.102c0.02,0.341,0.031,0.604,0.031,0.791h-1.861c-0.021-0.537-0.036-1.055-0.046-1.551
+		c-0.011-0.497-0.036-0.817-0.078-0.962h-0.093c-0.373,0.786-0.993,1.463-1.861,2.032c-0.869,0.568-1.882,0.853-3.04,0.853
+		c-1.117,0-2.032-0.176-2.746-0.527s-1.272-0.812-1.675-1.38c-0.403-0.569-0.678-1.226-0.822-1.971
+		c-0.145-0.744-0.217-1.509-0.217-2.295v-8.531h1.861v8.438c0,0.58,0.051,1.144,0.155,1.691s0.284,1.039,0.543,1.474
+		c0.258,0.434,0.621,0.78,1.086,1.039s1.07,0.388,1.815,0.388c0.682,0,1.329-0.119,1.938-0.356c0.61-0.238,1.137-0.6,1.582-1.086
+		s0.796-1.097,1.055-1.83c0.258-0.734,0.388-1.598,0.388-2.591v-7.166H126V229.047z"/>
+	<path fill="#FFFFFF" d="M130.584,222.781c0-0.269-0.01-0.595-0.029-0.978c-0.021-0.383-0.037-0.771-0.047-1.163
+		c-0.012-0.393-0.027-0.76-0.047-1.102c-0.021-0.341-0.031-0.604-0.031-0.791h1.861c0.02,0.538,0.035,1.055,0.047,1.551
+		c0.01,0.497,0.035,0.817,0.076,0.962h0.094c0.373-0.785,0.992-1.463,1.861-2.032c0.869-0.568,1.883-0.853,3.041-0.853
+		c1.115,0,2.025,0.176,2.729,0.527s1.258,0.812,1.66,1.381c0.404,0.568,0.684,1.225,0.838,1.97c0.154,0.744,0.232,1.51,0.232,2.295
+		v8.531h-1.861v-8.438c0-0.579-0.051-1.143-0.154-1.691c-0.104-0.547-0.285-1.039-0.543-1.473c-0.26-0.435-0.621-0.781-1.086-1.04
+		c-0.465-0.258-1.07-0.388-1.814-0.388c-0.684,0-1.33,0.119-1.939,0.357c-0.609,0.237-1.137,0.6-1.582,1.085
+		c-0.445,0.486-0.797,1.097-1.055,1.831c-0.26,0.734-0.389,1.598-0.389,2.59v7.166h-1.861V222.781z"/>
+	<path fill="#FFFFFF" d="M159.28,230.971c-0.703,0.849-1.5,1.474-2.389,1.877c-0.89,0.403-1.852,0.604-2.885,0.604
+		c-1.097,0-2.11-0.186-3.041-0.559c-0.931-0.372-1.727-0.894-2.389-1.566c-0.662-0.672-1.179-1.468-1.551-2.389
+		c-0.372-0.92-0.559-1.928-0.559-3.024c0-1.096,0.187-2.104,0.559-3.024s0.889-1.717,1.551-2.389s1.458-1.194,2.389-1.566
+		c0.931-0.373,1.944-0.559,3.041-0.559c1.055,0,2.031,0.217,2.931,0.651c0.9,0.435,1.701,1.045,2.404,1.83l-1.489,1.117
+		c-0.537-0.6-1.127-1.07-1.768-1.412c-0.642-0.341-1.334-0.512-2.078-0.512c-0.869,0-1.655,0.155-2.358,0.466
+		c-0.703,0.31-1.303,0.729-1.799,1.256s-0.874,1.148-1.133,1.861c-0.259,0.714-0.388,1.474-0.388,2.28s0.129,1.566,0.388,2.28
+		c0.259,0.713,0.637,1.334,1.133,1.861s1.096,0.946,1.799,1.256c0.703,0.311,1.489,0.466,2.358,0.466
+		c0.785,0,1.504-0.181,2.155-0.543c0.651-0.361,1.215-0.843,1.69-1.442L159.28,230.971z"/>
+	<path fill="#FFFFFF" d="M161.925,209.628h1.861v11.633h0.062c0.372-0.785,0.992-1.463,1.861-2.032
+		c0.868-0.568,1.882-0.853,3.04-0.853c1.116,0,2.026,0.176,2.729,0.527s1.257,0.812,1.66,1.381c0.403,0.568,0.683,1.225,0.837,1.97
+		c0.155,0.744,0.233,1.51,0.233,2.295v8.531h-1.861v-8.438c0-0.579-0.052-1.143-0.155-1.691c-0.104-0.547-0.285-1.039-0.543-1.473
+		c-0.259-0.435-0.62-0.781-1.086-1.04c-0.465-0.258-1.07-0.388-1.814-0.388c-0.683,0-1.329,0.119-1.939,0.357
+		c-0.609,0.237-1.137,0.6-1.582,1.085c-0.444,0.486-0.796,1.097-1.055,1.831s-0.388,1.598-0.388,2.59v7.166h-1.861V209.628z"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

examples/brunch/app/assets/index.html

@@ -10,7 +10,8 @@
 </head>
 <body>
   <div class="brunch">
-    <a href="http://brunch.io"><img src="http://brunch.io/images/logo.png" alt="Brunch"></a>
-    <p>Bon Appétit.</p>
+    <img src="/brunch-napkin.svg" alt="Brunch">
+    <h4>Bon Appétit.</h4>
+    <h6>A <a href="http://brunch.io" target="_blank">Brunch</a> website deployed on <a href="https://zeit.co" target="_blank">ZEIT Now</a></h6>
   </div>
 </body>

examples/brunch/app/styles.css

@@ -1,6 +1,21 @@
+html, body {
+  height: 100%;
+}
+
+body {
+  display: flex;
+  margin: 0;
+  align-items: center;
+  justify-content: center;
+}
+
 .brunch {
   font-family: -apple-system, Sans-Serif;
   text-align: center;
   font-size: 24pt;
   color: #3f894a;
 }
+
+a {
+  color: inherit;
+}

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/gatsby/gatsby-config.js

@@ -8,7 +8,7 @@ module.exports = {
       resolve: `gatsby-plugin-manifest`,
       options: {
         name: 'Gatsby + Node.js (TypeScript) API',
-        short_name: 'Gatbsy + Node.js (TypeScript)',
+        short_name: 'Gatsby + Node.js (TypeScript)',
         start_url: '/',
         icon: 'src/images/gatsby-icon.png',
       },

examples/gatsby/package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "gatsby-starter-default",
+  "name": "gatsby",
   "version": "1.0.0",
   "dependencies": {
     "gatsby": "^2.18.14",

examples/gridsome/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "gridsomee",
+  "name": "gridsome",
   "private": true,
   "scripts": {
     "build": "gridsome build",

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/ionic-react/public/assets/shapes.svg

@@ -0,0 +1 @@
+<svg width="350" height="140" xmlns="http://www.w3.org/2000/svg" style="background:#f6f7f9"><g fill="none" fill-rule="evenodd"><path fill="#F04141" style="mix-blend-mode:multiply" d="M61.905-34.23l96.194 54.51-66.982 54.512L22 34.887z"/><circle fill="#10DC60" style="mix-blend-mode:multiply" cx="155.5" cy="135.5" r="57.5"/><path fill="#3880FF" style="mix-blend-mode:multiply" d="M208.538 9.513l84.417 15.392L223.93 93.93z"/><path fill="#FFCE00" style="mix-blend-mode:multiply" d="M268.625 106.557l46.332-26.75 46.332 26.75v53.5l-46.332 26.75-46.332-26.75z"/><circle fill="#7044FF" style="mix-blend-mode:multiply" cx="299.5" cy="9.5" r="38.5"/><rect fill="#11D3EA" style="mix-blend-mode:multiply" transform="rotate(-60 148.47 37.886)" x="143.372" y="-7.056" width="10.196" height="89.884" rx="5.098"/><path d="M-25.389 74.253l84.86 8.107c5.498.525 9.53 5.407 9.004 10.905a10 10 0 0 1-.057.477l-12.36 85.671a10.002 10.002 0 0 1-11.634 8.42l-86.351-15.226c-5.44-.959-9.07-6.145-8.112-11.584l13.851-78.551a10 10 0 0 1 10.799-8.219z" fill="#7044FF" style="mix-blend-mode:multiply"/><circle fill="#0CD1E8" style="mix-blend-mode:multiply" cx="273.5" cy="106.5" r="20.5"/></g></svg>

examples/ionic-react/public/index.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Ionic App</title>
+
+    <base href="/" />
+
+    <meta
+      name="viewport"
+      content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"
+    />
+    <meta name="format-detection" content="telephone=no" />
+    <meta name="msapplication-tap-highlight" content="no" />
+
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+
+    <link rel="shortcut icon" type="image/png" href="%PUBLIC_URL%/assets/icon/favicon.png" />
+
+    <!-- add to homescreen for ios -->
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-title" content="Ionic App" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+  </head>
+
+  <body>
+    <div id="root"></div>
+  </body>
+
+</html>

examples/ionic-react/public/manifest.json

@@ -0,0 +1,21 @@
+{
+  "short_name": "Ionic App",
+  "name": "My Ionic App",
+  "icons": [
+    {
+      "src": "assets/icon/favicon.png",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "assets/icon/icon.png",
+      "type": "image/png",
+      "sizes": "512x512",
+      "purpose": "maskable"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff"
+}

examples/jekyll/Gemfile.lock

@@ -79,4 +79,4 @@ DEPENDENCIES
   wdm (~> 0.1.0)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

examples/middleman/Gemfile.lock

@@ -105,4 +105,4 @@ DEPENDENCIES
   wdm (~> 0.1)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

examples/nextjs/.gitignore

@@ -24,3 +24,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# Environment Variables
+.env
+.env.build

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

@@ -3,12 +3,12 @@
     {
       "source": "/",
       "destination": "/api/frameworks"
+    },
+    {
+      "source": "/api/v1/frameworks",
+      "destination": "/api/frameworks"
     }
   ],
-  "env": {
-    "GITHUB_ACCESS_TOKEN": "@now-api-examples-github-token",
-    "SENTRY_DSN": "@sentry-product-dsn"
-  },
   "github": {
     "silent": true,
     "autoJobCancelation": true

package.json

@@ -23,6 +23,7 @@
     "eslint": "6.2.2",
     "eslint-config-prettier": "6.1.0",
     "husky": "3.0.4",
+    "json5": "2.1.1",
     "lint-staged": "9.2.5",
     "node-fetch": "2.6.0",
     "prettier": "1.18.2"
@@ -37,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": {
@@ -58,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

@@ -17,7 +17,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`build` from `package.json` or `next build`"
+        "placeholder": "`npm run build` or `next build`"
       },
       "devCommand": {
         "value": "next dev --port $PORT"
@@ -45,7 +45,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`gatsby build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `gatsby build`"
       },
       "devCommand": {
         "value": "gatsby develop --port $PORT"
@@ -62,6 +62,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/hexo.svg",
     "tagline": "Hexo is a fast, simple & powerful blog framework powered by Node.js.",
     "description": "A Hexo site, created with the Hexo CLI.",
+    "website": "https://hexo.io/",
     "detectors": {
       "every": [
         {
@@ -72,7 +73,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`hexo generate` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `hexo generate`"
       },
       "devCommand": {
         "value": "hexo server --port $PORT"
@@ -89,6 +90,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/eleventy.svg",
     "tagline": "11ty is a simpler static site generator written in JavaScript, created to be an alternative to Jekyll.",
     "description": "An Eleventy site, created with npm init.",
+    "website": "https://www.11ty.dev/",
     "detectors": {
       "every": [
         {
@@ -99,7 +101,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`npx @11ty/eleventy` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `npx @11ty/eleventy`"
       },
       "devCommand": {
         "value": "npx @11ty/eleventy --serve --watch --port $PORT"
@@ -110,18 +112,15 @@
     }
   },
   {
-    "name": "Docusaurus",
-    "slug": "docusaurus",
+    "name": "Docusaurus 2",
+    "slug": "docusaurus-2",
     "demo": "https://docusaurus.now-examples.now.sh",
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/docusaurus.svg",
     "tagline": "Docusaurus makes it easy to maintain Open Source documentation websites.",
     "description": "A static Docusaurus site that makes it easy to maintain OSS documentation.",
+    "website": "https://v2.docusaurus.io",
     "detectors": {
       "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"docusaurus\":\\s*\".+?\"[^}]*}"
-        },
         {
           "path": "package.json",
           "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@docusaurus\\/core\":\\s*\".+?\"[^}]*}"
@@ -130,7 +129,35 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`docusaurus-build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `docusaurus build`"
+      },
+      "devCommand": {
+        "value": "docusaurus start --port $PORT"
+      },
+      "outputDirectory": {
+        "value": "build"
+      }
+    }
+  },
+  {
+    "name": "Docusaurus 1",
+    "slug": "docusaurus",
+    "demo": "https://docusaurus.now-examples.now.sh",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/docusaurus.svg",
+    "tagline": "Docusaurus makes it easy to maintain Open Source documentation websites.",
+    "description": "A static Docusaurus site that makes it easy to maintain OSS documentation.",
+    "website": "https://docusaurus.io/",
+    "detectors": {
+      "some": [
+        {
+          "path": "package.json",
+          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"docusaurus\":\\s*\".+?\"[^}]*}"
+        }
+      ]
+    },
+    "settings": {
+      "buildCommand": {
+        "placeholder": "`npm run build` or `docusaurus-build`"
       },
       "devCommand": {
         "value": "docusaurus-start --port $PORT"
@@ -158,7 +185,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`preact build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `preact build`"
       },
       "devCommand": {
         "value": "preact watch --port $PORT"
@@ -168,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",
@@ -175,6 +233,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/ember.svg",
     "tagline": "Ember.js helps webapp developers be more productive out of the box.",
     "description": "An Ember app, created with the Ember CLI.",
+    "website": "https://emberjs.com/",
     "detectors": {
       "every": [
         {
@@ -185,7 +244,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`ember build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `ember build`"
       },
       "devCommand": {
         "value": "ember serve --port $PORT"
@@ -213,7 +272,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`vue-cli-service build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `vue-cli-service build`"
       },
       "devCommand": {
         "value": "vue-cli-service serve --port $PORT"
@@ -229,6 +288,7 @@
     "demo": "https://scully.now-examples.now.sh",
     "tagline": "Scully is a static site generator for Angular.",
     "description": "The Static Site Generator for Angular apps.",
+    "website": "https://github.com/scullyio/scully",
     "detectors": {
       "every": [
         {
@@ -239,7 +299,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`ng build && scully` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `ng build && scully`"
       },
       "devCommand": {
         "value": "ng serve --port $PORT"
@@ -249,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",
@@ -267,7 +355,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`ng build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `ng build`"
       },
       "devCommand": {
         "value": "ng serve --port $PORT"
@@ -284,6 +372,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/polymer.svg",
     "tagline": "Polymer is an open-source webapps library from Google, for building using Web Components.",
     "description": "A Polymer app, created with the Polymer CLI.",
+    "website": "https://www.polymer-project.org/",
     "detectors": {
       "every": [
         {
@@ -294,7 +383,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`polymer build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `polymer build`"
       },
       "devCommand": {
         "value": "polymer serve --port $PORT"
@@ -322,7 +411,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`rollup -c` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `rollup -c`"
       },
       "devCommand": {
         "value": "sirv public --single --dev --port $PORT"
@@ -336,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",
@@ -350,13 +439,13 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`build` from `package.json`"
+        "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"
       }
     }
   },
@@ -382,7 +471,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`react-scripts build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `react-scripts build`"
       },
       "devCommand": {
         "value": "react-scripts start"
@@ -399,6 +488,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/gridsome.svg",
     "tagline": "Gridsome is a Vue.js-powered framework for building websites & apps that are fast by default.",
     "description": "A Gridsome app, created with the Gridsome CLI.",
+    "website": "https://gridsome.org/",
     "detectors": {
       "every": [
         {
@@ -409,7 +499,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`gridsome build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `gridsome build`"
       },
       "devCommand": {
         "value": "gridsome develop -p $PORT"
@@ -437,7 +527,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`umi build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `umi build`"
       },
       "devCommand": {
         "value": "umi dev --port $PORT"
@@ -465,7 +555,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`sapper export` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `sapper export`"
       },
       "devCommand": {
         "value": "sapper dev --port $PORT"
@@ -482,6 +572,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/saber.svg",
     "tagline": "Saber is a framework for building static sites in Vue.js that supports data from any source.",
     "description": "A Saber site, created with npm init.",
+    "website": "https://saber.land/",
     "detectors": {
       "every": [
         {
@@ -492,7 +583,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`saber build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `saber build`"
       },
       "devCommand": {
         "value": "saber --port $PORT"
@@ -509,6 +600,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/stencil.svg",
     "tagline": "Stencil is a powerful toolchain for building Progressive Web Apps and Design Systems.",
     "description": "A Stencil site, created with the Stencil CLI.",
+    "website": "https://stenciljs.com/",
     "detectors": {
       "every": [
         {
@@ -519,7 +611,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`stencil build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `stencil build`"
       },
       "devCommand": {
         "value": "stencil build --dev --watch --serve --port $PORT"
@@ -547,7 +639,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`nuxt build` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `nuxt build`"
       },
       "devCommand": {
         "value": "nuxt"
@@ -580,7 +672,7 @@
     },
     "settings": {
       "buildCommand": {
-        "value": "hugo -D --gc"
+        "placeholder": "`npm run build` or `hugo -D --gc`"
       },
       "devCommand": {
         "value": "hugo server -D -w -p $PORT"
@@ -597,6 +689,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/jekyll.svg",
     "tagline": "Jekyll makes it super easy to transform your plain text into static websites and blogs.",
     "description": "A Jekyll site, created with the Jekyll CLI.",
+    "website": "https://jekyllrb.com/",
     "detectors": {
       "every": [
         {
@@ -606,7 +699,7 @@
     },
     "settings": {
       "buildCommand": {
-        "value": "jekyll build"
+        "placeholder": "`npm run build` or `jekyll build`"
       },
       "devCommand": {
         "value": "bundle exec jekyll serve --watch --port $PORT"
@@ -623,6 +716,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/brunch.svg",
     "tagline": "Brunch is a fast and simple webapp build tool with seamless incremental compilation for rapid development.",
     "description": "A Brunch app, created with the Brunch CLI.",
+    "website": "https://brunch.io/",
     "detectors": {
       "every": [
         {
@@ -632,7 +726,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`brunch build --production` or `build` from `package.json`"
+        "placeholder": "`npm run build` or `brunch build --production`"
       },
       "devCommand": {
         "value": "brunch watch --server --port $PORT"
@@ -649,6 +743,7 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/middleman.svg",
     "tagline": "Middleman is a static site generator that uses all the shortcuts and tools in modern web development.",
     "description": "A Middleman app, created with the Middleman CLI.",
+    "website": "https://middlemanapp.com/",
     "detectors": {
       "every": [
         {
@@ -658,7 +753,7 @@
     },
     "settings": {
       "buildCommand": {
-        "value": "bundle exec middleman build"
+        "value": "`npm run build` or `bundle exec middleman build`"
       },
       "devCommand": {
         "value": "bundle exec middleman server -p $PORT"
@@ -675,7 +770,7 @@
     "description": "No framework or a unoptimized framework.",
     "settings": {
       "buildCommand": {
-        "placeholder": "`build` or `now-build` from `package.json` if it exists"
+        "placeholder": "`npm run now-build` or `npm run build`"
       },
       "devCommand": {
         "placeholder": "None"

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/frameworks",
-  "version": "0.0.11-canary.0",
+  "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.1.2-canary.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,23 +98,30 @@ 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;
 }
 
+export async function getNodeBinPath({ cwd }: { cwd: string }) {
+  const { stdout } = await execAsync('npm', ['bin'], { cwd });
+  return stdout.trim();
+}
+
 async function chmodPlusX(fsPath: string) {
   const s = await fs.stat(fsPath);
   const newMode = s.mode | 64 | 8 | 1; // eslint-disable-line no-bitwise
@@ -115,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;
 }
@@ -189,6 +214,46 @@ async function scanParentDirs(destPath: string, readPackageJson = false) {
   return { hasPackageLockJson, packageJson };
 }
 
+interface WalkParentDirsProps {
+  /**
+   * The highest directory, typically the workPath root of the project.
+   * If this directory is reached and it doesn't contain the file, null is returned.
+   */
+  base: string;
+  /**
+   * The directory to start searching, typically the same directory of the entrypoint.
+   * If this directory doesn't contain the file, the parent is checked, etc.
+   */
+  start: string;
+  /**
+   * The name of the file to search for, typically `package.json` or `Gemfile`.
+   */
+  filename: string;
+}
+
+export async function walkParentDirs({
+  base,
+  start,
+  filename,
+}: WalkParentDirsProps): Promise<string | null> {
+  assert(path.isAbsolute(base), 'Expected "base" to be absolute path');
+  assert(path.isAbsolute(start), 'Expected "start" to be absolute path');
+  let parent = '';
+
+  for (let current = start; base.length <= current.length; current = parent) {
+    const fullPath = path.join(current, filename);
+
+    // eslint-disable-next-line no-await-in-loop
+    if (await fs.pathExists(fullPath)) {
+      return fullPath;
+    }
+
+    parent = path.dirname(current);
+  }
+
+  return null;
+}
+
 export async function runNpmInstall(
   destPath: string,
   args: string[] = [],
@@ -204,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;
@@ -213,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']);
   }
@@ -240,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',
@@ -268,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',
@@ -295,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/src/index.ts

@@ -12,6 +12,7 @@ import {
   spawnAsync,
   execCommand,
   spawnCommand,
+  walkParentDirs,
   installDependencies,
   runPackageJsonScript,
   runNpmInstall,
@@ -20,6 +21,7 @@ import {
   runShellScript,
   getNodeVersion,
   getSpawnOptions,
+  getNodeBinPath,
 } from './fs/run-user-scripts';
 import {
   getLatestNodeVersion,
@@ -48,6 +50,8 @@ export {
   runPackageJsonScript,
   execCommand,
   spawnCommand,
+  walkParentDirs,
+  getNodeBinPath,
   runNpmInstall,
   runBundleInstall,
   runPipInstall,

packages/now-build-utils/test/fixtures/05-zero-config-gatsby/gatsby-config.js

@@ -18,7 +18,7 @@ module.exports = {
     {
       resolve: `gatsby-plugin-manifest`,
       options: {
-        name: `gatsby-starter-default`,
+        name: `05-zero-config-gatsby`,
         short_name: `starter`,
         start_url: `/`,
         background_color: `#663399`,

packages/now-build-utils/test/fixtures/05-zero-config-gatsby/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "gatsby-starter-default",
+  "name": "05-zero-config-gatsby",
   "private": true,
   "description": "A simple starter to get up and developing quickly with Gatsby",
   "version": "0.1.0",

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

@@ -0,0 +1,107 @@
+import { walkParentDirs } from '../';
+import { strict } from 'assert';
+import { join } from 'path';
+import { promises } from 'fs';
+const { deepEqual, notDeepEqual, fail } = strict;
+const { readFile } = promises;
+const fixture = (name: string) => join(__dirname, 'walk', name);
+const filename = 'file.txt';
+
+async function assertContent(target: string | null, contents: string) {
+  notDeepEqual(target, null);
+  const actual = await readFile(target!, 'utf8');
+  deepEqual(actual.trim(), contents.trim());
+}
+
+describe('Test `walkParentDirs`', () => {
+  it('should throw when `base` is relative', async () => {
+    const base = './relative';
+    const start = __dirname;
+    try {
+      await walkParentDirs({ base, start, filename });
+      fail('Expected error');
+    } catch (error) {
+      deepEqual(
+        (error as Error).message,
+        'Expected "base" to be absolute path'
+      );
+    }
+  });
+
+  it('should throw when `start` is relative', async () => {
+    const base = __dirname;
+    const start = './relative';
+    try {
+      await walkParentDirs({ base, start, filename });
+      fail('Expected error');
+    } catch (error) {
+      deepEqual(
+        (error as Error).message,
+        'Expected "start" to be absolute path'
+      );
+    }
+  });
+
+  it('should find nested one', async () => {
+    const base = fixture('every-directory');
+    const start = base;
+    const target = await walkParentDirs({ base, start, filename });
+    await assertContent(target, 'First');
+  });
+
+  it('should find nested two', async () => {
+    const base = fixture('every-directory');
+    const start = join(base, 'two');
+    const target = await walkParentDirs({ base, start, filename });
+    await assertContent(target, 'Second');
+  });
+
+  it('should find nested three', async () => {
+    const base = fixture('every-directory');
+    const start = join(base, 'two', 'three');
+    const target = await walkParentDirs({ base, start, filename });
+    await assertContent(target, 'Third');
+  });
+
+  it('should not find nested one', async () => {
+    const base = fixture('not-found');
+    const start = base;
+    const target = await walkParentDirs({ base, start, filename });
+    deepEqual(target, null);
+  });
+
+  it('should not find nested two', async () => {
+    const base = fixture('not-found');
+    const start = join(base, 'two');
+    const target = await walkParentDirs({ base, start, filename });
+    deepEqual(target, null);
+  });
+
+  it('should not find nested three', async () => {
+    const base = fixture('not-found');
+    const start = join(base, 'two', 'three');
+    const target = await walkParentDirs({ base, start, filename });
+    deepEqual(target, null);
+  });
+
+  it('should find only one', async () => {
+    const base = fixture('only-one');
+    const start = join(base, 'two', 'three');
+    const target = await walkParentDirs({ base, start, filename });
+    await assertContent(target, 'First');
+  });
+
+  it('should find only two', async () => {
+    const base = fixture('only-two');
+    const start = join(base, 'two', 'three');
+    const target = await walkParentDirs({ base, start, filename });
+    await assertContent(target, 'Second');
+  });
+
+  it('should find only three', async () => {
+    const base = fixture('only-three');
+    const start = join(base, 'two', 'three');
+    const target = await walkParentDirs({ base, start, filename });
+    await assertContent(target, 'Third');
+  });
+});

packages/now-build-utils/test/walk/every-directory/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/every-directory/file.txt

@@ -0,0 +1 @@
+First

packages/now-build-utils/test/walk/every-directory/two/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/every-directory/two/file.txt

@@ -0,0 +1 @@
+Second

packages/now-build-utils/test/walk/every-directory/two/three/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/every-directory/two/three/file.txt

@@ -0,0 +1 @@
+Third

packages/now-build-utils/test/walk/not-found/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/not-found/two/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/not-found/two/three/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-one/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-one/file.txt

@@ -0,0 +1 @@
+First

packages/now-build-utils/test/walk/only-one/two/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-one/two/three/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-three/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-three/two/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-three/two/three/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-three/two/three/file.txt

@@ -0,0 +1 @@
+Third

packages/now-build-utils/test/walk/only-two/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-two/two/another.txt

@@ -0,0 +1 @@
+Another

packages/now-build-utils/test/walk/only-two/two/file.txt

@@ -0,0 +1 @@
+Second

packages/now-build-utils/test/walk/only-two/two/three/another.txt

@@ -0,0 +1 @@
+Another

packages/now-cgi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/cgi",
-  "version": "1.0.4-canary.0",
+  "version": "1.0.4",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now",
-  "version": "18.0.0-canary.6",
+  "version": "18.0.1-canary.1",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Now",
@@ -13,8 +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-now-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
+    "test-integration-cli": "ava test/integration.js --serial --fail-fast --verbose",
+    "test-integration-v1": "ava test/integration-v1.js --serial --fail-fast",
+    "test-integration-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
     "prepublishOnly": "yarn build",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "build": "ts-node ./scripts/build.ts",
@@ -62,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",
@@ -91,10 +92,12 @@
     "@types/universal-analytics": "0.4.2",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
+    "@zeit/dockerignore": "0.0.5",
     "@zeit/fun": "0.11.2",
     "@zeit/ncc": "0.18.5",
     "@zeit/source-map-support": "0.6.2",
     "ajv": "6.10.2",
+    "alpha-sort": "2.0.1",
     "ansi-escapes": "3.0.0",
     "ansi-regex": "3.0.0",
     "arg": "2.0.0",
@@ -127,6 +130,8 @@
     "get-port": "5.1.1",
     "glob": "7.1.2",
     "http-proxy": "1.17.0",
+    "ignore": "4.0.6",
+    "ini": "1.3.4",
     "inquirer": "7.0.4",
     "is-port-reachable": "3.0.0",
     "is-url": "1.2.2",
@@ -136,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/index.js

@@ -1,3 +1,4 @@
+//
 import chalk from 'chalk';
 
 import { handleError } from '../../util/error';
@@ -30,12 +31,16 @@ const help = () => {
     -Q ${chalk.bold.underline('DIR')}, --global-config=${chalk.bold.underline(
     'DIR'
   )}         Path to the global ${'`.now`'} directory
+    -r ${chalk.bold.underline('RULES_FILE')}, --rules=${chalk.bold.underline(
+    'RULES_FILE'
+  )}   Rules file
     -d, --debug                         Debug mode [off]
     -t ${chalk.bold.underline('TOKEN')}, --token=${chalk.bold.underline(
     'TOKEN'
   )}             Login token
     -S, --scope                         Set a custom scope
-
+    -n, --no-verify                     Don't wait until instance count meets the previous alias constraints
+    -N, --next                          Show next page of results
   ${chalk.dim('Examples:')}
 
   ${chalk.gray('–')} Add a new alias to ${chalk.underline('my-api.now.sh')}
@@ -60,6 +65,28 @@ const help = () => {
       ${chalk.dim('–')} ${chalk.dim(
     'Protocols'
   )} in the URLs are unneeded and ignored.
+
+  ${chalk.gray('–')} Add and modify path based aliases for ${chalk.underline(
+    'zeit.ninja'
+  )}
+
+      ${chalk.cyan(
+        `$ now alias ${chalk.underline('zeit.ninja')} -r ${chalk.underline(
+          'rules.json'
+        )}`
+      )}
+
+      Export effective routing rules
+
+      ${chalk.cyan(
+        `$ now alias ls aliasId --json > ${chalk.underline('rules.json')}`
+      )}
+
+  ${chalk.gray('–')} Paginate results, where ${chalk.dim(
+    '`1584722256178`'
+  )} is the time in milliseconds since the UNIX epoch.
+
+      ${chalk.cyan(`$ now alias ls --next 1584722256178`)}
 `);
 };
 
@@ -76,8 +103,14 @@ export default async function main(ctx) {
   try {
     argv = getArgs(ctx.argv.slice(2), {
       '--json': Boolean,
+      '--no-verify': Boolean,
+      '--rules': String,
       '--yes': Boolean,
+      '--next': Number,
+      '-n': '--no-verify',
+      '-r': '--rules',
       '-y': '--yes',
+      '-N': '--next',
     });
   } catch (err) {
     handleError(err);

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

@@ -2,12 +2,14 @@ import chalk from 'chalk';
 import ms from 'ms';
 import plural from 'pluralize';
 import table from 'text-table';
-import Now from '../../util/now';
+import Now from '../../util';
 import Client from '../../util/client.ts';
 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 {
@@ -16,7 +18,7 @@ export default async function ls(ctx, opts, args, output) {
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
-  const { '--debug': debugEnabled } = opts;
+  const { '--debug': debugEnabled, '--next': nextTimestamp } = opts;
   const client = new Client({
     apiUrl,
     token,
@@ -36,7 +38,17 @@ export default async function ls(ctx, opts, args, output) {
     throw err;
   }
 
-  const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
+  if (typeof nextTimestamp !== undefined && Number.isNaN(nextTimestamp)) {
+    output.error('Please provide a number for flag --next');
+    return 1;
+  }
+
+  const now = new Now({
+    apiUrl,
+    token,
+    debug: debugEnabled,
+    currentTeam,
+  });
   const lsStamp = stamp();
   let cancelWait;
 
@@ -57,7 +69,11 @@ export default async function ls(ctx, opts, args, output) {
       : `Fetching aliases under ${chalk.bold(contextName)}`
   );
 
-  const aliases = await getAliases(now);
+  const { aliases, pagination } = await getAliases(
+    now,
+    undefined,
+    nextTimestamp
+  );
   if (cancelWait) cancelWait();
 
   if (args[0]) {
@@ -83,15 +99,19 @@ export default async function ls(ctx, opts, args, output) {
       output.print(`${printPathAliasTable(rules)}\n`);
     }
   } else {
-    aliases.sort((a, b) => new Date(b.created) - new Date(a.created));
-    output.log(
-      `${plural('alias', aliases.length, true)} found under ${chalk.bold(
-        contextName
-      )} ${lsStamp()}`
-    );
+    output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
     console.log(printAliasTable(aliases));
   }
 
+  if (pagination && pagination.count === 20) {
+    const flags = getCommandFlags(opts, ['_', '--next']);
+    output.log(
+      `To display the next page run ${cmd(
+        `now alias ls${flags} --next ${pagination.next}`
+      )}`
+    );
+  }
+
   now.close();
   return 0;
 }
@@ -110,7 +130,7 @@ function printAliasTable(aliases) {
           ? a.deployment.url
           : chalk.gray('–'),
         a.alias,
-        ms(Date.now() - new Date(a.created)),
+        ms(Date.now() - new Date(a.createdAt)),
       ]),
     ],
     {