Publish Stable

- @now/build-utils@1.1.1
 - now@16.6.3
 - now-client@6.0.0
 - @now/next@2.1.1
 - @now/node@1.2.1
 - @now/routing-utils@1.4.0
 - @now/static-build@0.13.1

changelog.js

@@ -12,12 +12,31 @@ if (!commit) {
   throw new Error('Unable to find last publish commit');
 }
 
-const log = execSync(`git log --pretty=format:"- %s [%an]" ${commit}...HEAD`)
-  .toString()
-  .trim()
-  .split('\n')
-  .filter(line => !line.startsWith('- Publish Canary '))
-  .join('\n');
+const log =
+  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`
+);

package.json

@@ -30,7 +30,7 @@
   "scripts": {
     "lerna": "lerna",
     "bootstrap": "lerna bootstrap",
-    "publish-stable": "git pull && lerna version --message 'Publish Stable' --exact",
+    "publish-stable": "echo 'Run `yarn changelog` for instructions'",
     "publish-canary": "git pull && lerna version prerelease --preid canary --message 'Publish Canary' --exact",
     "publish-from-github": "./.circleci/publish.sh",
     "changelog": "node changelog.js",

packages/now-build-utils/package.json

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

packages/now-build-utils/src/fs/run-user-scripts.ts

@@ -155,7 +155,7 @@ export async function runNpmInstall(
     commandArgs = args.filter(a => a !== '--prefer-offline');
     await spawnAsync(
       'npm',
-      commandArgs.concat(['install', '--unsafe-perm']),
+      commandArgs.concat(['install', '--no-audit', '--unsafe-perm']),
       opts
     );
   } else {

packages/now-cli/package.json

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

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

@@ -294,15 +294,11 @@ export default async function main(
     parseEnv(argv['--env'])
   );
 
-  // Enable debug mode for builders
-  const buildDebugEnv = debugEnabled ? { NOW_BUILDER_DEBUG: '1' } : {};
-
   // Merge build env out of  `build.env` from now.json, and `--build-env` args
   const deploymentBuildEnv = Object.assign(
     {},
     parseEnv(localConfig.build && localConfig.build.env),
-    parseEnv(argv['--build-env']),
-    buildDebugEnv
+    parseEnv(argv['--build-env'])
   );
 
   // If there's any undefined values, then inherit them from this process

packages/now-cli/src/util/dev/builder.ts

@@ -83,12 +83,6 @@ async function createBuildProcess(
     NOW_REGION: 'dev1',
   };
 
-  // Builders won't show debug logs by default.
-  // The `NOW_BUILDER_DEBUG` env variable enables them.
-  if (debugEnabled) {
-    env.NOW_BUILDER_DEBUG = '1';
-  }
-
   const buildProcess = fork(modulePath, [], {
     cwd: workPath,
     env,

packages/now-cli/src/util/index.js

@@ -134,6 +134,7 @@ export default class Now extends EventEmitter {
 
     // Ignore specific items from Now.json
     delete requestBody.scope;
+    delete requestBody.github;
 
     if (isLegacy) {
       // Read `registry.npmjs.org` authToken from .npmrc

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

@@ -307,10 +307,10 @@ test(
     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(301, '/index.html', '', { Location: '/' });
-    await testPath(301, '/about.html', '', { Location: '/about' });
-    await testPath(301, '/sub/index.html', '', { Location: '/sub' });
-    await testPath(301, '/sub/another.html', '', { Location: '/sub/another' });
+    await testPath(308, '/index.html', '', { Location: '/' });
+    await testPath(308, '/about.html', '', { Location: '/about' });
+    await testPath(308, '/sub/index.html', '', { Location: '/sub' });
+    await testPath(308, '/sub/another.html', '', { Location: '/sub/another' });
   })
 );
 
@@ -324,10 +324,10 @@ test(
       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(301, '/index.html', '', { Location: '/' });
-      await testPath(301, '/about.html', '', { Location: '/about/' });
-      await testPath(301, '/sub/index.html', '', { Location: '/sub/' });
-      await testPath(301, '/sub/another.html', '', {
+      await testPath(308, '/index.html', '', { Location: '/' });
+      await testPath(308, '/about.html', '', { Location: '/about/' });
+      await testPath(308, '/sub/index.html', '', { Location: '/sub/' });
+      await testPath(308, '/sub/another.html', '', {
         Location: '/sub/another/',
       });
     }
@@ -344,9 +344,9 @@ test(
     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(307, '/about.html', '', { Location: '/about.html/' });
-    await testPath(307, '/sub', '', { Location: '/sub/' });
-    await testPath(307, '/sub/another.html', '', {
+    await testPath(308, '/about.html', '', { Location: '/about.html/' });
+    await testPath(308, '/sub', '', { Location: '/sub/' });
+    await testPath(308, '/sub/another.html', '', {
       Location: '/sub/another.html/',
     });
   })
@@ -362,9 +362,9 @@ test(
     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(307, '/about.html/', '', { Location: '/about.html' });
-    await testPath(307, '/sub/', '', { Location: '/sub' });
-    await testPath(307, '/sub/another.html/', '', {
+    await testPath(308, '/about.html/', '', { Location: '/about.html' });
+    await testPath(308, '/sub/', '', { Location: '/sub' });
+    await testPath(308, '/sub/another.html/', '', {
       Location: '/sub/another.html',
     });
   })

packages/now-cli/test/helpers/prepare.js

@@ -122,11 +122,6 @@ module.exports = async session => {
     'single-dotfile': {
       '.testing': 'i am a dotfile',
     },
-    'config-alias-property': {
-      'now.json':
-        '{ "alias": "test.now.sh", "builds": [ { "src": "*.html", "use": "@now/static" } ] }',
-      'index.html': '<span>test alias</span',
-    },
     'config-scope-property-email': {
       'now.json': `{ "scope": "${session}@zeit.pub", "builds": [ { "src": "*.html", "use": "@now/static" } ], "version": 2 }`,
       'index.html': '<span>test scope email</span',
@@ -204,7 +199,7 @@ fs.writeFileSync(
   'index.js',
   fs
     .readFileSync('index.js', 'utf8')
-    .replace('BUILD_ENV_DEBUG', process.env.NOW_BUILDER_DEBUG),
+    .replace('BUILD_ENV_DEBUG', process.env.NOW_BUILDER_DEBUG ? 'on' : 'off'),
 );
       `,
       'index.js': `
@@ -463,6 +458,18 @@ CMD ["node", "index.js"]`,
         },
       }),
     },
+    'github-and-scope-config': {
+      'index.txt': 'I Am a Website!',
+      'now.json': JSON.stringify({
+        scope: 'i-do-not-exist',
+        github: {
+          autoAlias: true,
+          autoJobCancelation: true,
+          enabled: true,
+          silent: true
+        }
+      })
+    }
   };
 
   for (const typeName of Object.keys(spec)) {

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

@@ -1427,35 +1427,6 @@ test('ensure we render a prompt when deploying home directory', async t => {
   t.true(stderr.includes('> Aborted'));
 });
 
-test('ensure the `alias` property is not sent to the API', async t => {
-  const directory = fixture('config-alias-property');
-
-  const { stdout, stderr, exitCode } = await execa(
-    binaryPath,
-    [directory, '--public', '--name', session, ...defaultArgs, '--force'],
-    {
-      reject: false,
-    }
-  );
-
-  console.log(stderr);
-  console.log(stdout);
-  console.log(exitCode);
-
-  // Ensure the exit code is right
-  t.is(exitCode, 0);
-
-  // Test if the output is really a URL
-  const { href, host } = new URL(stdout);
-  t.is(host.split('-')[0], session);
-
-  // Send a test request to the deployment
-  const response = await fetch(href);
-  const contentType = response.headers.get('content-type');
-
-  t.is(contentType, 'text/html; charset=utf-8');
-});
-
 test('ensure the `scope` property works with email', async t => {
   const directory = fixture('config-scope-property-email');
 
@@ -1995,7 +1966,7 @@ test('use `--debug` CLI flag', async t => {
   // get the content
   const response = await fetch(href);
   const content = await response.text();
-  t.is(content.trim(), '1');
+  t.is(content.trim(), 'off');
 });
 
 test('try to deploy non-existing path', async t => {

packages/now-cli/test/integration.js

@@ -919,35 +919,6 @@ test('ensure we render a prompt when deploying home directory', async t => {
   t.true(stderr.includes('> Aborted'));
 });
 
-test('ensure the `alias` property is not sent to the API', async t => {
-  const directory = fixture('config-alias-property');
-
-  const { stdout, stderr, exitCode } = await execa(
-    binaryPath,
-    [directory, '--public', '--name', session, ...defaultArgs, '--force'],
-    {
-      reject: false,
-    }
-  );
-
-  console.log(stderr);
-  console.log(stdout);
-  console.log(exitCode);
-
-  // Ensure the exit code is right
-  t.is(exitCode, 0);
-
-  // Test if the output is really a URL
-  const { href, host } = new URL(stdout);
-  t.is(host.split('-')[0], session);
-
-  // Send a test request to the deployment
-  const response = await fetch(href);
-  const contentType = response.headers.get('content-type');
-
-  t.is(contentType, 'text/html; charset=utf-8');
-});
-
 test('ensure the `scope` property works with email', async t => {
   const directory = fixture('config-scope-property-email');
 
@@ -1456,7 +1427,7 @@ test('use `--debug` CLI flag', async t => {
   // get the content
   const response = await fetch(href);
   const content = await response.text();
-  t.is(content.trim(), '1');
+  t.is(content.trim(), 'off');
 });
 
 test('try to deploy non-existing path', async t => {
@@ -2056,7 +2027,6 @@ test('deploy a Lambda with a specific runtime', async t => {
   t.is(build.use, 'now-php@0.0.7', JSON.stringify(build, null, 2));
 });
 
-// We need to skip this test until `now-php` supports Runtime version 3
 test('fail to deploy a Lambda with a specific runtime but without a locked version', async t => {
   const directory = fixture('lambda-with-invalid-runtime');
   const output = await execute([directory]);
@@ -2069,6 +2039,13 @@ test('fail to deploy a Lambda with a specific runtime but without a locked versi
   );
 });
 
+test('ensure `github` and `scope` are not sent to the API', async t => {
+    const directory = fixture('github-and-scope-config');
+    const output = await execute([directory]);
+
+    t.is(output.exitCode, 0, formatOutput(output));
+});
+
 test.after.always(async () => {
   // Make sure the token gets revoked
   await execa(binaryPath, ['logout', ...defaultArgs]);

packages/now-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now-client",
-  "version": "6.0.0-canary.1",
+  "version": "6.0.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://zeit.co",

packages/now-next/package.json

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

packages/now-next/src/index.ts

@@ -910,7 +910,7 @@ export const build = async ({
 export const prepareCache = async ({
   workPath,
   entrypoint,
-}: PrepareCacheOptions) => {
+}: PrepareCacheOptions): Promise<Files> => {
   debug('Preparing cache...');
   const entryDirectory = path.dirname(entrypoint);
   const entryPath = path.join(workPath, entryDirectory);
@@ -930,8 +930,6 @@ export const prepareCache = async ({
   const cache = {
     ...(await glob(path.join(cacheEntrypoint, 'node_modules/**'), workPath)),
     ...(await glob(path.join(cacheEntrypoint, '.next/cache/**'), workPath)),
-    ...(await glob(path.join(cacheEntrypoint, 'package-lock.json'), workPath)),
-    ...(await glob(path.join(cacheEntrypoint, 'yarn.lock'), workPath)),
   };
   debug('Cache file manifest produced');
   return cache;

packages/now-node/package.json

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

packages/now-node/src/index.ts

@@ -393,10 +393,9 @@ export async function build({
   return { output: lambda, watch };
 }
 
-export async function prepareCache({ workPath }: PrepareCacheOptions) {
-  return {
-    ...(await glob('node_modules/**', workPath)),
-    ...(await glob('package-lock.json', workPath)),
-    ...(await glob('yarn.lock', workPath)),
-  };
+export async function prepareCache({
+  workPath,
+}: PrepareCacheOptions): Promise<Files> {
+  const cache = await glob('node_modules/**', workPath);
+  return cache;
 }

packages/now-routing-utils/package.json

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

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

@@ -30,12 +30,12 @@ export function convertCleanUrls(
     routes.push({
       src: '^/(?:(.+)/)?index(?:\\.html)?/?$',
       headers: { Location: loc },
-      status: 301,
+      status: 308,
     });
     routes.push({
       src: '^/(.*)\\.html/?$',
       headers: { Location: loc },
-      status: 301,
+      status: 308,
     });
   }
   return routes;
@@ -48,7 +48,7 @@ export function convertRedirects(redirects: NowRedirect[]): Route[] {
     const route: Route = {
       src,
       headers: { Location: loc },
-      status: r.statusCode || 307,
+      status: r.statusCode || 308,
     };
     return route;
   });
@@ -84,13 +84,13 @@ export function convertTrailingSlash(enable: boolean): Route[] {
     routes.push({
       src: '^/(.*[^\\/])$',
       headers: { Location: '/$1/' },
-      status: 307,
+      status: 308,
     });
   } else {
     routes.push({
       src: '^/(.*)\\/$',
       headers: { Location: '/$1' },
-      status: 307,
+      status: 308,
     });
   }
   return routes;

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

@@ -501,12 +501,12 @@ describe('getTransformedRoutes', () => {
       {
         src: '^/(?:(.+)/)?index(?:\\.html)?/?$',
         headers: { Location: '/$1' },
-        status: 301,
+        status: 308,
       },
       {
         src: '^/(.*)\\.html/?$',
         headers: { Location: '/$1' },
-        status: 301,
+        status: 308,
       },
       {
         src: '^/help$',

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

@@ -58,12 +58,12 @@ test('convertCleanUrls true', () => {
     {
       src: '^/(?:(.+)/)?index(?:\\.html)?/?$',
       headers: { Location: '/$1' },
-      status: 301,
+      status: 308,
     },
     {
       src: '^/(.*)\\.html/?$',
       headers: { Location: '/$1' },
-      status: 301,
+      status: 308,
     },
   ];
   deepEqual(actual, expected);
@@ -94,12 +94,12 @@ test('convertCleanUrls true, trailingSlash true', () => {
     {
       src: '^/(?:(.+)/)?index(?:\\.html)?/?$',
       headers: { Location: '/$1/' },
-      status: 301,
+      status: 308,
     },
     {
       src: '^/(.*)\\.html/?$',
       headers: { Location: '/$1/' },
-      status: 301,
+      status: 308,
     },
   ];
   deepEqual(actual, expected);
@@ -165,12 +165,12 @@ test('convertRedirects', () => {
     {
       src: '^\\/some\\/old\\/path$',
       headers: { Location: '/some/new/path' },
-      status: 307,
+      status: 308,
     },
     {
       src: '^\\/next(\\.js)?$',
       headers: { Location: 'https://nextjs.org' },
-      status: 307,
+      status: 308,
     },
     {
       src: '^\\/firebase(?:\\/(.*))$',
@@ -180,12 +180,12 @@ test('convertRedirects', () => {
     {
       src: '^\\/projects(?:\\/([^\\/#\\?]+?))(?:\\/([^\\/#\\?]+?))$',
       headers: { Location: '/projects.html?id=$1&action=$2' },
-      status: 307,
+      status: 308,
     },
     {
       src: '^\\/old(?:\\/([^\\/#\\?]+?))\\/path$',
       headers: { Location: '/new/path/$1' },
-      status: 307,
+      status: 308,
     },
   ];
 
@@ -310,7 +310,7 @@ test('convertTrailingSlash enabled', () => {
     {
       src: '^/(.*[^\\/])$',
       headers: { Location: '/$1/' },
-      status: 307,
+      status: 308,
     },
   ];
   deepEqual(actual, expected);
@@ -328,7 +328,7 @@ test('convertTrailingSlash disabled', () => {
     {
       src: '^/(.*)\\/$',
       headers: { Location: '/$1' },
-      status: 307,
+      status: 308,
     },
   ];
   deepEqual(actual, expected);

packages/now-static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/static-build",
-  "version": "0.13.1-canary.0",
+  "version": "0.13.1",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/static-builds",
@@ -14,7 +14,8 @@
   },
   "scripts": {
     "build": "./build.sh",
-    "test-integration-once": "jest --env node --verbose --runInBand",
+    "test-unit": "jest --env node --verbose --runInBand test/unit.test.js",
+    "test-integration-once": "jest --env node --verbose --runInBand test/integration.test.js",
     "prepublishOnly": "./build.sh"
   },
   "devDependencies": {

packages/now-static-build/src/index.ts

@@ -415,12 +415,9 @@ export async function build({
 export async function prepareCache({
   entrypoint,
   workPath,
-}: PrepareCacheOptions) {
+}: PrepareCacheOptions): Promise<Files> {
   // default cache paths
-  const defaultCacheFiles = await glob(
-    '{node_modules/**,package-lock.json,yarn.lock}',
-    workPath
-  );
+  const defaultCacheFiles = await glob('node_modules/**', workPath);
 
   // framework specific cache paths
   let frameworkCacheFiles: { [path: string]: FileFsRef } | null = null;

packages/now-static-build/test/cache-fixtures/gatsby/node_modules/file2

@@ -0,0 +1 @@
+file2

packages/now-static-build/test/unit.test.js

@@ -2,26 +2,24 @@ const { prepareCache } = require('../dist');
 const path = require('path');
 
 describe('prepareCache', () => {
-  test('should cache yarn.lock, package-lock.json and node_modules', async () => {
+  test('should cache node_modules', async () => {
     const files = await prepareCache({
       workPath: path.resolve(__dirname, './cache-fixtures/default'),
       entrypoint: 'index.js',
     });
 
-    expect(files['yarn.lock']).toBeDefined();
-    expect(files['package-lock.json']).toBeDefined();
     expect(files['node_modules/file']).toBeDefined();
-
     expect(files['index.js']).toBeUndefined();
   });
 
-  test('should cache `.cache` folder for gatsby deployments', async () => {
+  test('should cache node_modules and `.cache` folder for gatsby deployments', async () => {
     const files = await prepareCache({
       workPath: path.resolve(__dirname, './cache-fixtures/gatsby'),
       entrypoint: 'package.json',
     });
 
+    expect(files['node_modules/file2']).toBeDefined();
     expect(files['.cache/file']).toBeDefined();
-    expect(files['yarn.lock']).toBeDefined();
+    expect(files['package.json']).toBeUndefined();
   });
 });