Publish Canary

- vercel@19.1.2-canary.2
 - @vercel/ruby@1.2.3-canary.0

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "19.1.0",
+  "version": "19.1.2-canary.2",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Now",
@@ -64,11 +64,11 @@
   "dependencies": {
     "@vercel/build-utils": "2.4.0",
     "@vercel/go": "1.1.2",
-    "@vercel/next": "2.6.6",
-    "@vercel/node": "1.7.0",
+    "@vercel/next": "2.6.8-canary.0",
+    "@vercel/node": "1.7.2-canary.0",
     "@vercel/python": "1.2.2",
-    "@vercel/ruby": "1.2.2",
-    "@vercel/static-build": "0.17.2"
+    "@vercel/ruby": "1.2.3-canary.0",
+    "@vercel/static-build": "0.17.3"
   },
   "devDependencies": {
     "@sentry/node": "5.5.0",

packages/now-cli/src/index.js

@@ -314,21 +314,6 @@ const main = async argv_ => {
     // need to migrate.
     if (authConfig.credentials) {
       authConfigExists = false;
-    } else if (
-      !authConfig.token &&
-      !subcommandsWithoutToken.includes(targetOrSubcommand) &&
-      !argv['--help'] &&
-      !argv['--token']
-    ) {
-      console.error(
-        error(
-          `The content of "${hp(VERCEL_AUTH_CONFIG_PATH)}" is invalid. ` +
-            `No \`token\` property found inside. Run ${getCommandName(
-              'login'
-            )} to authorize.`
-        )
-      );
-      return 1;
     }
   } else {
     const results = await getDefaultAuthConfig(authConfig);

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

@@ -1503,16 +1503,15 @@ export default class DevServer {
     if (!match) {
       // If the dev command is started, then proxy to it
       if (this.devProcessPort) {
-        debug('Proxying to frontend dev server');
+        const upstream = `http://localhost:${this.devProcessPort}`;
+        debug(`Proxying to frontend dev server: ${upstream}`);
         this.setResponseHeaders(res, nowRequestId);
-        return proxyPass(
-          req,
-          res,
-          `http://localhost:${this.devProcessPort}`,
-          this,
-          nowRequestId,
-          false
-        );
+        const origUrl = url.parse(req.url || '/', true);
+        delete origUrl.search;
+        origUrl.pathname = dest;
+        Object.assign(origUrl.query, uri_args);
+        req.url = url.format(origUrl);
+        return proxyPass(req, res, upstream, this, nowRequestId, false);
       }
 
       if (

packages/now-cli/test/dev/fixtures/06-gridsome/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "build": "gridsome build",
-    "develop": "gridsome develop",
+    "dev": "gridsome develop -p $PORT",
     "explore": "gridsome explore"
   },
   "dependencies": {

packages/now-cli/test/dev/fixtures/06-gridsome/src/pages/404.vue

@@ -0,0 +1,14 @@
+<template>
+  <Layout>
+    <h1>Not Found</h1>
+    <p>This is a Custom Gridsome 404.</p>
+  </Layout>
+</template>
+
+<script>
+export default {
+  metaInfo: {
+    title: 'Not Found'
+  }
+}
+</script>

packages/now-cli/test/dev/fixtures/06-gridsome/src/pages/Index.vue

@@ -1,11 +1,11 @@
 <template>
   <Layout>
-    
+
     <!-- Learn how to use images here: https://gridsome.org/docs/images -->
     <g-image alt="Example image" src="~/favicon.png" width="135" />
-    
-    <h1>Hello, world!</h1>
-   
+
+    <h1>Gridsome on Vercel</h1>
+
     <p>
       Lorem ipsum dolor sit amet, consectetur adipisicing elit. Pariatur excepturi labore tempore expedita, et iste tenetur suscipit explicabo! Dolores, aperiam non officia eos quod asperiores
     </p>

packages/now-cli/test/dev/fixtures/06-gridsome/vercel.json

@@ -0,0 +1,3 @@
+{
+  "redirects": [{ "source": "/support", "destination": "/about?ref=support" }]
+}

packages/now-cli/test/dev/fixtures/07-hexo-node/source/contact.html

@@ -0,0 +1 @@
+<h1>Contact Us</h1>

packages/now-cli/test/dev/fixtures/07-hexo-node/vercel.json

@@ -0,0 +1,3 @@
+{
+  "rewrites": [{ "source": "/support", "destination": "/contact.html" }]
+}

packages/now-cli/test/dev/fixtures/10-nextjs-node/pages/contact.js

@@ -0,0 +1,3 @@
+export default function Contact() {
+  return <h1>Contact Page</h1>;
+}

packages/now-cli/test/dev/fixtures/10-nextjs-node/vercel.json

@@ -0,0 +1,3 @@
+{
+  "rewrites": [{ "source": "/support", "destination": "/contact" }]
+}

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

@@ -1,4 +1,5 @@
 import ms from 'ms';
+import os from 'os';
 import fs from 'fs-extra';
 import test from 'ava';
 import { join, resolve, delimiter } from 'path';
@@ -526,6 +527,35 @@ test('[vercel dev] reflects changes to config and env without restart', async t
   }
 });
 
+test('[vercel dev] `@vercel/node` TypeScript should be resolved by default', async t => {
+  // The purpose of this test is to test that `@vercel/node` can properly
+  // resolve the default "typescript" module when the project doesn't include
+  // its own version. To properly test for this, a fixture needs to be created
+  // *outside* of the `vercel` repo, since otherwise the root-level
+  // "node_modules/typescript" is resolved as relative to the project, and
+  // not relative to `@vercel/node` which is what we are testing for here.
+  const dir = join(os.tmpdir(), 'vercel-node-typescript-resolve-test');
+  const apiDir = join(dir, 'api');
+  await fs.mkdirp(apiDir);
+  await fs.writeFile(
+    join(apiDir, 'hello.js'),
+    'export default (req, res) => { res.end("world"); }'
+  );
+
+  const { dev, port, readyResolver } = await testFixture(dir);
+
+  try {
+    await readyResolver;
+
+    const res = await fetch(`http://localhost:${port}/api/hello`);
+    const body = await res.text();
+    t.is(body, 'world');
+  } finally {
+    await dev.kill('SIGTERM');
+    await fs.remove(dir);
+  }
+});
+
 test(
   '[vercel dev] validate routes that use `check: true`',
   testFixtureStdio('routes-check-true', async testPath => {
@@ -1059,6 +1089,13 @@ test(
   '[vercel dev] 06-gridsome',
   testFixtureStdio('06-gridsome', async testPath => {
     await testPath(200, '/');
+    await testPath(200, '/about');
+    await testPath(308, '/support', 'Redirecting to /about?ref=support (308)', {
+      Location: '/about?ref=support',
+    });
+    // Bug with gridsome's dev server: https://github.com/gridsome/gridsome/issues/831
+    // Works in prod only so leave out for now
+    // await testPath(404, '/nothing');
   })
 );
 
@@ -1066,6 +1103,9 @@ test(
   '[vercel dev] 07-hexo-node',
   testFixtureStdio('07-hexo-node', async testPath => {
     await testPath(200, '/', /Hexo \+ Node.js API/m);
+    await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
+    await testPath(200, '/contact.html', /Contact Us/m);
+    await testPath(200, '/support', /Contact Us/m);
   })
 );
 
@@ -1090,6 +1130,8 @@ test(
   testFixtureStdio('10-nextjs-node', async testPath => {
     await testPath(200, '/', /Next.js \+ Node.js API/m);
     await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
+    await testPath(200, '/contact', /Contact Page/);
+    await testPath(200, '/support', /Contact Page/);
     await testPath(404, '/nothing', /Custom Next 404/);
   })
 );
@@ -1100,6 +1142,7 @@ test(
     '12-polymer-node',
     async testPath => {
       await testPath(200, '/', /Polymer \+ Node.js API/m);
+      await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
     },
     { skipDeploy: true }
   )
@@ -1111,6 +1154,7 @@ test(
     '13-preact-node',
     async testPath => {
       await testPath(200, '/', /Preact/m);
+      await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
     },
     { skipDeploy: true }
   )
@@ -1122,6 +1166,7 @@ test(
     '14-svelte-node',
     async testPath => {
       await testPath(200, '/', /Svelte/m);
+      await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
     },
     { skipDeploy: true }
   )
@@ -1133,6 +1178,7 @@ test(
     '16-vue-node',
     async testPath => {
       await testPath(200, '/', /Vue.js \+ Node.js API/m);
+      await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
     },
     { skipDeploy: true }
   )
@@ -1144,6 +1190,7 @@ test(
     '17-vuepress-node',
     async testPath => {
       await testPath(200, '/', /VuePress \+ Node.js API/m);
+      await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
     },
     { skipDeploy: true }
   )

packages/now-cli/test/integration.js

@@ -31,6 +31,8 @@ function execa(file, args, options) {
 
 const binaryPath = path.resolve(__dirname, `../scripts/start.js`);
 const fixture = name => path.join(__dirname, 'fixtures', 'integration', name);
+const example = name =>
+  path.join(__dirname, '..', '..', '..', 'examples', name);
 const deployHelpMessage = `${logo} vercel [options] <command | path>`;
 let session = 'temp-session';
 
@@ -243,8 +245,10 @@ test.after.always(async () => {
     loginApiServer.close();
   }
 
-  // Make sure the token gets revoked
-  await execa(binaryPath, ['logout', ...defaultArgs]);
+  // Make sure the token gets revoked unless it's passed in via environment
+  if (!process.env.VERCEL_TOKEN) {
+    await execa(binaryPath, ['logout', ...defaultArgs]);
+  }
 
   if (tmpDir) {
     // Remove config directory entirely
@@ -252,6 +256,20 @@ test.after.always(async () => {
   }
 });
 
+test('default command should prompt login with empty auth.json', async t => {
+  await fs.writeFile(getConfigAuthPath(), JSON.stringify({}));
+  try {
+    await execa(binaryPath, [...defaultArgs]);
+    t.fail();
+  } catch (err) {
+    t.true(
+      err.stderr.includes(
+        'Error! No existing credentials found. Please run `vercel login` or pass "--token"'
+      )
+    );
+  }
+});
+
 test('login', async t => {
   t.timeout(ms('1m'));
 
@@ -2934,3 +2952,36 @@ test('`vc --debug project ls` should output the projects listing', async t => {
     formatOutput({ stderr, stdout })
   );
 });
+
+test('deploy gatsby twice and print cached directories', async t => {
+  const directory = example('gatsby');
+  const packageJsonPath = path.join(directory, 'package.json');
+  const packageJsonOriginal = await readFile(packageJsonPath, 'utf8');
+  const pkg = JSON.parse(packageJsonOriginal);
+
+  async function tryDeploy(cwd) {
+    await execa(binaryPath, [...defaultArgs, '--public', '--confirm'], {
+      cwd,
+      stdio: 'inherit',
+      reject: true,
+    });
+
+    t.true(true);
+  }
+
+  // Deploy once to populate the cache
+  await tryDeploy(directory);
+
+  // Wait because the cache is not available right away
+  // See https://codeburst.io/quick-explanation-of-the-s3-consistency-model-6c9f325e3f82
+  await sleep(60000);
+
+  // Update build script to ensure cached files were restored in the next deploy
+  pkg.scripts.build = `ls -lA && ls .cache && ls public && ${pkg.scripts.build}`;
+  await writeFile(packageJsonPath, JSON.stringify(pkg));
+  try {
+    await tryDeploy(directory);
+  } finally {
+    await writeFile(packageJsonPath, packageJsonOriginal);
+  }
+});

packages/now-next/package.json

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

packages/now-next/src/index.ts

@@ -208,7 +208,7 @@ export const build = async ({
   // Limit for max size each lambda can be, 50 MB if no custom limit
   const lambdaCompressedByteLimit = config.maxLambdaSize || 50 * 1000 * 1000;
 
-  const entryDirectory = path.dirname(entrypoint);
+  let entryDirectory = path.dirname(entrypoint);
   const entryPath = path.join(workPath, entryDirectory);
   const outputDirectory = config.outputDirectory || '.next';
   const dotNextStatic = path.join(entryPath, outputDirectory, 'static');
@@ -422,17 +422,16 @@ export const build = async ({
   const headers: Route[] = [];
   const rewrites: Route[] = [];
   const redirects: Route[] = [];
-  const nextBasePathRoute: Route[] = [];
   const dataRoutes: Route[] = [];
   let dynamicRoutes: Route[] = [];
-  let nextBasePath: string | undefined;
   // whether they have enabled pages/404.js as the custom 404 page
   let hasPages404 = false;
 
   if (routesManifest) {
     switch (routesManifest.version) {
       case 1:
-      case 2: {
+      case 2:
+      case 3: {
         redirects.push(...convertRedirects(routesManifest.redirects));
         rewrites.push(...convertRewrites(routesManifest.rewrites));
 
@@ -468,7 +467,14 @@ export const build = async ({
                 // make sure to route SSG data route to the data prerender
                 // output, we don't do this for SSP routes since they don't
                 // have a separate data output
-                (ssgDataRoute && ssgDataRoute.dataRoute) || dataRoute.page
+                (ssgDataRoute && ssgDataRoute.dataRoute) || dataRoute.page,
+                `${
+                  dataRoute.routeKeys
+                    ? `?${Object.keys(dataRoute.routeKeys)
+                        .map(key => `${dataRoute.routeKeys![key]}=$${key}`)
+                        .join('&')}`
+                    : ''
+                }`
               ),
               check: true,
             });
@@ -480,7 +486,7 @@ export const build = async ({
         }
 
         if (routesManifest.basePath && routesManifest.basePath !== '/') {
-          nextBasePath = routesManifest.basePath;
+          const nextBasePath = routesManifest.basePath;
 
           if (!nextBasePath.startsWith('/')) {
             throw new NowBuildError({
@@ -497,11 +503,7 @@ export const build = async ({
             });
           }
 
-          nextBasePathRoute.push({
-            src: `^${nextBasePath}(?:$|/(.*))$`,
-            dest: `/$1`,
-            continue: true,
-          });
+          entryDirectory = path.join(entryDirectory, nextBasePath);
         }
         break;
       }
@@ -565,9 +567,6 @@ export const build = async ({
       routes: [
         // TODO: low priority: handle trailingSlash
 
-        // Add top level rewrite for basePath if provided
-        ...nextBasePathRoute,
-
         // User headers
         ...headers,
 
@@ -1583,9 +1582,6 @@ export const build = async ({
       - Builder rewrites
     */
     routes: [
-      // Add top level rewrite for basePath if provided
-      ...nextBasePathRoute,
-
       // headers
       ...headers,
 

packages/now-next/src/utils.ts

@@ -312,9 +312,16 @@ export type RoutesManifest = {
   dynamicRoutes: {
     page: string;
     regex: string;
+    namedRegex?: string;
+    routeKeys?: { [named: string]: string };
   }[];
   version: number;
-  dataRoutes?: Array<{ page: string; dataRouteRegex: string }>;
+  dataRoutes?: Array<{
+    page: string;
+    dataRouteRegex: string;
+    namedDataRouteRegex?: string;
+    routeKeys?: { [named: string]: string };
+  }>;
 };
 
 export async function getRoutesManifest(
@@ -352,6 +359,20 @@ export async function getRoutesManifest(
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const routesManifest: RoutesManifest = require(pathRoutesManifest);
 
+  // massage temporary array based routeKeys from v1/v2 of routes
+  // manifest into new object based
+  for (const route of [
+    ...(routesManifest.dataRoutes || []),
+    ...(routesManifest.dynamicRoutes || []),
+  ]) {
+    if (Array.isArray(route.routeKeys)) {
+      route.routeKeys = route.routeKeys.reduce((prev, cur) => {
+        prev[cur] = cur;
+        return prev;
+      }, {});
+    }
+  }
+
   return routesManifest;
 }
 
@@ -383,6 +404,25 @@ export async function getDynamicRoutes(
             };
           });
       }
+      case 3: {
+        return routesManifest.dynamicRoutes
+          .filter(({ page }) =>
+            omittedRoutes ? !omittedRoutes.has(page) : true
+          )
+          .map(({ page, namedRegex, regex, routeKeys }) => {
+            return {
+              src: namedRegex || regex,
+              dest: `${!isDev ? path.join('/', entryDirectory, page) : page}${
+                routeKeys
+                  ? `?${Object.keys(routeKeys)
+                      .map(key => `${routeKeys[key]}=$${key}`)
+                      .join('&')}`
+                  : ''
+              }`,
+              check: true,
+            };
+          });
+      }
       default: {
         // update MIN_ROUTES_MANIFEST_VERSION
         throw new NowBuildError({

packages/now-next/test/fixtures/10-export-cache-headers/now.json

@@ -3,7 +3,7 @@
   "builds": [{ "src": "package.json", "use": "@vercel/next" }],
   "probes": [
     {
-      "path": "/_next/static/testing-build-id/pages/index.js",
+      "path": "/_next/static/9dc4d2c93491d81eead3/pages/index.js",
       "responseHeaders": {
         "cache-control": "public,max-age=31536000,immutable"
       }

packages/now-next/test/fixtures/16-base-path/now.json

@@ -3,7 +3,7 @@
   "builds": [{ "src": "package.json", "use": "@vercel/next" }],
   "probes": [
     {
-      "path": "/docs/_next/static/testing-build-id/pages/index.js",
+      "path": "/docs/_next/static/a7184ed7301386fd6825/pages/index.js",
       "responseHeaders": {
         "cache-control": "public,max-age=31536000,immutable"
       }
@@ -19,6 +19,22 @@
     {
       "path": "/docs/another",
       "mustContain": "hello from another"
+    },
+    {
+      "path": "/",
+      "mustNotContain": "hello from index"
+    },
+    {
+      "path": "/another",
+      "mustNotContain": "hello from another"
+    },
+    {
+      "path": "/_next/static/testing-build-id/pages/index.js",
+      "mustNotContain": "hello from index"
+    },
+    {
+      "path": "/_next/static/testing-build-id/pages/another.js",
+      "mustNotContain": "hello from another"
     }
   ]
 }

packages/now-next/test/fixtures/23-custom-routes-verbose/now.json

@@ -182,7 +182,7 @@
 
     // should match /_next file after rewrite
     {
-      "path": "/hidden/_next/static/testing-build-id/pages/hello.js",
+      "path": "/hidden/_next/static/b09092d6eebe375caba5/pages/hello.js",
       "mustContain": "createElement"
     },
 
@@ -245,6 +245,13 @@
       "path": "/hello/post-123.html",
       "status": 200,
       "mustContain": "123"
+    },
+
+    // should rewrite to catch-all with dash in segment name
+    {
+      "path": "/catchall-dash/hello/world",
+      "status": 200,
+      "mustContain": "hello/world"
     }
   ]
 }

packages/now-next/test/fixtures/23-custom-routes-verbose/pages/catchall-dash/[...hello-world].js

@@ -0,0 +1,17 @@
+import { useRouter } from 'next/router'
+
+const Page = () => {
+  return (
+    <p>path: {useRouter().query['hello-world']?.join('/')}</p>
+  )
+}
+
+export default Page
+
+export const getServerSideProps = () => {
+  return {
+    props: {
+      hello: 'world'
+    }
+  }
+}

packages/now-next/test/fixtures/23-custom-routes-verbose/pages/dash/[hello-world].js

@@ -0,0 +1 @@
+export default () => 'hi'

packages/now-node/package.json

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

packages/now-node/src/dev-server.ts

@@ -15,7 +15,7 @@ import { register } from 'ts-node';
 let compiler: string;
 try {
   compiler = require.resolve('typescript', {
-    paths: [process.cwd(), __dirname],
+    paths: [process.cwd()],
   });
 } catch (e) {
   compiler = 'typescript';

packages/now-ruby/now_init.rb

@@ -60,9 +60,19 @@ def webrick_handler(httpMethod, path, body, headers)
   server.shutdown
   Thread.kill(th)
 
+  # Net::HTTP doesnt read the set the encoding so we must set manually.
+  # Bug: https://bugs.ruby-lang.org/issues/15517
+  # More: https://yehudakatz.com/2010/05/17/encodings-unabridged/
+  res_headers = res.each_capitalized.to_h
+  if res_headers["Content-Type"] && res_headers["Content-Type"].include?("charset=")
+    res_encoding = res_headers["Content-Type"].match(/charset=([^;]*)/)[1]
+    res.body.force_encoding(res_encoding)
+    res.body = res.body.encode(res_encoding)
+  end
+
   {
     :statusCode => res.code.to_i,
-    :headers => res.each_capitalized.to_h,
+    :headers => res_headers,
     :body => res.body,
   }
 end

packages/now-ruby/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/ruby",
   "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "1.2.2",
+  "version": "1.2.3-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",

packages/now-ruby/test/fixtures/10-utf8-encoding-emoji/index.rb

@@ -0,0 +1,6 @@
+
+Handler = Proc.new do |req, res|
+  res.status = 200
+  res['Content-Type'] = 'text/text; charset=utf-8'
+  res.body = '🐄RANDOMNESS_PLACEHOLDER'
+end

packages/now-ruby/test/fixtures/10-utf8-encoding-emoji/now.json

@@ -0,0 +1,5 @@
+{
+  "version": 2,
+  "builds": [{ "src": "index.rb", "use": "@vercel/ruby" }],
+  "probes": [{ "path": "/", "mustContain": "🐄RANDOMNESS_PLACEHOLDER" }]
+}

packages/now-static-build/package.json

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

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

@@ -43,6 +43,7 @@ const frameworkList: Framework[] = [
     buildCommand: 'gatsby build',
     getOutputDirName: async () => 'public',
     defaultRoutes: async (dirPrefix: string) => {
+      // This file could be generated by gatsby-plugin-now or gatsby-plugin-zeit-now
       try {
         const nowRoutesPath = join(
           dirPrefix,
@@ -58,8 +59,34 @@ const frameworkList: Framework[] = [
         }
         return nowRoutes;
       } catch (err) {
-        // if the file doesn't exist, we don't create routes
-        return [];
+        // if the file doesn't exist, we implement gatsby's recommendations
+        // https://www.gatsbyjs.org/docs/caching
+
+        return [
+          {
+            src: '^/static/(.*)$',
+            headers: { 'cache-control': 'public,max-age=31536000,immutable' },
+            continue: true,
+          },
+          {
+            src: '^/.*\\.(js|css)$',
+            headers: { 'cache-control': 'public,max-age=31536000,immutable' },
+            continue: true,
+          },
+          {
+            src: '^/(sw\\.js|app-data\\.json|.*\\.html|page-data/.*)$',
+            headers: { 'cache-control': 'public,max-age=0,must-revalidate' },
+            continue: true,
+          },
+          {
+            handle: 'filesystem',
+          },
+          {
+            src: '.*',
+            status: 404,
+            dest: '404.html',
+          },
+        ];
       }
     },
     cachePattern: '{.cache,public}/**',

packages/now-static-build/test/fixtures/10-gatsby/now.json

@@ -7,5 +7,49 @@
       "config": { "zeroConfig": true }
     }
   ],
-  "probes": [{ "path": "/", "mustContain": "Welcome to your new Gatsby site" }]
+  "probes": [
+    { "path": "/", "mustContain": "Welcome to your new Gatsby site" },
+    {
+      "path": "/static/d/856328897.json",
+      "responseHeaders": {
+        "cache-control": "public,max-age=31536000,immutable"
+      }
+    },
+    {
+      "path": "/app-08a9fb9626777db1bf33.js",
+      "responseHeaders": {
+        "cache-control": "public,max-age=31536000,immutable"
+      }
+    },
+    {
+      "path": "/styles.fc4fa5e094d218207796.css",
+      "responseHeaders": {
+        "cache-control": "public,max-age=31536000,immutable"
+      }
+    },
+    {
+      "path": "/sw.js",
+      "responseHeaders": { "cache-control": "public,max-age=0,must-revalidate" }
+    },
+    {
+      "path": "/app-data.json",
+      "responseHeaders": { "cache-control": "public,max-age=0,must-revalidate" }
+    },
+    {
+      "path": "/index.html",
+      "responseHeaders": { "cache-control": "public,max-age=0,must-revalidate" }
+    },
+    {
+      "path": "/page-data/404/page-data.json",
+      "responseHeaders": { "cache-control": "public,max-age=0,must-revalidate" }
+    },
+    {
+      "path": "/path-that-does-not-exist",
+      "mustContain": "You just hit a route that doesn't exist..."
+    },
+    {
+      "path": "/path-that-does-not-exist",
+      "status": 404
+    }
+  ]
 }

yarn.lock

@@ -2266,10 +2266,10 @@
   resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.20.4.tgz#00f0a25a88cac3712af4ba66561d9e281c6f05c9"
   integrity sha512-fmq+F/QxPec+k/zvT7HiVpk7oiGFseS6brfT/AYqmCUp6QFRK7vZf2Ref46MImsg/g2W3g5X6SRvGRmOAvEfdA==
 
-"@zeit/node-file-trace@0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@zeit/node-file-trace/-/node-file-trace-0.6.1.tgz#44d832c4bf71bc4d142cc5e2ef3e708673cdd2b4"
-  integrity sha512-rcaY2xxhjBzGJEtpdLFbS87HYx8bVbi/a+0MBVpMVvURrmjVAY58VL+Ynz4QPNs1C6o8e0FB1gVQFtN47ZnkMw==
+"@zeit/node-file-trace@0.6.5":
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/@zeit/node-file-trace/-/node-file-trace-0.6.5.tgz#ffd443e4648eb88591c53b1a871a47bff651b62e"
+  integrity sha512-PbxtiZBU+axKtR9dU2/iQgK9+aP/ip94SqI/FCMWppmFPGlxGKHf8UnJZskFuqLZeWWzL+L+8SeipsNHATO9nw==
   dependencies:
     acorn "^7.1.1"
     acorn-class-fields "^0.3.2"