@vercel/build-utils 2.12.3-canary.33 → 2.12.3-canary.37

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

@@ -79,6 +79,8 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
         await fs_extra_1.default.ensureDir(traceDir);
         let newPathsRuntime = new Set();
         let linkersRuntime = [];
+        const entryDir = path_1.join('.output', 'server', 'pages');
+        const entryRoot = path_1.join(workPath, entryDir);
         for (const entrypoint of Object.keys(entrypoints)) {
             const { output } = await buildRuntime({
                 files: sourceFilesPreBuild,
@@ -98,22 +100,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}`, '');
-            pages[entrypoint] = {
-                handler: handler,
-                runtime: output.runtime,
-                memory: output.memory,
-                maxDuration: output.maxDuration,
-                environment: output.environment,
-                allowQuery: output.allowQuery,
-            };
             // @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
@@ -125,16 +111,33 @@ 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];
             }
-            const entry = path_1.join(workPath, '.output', 'server', 'pages', entrypoint);
+            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 handlerExtName = path_1.extname(handlerFile.fsPath);
+            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 linkOrCopy(handlerFileOrigin, entry);
+            await fs_extra_1.default.copy(handlerFile.fsPath, entry);
             const newFilesEntrypoint = [];
             const newDirectoriesEntrypoint = [];
             const preBuildFiles = Object.values(sourceFilesPreBuild).map(file => {
@@ -185,7 +188,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 });
@@ -222,12 +225,14 @@ 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 => ({
                     input: normalize_path_1.normalizePath(path_1.relative(path_1.dirname(nft), file.absolutePath)),
-                    output: normalize_path_1.normalizePath(file.relativePath),
+                    // We'd like to place all the dependency files right next
+                    // to the final launcher file inside of the Lambda.
+                    output: normalize_path_1.normalizePath(path_1.join(entryDir, 'api', file.relativePath)),
                 })),
             });
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
@@ -240,6 +245,20 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 ...newFilesEntrypoint,
                 ...newDirectoriesEntrypoint,
             ]);
+            // Add an entry that will later on be added to the `functions-manifest.json`
+            // file that is placed inside of the `.output` directory.
+            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,
+                environment: output.environment,
+                allowQuery: output.allowQuery,
+            };
         }
         // Instead of of waiting for all of the linking to be done for every
         // entrypoint before processing the next one, we immediately handle all
@@ -265,14 +284,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
 async function linkOrCopy(existingPath, newPath) {
-    try {
-        await fs_extra_1.default.createLink(existingPath, newPath);
-    }
-    catch (err) {
-        if (err.code !== 'EEXIST') {
-            await fs_extra_1.default.copyFile(existingPath, newPath);
-        }
-    }
+    await fs_extra_1.default.copyFile(existingPath, newPath);
 }
 async function readJson(filePath) {
     try {

package/dist/index.js

@@ -32826,6 +32826,8 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
         await fs_extra_1.default.ensureDir(traceDir);
         let newPathsRuntime = new Set();
         let linkersRuntime = [];
+        const entryDir = path_1.join('.output', 'server', 'pages');
+        const entryRoot = path_1.join(workPath, entryDir);
         for (const entrypoint of Object.keys(entrypoints)) {
             const { output } = await buildRuntime({
                 files: sourceFilesPreBuild,
@@ -32845,22 +32847,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}`, '');
-            pages[entrypoint] = {
-                handler: handler,
-                runtime: output.runtime,
-                memory: output.memory,
-                maxDuration: output.maxDuration,
-                environment: output.environment,
-                allowQuery: output.allowQuery,
-            };
             // @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
@@ -32872,16 +32858,33 @@ 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];
             }
-            const entry = path_1.join(workPath, '.output', 'server', 'pages', entrypoint);
+            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 handlerExtName = path_1.extname(handlerFile.fsPath);
+            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 linkOrCopy(handlerFileOrigin, entry);
+            await fs_extra_1.default.copy(handlerFile.fsPath, entry);
             const newFilesEntrypoint = [];
             const newDirectoriesEntrypoint = [];
             const preBuildFiles = Object.values(sourceFilesPreBuild).map(file => {
@@ -32932,7 +32935,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 });
@@ -32969,12 +32972,14 @@ 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 => ({
                     input: normalize_path_1.normalizePath(path_1.relative(path_1.dirname(nft), file.absolutePath)),
-                    output: normalize_path_1.normalizePath(file.relativePath),
+                    // We'd like to place all the dependency files right next
+                    // to the final launcher file inside of the Lambda.
+                    output: normalize_path_1.normalizePath(path_1.join(entryDir, 'api', file.relativePath)),
                 })),
             });
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
@@ -32987,6 +32992,20 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 ...newFilesEntrypoint,
                 ...newDirectoriesEntrypoint,
             ]);
+            // Add an entry that will later on be added to the `functions-manifest.json`
+            // file that is placed inside of the `.output` directory.
+            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,
+                environment: output.environment,
+                allowQuery: output.allowQuery,
+            };
         }
         // Instead of of waiting for all of the linking to be done for every
         // entrypoint before processing the next one, we immediately handle all
@@ -33012,14 +33031,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
 }
 exports.convertRuntimeToPlugin = convertRuntimeToPlugin;
 async function linkOrCopy(existingPath, newPath) {
-    try {
-        await fs_extra_1.default.createLink(existingPath, newPath);
-    }
-    catch (err) {
-        if (err.code !== 'EEXIST') {
-            await fs_extra_1.default.copyFile(existingPath, newPath);
-        }
-    }
+    await fs_extra_1.default.copyFile(existingPath, newPath);
 }
 async function readJson(filePath) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.33",
+  "version": "2.12.3-canary.37",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "5efd3b98deb33029180ac40b0e30df1155c1ea5d"
+  "gitHead": "fe43c9c4b2e8fdefbc4b35778e4593a55feddac0"
 }