Publish Canary

- now@17.0.2-canary.0
 - @now/routing-utils@1.5.3-canary.0

packages/now-cli/package.json

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

packages/now-cli/src/commands/deploy/latest.js

@@ -94,7 +94,6 @@ const printDeploymentStatus = async (
   },
   deployStamp,
   isClipboardEnabled,
-  quiet,
   isFile
 ) => {
   const isProdDeployment = target === 'production';
@@ -144,11 +143,6 @@ const printDeploymentStatus = async (
         .catch(error => output.debug(`Error copying to clipboard: ${error}`));
     }
 
-    // write to stdout
-    if (quiet) {
-      process.stdout.write(`https://${deploymentUrl}`);
-    }
-
     output.print(
       prependEmoji(
         `${isProdDeployment ? 'Production' : 'Preview'}: ${chalk.bold(
@@ -659,7 +653,6 @@ export default async function main(
     deployment,
     deployStamp,
     !argv['--no-clipboard'],
-    quiet,
     isFile
   );
 }

packages/now-cli/src/util/deploy/process-deployment.ts

@@ -83,6 +83,7 @@ export default async function processDeployment({
     deployStamp,
     force,
     nowConfig,
+    quiet,
   } = args;
 
   const { debug } = output;
@@ -179,6 +180,10 @@ export default async function processDeployment({
 
       printInspectUrl(output, event.payload.url, deployStamp, org.slug);
 
+      if (quiet) {
+        process.stdout.write(`https://${event.payload.url}`);
+      }
+
       if (queuedSpinner === null) {
         queuedSpinner =
           event.payload.readyState === 'QUEUED'

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

@@ -638,7 +638,7 @@ test(
       await testPath(200, '/about/', 'About Page');
       await testPath(200, '/sub/', 'Sub Index Page');
       await testPath(200, '/sub/another/', 'Sub Another Page');
-      await testPath(200, '/style.css/', 'body { color: green }');
+      await testPath(200, '/style.css', 'body { color: green }');
       await testPath(308, '/index.html', '', { Location: '/' });
       await testPath(308, '/about.html', '', { Location: '/about/' });
       await testPath(308, '/sub/index.html', '', { Location: '/sub/' });
@@ -653,17 +653,15 @@ test(
   '[now dev] test trailingSlash true serve correct content',
   testFixtureStdio('test-trailing-slash', async (t, port, testPath) => {
     await testPath(200, '/', 'Index Page');
-    await testPath(200, '/index.html/', 'Index Page');
-    await testPath(200, '/about.html/', 'About Page');
+    await testPath(200, '/index.html', 'Index Page');
+    await testPath(200, '/about.html', 'About Page');
     await testPath(200, '/sub/', 'Sub Index Page');
-    await testPath(200, '/sub/index.html/', 'Sub Index Page');
-    await testPath(200, '/sub/another.html/', 'Sub Another Page');
-    await testPath(200, '/style.css/', 'body { color: green }');
-    await testPath(308, '/about.html', '', { Location: '/about.html/' });
+    await testPath(200, '/sub/index.html', 'Sub Index Page');
+    await testPath(200, '/sub/another.html', 'Sub Another Page');
+    await testPath(200, '/style.css', 'body { color: green }');
+    await testPath(308, '/about.html/', '', { Location: '/about.html' });
+    await testPath(308, '/style.css/', '', { Location: '/style.css' });
     await testPath(308, '/sub', '', { Location: '/sub/' });
-    await testPath(308, '/sub/another.html', '', {
-      Location: '/sub/another.html/',
-    });
   })
 );
 

packages/now-routing-utils/package.json

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

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

@@ -105,10 +105,15 @@ export function convertTrailingSlash(enable: boolean, status = 308): Route[] {
   const routes: Route[] = [];
   if (enable) {
     routes.push({
-      src: '^/(.*[^\\/])$',
+      src: '^/((?:[^/]+/)*[^/\\.]+)$',
       headers: { Location: '/$1/' },
       status,
     });
+    routes.push({
+      src: '^/((?:[^/]+/)*[^/]+\\.\\w+)/$',
+      headers: { Location: '/$1' },
+      status,
+    });
   } else {
     routes.push({
       src: '^/(.*)\\/$',

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

@@ -503,16 +503,41 @@ test('convertTrailingSlash enabled', () => {
   const actual = convertTrailingSlash(true);
   const expected = [
     {
-      src: '^/(.*[^\\/])$',
+      src: '^/((?:[^/]+/)*[^/\\.]+)$',
       headers: { Location: '/$1/' },
       status: 308,
     },
+    {
+      src: '^/((?:[^/]+/)*[^/]+\\.\\w+)/$',
+      headers: { Location: '/$1' },
+      status: 308,
+    },
   ];
   deepEqual(actual, expected);
 
-  const mustMatch = [['/index.html', '/dir', '/dir/index.html', '/foo/bar']];
+  const mustMatch = [
+    ['/dir', '/dir/foo', '/dir/foo/bar'],
+    ['/foo.html/', '/dir/foo.html/', '/dir/foo/bar.css/', '/dir/about.map.js/'],
+  ];
 
-  const mustNotMatch = [['/', '/dir/', '/dir/foo/', '/next.php?page=/']];
+  const mustNotMatch = [
+    [
+      '/',
+      '/index.html',
+      '/asset/style.css',
+      '/asset/about.map.js',
+      '/dir/',
+      '/dir/foo/',
+      '/next.php?page=/',
+    ],
+    [
+      '/',
+      '/foo.html',
+      '/dir/foo.html',
+      '/dir/foo/bar.css',
+      '/dir/about.map.js',
+    ],
+  ];
 
   assertRegexMatches(actual, mustMatch, mustNotMatch);
 });