Publish

- @now/go@0.5.0
 - @now/next@0.4.0
 - @now/node-bridge@1.1.3
 - @now/node-server@0.7.3
 - @now/node@0.7.3
 - @now/python@0.2.4
 - @now/static-build@0.5.7

packages/now-go/index.ts

@@ -1,5 +1,7 @@
 import { join, sep, dirname, basename } from 'path';
 import { readFile, writeFile, pathExists, move, copy } from 'fs-extra';
+import { homedir } from 'os';
+import execa from 'execa';
 
 import {
   glob,
@@ -29,6 +31,18 @@ interface BuildParamsType extends BuildOptions {
   meta: BuildParamsMeta;
 }
 
+// Initialize private git repo for Go Modules
+async function initPrivateGit(credentials: string) {
+  await execa('git', [
+    'config',
+    '--global',
+    'credential.helper',
+    `store --file ${join(homedir(), '.git-credentials')}`,
+  ]);
+
+  await writeFile(join(homedir(), '.git-credentials'), credentials);
+}
+
 export const version = 2;
 
 export const config = {
@@ -42,6 +56,11 @@ export async function build({
   workPath,
   meta = {} as BuildParamsMeta,
 }: BuildParamsType) {
+  if (process.env.GIT_CREDENTIALS && !meta.isDev) {
+    console.log('Initialize Git credentials...');
+    await initPrivateGit(process.env.GIT_CREDENTIALS);
+  }
+
   console.log('Downloading user files...');
   const entrypointArr = entrypoint.split(sep);
 

packages/now-go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/go",
-  "version": "0.4.8-canary.0",
+  "version": "0.5.0",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/next",
-  "version": "0.3.4-canary.1",
+  "version": "0.4.0",
   "license": "MIT",
   "main": "./dist/index",
   "scripts": {
@@ -14,7 +14,7 @@
     "directory": "packages/now-next"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.1.3-canary.0",
+    "@now/node-bridge": "^1.1.3",
     "fs-extra": "^7.0.0",
     "get-port": "^5.0.0",
     "resolve-from": "^5.0.0",

packages/now-next/src/index.ts

@@ -155,14 +155,13 @@ export const build = async ({
   entrypoint,
   meta = {} as BuildParamsMeta,
 }: BuildParamsType): Promise<{
-  routes?: any[];
+  routes?: { src: string; dest: string }[];
   output: Files;
   watch?: string[];
   childProcesses: ChildProcess[];
 }> => {
   validateEntrypoint(entrypoint);
 
-  const routes: any[] = [];
   const entryDirectory = path.dirname(entrypoint);
   const entryPath = path.join(workPath, entryDirectory);
   const dotNext = path.join(entryPath, '.next');
@@ -289,7 +288,9 @@ export const build = async ({
     await unlinkFile(path.join(entryPath, '.npmrc'));
   }
 
+  const routes: { src: string; dest: string }[] = [];
   const lambdas: { [key: string]: Lambda } = {};
+  const staticPages: { [key: string]: FileFsRef } = {};
 
   if (isLegacy) {
     const filesAfterBuild = await glob('**', entryPath);
@@ -381,10 +382,21 @@ export const build = async ({
         fsPath: path.join(__dirname, 'launcher.js'),
       }),
     };
-    const pages = await glob(
-      '**/*.js',
-      path.join(entryPath, '.next', 'serverless', 'pages')
-    );
+    const pagesDir = path.join(entryPath, '.next', 'serverless', 'pages');
+
+    const pages = await glob('**/*.js', pagesDir);
+    const staticPageFiles = await glob('**/*.html', pagesDir);
+
+    Object.keys(staticPageFiles).forEach((page: string) => {
+      const staticRoute = path.join(entryDirectory, page);
+      staticPages[staticRoute] = staticPageFiles[page];
+
+      const pathname = page.replace(/\.html$/, '');
+      routes.push({
+        src: `^${path.join('/', entryDirectory, pathname)}$`,
+        dest: path.join('/', staticRoute),
+      });
+    });
 
     const pageKeys = Object.keys(pages);
 
@@ -473,10 +485,11 @@ export const build = async ({
     output: {
       ...publicFiles,
       ...lambdas,
+      ...staticPages,
       ...staticFiles,
       ...staticDirectoryFiles,
     },
-    routes: [],
+    routes,
     watch: [],
     childProcesses: [],
   };

packages/now-node-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-bridge",
-  "version": "1.1.3-canary.0",
+  "version": "1.1.3",
   "license": "MIT",
   "main": "./index.js",
   "repository": {

packages/now-node-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-server",
-  "version": "0.7.3-canary.0",
+  "version": "0.7.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,7 +8,7 @@
     "directory": "packages/now-node-server"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.1.3-canary.0",
+    "@now/node-bridge": "^1.1.3",
     "@zeit/ncc": "0.18.5",
     "fs-extra": "7.0.1"
   },

packages/now-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node",
-  "version": "0.7.3-canary.0",
+  "version": "0.7.3",
   "license": "MIT",
   "main": "./dist/index",
   "repository": {
@@ -9,7 +9,7 @@
     "directory": "packages/now-node"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.1.3-canary.0",
+    "@now/node-bridge": "^1.1.3",
     "@zeit/ncc": "0.18.5",
     "fs-extra": "7.0.1"
   },

packages/now-python/now_init.py

@@ -22,6 +22,7 @@ _now_imported, _now_is_legacy = _now_get_import()
 if _now_is_legacy:
     print('using HTTP Handler')
     from http.server import HTTPServer
+    from urllib.parse import unquote
     import requests
     import _thread
     server = HTTPServer(('', 0), _now_imported)
@@ -30,7 +31,7 @@ if _now_is_legacy:
         _thread.start_new_thread(server.handle_request, ())
 
         payload = json.loads(event['body'])
-        path = payload['path']
+        path = unquote(payload['path'])
         headers = payload['headers']
         method = payload['method']
         encoding = payload.get('encoding')
@@ -53,10 +54,7 @@ if _now_is_legacy:
 else:
     print('using Web Server Gateway Interface (WSGI)')
     import sys
-    try:
-        from urllib.parse import urlparse
-    except ImportError:
-        from urlparse import urlparse
+    from urllib.parse import urlparse, unquote
     from werkzeug._compat import BytesIO
     from werkzeug._compat import string_types
     from werkzeug._compat import to_bytes
@@ -75,13 +73,14 @@ else:
         if isinstance(body, string_types):
             body = to_bytes(body, charset='utf-8')
 
-        urlinfo = urlparse(payload['path'])
+        path = unquote(payload['path'])
+        query = urlparse(path).query
 
         environ = {
             'CONTENT_LENGTH': str(len(body)),
             'CONTENT_TYPE': headers.get('content-type', ''),
-            'PATH_INFO': payload['path'],
-            'QUERY_STRING': urlinfo.query,
+            'PATH_INFO': path,
+            'QUERY_STRING': query,
             'REMOTE_ADDR': headers.get(
                 'x-forwarded-for', headers.get(
                     'x-real-ip', payload.get(
@@ -102,7 +101,7 @@ else:
         }
 
         for key, value in environ.items():
-            if isinstance(value, string_types):
+            if isinstance(value, string_types) and key != 'QUERY_STRING':
                 environ[key] = wsgi_encoding_dance(value)
 
         for key, value in headers.items():

packages/now-python/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/python",
-  "version": "0.2.4-canary.0",
+  "version": "0.2.4",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/now-python/test/fixtures/09-url-params/custom.py

@@ -0,0 +1,7 @@
+from flask import Flask, Response, __version__
+app = Flask(__name__)
+
+@app.route('/', defaults={'path': ''})
+@app.route('/<path:path>')
+def catch_all(path):
+    return Response("path=%s" %(path), mimetype='text/html')

packages/now-python/test/fixtures/09-url-params/index.py

@@ -0,0 +1,7 @@
+from flask import Flask, Response, __version__
+app = Flask(__name__)
+
+@app.route('/', defaults={'path': ''})
+@app.route('/<path:path>')
+def catch_all(path):
+    return Response("path=%s" %(path), mimetype='text/html')

packages/now-python/test/fixtures/09-url-params/now.json

@@ -0,0 +1,13 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "*.py", "use": "@now/python" }
+  ],
+  "routes": [
+    { "src": "/another", "dest": "custom.py" }
+  ],
+  "probes": [
+    { "path": "/?hello=/", "mustContain": "path=?hello=/" },
+    { "path": "/another?hello=/", "mustContain": "path=another?hello=/" }
+  ]
+}

packages/now-python/test/fixtures/09-url-params/requirements.txt

@@ -0,0 +1 @@
+Flask==1.0.2

packages/now-python/test/fixtures/10-url-params-http-handler/custom.py

@@ -0,0 +1,8 @@
+from http.server import BaseHTTPRequestHandler
+
+class handler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        self.send_response(200)
+        self.end_headers()
+        self.wfile.write(str("path=").encode()+self.path.encode())
+        return

packages/now-python/test/fixtures/10-url-params-http-handler/index.py

@@ -0,0 +1,8 @@
+from http.server import BaseHTTPRequestHandler
+
+class handler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        self.send_response(200)
+        self.end_headers()
+        self.wfile.write(str("path=").encode()+self.path.encode())
+        return

packages/now-python/test/fixtures/10-url-params-http-handler/now.json

@@ -0,0 +1,13 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "*.py", "use": "@now/python" }
+  ],
+  "routes": [
+    { "src": "/another", "dest": "custom.py" }
+  ],
+  "probes": [
+    { "path": "/?hello=/", "mustContain": "path=/?hello=/" },
+    { "path": "/another?hello=/", "mustContain": "path=/another?hello=/" }
+  ]
+}

packages/now-static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/static-build",
-  "version": "0.5.7-canary.0",
+  "version": "0.5.7",
   "license": "MIT",
   "repository": {
     "type": "git",