Publish Canary

- @vercel/build-utils@2.12.3-canary.36
 - vercel@23.1.3-canary.59
 - @vercel/client@10.2.3-canary.37
 - vercel-plugin-middleware@0.0.0-canary.12
 - vercel-plugin-go@1.0.0-canary.24
 - vercel-plugin-node@1.12.2-canary.28
 - vercel-plugin-python@1.0.0-canary.25
 - vercel-plugin-ruby@1.0.0-canary.24

packages/build-utils/package.json

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

packages/build-utils/src/convert-runtime-to-plugin.ts

@@ -104,6 +104,9 @@ export function convertRuntimeToPlugin(
     let newPathsRuntime: Set<string> = new Set();
     let linkersRuntime: Array<Promise<void>> = [];
 
+    const entryDir = join('.output', 'server', 'pages');
+    const entryRoot = join(workPath, entryDir);
+
     for (const entrypoint of Object.keys(entrypoints)) {
       const { output } = await buildRuntime({
         files: sourceFilesPreBuild,
@@ -166,7 +169,6 @@ export function convertRuntimeToPlugin(
 
       const handlerExtName = extname(handlerFile.fsPath);
 
-      const entryRoot = join(workPath, '.output', 'server', 'pages');
       const entryBase = basename(entrypoint).replace(ext, handlerExtName);
       const entryPath = join(dirname(entrypoint), entryBase);
       const entry = join(entryRoot, entryPath);
@@ -290,7 +292,9 @@ export function convertRuntimeToPlugin(
         version: 1,
         files: tracedFiles.map(file => ({
           input: normalizePath(relative(dirname(nft), file.absolutePath)),
-          output: normalizePath(file.relativePath),
+          // We'd like to place all the dependency files right next
+          // to the final launcher file inside of the Lambda.
+          output: normalizePath(join(entryDir, 'api', file.relativePath)),
         })),
       });
 

packages/build-utils/test/unit.convert-runtime-to-plugin.test.ts

@@ -114,35 +114,35 @@ describe('convert-runtime-to-plugin', () => {
       files: [
         {
           input: `../../../inputs/api-routes-python/api/db/[id].py`,
-          output: 'api/db/[id].py',
+          output: '.output/server/pages/api/api/db/[id].py',
         },
         {
           input: `../../../inputs/api-routes-python/api/index.py`,
-          output: 'api/index.py',
+          output: '.output/server/pages/api/api/index.py',
         },
         {
           input: `../../../inputs/api-routes-python/api/project/[aid]/[bid]/index.py`,
-          output: 'api/project/[aid]/[bid]/index.py',
+          output: '.output/server/pages/api/api/project/[aid]/[bid]/index.py',
         },
         {
           input: `../../../inputs/api-routes-python/api/users/get.py`,
-          output: 'api/users/get.py',
+          output: '.output/server/pages/api/api/users/get.py',
         },
         {
           input: `../../../inputs/api-routes-python/api/users/post.py`,
-          output: 'api/users/post.py',
+          output: '.output/server/pages/api/api/users/post.py',
         },
         {
           input: `../../../inputs/api-routes-python/file.txt`,
-          output: 'file.txt',
+          output: '.output/server/pages/api/file.txt',
         },
         {
           input: `../../../inputs/api-routes-python/util/date.py`,
-          output: 'util/date.py',
+          output: '.output/server/pages/api/util/date.py',
         },
         {
           input: `../../../inputs/api-routes-python/util/math.py`,
-          output: 'util/math.py',
+          output: '.output/server/pages/api/util/math.py',
         },
       ],
     });
@@ -155,35 +155,35 @@ describe('convert-runtime-to-plugin', () => {
       files: [
         {
           input: `../../../../inputs/api-routes-python/api/db/[id].py`,
-          output: 'api/db/[id].py',
+          output: '.output/server/pages/api/api/db/[id].py',
         },
         {
           input: `../../../../inputs/api-routes-python/api/index.py`,
-          output: 'api/index.py',
+          output: '.output/server/pages/api/api/index.py',
         },
         {
           input: `../../../../inputs/api-routes-python/api/project/[aid]/[bid]/index.py`,
-          output: 'api/project/[aid]/[bid]/index.py',
+          output: '.output/server/pages/api/api/project/[aid]/[bid]/index.py',
         },
         {
           input: `../../../../inputs/api-routes-python/api/users/get.py`,
-          output: 'api/users/get.py',
+          output: '.output/server/pages/api/api/users/get.py',
         },
         {
           input: `../../../../inputs/api-routes-python/api/users/post.py`,
-          output: 'api/users/post.py',
+          output: '.output/server/pages/api/api/users/post.py',
         },
         {
           input: `../../../../inputs/api-routes-python/file.txt`,
-          output: 'file.txt',
+          output: '.output/server/pages/api/file.txt',
         },
         {
           input: `../../../../inputs/api-routes-python/util/date.py`,
-          output: 'util/date.py',
+          output: '.output/server/pages/api/util/date.py',
         },
         {
           input: `../../../../inputs/api-routes-python/util/math.py`,
-          output: 'util/math.py',
+          output: '.output/server/pages/api/util/math.py',
         },
       ],
     });
@@ -196,35 +196,35 @@ describe('convert-runtime-to-plugin', () => {
       files: [
         {
           input: `../../../../inputs/api-routes-python/api/db/[id].py`,
-          output: 'api/db/[id].py',
+          output: '.output/server/pages/api/api/db/[id].py',
         },
         {
           input: `../../../../inputs/api-routes-python/api/index.py`,
-          output: 'api/index.py',
+          output: '.output/server/pages/api/api/index.py',
         },
         {
           input: `../../../../inputs/api-routes-python/api/project/[aid]/[bid]/index.py`,
-          output: 'api/project/[aid]/[bid]/index.py',
+          output: '.output/server/pages/api/api/project/[aid]/[bid]/index.py',
         },
         {
           input: `../../../../inputs/api-routes-python/api/users/get.py`,
-          output: 'api/users/get.py',
+          output: '.output/server/pages/api/api/users/get.py',
         },
         {
           input: `../../../../inputs/api-routes-python/api/users/post.py`,
-          output: 'api/users/post.py',
+          output: '.output/server/pages/api/api/users/post.py',
         },
         {
           input: `../../../../inputs/api-routes-python/file.txt`,
-          output: 'file.txt',
+          output: '.output/server/pages/api/file.txt',
         },
         {
           input: `../../../../inputs/api-routes-python/util/date.py`,
-          output: 'util/date.py',
+          output: '.output/server/pages/api/util/date.py',
         },
         {
           input: `../../../../inputs/api-routes-python/util/math.py`,
-          output: 'util/math.py',
+          output: '.output/server/pages/api/util/math.py',
         },
       ],
     });

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "23.1.3-canary.58",
+  "version": "23.1.3-canary.59",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -43,14 +43,14 @@
     "node": ">= 12"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.35",
+    "@vercel/build-utils": "2.12.3-canary.36",
     "@vercel/go": "1.2.4-canary.4",
     "@vercel/node": "1.12.2-canary.7",
     "@vercel/python": "2.1.2-canary.1",
     "@vercel/ruby": "1.2.10-canary.0",
     "update-notifier": "4.1.0",
-    "vercel-plugin-middleware": "0.0.0-canary.11",
-    "vercel-plugin-node": "1.12.2-canary.27"
+    "vercel-plugin-middleware": "0.0.0-canary.12",
+    "vercel-plugin-node": "1.12.2-canary.28"
   },
   "devDependencies": {
     "@next/env": "11.1.2",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "10.2.3-canary.36",
+  "version": "10.2.3-canary.37",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -40,7 +40,7 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.35",
+    "@vercel/build-utils": "2.12.3-canary.36",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",

packages/middleware/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-plugin-middleware",
-  "version": "0.0.0-canary.11",
+  "version": "0.0.0-canary.12",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "",
@@ -30,7 +30,7 @@
     "@types/node-fetch": "^2",
     "@types/ua-parser-js": "0.7.36",
     "@types/uuid": "8.3.1",
-    "@vercel/build-utils": "2.12.3-canary.35",
+    "@vercel/build-utils": "2.12.3-canary.36",
     "@vercel/ncc": "0.24.0",
     "cookie": "0.4.1",
     "formdata-node": "4.3.1",

packages/plugin-go/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-go",
-  "version": "1.0.0-canary.23",
+  "version": "1.0.0-canary.24",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,7 +17,7 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.35",
+    "@vercel/build-utils": "2.12.3-canary.36",
     "@vercel/go": "1.2.4-canary.4"
   },
   "devDependencies": {

packages/plugin-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-plugin-node",
-  "version": "1.12.2-canary.27",
+  "version": "1.12.2-canary.28",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -34,7 +34,7 @@
     "@types/node-fetch": "2",
     "@types/test-listen": "1.1.0",
     "@types/yazl": "2.4.2",
-    "@vercel/build-utils": "2.12.3-canary.35",
+    "@vercel/build-utils": "2.12.3-canary.36",
     "@vercel/fun": "1.0.3",
     "@vercel/ncc": "0.24.0",
     "@vercel/nft": "0.14.0",

packages/plugin-python/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-python",
-  "version": "1.0.0-canary.24",
+  "version": "1.0.0-canary.25",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,7 +17,7 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.35",
+    "@vercel/build-utils": "2.12.3-canary.36",
     "@vercel/python": "2.1.2-canary.1"
   },
   "devDependencies": {

packages/plugin-ruby/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-ruby",
-  "version": "1.0.0-canary.23",
+  "version": "1.0.0-canary.24",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,7 +17,7 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.35",
+    "@vercel/build-utils": "2.12.3-canary.36",
     "@vercel/ruby": "1.2.10-canary.0"
   },
   "devDependencies": {