Publish Stable

- now@17.0.2
 - @now/routing-utils@1.5.3

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now",
-  "version": "17.0.0",
+  "version": "17.0.2",
   "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/src/util/dev/server.ts

@@ -11,7 +11,7 @@ import { randomBytes } from 'crypto';
 import serveHandler from 'serve-handler';
 import { watch, FSWatcher } from 'chokidar';
 import { parse as parseDotenv } from 'dotenv';
-import { basename, dirname, extname, join, delimiter } from 'path';
+import { basename, dirname, extname, join } from 'path';
 import { getTransformedRoutes, HandleValue } from '@now/routing-utils';
 import directoryTemplate from 'serve-handler/src/directory';
 import getPort from 'get-port';
@@ -27,7 +27,6 @@ import {
   detectRoutes,
   detectApiDirectory,
   detectApiExtensions,
-  execAsync,
   spawnCommand,
 } from '@now/build-utils';
 
@@ -1637,12 +1636,6 @@ export default class DevServer {
 
     const cwd = this.cwd;
 
-    const { stdout: yarnBinStdout } = await execAsync('yarn', ['bin'], {
-      cwd,
-    });
-
-    const yarnBinPath = yarnBinStdout.trim();
-
     this.output.log(
       `Running Dev Command ${chalk.cyan.bold(`“${this.devCommand}”`)}`
     );
@@ -1667,21 +1660,27 @@ export default class DevServer {
       })}`
     );
 
+    let command = devCommand;
+
     const isNpxAvailable = await which('npx')
       .then(() => true)
       .catch(() => false);
 
-    if (!isNpxAvailable) {
+    if (isNpxAvailable) {
-      env.PATH = `${yarnBinPath}${delimiter}${env.PATH}`;
+      command = `npx --no-install ${devCommand}`;
+    } else {
+      const isYarnAvailable = await which('yarn')
+        .then(() => true)
+        .catch(() => false);
+
+      if (isYarnAvailable) {
+        command = `yarn run --silent ${devCommand}`;
+      }
     }
 
-    this.output.debug('Spawning dev command');
+    this.output.debug(`Spawning dev command: ${command}`);
-    this.output.debug(`PATH is ${env.PATH}`);
 
-    const p = spawnCommand(
+    const p = spawnCommand(command, { stdio: 'inherit', cwd, env });
-      isNpxAvailable ? `npx --no-install ${devCommand}` : devCommand,
-      { stdio: 'inherit', cwd, env }
-    );
 
     p.on('exit', () => {
       this.devProcessPort = undefined;

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, '/index.html', 'Index Page');
-    await testPath(200, '/about.html/', 'About 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/index.html', 'Sub Index Page');
-    await testPath(200, '/sub/another.html/', 'Sub Another Page');
+    await testPath(200, '/sub/another.html', 'Sub Another Page');
-    await testPath(200, '/style.css/', 'body { color: green }');
+    await testPath(200, '/style.css', 'body { color: green }');
-    await testPath(308, '/about.html', '', { Location: '/about.html/' });
+    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",
   "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);
 });

utils/changelog.js

@@ -1,45 +1,56 @@
 const { join } = require('path');
 const { execSync } = require('child_process');
+const fetch = require('node-fetch');
 
 process.chdir(join(__dirname, '..'));
 
-const commit = execSync('git log --pretty=format:"%s %H"')
+async function main() {
-  .toString()
+  const res = await fetch(
-  .trim()
+    'https://api.github.com/repos/zeit/now/releases/latest'
-  .split('\n')
+  );
-  .find(line => line.startsWith('Publish Stable '))
+  const { tag_name } = await res.json();
-  .split(' ')
-  .pop();
 
-if (!commit) {
+  // git log --pretty=format:"- %s [%an]" `git show-ref -s 'now@16.7.3'`...HEAD | grep -v '\- Publish '
-  throw new Error('Unable to find last publish commit');
+
+  if (!tag_name) {
+    throw new Error('Unable to find last GitHub Release tag.');
+  }
+
+  const log =
+    execSync(`git log --pretty=format:"- %s [%an]" ${tag_name}...HEAD`)
+      .toString()
+      .trim()
+      .split('\n')
+      .filter(line => !line.startsWith('- Publish '))
+      .join('\n') || 'NO CHANGES DETECTED';
+
+  console.log(`Changes since the last stable release (${tag_name}):`);
+  console.log(`\n${log}\n`);
+
+  const pkgs =
+    Array.from(
+      new Set(
+        execSync(`git diff --name-only ${tag_name}...HEAD`)
+          .toString()
+          .trim()
+          .split('\n')
+          .filter(line => line.startsWith('packages/'))
+          .map(line => line.split('/')[1])
+          .map(pkgName => {
+            try {
+              return require(`../packages/${pkgName}/package.json`).name;
+            } catch {
+              // Failed to read package.json (perhaps the pkg was deleted)
+            }
+          })
+          .filter(s => Boolean(s))
+      )
+    ).join(',') || 'now';
+
+  console.log('To publish a stable release, execute the following:');
+  console.log(
+    `\nnpx lerna version --message 'Publish Stable' --exact --force-publish=${pkgs}\n`
+  );
 }
 
-const log =
+main().catch(console.error);
-  execSync(`git log --pretty=format:"- %s [%an]" ${commit}...HEAD`)
-    .toString()
-    .trim()
-    .split('\n')
-    .filter(line => !line.startsWith('- Publish Canary '))
-    .join('\n') || 'NO CHANGES DETECTED';
-
-console.log(`Changes since the last Stable release (${commit.slice(0, 7)}):`);
-console.log(`\n${log}\n`);
-
-const pkgs =
-  Array.from(
-    new Set(
-      execSync(`git diff --name-only ${commit}...HEAD`)
-        .toString()
-        .trim()
-        .split('\n')
-        .filter(line => line.startsWith('packages/'))
-        .map(line => line.split('/')[1])
-        .map(pkgName => require(`../packages/${pkgName}/package.json`).name)
-    )
-  ).join(',') || 'now';
-
-console.log('To publish a stable release, execute the following:');
-console.log(
-  `\ngit pull && lerna version --message 'Publish Stable' --exact --force-publish=${pkgs}\n`
-);