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

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

@@ -78,7 +78,8 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
         `api-routes-${pluginName}`);
         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 +90,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 },
                 meta: {
                     avoidTopLevelInstall: true,
+                    skipDownload: true,
                 },
             });
             // Legacy Runtimes tend to pollute the `workPath` with compiled results,
@@ -127,7 +129,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 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 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);
@@ -183,54 +184,22 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                     }
                 }
             }
-            const tracedFiles = [];
-            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 === handlerFileBase) {
-                    return;
-                }
-                tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
-                const { fsPath, type } = file;
-                if (fsPath) {
-                    await fs_extra_1.default.ensureDir(path_1.dirname(newPath));
-                    const isNewFile = newFilesEntrypoint.includes(fsPath);
-                    const isInsideNewDirectory = newDirectoriesEntrypoint.some(dirPath => {
-                        return fsPath.startsWith(dirPath);
-                    });
-                    // With this, we're making sure that files in the `workPath` that existed
-                    // before the Legacy Runtime was invoked (source files) are linked from
-                    // `.output` instead of copying there (the latter only happens if linking fails),
-                    // which is the fastest solution. However, files that are created fresh
-                    // by the Legacy Runtimes are always copied, because their link destinations
-                    // are likely to be overwritten every time an entrypoint is processed by
-                    // the Legacy Runtime. This is likely to overwrite the destination on subsequent
-                    // runs, but that's also how `workPath` used to work originally, without
-                    // the File System API (meaning that there was one `workPath` for all entrypoints).
-                    if (isNewFile || isInsideNewDirectory) {
-                        _1.debug(`Copying from ${fsPath} to ${newPath}`);
-                        await fs_extra_1.default.copy(fsPath, newPath);
-                    }
-                    else {
-                        await linkOrCopy(fsPath, newPath);
-                    }
-                }
-                else if (type === 'FileBlob') {
-                    const { data, mode } = file;
-                    await fs_extra_1.default.writeFile(newPath, data, { mode });
-                }
-                else {
-                    throw new Error(`Unknown file type: ${type}`);
-                }
-            });
-            linkersRuntime = linkersRuntime.concat(linkers);
             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),
-                })),
+                version: 2,
+                files: Object.keys(lambdaFiles)
+                    .map(file => {
+                    const { fsPath } = lambdaFiles[file];
+                    if (!fsPath) {
+                        throw new Error(`File "${file}" is missing valid \`fsPath\` property`);
+                    }
+                    // The handler was already moved into position above.
+                    if (file === handlerFileBase) {
+                        return;
+                    }
+                    return normalize_path_1.normalizePath(path_1.relative(path_1.dirname(nft), fsPath));
+                })
+                    .filter(Boolean),
             });
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
             await fs_extra_1.default.writeFile(nft, json);
@@ -257,11 +226,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 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
-        // of them one after the other, while then waiting for the linking
-        // to finish right here, before we clean up newly created files below.
-        await Promise.all(linkersRuntime);
         // A list of all the files that were created by the Legacy Runtime,
         // which we'd like to remove from the File System.
         const toRemove = Array.from(newPathsRuntime).map(path => {
@@ -280,16 +244,6 @@ 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);
-        }
-    }
-}
 async function readJson(filePath) {
     try {
         const str = await fs_extra_1.default.readFile(filePath, 'utf8');
@@ -310,7 +264,7 @@ async function updateFunctionsManifest({ workPath, pages, }) {
     const functionsManifestPath = path_1.join(workPath, '.output', 'functions-manifest.json');
     const functionsManifest = await readJson(functionsManifestPath);
     if (!functionsManifest.version)
-        functionsManifest.version = 1;
+        functionsManifest.version = 2;
     if (!functionsManifest.pages)
         functionsManifest.pages = {};
     for (const [pageKey, pageConfig] of Object.entries(pages)) {

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: [
             {
@@ -32825,7 +32760,8 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
         `api-routes-${pluginName}`);
         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 +32772,7 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 },
                 meta: {
                     avoidTopLevelInstall: true,
+                    skipDownload: true,
                 },
             });
             // Legacy Runtimes tend to pollute the `workPath` with compiled results,
@@ -32874,7 +32811,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 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 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);
@@ -32930,54 +32866,22 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                     }
                 }
             }
-            const tracedFiles = [];
-            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 === handlerFileBase) {
-                    return;
-                }
-                tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
-                const { fsPath, type } = file;
-                if (fsPath) {
-                    await fs_extra_1.default.ensureDir(path_1.dirname(newPath));
-                    const isNewFile = newFilesEntrypoint.includes(fsPath);
-                    const isInsideNewDirectory = newDirectoriesEntrypoint.some(dirPath => {
-                        return fsPath.startsWith(dirPath);
-                    });
-                    // With this, we're making sure that files in the `workPath` that existed
-                    // before the Legacy Runtime was invoked (source files) are linked from
-                    // `.output` instead of copying there (the latter only happens if linking fails),
-                    // which is the fastest solution. However, files that are created fresh
-                    // by the Legacy Runtimes are always copied, because their link destinations
-                    // are likely to be overwritten every time an entrypoint is processed by
-                    // the Legacy Runtime. This is likely to overwrite the destination on subsequent
-                    // runs, but that's also how `workPath` used to work originally, without
-                    // the File System API (meaning that there was one `workPath` for all entrypoints).
-                    if (isNewFile || isInsideNewDirectory) {
-                        _1.debug(`Copying from ${fsPath} to ${newPath}`);
-                        await fs_extra_1.default.copy(fsPath, newPath);
-                    }
-                    else {
-                        await linkOrCopy(fsPath, newPath);
-                    }
-                }
-                else if (type === 'FileBlob') {
-                    const { data, mode } = file;
-                    await fs_extra_1.default.writeFile(newPath, data, { mode });
-                }
-                else {
-                    throw new Error(`Unknown file type: ${type}`);
-                }
-            });
-            linkersRuntime = linkersRuntime.concat(linkers);
             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),
-                })),
+                version: 2,
+                files: Object.keys(lambdaFiles)
+                    .map(file => {
+                    const { fsPath } = lambdaFiles[file];
+                    if (!fsPath) {
+                        throw new Error(`File "${file}" is missing valid \`fsPath\` property`);
+                    }
+                    // The handler was already moved into position above.
+                    if (file === handlerFileBase) {
+                        return;
+                    }
+                    return normalize_path_1.normalizePath(path_1.relative(path_1.dirname(nft), fsPath));
+                })
+                    .filter(Boolean),
             });
             await fs_extra_1.default.ensureDir(path_1.dirname(nft));
             await fs_extra_1.default.writeFile(nft, json);
@@ -33004,11 +32908,6 @@ function convertRuntimeToPlugin(buildRuntime, packageName, ext) {
                 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
-        // of them one after the other, while then waiting for the linking
-        // to finish right here, before we clean up newly created files below.
-        await Promise.all(linkersRuntime);
         // A list of all the files that were created by the Legacy Runtime,
         // which we'd like to remove from the File System.
         const toRemove = Array.from(newPathsRuntime).map(path => {
@@ -33027,16 +32926,6 @@ 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);
-        }
-    }
-}
 async function readJson(filePath) {
     try {
         const str = await fs_extra_1.default.readFile(filePath, 'utf8');
@@ -33057,7 +32946,7 @@ async function updateFunctionsManifest({ workPath, pages, }) {
     const functionsManifestPath = path_1.join(workPath, '.output', 'functions-manifest.json');
     const functionsManifest = await readJson(functionsManifestPath);
     if (!functionsManifest.version)
-        functionsManifest.version = 1;
+        functionsManifest.version = 2;
     if (!functionsManifest.pages)
         functionsManifest.pages = {};
     for (const [pageKey, pageConfig] of Object.entries(pages)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.35",
+  "version": "2.12.3-canary.39",
   "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": "2c3ddffaacb370eb4c0893815b3bc7417f92d432"
+  "gitHead": "2c86ac654ccde97426127fd0a6ffd04253227c50"
 }