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

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,
@@ -89,6 +91,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 },
                 meta: {
                     avoidTopLevelInstall: true,
+                    skipDownload: true,
                 },
             });
             // Legacy Runtimes tend to pollute the `workPath` with compiled results,
@@ -98,14 +101,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 +112,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];
+            }
+            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 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 +189,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,12 +226,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));
@@ -236,11 +246,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

@@ -26693,7 +26693,6 @@ exports.frameworks = [
         },
         dependency: 'gatsby',
         getOutputDirName: async () => 'public',
-        getFsOutputDir: async () => 'public',
         defaultRoutes: async (dirPrefix) => {
             // This file could be generated by gatsby-plugin-now or gatsby-plugin-zeit-now
             try {
@@ -26774,7 +26773,6 @@ exports.frameworks = [
             },
         },
         dependency: 'remix',
-        getFsOutputDir: async () => 'public',
         getOutputDirName: async () => 'public',
         defaultRoutes: [
             {
@@ -26802,10 +26800,13 @@ exports.frameworks = [
                 source: '/build/(.*)',
                 regex: '/build/(.*)',
                 headers: [
-                    { key: 'cache-control', value: 'public, max-age=31536000, immutable' },
+                    {
+                        key: 'cache-control',
+                        value: 'public, max-age=31536000, immutable',
+                    },
                 ],
             },
-        ]
+        ],
     },
     {
         name: 'Hexo',
@@ -26840,7 +26841,6 @@ exports.frameworks = [
             },
         },
         dependency: 'hexo',
-        getFsOutputDir: async () => 'public',
         getOutputDirName: async () => 'public',
     },
     {
@@ -26876,7 +26876,6 @@ exports.frameworks = [
             },
         },
         dependency: '@11ty/eleventy',
-        getFsOutputDir: async () => '_site',
         getOutputDirName: async () => '_site',
         cachePattern: '.cache/**',
     },
@@ -26913,21 +26912,6 @@ exports.frameworks = [
             },
         },
         dependency: '@docusaurus/core',
-        getFsOutputDir: async (dirPrefix) => {
-            const base = 'build';
-            try {
-                const location = path_1.join(dirPrefix, base);
-                const content = await readdir(location, { withFileTypes: true });
-                // If there is only one file in it that is a dir we'll use it as dist dir
-                if (content.length === 1 && content[0].isDirectory()) {
-                    return path_1.join(base, content[0].name);
-                }
-            }
-            catch (error) {
-                console.error(`Error detecting output directory: `, error);
-            }
-            return base;
-        },
         getOutputDirName: async (dirPrefix) => {
             const base = 'build';
             try {
@@ -27057,21 +27041,6 @@ exports.frameworks = [
             },
         },
         dependency: 'docusaurus',
-        getFsOutputDir: async (dirPrefix) => {
-            const base = 'build';
-            try {
-                const location = path_1.join(dirPrefix, base);
-                const content = await readdir(location, { withFileTypes: true });
-                // If there is only one file in it that is a dir we'll use it as dist dir
-                if (content.length === 1 && content[0].isDirectory()) {
-                    return path_1.join(base, content[0].name);
-                }
-            }
-            catch (error) {
-                console.error(`Error detecting output directory: `, error);
-            }
-            return base;
-        },
         getOutputDirName: async (dirPrefix) => {
             const base = 'build';
             try {
@@ -27121,7 +27090,6 @@ exports.frameworks = [
             },
         },
         dependency: 'preact-cli',
-        getFsOutputDir: async () => 'build',
         getOutputDirName: async () => 'build',
         defaultRoutes: [
             {
@@ -27176,7 +27144,6 @@ exports.frameworks = [
             },
         },
         dependency: '@dojo/cli',
-        getFsOutputDir: async () => 'output/dist',
         getOutputDirName: async () => path_1.join('output', 'dist'),
         defaultRoutes: [
             {
@@ -27241,7 +27208,6 @@ exports.frameworks = [
             },
         },
         dependency: 'ember-cli',
-        getFsOutputDir: async () => 'dist',
         getOutputDirName: async () => 'dist',
         defaultRoutes: [
             {
@@ -27294,7 +27260,6 @@ exports.frameworks = [
             },
         },
         dependency: '@vue/cli-service',
-        getFsOutputDir: async () => 'dist',
         getOutputDirName: async () => 'dist',
         defaultRoutes: [
             {
@@ -27370,7 +27335,6 @@ exports.frameworks = [
             },
         },
         dependency: '@scullyio/init',
-        getFsOutputDir: async () => 'dist',
         getOutputDirName: async () => 'dist/static',
     },
     {
@@ -27405,7 +27369,6 @@ exports.frameworks = [
             },
         },
         dependency: '@ionic/angular',
-        getFsOutputDir: async () => 'www',
         getOutputDirName: async () => 'www',
         defaultRoutes: [
             {
@@ -27457,7 +27420,6 @@ exports.frameworks = [
             },
         },
         dependency: '@angular/cli',
-        getFsOutputDir: async () => 'dist',
         getOutputDirName: async (dirPrefix) => {
             const base = 'dist';
             try {
@@ -27523,7 +27485,6 @@ exports.frameworks = [
             },
         },
         dependency: 'polymer-cli',
-        getFsOutputDir: async () => 'build',
         getOutputDirName: async (dirPrefix) => {
             const base = 'build';
             try {
@@ -27591,7 +27552,6 @@ exports.frameworks = [
             },
         },
         dependency: 'sirv-cli',
-        getFsOutputDir: async () => 'public',
         getOutputDirName: async () => 'public',
         defaultRoutes: [
             {
@@ -27639,10 +27599,9 @@ exports.frameworks = [
                 placeholder: 'svelte-kit dev',
             },
             outputDirectory: {
-                placeholder: 'public',
+                value: 'public',
             },
         },
-        getFsOutputDir: async () => '.output',
         getOutputDirName: async () => 'public',
     },
     {
@@ -27677,7 +27636,6 @@ exports.frameworks = [
             },
         },
         dependency: '@ionic/react',
-        getFsOutputDir: async () => 'build',
         getOutputDirName: async () => 'build',
         defaultRoutes: [
             {
@@ -27782,7 +27740,6 @@ exports.frameworks = [
             },
         },
         dependency: 'react-scripts',
-        getFsOutputDir: async () => 'build',
         getOutputDirName: async () => 'build',
         defaultRoutes: [
             {
@@ -27882,7 +27839,6 @@ exports.frameworks = [
             },
         },
         dependency: 'gridsome',
-        getFsOutputDir: async () => 'dist',
         getOutputDirName: async () => 'dist',
     },
     {
@@ -27918,7 +27874,6 @@ exports.frameworks = [
             },
         },
         dependency: 'umi',
-        getFsOutputDir: async () => 'dist',
         getOutputDirName: async () => 'dist',
         defaultRoutes: [
             {
@@ -27970,7 +27925,6 @@ exports.frameworks = [
             },
         },
         dependency: 'sapper',
-        getFsOutputDir: async () => '__sapper__/export',
         getOutputDirName: async () => '__sapper__/export',
     },
     {
@@ -28006,7 +27960,6 @@ exports.frameworks = [
             },
         },
         dependency: 'saber',
-        getFsOutputDir: async () => 'public',
         getOutputDirName: async () => 'public',
         defaultRoutes: [
             {
@@ -28073,7 +28026,6 @@ exports.frameworks = [
             },
         },
         dependency: '@stencil/core',
-        getFsOutputDir: async () => 'www',
         getOutputDirName: async () => 'www',
         defaultRoutes: [
             {
@@ -28160,7 +28112,6 @@ exports.frameworks = [
             },
         },
         dependency: 'nuxt',
-        getFsOutputDir: async () => '.output',
         getOutputDirName: async () => 'dist',
         cachePattern: '.nuxt/**',
         defaultRoutes: [
@@ -28217,7 +28168,6 @@ exports.frameworks = [
                 placeholder: 'RedwoodJS default',
             },
         },
-        getFsOutputDir: async () => 'public',
         getOutputDirName: async () => 'public',
     },
     {
@@ -28260,12 +28210,6 @@ exports.frameworks = [
                 placeholder: '`public` or `publishDir` from the `config` file',
             },
         },
-        getFsOutputDir: async (dirPrefix) => {
-            const config = await read_config_file_1.readConfigFile(['config.json', 'config.yaml', 'config.toml'].map(fileName => {
-                return path_1.join(dirPrefix, fileName);
-            }));
-            return (config && config.publishDir) || 'public';
-        },
         getOutputDirName: async (dirPrefix) => {
             const config = await read_config_file_1.readConfigFile(['config.json', 'config.yaml', 'config.toml'].map(fileName => {
                 return path_1.join(dirPrefix, fileName);
@@ -28305,10 +28249,6 @@ exports.frameworks = [
                 placeholder: '`_site` or `destination` from `_config.yml`',
             },
         },
-        getFsOutputDir: async (dirPrefix) => {
-            const config = await read_config_file_1.readConfigFile(path_1.join(dirPrefix, '_config.yml'));
-            return (config && config.destination) || '_site';
-        },
         getOutputDirName: async (dirPrefix) => {
             const config = await read_config_file_1.readConfigFile(path_1.join(dirPrefix, '_config.yml'));
             return (config && config.destination) || '_site';
@@ -28346,7 +28286,6 @@ exports.frameworks = [
                 value: 'public',
             },
         },
-        getFsOutputDir: async () => 'public',
         getOutputDirName: async () => 'public',
     },
     {
@@ -28380,7 +28319,6 @@ exports.frameworks = [
                 value: 'build',
             },
         },
-        getFsOutputDir: async () => 'build',
         getOutputDirName: async () => 'build',
         cachePattern: '{vendor/bin,vendor/cache,vendor/bundle}/**',
     },
@@ -28415,7 +28353,6 @@ exports.frameworks = [
                 value: 'public',
             },
         },
-        getFsOutputDir: async () => 'public',
         getOutputDirName: async () => 'public',
         defaultVersion: '0.13.0',
     },
@@ -28453,7 +28390,6 @@ exports.frameworks = [
             },
         },
         dependency: 'vite',
-        getFsOutputDir: async () => 'dist',
         getOutputDirName: async () => 'dist',
     },
     {
@@ -28489,7 +28425,6 @@ exports.frameworks = [
             },
         },
         dependency: 'parcel',
-        getFsOutputDir: async () => 'dist',
         getOutputDirName: async () => 'dist',
         defaultRoutes: [
             {
@@ -32826,6 +32761,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,
@@ -32836,6 +32773,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 },
                 meta: {
                     avoidTopLevelInstall: true,
+                    skipDownload: true,
                 },
             });
             // Legacy Runtimes tend to pollute the `workPath` with compiled results,
@@ -32845,14 +32783,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 +32794,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];
+            }
+            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 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 +32871,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,12 +32908,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));
@@ -32983,11 +32928,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.38",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -30,7 +30,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.5.1-canary.16",
+    "@vercel/frameworks": "0.5.1-canary.17",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "34f4222ca2d3cc5134469daa355a7f67c2054c9b"
+  "gitHead": "6792edf32a1a81f240cc1b5c9f9cc756a9a2b83b"
 }