Publish Canary

- @vercel/next@2.7.1-canary.0

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.1.3",
+  "version": "20.1.5-canary.1",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",

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

@@ -18,7 +18,7 @@ import withSpinner from '../../util/with-spinner';
 import { emoji, prependEmoji } from '../../util/emoji';
 import { isKnownError } from '../../util/env/known-error';
 import { getCommandName } from '../../util/pkg-name';
-import { SYSTEM_ENV_VALUES } from '../../util/env/system-env';
+import getSystemEnvValues from '../../util/env/get-system-env-values';
 
 type Options = {
   '--debug': boolean;
@@ -91,7 +91,10 @@ export default async function add(
           name: `Secret (can be created using ${getCommandName('secret add')})`,
           value: ProjectEnvType.Secret,
         },
-        { name: 'Provided by System', value: ProjectEnvType.System },
+        {
+          name: 'Reference to System Environment Variable',
+          value: ProjectEnvType.System,
+        },
       ],
     })) as { inputEnvType: ProjectEnvType };
 
@@ -112,7 +115,10 @@ export default async function add(
     }
   }
 
-  const { envs } = await getEnvVariables(output, client, project.id);
+  const [{ envs }, { systemEnvValues }] = await Promise.all([
+    getEnvVariables(output, client, project.id),
+    getSystemEnvValues(output, client, project.id),
+  ]);
   const existing = new Set(
     envs.filter(r => r.key === envName).map(r => r.target)
   );
@@ -182,7 +188,7 @@ export default async function add(
       name: 'systemEnvValue',
       type: 'list',
       message: `What’s the value of ${envName}?`,
-      choices: SYSTEM_ENV_VALUES.map(value => ({ name: value, value })),
+      choices: systemEnvValues.map(value => ({ name: value, value })),
     });
 
     envValue = systemEnvValue;

packages/now-cli/src/util/env/get-system-env-values.ts

@@ -0,0 +1,12 @@
+import { Output } from '../output';
+import Client from '../client';
+
+export default async function getSystemEnvValues(
+  output: Output,
+  client: Client,
+  projectId: string
+) {
+  output.debug(`Fetching System Environment Values of project ${projectId}`);
+  const url = `/v6/projects/${projectId}/system-env-values`;
+  return client.fetch<{ systemEnvValues: string[] }>(url);
+}

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

@@ -1,32 +0,0 @@
-export const SYSTEM_ENV_VALUES = [
-  'VERCEL_URL',
-  'VERCEL_GITHUB_COMMIT_ORG',
-  'VERCEL_GITHUB_COMMIT_REF',
-  'VERCEL_GITHUB_ORG',
-  'VERCEL_GITHUB_DEPLOYMENT',
-  'VERCEL_GITHUB_COMMIT_REPO',
-  'VERCEL_GITHUB_REPO',
-  'VERCEL_GITHUB_COMMIT_AUTHOR_LOGIN',
-  'VERCEL_GITHUB_COMMIT_AUTHOR_NAME',
-  'VERCEL_GITHUB_COMMIT_SHA',
-  'VERCEL_GITLAB_DEPLOYMENT',
-  'VERCEL_GITLAB_PROJECT_NAMESPACE',
-  'VERCEL_GITLAB_PROJECT_NAME',
-  'VERCEL_GITLAB_PROJECT_ID',
-  'VERCEL_GITLAB_PROJECT_PATH',
-  'VERCEL_GITLAB_COMMIT_REF',
-  'VERCEL_GITLAB_COMMIT_SHA',
-  'VERCEL_GITLAB_COMMIT_MESSAGE',
-  'VERCEL_GITLAB_COMMIT_AUTHOR_LOGIN',
-  'VERCEL_GITLAB_COMMIT_AUTHOR_NAME',
-  'VERCEL_BITBUCKET_DEPLOYMENT',
-  'VERCEL_BITBUCKET_REPO_OWNER',
-  'VERCEL_BITBUCKET_REPO_SLUG',
-  'VERCEL_BITBUCKET_REPO_NAME',
-  'VERCEL_BITBUCKET_COMMIT_REF',
-  'VERCEL_BITBUCKET_COMMIT_SHA',
-  'VERCEL_BITBUCKET_COMMIT_MESSAGE',
-  'VERCEL_BITBUCKET_COMMIT_AUTHOR_NAME',
-  'VERCEL_BITBUCKET_COMMIT_AUTHOR_URL',
-  'VERCEL_BITBUCKET_COMMIT_AUTHOR_AVATAR',
-];

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "2.7.0",
+  "version": "2.7.1-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",

packages/now-next/src/index.ts

@@ -448,7 +448,7 @@ export async function build({
   const prerenderManifest = await getPrerenderManifest(entryPath);
   const headers: Route[] = [];
   const rewrites: Route[] = [];
-  const redirects: Route[] = [];
+  let redirects: Route[] = [];
   const dataRoutes: Route[] = [];
   let dynamicRoutes: Route[] = [];
   // whether they have enabled pages/404.js as the custom 404 page
@@ -2020,6 +2020,31 @@ export async function build({
 
   const { i18n } = routesManifest || {};
 
+  let trailingSlashRedirect: Route | undefined;
+
+  if (i18n) {
+    redirects = redirects.filter(_redir => {
+      const redir = _redir as Source;
+      // detect the trailing slash redirect and make sure it's
+      // kept above the wildcard mapping to prevent erroneous redirects
+      // since non-continue routes come after continue the $wildcard
+      // route will come before the redirect otherwise and if the
+      // redirect is triggered it breaks locale mapping
+
+      const location =
+        redir.headers && (redir.headers.location || redir.headers.Location);
+
+      if (redir.status === 308 && (location === '/$1' || location === '/$1/')) {
+        // we set continue here to prevent the redirect from
+        // moving underneath i18n routes
+        redir.continue = true;
+        trailingSlashRedirect = redir;
+        return false;
+      }
+      return true;
+    });
+  }
+
   return {
     output: {
       ...publicDirectoryFiles,
@@ -2059,36 +2084,15 @@ export async function build({
       - Builder rewrites
     */
     routes: [
-      // headers
-      ...headers,
-
-      // redirects
-      ...redirects.map(_redir => {
-        if (i18n) {
-          const redir = _redir as Source;
-          // detect the trailing slash redirect and make sure it's
-          // kept above the wildcard mapping to prevent erroneous redirects
-          // since non-continue routes come after continue the $wildcard
-          // route will come before the redirect otherwise and if the
-          // redirect is triggered it breaks locale mapping
-
-          const location =
-            redir.headers && (redir.headers.location || redir.headers.Location);
-
-          if (
-            redir.status === 308 &&
-            (location === '/$1' || location === '/$1/')
-          ) {
-            // we set continue true
-            redir.continue = true;
-          }
-        }
-        return _redir;
-      }),
+      // force trailingSlashRedirect to the very top so it doesn't
+      // conflict with i18n routes that don't have or don't have the
+      // trailing slash
+      ...(trailingSlashRedirect ? [trailingSlashRedirect] : []),
 
       ...(i18n
         ? [
-            // Handle auto-adding current default locale to path based on $wildcard
+            // Handle auto-adding current default locale to path based on
+            // $wildcard
             {
               src: `^${path.join(
                 '/',
@@ -2097,8 +2101,8 @@ export async function build({
               )}(?!(?:_next/.*|${i18n.locales
                 .map(locale => escapeStringRegexp(locale))
                 .join('|')})(?:/.*|$))(.*)$`,
-              // TODO: this needs to contain or not contain a trailing slash
-              // to prevent the trailing slash redirect from being triggered
+              // we aren't able to ensure trailing slash mode here
+              // so ensure this comes after the trailing slash redirect
               dest: '$wildcard/$1',
               continue: true,
             },
@@ -2107,8 +2111,6 @@ export async function build({
             ...(i18n.domains && i18n.localeDetection !== false
               ? [
                   {
-                    // TODO: enable redirecting between domains, will require
-                    // updating the src with the desired locales to redirect
                     src: `^${path.join(
                       '/',
                       entryDirectory
@@ -2144,10 +2146,10 @@ export async function build({
             ...(i18n.localeDetection !== false
               ? [
                   {
-                    // TODO: if default locale is included in this src it won't be
-                    // visitable by users who prefer another language since a
-                    // cookie isn't set signaling the default locale is preferred
-                    // on redirect currently, investigate adding this
+                    // TODO: if default locale is included in this src it won't
+                    // be visitable by users who prefer another language since a
+                    // cookie isn't set signaling the default locale is
+                    // preferred on redirect currently, investigate adding this
                     src: '/',
                     locale: {
                       redirect: i18n.locales.reduce(
@@ -2190,6 +2192,12 @@ export async function build({
           ]
         : []),
 
+      // headers
+      ...headers,
+
+      // redirects
+      ...redirects,
+
       // Make sure to 404 for the /404 path itself
       ...(i18n
         ? [

packages/now-next/test/fixtures/00-i18n-support/next.config.js

@@ -18,4 +18,81 @@ module.exports = {
       },
     ],
   },
+  async redirects() {
+    return [
+      {
+        source: '/en-US/redirect-1',
+        destination: '/somewhere-else',
+        permanent: false,
+        locale: false,
+      },
+      {
+        source: '/nl/redirect-2',
+        destination: '/somewhere-else',
+        permanent: false,
+        locale: false,
+      },
+      {
+        source: '/redirect-3',
+        destination: '/somewhere-else',
+        permanent: false,
+      },
+    ];
+  },
+  async rewrites() {
+    return [
+      {
+        source: '/en-US/rewrite-1',
+        destination: '/another',
+        locale: false,
+      },
+      {
+        source: '/nl/rewrite-2',
+        destination: '/nl/another',
+        locale: false,
+      },
+      {
+        source: '/fr/rewrite-3',
+        destination: '/nl/another',
+        locale: false,
+      },
+      {
+        source: '/rewrite-4',
+        destination: '/another',
+      },
+    ];
+  },
+  async headers() {
+    return [
+      {
+        source: '/en-US/add-header-1',
+        locale: false,
+        headers: [
+          {
+            key: 'x-hello',
+            value: 'world',
+          },
+        ],
+      },
+      {
+        source: '/nl/add-header-2',
+        locale: false,
+        headers: [
+          {
+            key: 'x-hello',
+            value: 'world',
+          },
+        ],
+      },
+      {
+        source: '/add-header-3',
+        headers: [
+          {
+            key: 'x-hello',
+            value: 'world',
+          },
+        ],
+      },
+    ];
+  },
 };

packages/now-next/test/fixtures/00-i18n-support/now.json

@@ -520,6 +520,280 @@
       "path": "/_next/data/testing-build-id/fr/gsp/blocking/first.json",
       "status": 200,
       "mustContain": "\"catchall\":\"yes\""
+    },
+
+    {
+      "path": "/en-US/redirect-1",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//somewhere-else/"
+      }
+    },
+    {
+      "path": "/en/redirect-1",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404
+    },
+    {
+      "path": "/nl/redirect-2",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//somewhere-else/"
+      }
+    },
+    {
+      "path": "/en-US/redirect-2",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404
+    },
+    {
+      "path": "/redirect-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//somewhere-else/"
+      }
+    },
+    {
+      "path": "/en-US/redirect-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//somewhere-else/"
+      }
+    },
+    {
+      "path": "/fr/redirect-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//somewhere-else/"
+      }
+    },
+    {
+      "path": "/nl-NL/redirect-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//somewhere-else/"
+      }
+    },
+
+    {
+      "path": "/en-US/rewrite-1",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "another page"
+    },
+    {
+      "path": "/en-US/rewrite-1",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "lang=\"en-US\""
+    },
+    {
+      "path": "/nl/rewrite-1",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404
+    },
+    {
+      "path": "/nl/rewrite-2",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "another page"
+    },
+    {
+      "path": "/nl/rewrite-2",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "lang=\"nl\""
+    },
+    {
+      "path": "/rewrite-2",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404
+    },
+    {
+      "path": "/fr/rewrite-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "another page"
+    },
+    {
+      "path": "/fr/rewrite-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "lang=\"nl\""
+    },
+    {
+      "path": "/rewrite-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404
+    },
+    {
+      "path": "/rewrite-4",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "another page"
+    },
+    {
+      "path": "/rewrite-4",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "lang=\"en-US\""
+    },
+    {
+      "path": "/en/rewrite-4",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "another page"
+    },
+    {
+      "path": "/en/rewrite-4",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "lang=\"en\""
+    },
+    {
+      "path": "/fr/rewrite-4",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "another page"
+    },
+    {
+      "path": "/fr/rewrite-4",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "lang=\"fr\""
+    },
+
+    {
+      "path": "/en-US/add-header-1",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404,
+      "responseHeaders": {
+        "x-hello": "world"
+      }
+    },
+    {
+      "path": "/en/add-header-1",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404,
+      "responseHeaders": {
+        "x-hello": null
+      }
+    },
+    {
+      "path": "/nl/add-header-2",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404,
+      "responseHeaders": {
+        "x-hello": "world"
+      }
+    },
+    {
+      "path": "/en-US/add-header-2",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404,
+      "responseHeaders": {
+        "x-hello": null
+      }
+    },
+    {
+      "path": "/add-header-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404,
+      "responseHeaders": {
+        "x-hello": "world"
+      }
+    },
+    {
+      "path": "/en-US/add-header-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404,
+      "responseHeaders": {
+        "x-hello": "world"
+      }
+    },
+    {
+      "path": "/fr/add-header-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404,
+      "responseHeaders": {
+        "x-hello": "world"
+      }
+    },
+    {
+      "path": "/nl-NL/add-header-3",
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 404,
+      "responseHeaders": {
+        "x-hello": "world"
+      }
     }
   ]
 }

packages/now-routing-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/routing-utils",
-  "version": "1.9.1",
+  "version": "1.9.2-canary.1",
   "description": "Vercel routing utilities",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

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

@@ -80,6 +80,9 @@ export const routesSchema = {
       check: {
         type: 'boolean',
       },
+      important: {
+        type: 'boolean',
+      },
       status: {
         type: 'integer',
         minimum: 100,

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

@@ -119,6 +119,9 @@ export function convertHeaders(headers: NowHeader[]): Route[] {
 export function convertTrailingSlash(enable: boolean, status = 308): Route[] {
   const routes: Route[] = [];
   if (enable) {
+    routes.push({
+      src: '^/\\.well-known(?:/.*)?$'
+    });
     routes.push({
       src: '^/((?:[^/]+/)*[^/\\.]+)$',
       headers: { Location: '/$1/' },

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

@@ -72,6 +72,7 @@ describe('normalizeRoutes', () => {
         src: '^/missed-me$',
         headers: { 'Cache-Control': 'max-age=10' },
         continue: true,
+        important: true,
       },
       { handle: 'rewrite' },
       { src: '^.*$', dest: '/somewhere' },

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

@@ -671,6 +671,7 @@ test('convertHeaders', () => {
 test('convertTrailingSlash enabled', () => {
   const actual = convertTrailingSlash(true);
   const expected = [
+    { src: '^/\\.well-known(?:/.*)?$' },
     {
       src: '^/((?:[^/]+/)*[^/\\.]+)$',
       headers: { Location: '/$1/' },
@@ -685,11 +686,23 @@ test('convertTrailingSlash enabled', () => {
   deepEqual(actual, expected);
 
   const mustMatch = [
+    [
+      '/.well-known',
+      '/.well-known/',
+      '/.well-known/asdf',
+      '/.well-known/asdf/',
+    ],
     ['/dir', '/dir/foo', '/dir/foo/bar'],
     ['/foo.html/', '/dir/foo.html/', '/dir/foo/bar.css/', '/dir/about.map.js/'],
   ];
 
   const mustNotMatch = [
+    [
+      '/swell-known',
+      '/swell-known/',
+      '/swell-known/asdf',
+      '/swell-known/asdf/',
+    ],
     [
       '/',
       '/index.html',

test/lib/deployment/test-deployment.js

@@ -251,7 +251,9 @@ async function testDeployment(
         const expected = probe.responseHeaders[header];
         const isEqual = Array.isArray(expected)
           ? expected.every(h => actual.includes(h))
-          : expected.startsWith('/') && expected.endsWith('/')
+          : typeof expected === 'string' &&
+            expected.startsWith('/') &&
+            expected.endsWith('/')
           ? new RegExp(expected.slice(1, -1)).test(actual)
           : expected === actual;
         if (!isEqual) {