Publish

- @now/bash@0.1.1
 - @now/build-utils@0.4.32
 - @now/cgi@0.0.15
 - @now/go@0.2.12
 - @now/html-minifier@1.0.7
 - @now/lambda@0.4.9
 - @now/md@0.4.9
 - @now/mdx-deck@0.4.18
 - @now/next@0.0.84
 - @now/node-bridge@0.1.10
 - @now/node-server@0.4.26
 - @now/node@0.4.28
 - @now/optipng@0.4.8
 - @now/php-bridge@0.4.13
 - @now/php@0.4.13
 - @now/static-build@0.4.17
 - @now/wordpress@0.4.14

lerna.json

@@ -2,7 +2,24 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [
-    "packages/*"
+    "packages/now-build-utils",
+    "packages/now-node-bridge",
+    "packages/now-php-bridge",
+    "packages/now-bash",
+    "packages/now-cgi",
+    "packages/now-go",
+    "packages/now-html-minifier",
+    "packages/now-lambda",
+    "packages/now-md",
+    "packages/now-mdx-deck",
+    "packages/now-next",
+    "packages/now-node",
+    "packages/now-node-server",
+    "packages/now-optipng",
+    "packages/now-php",
+    "packages/now-python",
+    "packages/now-static-build",
+    "packages/now-wordpress"
   ],
   "command": {
     "publish": {

packages/now-bash/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/bash",
-  "version": "0.0.4-canary.2",
+  "version": "0.1.1",
   "description": "Now 2.0 builder for HTTP endpoints written in Bash",
   "main": "index.js",
   "author": "Nathan Rajlich <nate@zeit.co>",

packages/now-build-utils/fs/run-user-scripts.js

@@ -55,7 +55,7 @@ async function scanParentDirs(destPath, scriptName) {
   return { hasScript, hasPackageLockJson };
 }
 
-async function runNpmInstall(destPath, args = []) {
+async function installDependencies(destPath, args = []) {
   assert(path.isAbsolute(destPath));
 
   let commandArgs = args;
@@ -102,6 +102,7 @@ async function runPackageJsonScript(destPath, scriptName) {
 
 module.exports = {
   runShellScript,
-  runNpmInstall,
+  installDependencies,
+  runNpmInstall: installDependencies,
   runPackageJsonScript,
 };

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/build-utils",
-  "version": "0.4.32-canary.6",
+  "version": "0.4.32",
   "license": "MIT",
   "dependencies": {
     "async-retry": "1.2.3",

packages/now-cgi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/cgi",
-  "version": "0.0.15-canary.0",
+  "version": "0.0.15",
   "license": "MIT",
   "scripts": {
     "test": "best -I test/*.js",

packages/now-go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/go",
-  "version": "0.2.12-canary.0",
+  "version": "0.2.12",
   "license": "MIT",
   "scripts": {
     "test": "best -I test/*.js",

packages/now-html-minifier/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/html-minifier",
-  "version": "1.0.7-canary.0",
+  "version": "1.0.7",
   "license": "MIT",
   "dependencies": {
     "html-minifier": "3.5.21"

packages/now-lambda/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/lambda",
-  "version": "0.4.9-canary.0",
+  "version": "0.4.9",
   "license": "MIT",
   "peerDependencies": {
     "@now/build-utils": ">=0.0.1"

packages/now-md/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/md",
-  "version": "0.4.9-canary.0",
+  "version": "0.4.9",
   "license": "MIT",
   "dependencies": {
     "rehype-document": "^2.2.0",

packages/now-mdx-deck/index.js

@@ -15,7 +15,7 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   const packageJson = { dependencies: { 'mdx-deck': '1.7.15' } };
   const packageJsonPath = path.join(workPath, 'package.json');
   await writeFile(packageJsonPath, JSON.stringify(packageJson));
-  console.log('running npm install...');
+  console.log('installing dependencies...');
   process.env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = '1'; // TODO opts argument for runNpmInstall
   await runNpmInstall(path.dirname(packageJsonPath), [
     '--prod',

packages/now-mdx-deck/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/mdx-deck",
-  "version": "0.4.18-canary.1",
+  "version": "0.4.18",
   "license": "MIT",
   "peerDependencies": {
     "@now/build-utils": ">=0.0.1"

packages/now-next/index.js

@@ -168,7 +168,7 @@ exports.build = async ({ files, workPath, entrypoint }) => {
     await writeNpmRc(workPath, process.env.NPM_AUTH_TOKEN);
   }
 
-  console.log('running npm install...');
+  console.log('installing dependencies...');
   await runNpmInstall(workPath, ['--prefer-offline']);
   console.log('running user script...');
   await runPackageJsonScript(workPath, 'now-build');

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/next",
-  "version": "0.0.84-canary.0",
+  "version": "0.0.84",
   "license": "MIT",
   "dependencies": {
     "@now/node-bridge": "0.1.4",

packages/now-node-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-bridge",
-  "version": "0.1.10-canary.2",
+  "version": "0.1.10",
   "license": "MIT",
   "peerDependencies": {
     "@now/build-utils": ">=0.0.1"

packages/now-node-server/index.js

@@ -37,7 +37,7 @@ async function downloadInstallAndBundle(
   console.log('downloading user files...');
   const downloadedFiles = await download(files, userPath);
 
-  console.log('running npm install for user...');
+  console.log('installing dependencies for user\'s code...');
   const entrypointFsDirname = path.join(userPath, path.dirname(entrypoint));
   await runNpmInstall(entrypointFsDirname, npmArguments);
 
@@ -47,7 +47,7 @@ async function downloadInstallAndBundle(
       'package.json': new FileBlob({
         data: JSON.stringify({
           dependencies: {
-            '@zeit/ncc': '0.6.0',
+            '@zeit/ncc': '0.11.0',
           },
         }),
       }),
@@ -55,7 +55,7 @@ async function downloadInstallAndBundle(
     nccPath,
   );
 
-  console.log('running npm install for ncc...');
+  console.log('installing dependencies for ncc...');
   await runNpmInstall(nccPath, npmArguments);
   return [downloadedFiles, userPath, nccPath, entrypointFsDirname];
 }
@@ -71,7 +71,8 @@ async function compile(workNccPath, downloadedFiles, entrypoint) {
   preparedFiles[path.join('user', entrypoint)] = blob;
   // eslint-disable-next-line no-restricted-syntax
   for (const assetName of Object.keys(assets)) {
-    const blob2 = new FileBlob({ data: assets[assetName] });
+    const { source: data, permissions: mode } = assets[assetName];
+    const blob2 = new FileBlob({ data, mode });
     preparedFiles[
       path.join('user', path.dirname(entrypoint), assetName)
     ] = blob2;

packages/now-node-server/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@now/node-server",
-  "version": "0.4.26-canary.7",
+  "version": "0.4.26",
   "license": "MIT",
   "dependencies": {
-    "@now/node-bridge": "^0.1.10-canary.2",
+    "@now/node-bridge": "^0.1.10",
     "fs-extra": "7.0.1"
   },
   "peerDependencies": {

packages/now-node-server/test/fixtures/06-content-type/index.js

@@ -0,0 +1,7 @@
+const http = require('http');
+
+const server = http.createServer((req, resp) => {
+  resp.end('RANDOMNESS_PLACEHOLDER');
+});
+
+server.listen();

packages/now-node-server/test/fixtures/06-content-type/now.json

@@ -0,0 +1,6 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "index.js", "use": "@now/node-server" }
+  ]
+}

packages/now-node-server/test/fixtures/06-content-type/probe.js

@@ -0,0 +1,7 @@
+const assert = require('assert');
+
+module.exports = async ({ deploymentUrl, fetch, randomness }) => {
+  const resp = await fetch(`https://${deploymentUrl}/`);
+  assert.equal(resp.headers.get('content-type'), null);
+  assert.equal(await resp.text(), randomness);
+};

packages/now-node-server/test/fixtures/09-no-bundle/with-bundle/index.js

@@ -2,7 +2,7 @@ const http = require('http');
 const isBundled = require('./is-bundled.js');
 
 const server = http.createServer((req, resp) => {
-  resp.end(isBundled() ? 'RANDOMNESS_PLACEHOLDER:with-bundle' : '');
+  resp.end(isBundled() ? 'RANDOMNESS_PLACEHOLDER:with-bundle' : 'WITHOUT-BUNDLE-THAT-IS-WRONG');
 });
 
 server.listen();

packages/now-node-server/test/fixtures/09-no-bundle/with-bundle/is-bundled.js

@@ -1,3 +1,4 @@
 const path = require('path');
 
-module.exports = () => path.basename(__filename) === 'index.js';
+// eslint-disable-next-line no-eval
+module.exports = () => path.basename(eval('__filename')) === 'index.js';

packages/now-node-server/test/fixtures/09-no-bundle/without-bundle/index.js

@@ -2,7 +2,7 @@ const http = require('http');
 const isBundled = require('./is-bundled.js');
 
 const server = http.createServer((req, resp) => {
-  resp.end(isBundled() ? '' : 'RANDOMNESS_PLACEHOLDER:without-bundle');
+  resp.end(isBundled() ? 'WITH-BUNDLE-THAT-IS-WRONG' : 'RANDOMNESS_PLACEHOLDER:without-bundle');
 });
 
 server.listen();

packages/now-node-server/test/fixtures/09-no-bundle/without-bundle/is-bundled.js

@@ -1,3 +1,4 @@
 const path = require('path');
 
-module.exports = () => path.basename(__filename) === 'index.js';
+// eslint-disable-next-line no-eval
+module.exports = () => path.basename(eval('__filename')) === 'index.js';

packages/now-node/index.js

@@ -35,7 +35,7 @@ async function downloadInstallAndBundle(
   console.log('downloading user files...');
   const downloadedFiles = await download(files, userPath);
 
-  console.log('running npm install for user...');
+  console.log('installing dependencies for user\'s code...');
   const entrypointFsDirname = path.join(userPath, path.dirname(entrypoint));
   await runNpmInstall(entrypointFsDirname, npmArguments);
 
@@ -45,7 +45,7 @@ async function downloadInstallAndBundle(
       'package.json': new FileBlob({
         data: JSON.stringify({
           dependencies: {
-            '@zeit/ncc': '0.6.0',
+            '@zeit/ncc': '0.11.0',
           },
         }),
       }),
@@ -53,7 +53,7 @@ async function downloadInstallAndBundle(
     nccPath,
   );
 
-  console.log('running npm install for ncc...');
+  console.log('installing dependencies for ncc...');
   await runNpmInstall(nccPath, npmArguments);
   return [downloadedFiles, nccPath, entrypointFsDirname];
 }
@@ -69,7 +69,8 @@ async function compile(workNccPath, downloadedFiles, entrypoint) {
   preparedFiles[path.join('user', entrypoint)] = blob;
   // eslint-disable-next-line no-restricted-syntax
   for (const assetName of Object.keys(assets)) {
-    const blob2 = new FileBlob({ data: assets[assetName] });
+    const { source: data, permissions: mode } = assets[assetName];
+    const blob2 = new FileBlob({ data, mode });
     preparedFiles[
       path.join('user', path.dirname(entrypoint), assetName)
     ] = blob2;

packages/now-node/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@now/node",
-  "version": "0.4.28-canary.6",
+  "version": "0.4.28",
   "license": "MIT",
   "dependencies": {
-    "@now/node-bridge": "^0.1.10-canary.2",
+    "@now/node-bridge": "^0.1.10",
     "fs-extra": "7.0.1"
   },
   "peerDependencies": {

packages/now-node/test/fixtures/07-content-length/probe.js

@@ -4,21 +4,24 @@ async function test1({ deploymentUrl, fetch, randomness }) {
   const bodyMustBe = `${randomness}:content-length`;
   const resp = await fetch(`https://${deploymentUrl}/test1.js`);
   assert.equal(resp.status, 401);
-  assert.equal(resp.headers.get('content-length'), bodyMustBe.length);
   assert.equal(await resp.text(), bodyMustBe);
+  assert.equal(resp.headers.get('content-length'), bodyMustBe.length);
 }
 
 async function test2({ deploymentUrl, fetch }) {
+  const bodyMustBe = '';
   const resp = await fetch(`https://${deploymentUrl}/test2.js`);
-  assert.equal(resp.status, 502);
+  assert.equal(resp.status, 401);
+  assert.equal(await resp.text(), bodyMustBe);
+  assert.equal(resp.headers.get('content-length'), bodyMustBe.length);
 }
 
 async function test3({ deploymentUrl, fetch, randomness }) {
   const bodyMustBe = `${randomness}:content-length`;
   const resp = await fetch(`https://${deploymentUrl}/test3.js`);
   assert.equal(resp.status, 401);
-  assert.equal(resp.headers.get('content-length'), null);
   assert.equal(await resp.text(), bodyMustBe);
+  assert.equal(resp.headers.get('content-length'), null);
 }
 
 module.exports = async ({ deploymentUrl, fetch, randomness }) => {

packages/now-node/test/fixtures/07-content-length/test2.js

@@ -1,4 +1,4 @@
 module.exports = (_, resp) => {
   resp.writeHead(401, { 'content-length': 2 });
-  resp.end(`${process.env.RANDOMNESS_ENV_VAR}:content-length`);
+  resp.end();
 };

packages/now-optipng/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/optipng",
-  "version": "0.4.8-canary.0",
+  "version": "0.4.8",
   "license": "MIT",
   "dependencies": {
     "multipipe": "2.0.3",

packages/now-php-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/php-bridge",
-  "version": "0.4.13-canary.1",
+  "version": "0.4.13",
   "license": "MIT",
   "dependencies": {
     "fastcgi-client": "0.0.1"

packages/now-php/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@now/php",
-  "version": "0.4.13-canary.2",
+  "version": "0.4.13",
   "license": "MIT",
   "dependencies": {
-    "@now/php-bridge": "^0.4.13-canary.1"
+    "@now/php-bridge": "^0.4.13"
   },
   "peerDependencies": {
     "@now/build-utils": ">=0.0.1"

packages/now-static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/static-build",
-  "version": "0.4.17-canary.0",
+  "version": "0.4.17",
   "license": "MIT",
   "peerDependencies": {
     "@now/build-utils": ">=0.0.1"

packages/now-wordpress/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@now/wordpress",
-  "version": "0.4.14-canary.1",
+  "version": "0.4.14",
   "license": "MIT",
   "dependencies": {
-    "@now/php-bridge": "^0.4.13-canary.1",
+    "@now/php-bridge": "^0.4.13",
     "node-fetch": "2.3.0",
     "yauzl": "2.10.0"
   },

test/integration/now-next/index.test.js

@@ -20,6 +20,22 @@ it(
   FOUR_MINUTES,
 );
 
+it(
+  'Should build the monorepo example',
+  async () => {
+    const { buildResult } = await runBuildLambda(
+      path.join(__dirname, 'monorepo'),
+    );
+    expect(buildResult['www/index']).toBeDefined();
+    const filePaths = Object.keys(buildResult);
+    const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
+    const hasUnderScoreErrorStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_error\.js$/));
+    expect(hasUnderScoreAppStaticFile).toBeTruthy();
+    expect(hasUnderScoreErrorStaticFile).toBeTruthy();
+  },
+  FOUR_MINUTES,
+);
+
 it(
   'Should build the legacy standard example',
   async () => {

test/integration/now-next/monorepo/now.json

@@ -0,0 +1,6 @@
+{
+    "version": 2,
+    "builds": [
+        { "src": "www/package.json", "use": "@now/next" }
+    ]
+}

test/integration/now-next/monorepo/www/next.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  target: 'serverless',
+};

test/integration/now-next/monorepo/www/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "monorepo",
+  "dependencies": {
+    "next": "^8.0.0-canary.2",
+    "react": "^16.7.0",
+    "react-dom": "^16.7.0"
+  },
+  "scripts": {
+    "now-build": "next build"
+  }
+}

test/integration/now-next/monorepo/www/pages/index.js

@@ -0,0 +1 @@
+export default () => 'Index page';

test/lib/deployment/now-deploy.js

@@ -114,7 +114,11 @@ async function fetchWithAuth (url, opts = {}) {
 
   if (!opts.headers.Authorization) {
     if (!token) {
-      const { NOW_TOKEN_FACTORY_URL } = process.env;
+      const { NOW_TOKEN, NOW_TOKEN_FACTORY_URL } = process.env;
+
+      if (NOW_TOKEN) {
+        token = NOW_TOKEN;
+      } else
       if (NOW_TOKEN_FACTORY_URL) {
         const resp = await fetch(NOW_TOKEN_FACTORY_URL);
         token = (await resp.json()).token;