@vercel/build-utils 2.12.3-canary.34 → 2.12.3-canary.35

package/dist/convert-runtime-to-plugin.js

@@ -98,14 +98,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
             // so we don't want to pollute this space unnecessarily. That means we have to clean
             // up files that were created by the build, which is done further below.
             const sourceFilesAfterBuild = await getSourceFiles(workPath, ignoreFilter);
-            // Further down, we will need the filename of the Lambda handler
-            // for placing it inside `server/pages/api`, but because Legacy Runtimes
-            // don't expose the filename directly, we have to construct it
-            // from the handler name, and then find the matching file further below,
-            // because we don't yet know its extension here.
-            const handler = output.handler;
-            const handlerMethod = handler.split('.').reverse()[0];
-            const handlerFileName = handler.replace(`.${handlerMethod}`, '');
             // @ts-ignore This symbol is a private API
             const lambdaFiles = output[lambda_1.FILES_SYMBOL];
             // When deploying, the `files` that are passed to the Legacy Runtimes already
@@ -117,20 +109,34 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                     delete lambdaFiles[file];
                 }
             }
-            const handlerFilePath = Object.keys(lambdaFiles).find(item => {
-                return path_1.parse(item).name === handlerFileName;
-            });
-            const handlerFileOrigin = lambdaFiles[handlerFilePath || ''].fsPath;
-            if (!handlerFileOrigin) {
-                throw new Error(`Could not find a handler file. Please ensure that the list of \`files\` defined for the returned \`Lambda\` contains a file with the name ${handlerFileName} (+ any extension).`);
+            let handlerFileBase = output.handler;
+            let handlerFile = lambdaFiles[handlerFileBase];
+            const { handler } = output;
+            const handlerMethod = handler.split('.').pop();
+            const handlerFileName = handler.replace(`.${handlerMethod}`, '');
+            // For compiled languages, the launcher file for the Lambda generated
+            // by the Legacy Runtime matches the `handler` defined for it, but for
+            // interpreted languages, the `handler` consists of the launcher file name
+            // without an extension, plus the name of the method inside of that file
+            // that should be invoked, so we have to construct the file path explicitly.
+            if (!handlerFile) {
+                handlerFileBase = handlerFileName + ext;
+                handlerFile = lambdaFiles[handlerFileBase];
+            }
+            if (!handlerFile || !handlerFile.fsPath) {
+                throw new Error(`Could not find a handler file. Please ensure that \`files\` for the returned \`Lambda\` contains an \`FileFsRef\` named "${handlerFileBase}" with a valid \`fsPath\`.`);
             }
-            const entry = path_1.join(workPath, '.output', 'server', 'pages', entrypoint);
+            const handlerExtName = path_1.extname(handlerFile.fsPath);
+            const entryRoot = path_1.join(workPath, '.output', 'server', 'pages');
+            const entryBase = path_1.basename(entrypoint).replace(ext, handlerExtName);
+            const entryPath = path_1.join(path_1.dirname(entrypoint), entryBase);
+            const entry = path_1.join(entryRoot, entryPath);
             // We never want to link here, only copy, because the launcher
             // file often has the same name for every entrypoint, which means that
             // every build for every entrypoint overwrites the launcher of the previous
             // one, so linking would end with a broken reference.
             await fs_extra_1.default.ensureDir(path_1.dirname(entry));
-            await fs_extra_1.default.copy(handlerFileOrigin, entry);
+            await fs_extra_1.default.copy(handlerFile.fsPath, entry);
             const newFilesEntrypoint = [];
             const newDirectoriesEntrypoint = [];
             const preBuildFiles = Object.values(sourceFilesPreBuild).map(file => {
@@ -181,7 +187,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
             const linkers = Object.entries(lambdaFiles).map(async ([relPath, file]) => {
                 const newPath = path_1.join(traceDir, relPath);
                 // The handler was already moved into position above.
-                if (relPath === handlerFilePath) {
+                if (relPath === handlerFileBase) {
                     return;
                 }
                 tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
@@ -218,7 +224,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 }
             });
             linkersRuntime = linkersRuntime.concat(linkers);
-            const nft = path_1.join(workPath, '.output', 'server', 'pages', `${entrypoint}.nft.json`);
+            const nft = `${entry}.nft.json`;
             const json = JSON.stringify({
                 version: 1,
                 files: tracedFiles.map(file => ({
@@ -236,11 +242,14 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 ...newFilesEntrypoint,
                 ...newDirectoriesEntrypoint,
             ]);
-            const apiRouteHandler = `${path_1.parse(entry).name}.${handlerMethod}`;
             // Add an entry that will later on be added to the `functions-manifest.json`
             // file that is placed inside of the `.output` directory.
-            pages[entrypoint] = {
-                handler: apiRouteHandler,
+            pages[normalize_path_1.normalizePath(entryPath)] = {
+                // Because the underlying file used as a handler was placed
+                // inside `.output/server/pages/api`, it no longer has the name it originally
+                // had and is now named after the API Route that it's responsible for,
+                // so we have to adjust the name of the Lambda handler accordingly.
+                handler: handler.replace(handlerFileName, path_1.parse(entry).name),
                 runtime: output.runtime,
                 memory: output.memory,
                 maxDuration: output.maxDuration,

package/dist/index.js

@@ -32845,14 +32845,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
             // so we don't want to pollute this space unnecessarily. That means we have to clean
             // up files that were created by the build, which is done further below.
             const sourceFilesAfterBuild = await getSourceFiles(workPath, ignoreFilter);
-            // Further down, we will need the filename of the Lambda handler
-            // for placing it inside `server/pages/api`, but because Legacy Runtimes
-            // don't expose the filename directly, we have to construct it
-            // from the handler name, and then find the matching file further below,
-            // because we don't yet know its extension here.
-            const handler = output.handler;
-            const handlerMethod = handler.split('.').reverse()[0];
-            const handlerFileName = handler.replace(`.${handlerMethod}`, '');
             // @ts-ignore This symbol is a private API
             const lambdaFiles = output[lambda_1.FILES_SYMBOL];
             // When deploying, the `files` that are passed to the Legacy Runtimes already
@@ -32864,20 +32856,34 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                     delete lambdaFiles[file];
                 }
             }
-            const handlerFilePath = Object.keys(lambdaFiles).find(item => {
-                return path_1.parse(item).name === handlerFileName;
-            });
-            const handlerFileOrigin = lambdaFiles[handlerFilePath || ''].fsPath;
-            if (!handlerFileOrigin) {
-                throw new Error(`Could not find a handler file. Please ensure that the list of \`files\` defined for the returned \`Lambda\` contains a file with the name ${handlerFileName} (+ any extension).`);
+            let handlerFileBase = output.handler;
+            let handlerFile = lambdaFiles[handlerFileBase];
+            const { handler } = output;
+            const handlerMethod = handler.split('.').pop();
+            const handlerFileName = handler.replace(`.${handlerMethod}`, '');
+            // For compiled languages, the launcher file for the Lambda generated
+            // by the Legacy Runtime matches the `handler` defined for it, but for
+            // interpreted languages, the `handler` consists of the launcher file name
+            // without an extension, plus the name of the method inside of that file
+            // that should be invoked, so we have to construct the file path explicitly.
+            if (!handlerFile) {
+                handlerFileBase = handlerFileName + ext;
+                handlerFile = lambdaFiles[handlerFileBase];
+            }
+            if (!handlerFile || !handlerFile.fsPath) {
+                throw new Error(`Could not find a handler file. Please ensure that \`files\` for the returned \`Lambda\` contains an \`FileFsRef\` named "${handlerFileBase}" with a valid \`fsPath\`.`);
             }
-            const entry = path_1.join(workPath, '.output', 'server', 'pages', entrypoint);
+            const handlerExtName = path_1.extname(handlerFile.fsPath);
+            const entryRoot = path_1.join(workPath, '.output', 'server', 'pages');
+            const entryBase = path_1.basename(entrypoint).replace(ext, handlerExtName);
+            const entryPath = path_1.join(path_1.dirname(entrypoint), entryBase);
+            const entry = path_1.join(entryRoot, entryPath);
             // We never want to link here, only copy, because the launcher
             // file often has the same name for every entrypoint, which means that
             // every build for every entrypoint overwrites the launcher of the previous
             // one, so linking would end with a broken reference.
             await fs_extra_1.default.ensureDir(path_1.dirname(entry));
-            await fs_extra_1.default.copy(handlerFileOrigin, entry);
+            await fs_extra_1.default.copy(handlerFile.fsPath, entry);
             const newFilesEntrypoint = [];
             const newDirectoriesEntrypoint = [];
             const preBuildFiles = Object.values(sourceFilesPreBuild).map(file => {
@@ -32928,7 +32934,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
             const linkers = Object.entries(lambdaFiles).map(async ([relPath, file]) => {
                 const newPath = path_1.join(traceDir, relPath);
                 // The handler was already moved into position above.
-                if (relPath === handlerFilePath) {
+                if (relPath === handlerFileBase) {
                     return;
                 }
                 tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
@@ -32965,7 +32971,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 }
             });
             linkersRuntime = linkersRuntime.concat(linkers);
-            const nft = path_1.join(workPath, '.output', 'server', 'pages', `${entrypoint}.nft.json`);
+            const nft = `${entry}.nft.json`;
             const json = JSON.stringify({
                 version: 1,
                 files: tracedFiles.map(file => ({
@@ -32983,11 +32989,14 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 ...newFilesEntrypoint,
                 ...newDirectoriesEntrypoint,
             ]);
-            const apiRouteHandler = `${path_1.parse(entry).name}.${handlerMethod}`;
             // Add an entry that will later on be added to the `functions-manifest.json`
             // file that is placed inside of the `.output` directory.
-            pages[entrypoint] = {
-                handler: apiRouteHandler,
+            pages[normalize_path_1.normalizePath(entryPath)] = {
+                // Because the underlying file used as a handler was placed
+                // inside `.output/server/pages/api`, it no longer has the name it originally
+                // had and is now named after the API Route that it's responsible for,
+                // so we have to adjust the name of the Lambda handler accordingly.
+                handler: handler.replace(handlerFileName, path_1.parse(entry).name),
                 runtime: output.runtime,
                 memory: output.memory,
                 maxDuration: output.maxDuration,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.34",
+  "version": "2.12.3-canary.35",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "34f4222ca2d3cc5134469daa355a7f67c2054c9b"
+  "gitHead": "2c3ddffaacb370eb4c0893815b3bc7417f92d432"
 }