Publish Stable

- @vercel/next@2.6.16

examples/redwoodjs/api/package.json

@@ -3,6 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "0.14.0"
+    "@redwoodjs/api": "0.15.0"
   }
 }

examples/redwoodjs/package.json

@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "0.14.0"
+    "@redwoodjs/core": "0.15.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config"

examples/redwoodjs/web/package.json

@@ -6,8 +6,8 @@
     "defaults"
   ],
   "dependencies": {
-    "@redwoodjs/router": "0.14.0",
-    "@redwoodjs/web": "0.14.0",
+    "@redwoodjs/router": "0.15.0",
+    "@redwoodjs/web": "0.15.0",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"

packages/frameworks/frameworks.json

@@ -703,7 +703,7 @@
         "value": "yarn rw db up --no-db-client --auto-approve && yarn rw build"
       },
       "devCommand": {
-        "value": "yarn rw dev"
+        "value": "yarn rw dev --fwd=\"--port=$PORT --open=false\""
       },
       "outputDirectory": {
         "value": "RedwoodJS default"

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.0.18-canary.1",
+  "version": "0.0.18-canary.2",
   "main": "frameworks.json",
   "license": "UNLICENSED",
   "scripts": {

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.0.0-canary.6",
+  "version": "20.0.0-canary.8",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -64,10 +64,10 @@
   "dependencies": {
     "@vercel/build-utils": "2.4.3-canary.2",
     "@vercel/go": "1.1.5-canary.0",
-    "@vercel/next": "2.6.14",
-    "@vercel/node": "1.7.4-canary.1",
+    "@vercel/next": "2.6.16",
+    "@vercel/node": "1.7.5-canary.0",
     "@vercel/python": "1.2.2",
-    "@vercel/redwood": "0.0.2-canary.1",
+    "@vercel/redwood": "0.0.2-canary.2",
     "@vercel/ruby": "1.2.3",
     "@vercel/static-build": "0.17.7-canary.1",
     "update-notifier": "4.1.0"

packages/now-next/package.json

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

packages/now-next/src/index.ts

@@ -880,7 +880,13 @@ export const build = async ({
         !prerenderManifest.fallbackRoutes[route] &&
         !prerenderManifest.legacyBlockingRoutes[route]
       ) {
-        nonLambdaSsgPages.add(route);
+        // if the 404 page used getStaticProps we need to update static404Page
+        // since it wasn't populated from the staticPages group
+        if (route === '/404') {
+          static404Page = path.join(entryDirectory, '404');
+        }
+
+        nonLambdaSsgPages.add(route === '/' ? '/index' : route);
       }
     };
 

packages/now-next/test/fixtures/25-index-routes/next.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  generateBuildId() {
+    return 'testing-build-id';
+  },
+};

packages/now-next/test/fixtures/25-index-routes/now.json

@@ -0,0 +1,42 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "hello from index"
+    },
+    {
+      "path": "/index",
+      "mustContain": "hello from index"
+    },
+    {
+      "path": "/nested-index/index",
+      "mustContain": "hello from nested index"
+    },
+    {
+      "path": "/sub",
+      "mustContain": "hello from sub index"
+    },
+    {
+      "path": "/sub/index",
+      "mustContain": "hello from sub id"
+    },
+    {
+      "path": "/sub/another",
+      "mustContain": "hello from sub id"
+    },
+    {
+      "path": "/api/sub",
+      "mustContain": "hi from sub index"
+    },
+    {
+      "path": "/api/sub/index",
+      "mustContain": "hi from sub id"
+    },
+    {
+      "path": "/api/sub/another",
+      "mustContain": "hi from sub id"
+    }
+  ]
+}

packages/now-next/test/fixtures/25-index-routes/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "latest",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
+  }
+}

packages/now-next/test/fixtures/25-index-routes/pages/api/sub/[id].js

@@ -0,0 +1 @@
+export default (req, res) => res.end('hi from sub id')

packages/now-next/test/fixtures/25-index-routes/pages/api/sub/index.js

@@ -0,0 +1 @@
+export default (req, res) => res.end('hi from sub index');

packages/now-next/test/fixtures/25-index-routes/pages/index.js

@@ -0,0 +1,2 @@
+const page = () => 'hello from index';
+export default page;

packages/now-next/test/fixtures/25-index-routes/pages/nested-index/index/index.js

@@ -0,0 +1 @@
+export default () => 'hello from nested index';

packages/now-next/test/fixtures/25-index-routes/pages/sub/[id].js

@@ -0,0 +1,3 @@
+const page = () => "hello from sub id"
+page.getInitialProps = () => ({ hello: 'hi' })
+export default page

packages/now-next/test/fixtures/25-index-routes/pages/sub/index.js

@@ -0,0 +1,3 @@
+const page = () => 'hello from sub index';
+page.getInitialProps = () => ({ hello: 'hi' });
+export default page;

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/next.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  generateBuildId() {
+    return 'testing-build-id';
+  },
+};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/now.json

@@ -0,0 +1,113 @@
+{
+  "version": 2,
+  "uploadNowJson": true,
+  "builds": [{ "src": "package.json", "use": "@vercel/next" }],
+  "probes": [
+    {
+      "path": "/forever",
+      "status": 200,
+      "mustContain": "hello"
+    },
+    {
+      "path": "/blog/post-1",
+      "status": 200,
+      "mustContain": "post-1"
+    },
+    {
+      "path": "/blog/post-2",
+      "status": 200,
+      "mustContain": "post-2"
+    },
+    {
+      "path": "/_next/data/testing-build-id/blog/post-1.json",
+      "status": 200,
+      "mustContain": "post-1"
+    },
+    {
+      "path": "/_next/data/testing-build-id/blog/post-2.json",
+      "status": 200,
+      "mustContain": "post-2"
+    },
+
+    {
+      "path": "/blog/post-1/comment-1",
+      "status": 200,
+      "mustContain": "comment-1"
+    },
+    {
+      "path": "/blog/post-2/comment-2",
+      "status": 200,
+      "mustContain": "comment-2"
+    },
+    {
+      "path": "/_next/data/testing-build-id/blog/post-1/comment-1.json",
+      "status": 200,
+      "mustContain": "comment-1"
+    },
+    {
+      "path": "/_next/data/testing-build-id/blog/post-2/comment-2.json",
+      "status": 200,
+      "mustContain": "comment-2"
+    },
+
+    {
+      "path": "/_next/data/testing-build-id/forever.json",
+      "status": 200,
+      "mustContain": "world"
+    },
+    {
+      "path": "/_next/data/testing-build-id/another2.json",
+      "status": 200,
+      "mustContain": "world"
+    },
+    {
+      "path": "/nofallback/one",
+      "status": 200,
+      "mustContain": "one"
+    },
+    {
+      "path": "/nofallback/two",
+      "status": 200,
+      "mustContain": "two"
+    },
+    {
+      "path": "/nofallback/nope",
+      "status": 404,
+      "mustContain": "page not <!-- -->found"
+    },
+    {
+      "path": "/_next/data/testing-build-id/nofallback/one.json",
+      "status": 200,
+      "mustContain": "one"
+    },
+    {
+      "path": "/_next/data/testing-build-id/nofallback/two.json",
+      "status": 200,
+      "mustContain": "two"
+    },
+    {
+      "path": "/_next/data/testing-build-id/nofallback/nope.json",
+      "status": 404
+    },
+    {
+      "path": "/404",
+      "status": 404,
+      "mustContain": "page not <!-- -->found"
+    },
+    {
+      "logMustNotContain": "WARNING: your application is being opted out of @vercel/next's optimized lambdas mode due to legacy routes"
+    },
+    {
+      "logMustNotContain": "WARNING: Your application is being opted out of \"@vercel/next\" optimized lambdas mode due to `functions` config"
+    },
+    {
+      "logMustNotContain": "Traced Next.js serverless functions for external files in"
+    },
+    {
+      "logMustNotContain": "All serverless functions created in"
+    },
+    {
+      "logMustNotContain": "Compressed shared serverless function files"
+    }
+  ]
+}

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "canary",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
+  }
+}

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/404.js

@@ -0,0 +1,11 @@
+export default function Page({ found }) {
+  return <p>page not {found}</p>;
+}
+
+export const getStaticProps = () => {
+  return {
+    props: {
+      found: 'found',
+    },
+  };
+};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/another.js

@@ -0,0 +1,22 @@
+import React from 'react';
+
+// eslint-disable-next-line camelcase
+export async function getStaticProps() {
+  return {
+    props: {
+      world: 'world',
+      random: Math.random(),
+      time: new Date().getTime(),
+    },
+  };
+}
+
+export default ({ world, time, random }) => {
+  return (
+    <>
+      <p id="hello">hello: {world}</p>
+      <span id="time">time: {time}</span>
+      <span id="random">random: {random}</span>
+    </>
+  );
+};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/another2.js

@@ -0,0 +1,20 @@
+import React from 'react';
+
+// eslint-disable-next-line camelcase
+export async function getStaticProps() {
+  return {
+    props: {
+      world: 'world',
+      time: new Date().getTime(),
+    },
+  };
+}
+
+export default ({ world, time }) => {
+  return (
+    <>
+      <p>hello: {world}</p>
+      <span>time: {time}</span>
+    </>
+  );
+};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/blog/[post]/[comment].js

@@ -0,0 +1,39 @@
+import React from 'react';
+
+// eslint-disable-next-line camelcase
+export async function getStaticPaths() {
+  return {
+    paths: [
+      '/blog/post-1/comment-1',
+      { params: { post: 'post-2', comment: 'comment-2' } },
+      '/blog/post-1337/comment-1337',
+      '/blog/post-123/comment-321',
+    ],
+    fallback: false,
+  };
+}
+
+// eslint-disable-next-line camelcase
+export async function getStaticProps({ params }) {
+  return {
+    props: {
+      post: params.post,
+      random: Math.random(),
+      comment: params.comment,
+      time: new Date().getTime(),
+    },
+  };
+}
+
+export default ({ post, comment, time, random }) => {
+  if (!post) return <p>loading...</p>;
+
+  return (
+    <>
+      <p id="post">Post: {post}</p>
+      <p id="comment">Comment: {comment}</p>
+      <span id="time">time: {time}</span>
+      <span id="random">random: {random}</span>
+    </>
+  );
+};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/blog/[post]/index.js

@@ -0,0 +1,38 @@
+import React from 'react';
+
+// eslint-disable-next-line camelcase
+export async function getStaticPaths() {
+  return {
+    paths: ['/blog/post-1', { params: { post: 'post-2' } }, '/blog/post-123'],
+    fallback: false,
+  };
+}
+
+// eslint-disable-next-line camelcase
+export async function getStaticProps({ params }) {
+  if (params.post === 'post-10') {
+    await new Promise(resolve => {
+      setTimeout(() => resolve(), 1000);
+    });
+  }
+
+  return {
+    props: {
+      post: params.post,
+      random: Math.random(),
+      time: (await import('perf_hooks')).performance.now(),
+    },
+  };
+}
+
+export default ({ post, time, random }) => {
+  if (!post) return <p>loading...</p>;
+
+  return (
+    <>
+      <p id="post">Post: {post}</p>
+      <span id="time">time: {time}</span>
+      <span id="random">random: {random}</span>
+    </>
+  );
+};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/forever.js

@@ -0,0 +1,21 @@
+import React from 'react';
+
+// eslint-disable-next-line camelcase
+export async function getStaticProps() {
+  return {
+    props: {
+      world: 'world',
+      time: new Date().getTime(),
+    },
+    revalidate: false,
+  };
+}
+
+export default ({ world, time }) => {
+  return (
+    <>
+      <p>hello: {world}</p>
+      <span>time: {time}</span>
+    </>
+  );
+};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/index.js

@@ -0,0 +1,9 @@
+export default () => 'Hi';
+
+export const getStaticProps = () => {
+  return {
+    props: {
+      hello: 'world',
+    },
+  };
+};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/nofallback/[slug].js

@@ -0,0 +1,30 @@
+import React from 'react';
+
+// eslint-disable-next-line camelcase
+export async function getStaticPaths() {
+  return {
+    paths: ['/nofallback/one', { params: { slug: 'two' } }],
+    fallback: false,
+  };
+}
+
+// eslint-disable-next-line camelcase
+export async function getStaticProps({ params }) {
+  return {
+    props: {
+      slug: params.slug,
+      time: (await import('perf_hooks')).performance.now(),
+    },
+  };
+}
+
+export default ({ slug, time }) => {
+  return (
+    <>
+      <p>
+        Slug ({slug.length}): {slug}
+      </p>
+      <span>time: {time}</span>
+    </>
+  );
+};

packages/now-next/test/fixtures/29-ssg-all-static/pages/another-index/index.js

@@ -0,0 +1,9 @@
+export default () => 'Hi';
+
+export const getStaticProps = () => {
+  return {
+    props: {
+      hello: 'world',
+    },
+  };
+};

packages/now-next/test/fixtures/29-ssg-all-static/pages/index.js

@@ -1 +1,9 @@
 export default () => 'Hi';
+
+export const getStaticProps = () => {
+  return {
+    props: {
+      hello: 'world',
+    },
+  };
+};

packages/now-node/package.json

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

packages/now-routing-utils/package.json

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

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

@@ -218,18 +218,42 @@ function replaceSegments(
   return destination;
 }
 
-function safelyCompile(str: string, indexes: { [k: string]: string }): string {
-  if (!str) {
-    return str;
+function safelyCompile(
+  value: string,
+  indexes: { [k: string]: string }
+): string {
+  if (!value) {
+    return value;
   }
-  // path-to-regexp cannot compile question marks
-  return str
-    .split('?')
-    .map(part => {
-      const compiler = compile(part);
-      return compiler(indexes);
-    })
-    .join('?');
+
+  for (const key of Object.keys(indexes)) {
+    if (value.includes(`:${key}`)) {
+      value = value
+        .replace(
+          new RegExp(`:${key}\\*`, 'g'),
+          `:${key}--ESCAPED_PARAM_ASTERISK`
+        )
+        .replace(
+          new RegExp(`:${key}\\?`, 'g'),
+          `:${key}--ESCAPED_PARAM_QUESTION`
+        )
+        .replace(new RegExp(`:${key}\\+`, 'g'), `:${key}--ESCAPED_PARAM_PLUS`)
+        .replace(
+          new RegExp(`:${key}(?!\\w)`, 'g'),
+          `--ESCAPED_PARAM_COLON${key}`
+        );
+    }
+  }
+  value = value
+    .replace(/(:|\*|\?|\+|\(|\)|\{|\})/g, '\\$1')
+    .replace(/--ESCAPED_PARAM_PLUS/g, '+')
+    .replace(/--ESCAPED_PARAM_COLON/g, ':')
+    .replace(/--ESCAPED_PARAM_QUESTION/g, '?')
+    .replace(/--ESCAPED_PARAM_ASTERISK/g, '*');
+
+  // the value needs to start with a forward-slash to be compiled
+  // correctly
+  return compile(`/${value}`, { validate: false })(indexes).substr(1);
 }
 
 function toSegmentDest(index: number): string {

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

@@ -508,6 +508,60 @@ test('convertHeaders', () => {
         },
       ],
     },
+    {
+      source: '/like/params/:path',
+      headers: [
+        {
+          key: 'x-path',
+          value: ':path',
+        },
+        {
+          key: 'some:path',
+          value: 'hi',
+        },
+        {
+          key: 'x-test',
+          value: 'some:value*',
+        },
+        {
+          key: 'x-test-2',
+          value: 'value*',
+        },
+        {
+          key: 'x-test-3',
+          value: ':value?',
+        },
+        {
+          key: 'x-test-4',
+          value: ':value+',
+        },
+        {
+          key: 'x-test-5',
+          value: 'something https:',
+        },
+        {
+          key: 'x-test-6',
+          value: ':hello(world)',
+        },
+        {
+          key: 'x-test-7',
+          value: 'hello(world)',
+        },
+        {
+          key: 'x-test-8',
+          value: 'hello{1,}',
+        },
+        {
+          key: 'x-test-9',
+          value: ':hello{1,2}',
+        },
+        {
+          key: 'content-security-policy',
+          value:
+            "default-src 'self'; img-src *; media-src media1.com media2.com; script-src userscripts.example.com/:path",
+        },
+      ],
+    },
   ]);
 
   const expected = [
@@ -526,6 +580,25 @@ test('convertHeaders', () => {
       headers: { 'on-blog': '$1', $1: 'blog' },
       continue: true,
     },
+    {
+      continue: true,
+      headers: {
+        'content-security-policy':
+          "default-src 'self'; img-src *; media-src media1.com media2.com; script-src userscripts.example.com/$1",
+        some$1: 'hi',
+        'x-path': '$1',
+        'x-test': 'some:value*',
+        'x-test-2': 'value*',
+        'x-test-3': ':value?',
+        'x-test-4': ':value+',
+        'x-test-5': 'something https:',
+        'x-test-6': ':hello(world)',
+        'x-test-7': 'hello(world)',
+        'x-test-8': 'hello{1,}',
+        'x-test-9': ':hello{1,2}',
+      },
+      src: '^\\/like\\/params(?:\\/([^\\/]+?))$',
+    },
   ];
 
   deepEqual(actual, expected);
@@ -534,12 +607,14 @@ test('convertHeaders', () => {
     ['hello/world/file.eot', 'another/font.ttf', 'dir/arial.font.css'],
     ['404.html'],
     ['/blog/first-post', '/blog/another/one'],
+    ['/like/params/first', '/like/params/second'],
   ];
 
   const mustNotMatch = [
     ['hello/file.jpg', 'hello/font-css', 'dir/arial.font-css'],
     ['403.html', '500.html'],
     ['/blogg', '/random'],
+    ['/non-match', '/like/params', '/like/params/'],
   ];
 
   assertRegexMatches(actual, mustMatch, mustNotMatch);

packages/redwood/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/redwood",
-  "version": "0.0.2-canary.1",
+  "version": "0.0.2-canary.2",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://vercel.com/docs",

packages/redwood/test/fixtures/01-create-redwood-app/api/package.json

@@ -3,6 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "0.14.0"
+    "@redwoodjs/api": "0.15.0"
   }
 }

packages/redwood/test/fixtures/01-create-redwood-app/package.json

@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "0.14.0"
+    "@redwoodjs/core": "0.15.0"
   },
   "engines": {
     "node": ">=12",

packages/redwood/test/fixtures/01-create-redwood-app/vercel.json

@@ -14,7 +14,7 @@
       "method": "POST",
       "headers": { "Accept": "application/json" },
       "body": { "query": "{ redwood { version } }" },
-      "mustContain": "0.14.0"
+      "mustContain": "0.15.0"
     }
   ]
 }

packages/redwood/test/fixtures/01-create-redwood-app/web/package.json

@@ -6,8 +6,8 @@
     "defaults"
   ],
   "dependencies": {
-    "@redwoodjs/router": "0.14.0",
-    "@redwoodjs/web": "0.14.0",
+    "@redwoodjs/router": "0.15.0",
+    "@redwoodjs/web": "0.15.0",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"