Publish Stable

- @now/frameworks@0.0.10
 - @now/build-utils@2.0.0
 - now@17.0.4
 - @now/go@1.0.4
 - @now/next@2.3.16
 - @now/python@1.1.4
 - @now/routing-utils@1.6.0

.github/workflows/cancel.yml

@@ -4,13 +4,14 @@ on:
     branches:    
     - '*'
     - '!master'
+
 jobs:
   cancel:
     name: 'Cancel Previous Runs'
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - uses: styfle/cancel-workflow-action@master
+      - uses: styfle/cancel-workflow-action@0.2.0
         with:
           workflow_id: 435869
           access_token: ${{ secrets.GITHUB_WORKFLOW_TOKEN }}

packages/frameworks/package.json

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

packages/now-build-utils/package.json

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

packages/now-build-utils/src/prerender.ts

@@ -8,6 +8,7 @@ interface PrerenderOptions {
   lambda: Lambda;
   fallback: FileBlob | FileFsRef | FileRef | null;
   group?: number;
+  bypassToken?: string | null /* optional to be non-breaking change */;
 }
 
 export class Prerender {
@@ -16,8 +17,15 @@ export class Prerender {
   public lambda: Lambda;
   public fallback: FileBlob | FileFsRef | FileRef | null;
   public group?: number;
+  public bypassToken: string | null;
 
-  constructor({ expiration, lambda, fallback, group }: PrerenderOptions) {
+  constructor({
+    expiration,
+    lambda,
+    fallback,
+    group,
+    bypassToken,
+  }: PrerenderOptions) {
     this.type = 'Prerender';
     this.expiration = expiration;
     this.lambda = lambda;
@@ -32,6 +40,22 @@ export class Prerender {
     }
     this.group = group;
 
+    if (bypassToken == null) {
+      this.bypassToken = null;
+    } else if (typeof bypassToken === 'string') {
+      if (bypassToken.length < 32) {
+        // Enforce 128 bits of entropy for safety reasons (UUIDv4 size)
+        throw new Error(
+          'The `bypassToken` argument for `Prerender` must be 32 characters or more.'
+        );
+      }
+      this.bypassToken = bypassToken;
+    } else {
+      throw new Error(
+        'The `bypassToken` argument for `Prerender` must be a `string`.'
+      );
+    }
+
     if (typeof fallback === 'undefined') {
       throw new Error(
         'The `fallback` argument for `Prerender` needs to be a `FileBlob`, `FileFsRef`, `FileRef`, or null.'

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now",
-  "version": "17.0.4-canary.3",
+  "version": "17.0.4",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Now",

packages/now-go/index.ts

@@ -12,6 +12,7 @@ import {
   shouldServe,
   Files,
   debug,
+  Meta,
 } from '@now/build-utils';
 
 import { createGo, getAnalyzedEntrypoint, OUT_EXTENSION } from './go-helpers';
@@ -40,12 +41,18 @@ async function initPrivateGit(credentials: string) {
  * Since `go build` does not support files that begin with a square bracket,
  * we must rename to something temporary to support Path Segments.
  * The output file is not renamed because v3 builders can't rename outputs
- * which works great for this feature.
+ * which works great for this feature. We also need to add a suffix during `now dev`
+ * since the entrypoint is already stripped of its suffix before build() is called.
  */
-async function getRenamedEntrypoint(entrypoint: string, files: Files) {
+async function getRenamedEntrypoint(
+  entrypoint: string,
+  files: Files,
+  meta: Meta
+) {
   const filename = basename(entrypoint);
   if (filename.startsWith('[')) {
-    const newEntrypoint = entrypoint.replace('/[', '/now-bracket[');
+    const suffix = meta.isDev && !entrypoint.endsWith('.go') ? '.go' : '';
+    const newEntrypoint = entrypoint.replace('/[', '/now-bracket[') + suffix;
     const file = files[entrypoint];
     delete files[entrypoint];
     files[newEntrypoint] = file;
@@ -81,7 +88,7 @@ We highly recommend you leverage Go Modules in your project.
 Learn more: https://github.com/golang/go/wiki/Modules
 `);
   }
-  entrypoint = await getRenamedEntrypoint(entrypoint, files);
+  entrypoint = await getRenamedEntrypoint(entrypoint, files, meta);
   const entrypointArr = entrypoint.split(sep);
 
   // eslint-disable-next-line prefer-const
@@ -126,26 +133,16 @@ Learn more: https://zeit.co/docs/v2/advanced/builders/#go
   const parsedAnalyzed = JSON.parse(analyzed) as Analyzed;
 
   if (meta.isDev) {
-    let base = null;
-
-    if (config && config.zeroConfig) {
-      base = workPath;
-    } else {
-      base = dirname(downloadedFiles['now.json'].fsPath);
-    }
-
-    const destNow = join(
-      base,
+    // Create cache so Go rebuilds fast with `now dev`
+    goPath = join(
+      workPath,
       '.now',
       'cache',
-      basename(entrypoint, '.go'),
-      'src',
-      'lambda'
+      'now-go',
+      basename(entrypoint, '.go')
     );
-    // this will ensure Go rebuilt fast
-    goPath = join(base, '.now', 'cache', basename(entrypoint, '.go'));
+    const destNow = join(goPath, 'src', 'lambda');
     await download(downloadedFiles, destNow);
-
     downloadedFiles = await glob('**', destNow);
     downloadPath = destNow;
   }

packages/now-go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/go",
-  "version": "1.0.4-canary.2",
+  "version": "1.0.4",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/go",

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/next",
-  "version": "2.3.15",
+  "version": "2.3.16",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/next-js",

packages/now-next/src/index.ts

@@ -948,12 +948,14 @@ export const build = async ({
           lambda,
           fallback: htmlFsRef,
           group: prerenderGroup,
+          bypassToken: prerenderManifest.bypassToken,
         });
         prerenders[outputPathData] = new Prerender({
           expiration: initialRevalidate,
           lambda,
           fallback: jsonFsRef,
           group: prerenderGroup,
+          bypassToken: prerenderManifest.bypassToken,
         });
 
         ++prerenderGroup;

packages/now-next/src/utils.ts

@@ -614,6 +614,8 @@ export async function createLambdaFromPseudoLayers({
 }
 
 export type NextPrerenderedRoutes = {
+  bypassToken: string | null;
+
   routes: {
     [route: string]: {
       initialRevalidate: number | false;
@@ -714,7 +716,7 @@ export async function getPrerenderManifest(
     .catch(() => false);
 
   if (!hasManifest) {
-    return { routes: {}, lazyRoutes: {} };
+    return { routes: {}, lazyRoutes: {}, bypassToken: null };
   }
 
   const manifest: {
@@ -734,6 +736,9 @@ export async function getPrerenderManifest(
         dataRouteRegex: string;
       };
     };
+    preview?: {
+      previewModeId: string;
+    };
   } = JSON.parse(await fs.readFile(pathPrerenderManifest, 'utf8'));
 
   switch (manifest.version) {
@@ -741,7 +746,12 @@ export async function getPrerenderManifest(
       const routes = Object.keys(manifest.routes);
       const lazyRoutes = Object.keys(manifest.dynamicRoutes);
 
-      const ret: NextPrerenderedRoutes = { routes: {}, lazyRoutes: {} };
+      const ret: NextPrerenderedRoutes = {
+        routes: {},
+        lazyRoutes: {},
+        bypassToken:
+          (manifest.preview && manifest.preview.previewModeId) || null,
+      };
 
       routes.forEach(route => {
         const {
@@ -778,7 +788,7 @@ export async function getPrerenderManifest(
       return ret;
     }
     default: {
-      return { routes: {}, lazyRoutes: {} };
+      return { routes: {}, lazyRoutes: {}, bypassToken: null };
     }
   }
 }

packages/now-next/tsconfig.json

@@ -3,7 +3,7 @@
     "strict": true,
     "esModuleInterop": true,
     "lib": ["esnext"],
-    "target": "esnext",
+    "target": "es2018",
     "module": "commonjs",
     "outDir": "dist",
     "sourceMap": false,

packages/now-python/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/python",
-  "version": "1.1.4-canary.0",
+  "version": "1.1.4",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/python",

packages/now-python/src/index.ts

@@ -35,21 +35,17 @@ export async function downloadFilesInWorkPath({
   entrypoint,
   workPath,
   files,
-  meta,
-  config,
+  meta = {},
 }: BuildOptions) {
   debug('Downloading user files...');
   let downloadedFiles = await download(files, workPath, meta);
-  if (meta && meta.isDev) {
-    let base = null;
-
-    if (config && config.zeroConfig) {
-      base = workPath;
-    } else {
-      base = dirname(downloadedFiles['now.json'].fsPath);
-    }
-
-    const destNow = join(base, '.now', 'cache', basename(entrypoint, '.py'));
+  if (meta.isDev) {
+    const destNow = join(
+      workPath,
+      '.now',
+      'cache',
+      basename(entrypoint, '.py')
+    );
     await download(downloadedFiles, destNow);
     downloadedFiles = await glob('**', destNow);
     workPath = destNow;
@@ -151,14 +147,15 @@ export const build = async ({
 
   const originalPyPath = join(__dirname, '..', 'now_init.py');
   const originalNowHandlerPyContents = await readFile(originalPyPath, 'utf8');
-
-  // will be used on `from $here import handler`
-  // for example, `from api.users import handler`
   debug('Entrypoint is', entrypoint);
   const moduleName = entrypoint.replace(/\//g, '.').replace(/\.py$/, '');
+  // Since `now dev` renames source files, we must reference the original
+  const suffix = meta.isDev && !entrypoint.endsWith('.py') ? '.py' : '';
+  const entrypointWithSuffix = `${entrypoint}${suffix}`;
+  debug('Entrypoint with suffix is', entrypointWithSuffix);
   const nowHandlerPyContents = originalNowHandlerPyContents
     .replace(/__NOW_HANDLER_MODULE_NAME/g, moduleName)
-    .replace(/__NOW_HANDLER_ENTRYPOINT/g, entrypoint);
+    .replace(/__NOW_HANDLER_ENTRYPOINT/g, entrypointWithSuffix);
 
   // in order to allow the user to have `server.py`, we need our `server.py` to be called
   // somethig else

packages/now-routing-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/routing-utils",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "description": "ZEIT Now routing utilities",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

packages/now-routing-utils/src/superstatic.ts

@@ -49,7 +49,7 @@ export function convertRedirects(
 ): Route[] {
   return redirects.map(r => {
     const { src, segments } = sourceToRegex(r.source);
-    const loc = replaceSegments(segments, r.destination);
+    const loc = replaceSegments(segments, r.destination, true);
     const route: Route = {
       src,
       headers: { Location: loc },
@@ -137,7 +137,11 @@ export function sourceToRegex(
   return { src: r.source, segments };
 }
 
-function replaceSegments(segments: string[], destination: string): string {
+function replaceSegments(
+  segments: string[],
+  destination: string,
+  isRedirect?: boolean
+): string {
   const parsedDestination = parseUrl(destination, true);
   delete parsedDestination.href;
   delete parsedDestination.path;
@@ -169,6 +173,16 @@ function replaceSegments(segments: string[], destination: string): string {
     }
 
     for (const [name, value] of Object.entries(indexes)) {
+      if (
+        isRedirect &&
+        new RegExp(`\\${value}(?!\\d)`).test(pathname + (hash || ''))
+      ) {
+        // Don't add segment to query if used in destination
+        // and it's a redirect so that we don't pollute the query
+        // with unwanted values
+        continue;
+      }
+
       if (!(name in query)) {
         query[name] = value;
       }

packages/now-routing-utils/test/superstatic.spec.js

@@ -216,17 +216,17 @@ test('convertRedirects', () => {
     },
     {
       src: '^\\/old(?:\\/([^\\/]+?))\\/path$',
-      headers: { Location: '/new/path/$1?segment=$1' },
+      headers: { Location: '/new/path/$1' },
       status: 308,
     },
     {
       src: '^\\/catchall(?:\\/((?:[^\\/]+?)(?:\\/(?:[^\\/]+?))*))?$',
-      headers: { Location: '/catchall/$1/?hello=$1' },
+      headers: { Location: '/catchall/$1/' },
       status: 308,
     },
     {
       src: '^\\/another-catch(?:\\/((?:[^\\/]+?)(?:\\/(?:[^\\/]+?))*))$',
-      headers: { Location: '/another-catch/$1/?hello=$1' },
+      headers: { Location: '/another-catch/$1/' },
       status: 308,
     },
     {
@@ -241,7 +241,7 @@ test('convertRedirects', () => {
     },
     {
       src: '^\\/hello(?:\\/((?:[^\\/]+?)(?:\\/(?:[^\\/]+?))*))?$',
-      headers: { Location: '/something?world=$1#$1' },
+      headers: { Location: '/something#$1' },
       status: 308,
     },
   ];